[llvm] r363718 - Revert [SROA] Enhance SROA to handle `addrspacecast`ed allocas

[Jordan Rupprecht via llvm-commits]

Author: rupprecht
Date: Tue Jun 18 11:40:04 2019
New Revision: 363718

URL: http://llvm.org/viewvc/llvm-project?rev=363718&view=rev
Log:
Revert [SROA] Enhance SROA to handle `addrspacecast`ed allocas

This reverts r363711 (git commit 76a149ef8187310a60fd20481fdb2a10c8ba968e)

This causes stage2 build failures, e.g.:
http://lab.llvm.org:8011/builders/clang-x64-windows-msvc/builds/132/steps/stage%202%20build/logs/stdio
http://lab.llvm.org:8011/builders/ppc64le-lld-multistage-test/builds/87/steps/build-stage2-unified-tree/logs/stdio

Modified:
    llvm/trunk/lib/Transforms/Scalar/SROA.cpp
    llvm/trunk/test/Transforms/SROA/addrspacecast.ll

Modified: llvm/trunk/lib/Transforms/Scalar/SROA.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SROA.cpp?rev=363718&r1=363717&r2=363718&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/SROA.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/SROA.cpp Tue Jun 18 11:40:04 2019
@@ -1589,12 +1589,6 @@ static Value *getAdjustedPtr(IRBuilderTy
   PointerType *TargetPtrTy = cast<PointerType>(PointerTy);
   Type *TargetTy = TargetPtrTy->getElementType();
 
-  // As `addrspacecast` is , `Ptr` (the storage pointer) may have different
-  // address space from the expected `PointerTy` (the pointer to be used).
-  // Adjust the pointer type based the original storage pointer.
-  auto AS = cast<PointerType>(Ptr->getType())->getAddressSpace();
-  PointerTy = PointerTy->getPointerTo(AS);
-
   do {
     // First fold any existing GEPs into the offset.
     while (GEPOperator *GEP = dyn_cast<GEPOperator>(Ptr)) {

Modified: llvm/trunk/test/Transforms/SROA/addrspacecast.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SROA/addrspacecast.ll?rev=363718&r1=363717&r2=363718&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SROA/addrspacecast.ll (original)
+++ llvm/trunk/test/Transforms/SROA/addrspacecast.ll Tue Jun 18 11:40:04 2019
@@ -299,21 +299,6 @@ define void @select_addrspacecast_gv(i1
   ret void
 }
 
-; CHECK-LABEL: @select_addrspacecast_i8(
-; CHECK: [[SEL:%.*]] = select i1 undef, i8 undef, i8 undef
-; CHECK-NEXT: ret i8 [[SEL]]
-define i8 @select_addrspacecast_i8() {
-  %a = alloca i8
-  %b = alloca i8
-
-  %a.ptr = addrspacecast i8* %a to i8 addrspace(1)*
-  %b.ptr = addrspacecast i8* %b to i8 addrspace(1)*
-
-  %ptr = select i1 undef, i8 addrspace(1)* %a.ptr, i8 addrspace(1)* %b.ptr
-  %ret = load i8, i8 addrspace(1)* %ptr
-  ret i8 %ret
-}
-
 !0 = !{!1, !1, i64 0, i64 1}
 !1 = !{!2, i64 1, !"type_0"}
 !2 = !{!"root"}