From: Mitch Phillips <mitchphillips@outlook.com>
Date: Wed, 6 Mar 2019 00:25:40 +0000 (+0000)
Subject: Revert "[AtomicExpand] Allow libcall expansion for non-zero address spaces" for build... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eec5d41710cfe04a7869ccfd743f4a5c7dec54be;p=llvm

Revert "[AtomicExpand] Allow libcall expansion for non-zero address spaces" for buildbot failures.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@355461 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/AtomicExpandPass.cpp b/lib/CodeGen/AtomicExpandPass.cpp
index 10dd21d1ef9..c247a8afcf7 100644
--- a/lib/CodeGen/AtomicExpandPass.cpp
+++ b/lib/CodeGen/AtomicExpandPass.cpp
@@ -1691,14 +1691,8 @@ bool AtomicExpand::expandAtomicOpToLibcall(
   }
 
   // 'ptr' argument.
-  // note: This assumes all address spaces share a common libfunc
-  // implementation and that addresses are convertable.  For systems without
-  // that property, we'd need to extend this mechanism to support AS-specific
-  // families of atomic intrinsics.
-  auto PtrTypeAS = PointerOperand->getType()->getPointerAddressSpace();
-  Value *PtrVal = Builder.CreateBitCast(PointerOperand,
-                                        Type::getInt8PtrTy(Ctx, PtrTypeAS));
-  PtrVal = Builder.CreateAddrSpaceCast(PtrVal, Type::getInt8PtrTy(Ctx));
+  Value *PtrVal =
+      Builder.CreateBitCast(PointerOperand, Type::getInt8PtrTy(Ctx));
   Args.push_back(PtrVal);
 
   // 'expected' argument, if present.
diff --git a/test/Transforms/AtomicExpand/X86/expand-atomic-libcall.ll b/test/Transforms/AtomicExpand/X86/expand-atomic-libcall.ll
deleted file mode 100644
index 7bea3d75c3f..00000000000
--- a/test/Transforms/AtomicExpand/X86/expand-atomic-libcall.ll
+++ /dev/null
@@ -1,36 +0,0 @@
-; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -S -mtriple=i686-linux-gnu -atomic-expand %s | FileCheck %s
-
-
-define i256 @atomic_load256_libcall(i256* %ptr) nounwind {
-; CHECK-LABEL: @atomic_load256_libcall(
-; CHECK-NEXT:    [[TMP1:%.*]] = bitcast i256* [[PTR:%.*]] to i8*
-; CHECK-NEXT:    [[TMP2:%.*]] = alloca i256, align 8
-; CHECK-NEXT:    [[TMP3:%.*]] = bitcast i256* [[TMP2]] to i8*
-; CHECK-NEXT:    call void @llvm.lifetime.start.p0i8(i64 32, i8* [[TMP3]])
-; CHECK-NEXT:    call void @__atomic_load(i64 32, i8* [[TMP1]], i8* [[TMP3]], i32 0)
-; CHECK-NEXT:    [[TMP4:%.*]] = load i256, i256* [[TMP2]], align 8
-; CHECK-NEXT:    call void @llvm.lifetime.end.p0i8(i64 32, i8* [[TMP3]])
-; CHECK-NEXT:    ret i256 [[TMP4]]
-;
-  %result = load atomic i256, i256* %ptr unordered, align 16
-  ret i256 %result
-}
-
-define i256 @atomic_load256_libcall_as1(i256 addrspace(1)* %ptr) nounwind {
-; CHECK-LABEL: @atomic_load256_libcall_as1(
-; CHECK-NEXT:    [[TMP1:%.*]] = bitcast i256 addrspace(1)* [[PTR:%.*]] to i8 addrspace(1)*
-; CHECK-NEXT:    [[TMP2:%.*]] = addrspacecast i8 addrspace(1)* [[TMP1]] to i8*
-; CHECK-NEXT:    [[TMP3:%.*]] = alloca i256, align 8
-; CHECK-NEXT:    [[TMP4:%.*]] = bitcast i256* [[TMP3]] to i8*
-; CHECK-NEXT:    call void @llvm.lifetime.start.p0i8(i64 32, i8* [[TMP4]])
-; CHECK-NEXT:    call void @__atomic_load(i64 32, i8* [[TMP2]], i8* [[TMP4]], i32 0)
-; CHECK-NEXT:    [[TMP5:%.*]] = load i256, i256* [[TMP3]], align 8
-; CHECK-NEXT:    call void @llvm.lifetime.end.p0i8(i64 32, i8* [[TMP4]])
-; CHECK-NEXT:    ret i256 [[TMP5]]
-;
-  %result = load atomic i256, i256 addrspace(1)* %ptr unordered, align 16
-  ret i256 %result
-}
-
-; CHECK: fail