Revert the series of commits starting with r166578 which introduced the

getIntPtrType support for multiple address spaces via a pointer type,
and also introduced a crasher bug in the constant folder reported in
PR14233.

These commits also contained several problems that should really be
addressed before they are re-committed. I have avoided reverting various
cleanups to the DataLayout APIs that are reasonable to have moving
forward in order to reduce the amount of churn, and minimize the number
of commits that were reverted. I've also manually updated merge
conflicts and manually arranged for the getIntPtrType function to stay
in DataLayout and to be defined in a plausible way after this revert.

Thanks to Duncan for working through this exact strategy with me, and
Nick Lewycky for tracking down the really annoying crasher this
triggered. (Test case to follow in its own commit.)

After discussing with Duncan extensively, and based on a note from
Micah, I'm going to continue to back out some more of the more
problematic patches in this series in order to ensure we go into the
LLVM 3.2 branch with a reasonable story here. I'll send a note to
llvmdev explaining what's going on and why.

Summary of reverted revisions:

r166634: Fix a compiler warning with an unused variable.
r166607: Add some cleanup to the DataLayout changes requested by
         Chandler.
r166596: Revert "Back out r166591, not sure why this made it through
         since I cancelled the command. Bleh, sorry about this!
r166591: Delete a directory that wasn't supposed to be checked in yet.
r166578: Add in support for getIntPtrType to get the pointer type based
         on the address space.

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

2 files changed, 0 insertions, 278 deletions

diff --git a/test/Other/multi-pointer-size.ll b/test/Other/multi-pointer-size.ll
deleted file mode 100644
index 95fa54b8f2..0000000000
--- a/test/Other/multi-pointer-size.ll
+++ /dev/null
@@ -1,43 +0,0 @@
-; RUN: opt -instcombine %s | llvm-dis | FileCheck %s
-target datalayout = "e-p:32:32:32-p1:64:64:64-p2:8:8:8-p3:16:16:16--p4:96:96:96-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:32"
-
-define i32 @test_as0(i32 addrspace(0)* %A) {
-entry:
-; CHECK: %arrayidx = getelementptr i32* %A, i32 1
-  %arrayidx = getelementptr i32 addrspace(0)* %A, i64 1
-  %y = load i32 addrspace(0)* %arrayidx, align 4
-  ret i32 %y
-}
-
-define i32 @test_as1(i32 addrspace(1)* %A) {
-entry:
-; CHECK: %arrayidx = getelementptr i32 addrspace(1)* %A, i64 1
-  %arrayidx = getelementptr i32 addrspace(1)* %A, i32 1
-  %y = load i32 addrspace(1)* %arrayidx, align 4
-  ret i32 %y
-}
-
-define i32 @test_as2(i32 addrspace(2)* %A) {
-entry:
-; CHECK: %arrayidx = getelementptr i32 addrspace(2)* %A, i8 1
-  %arrayidx = getelementptr i32 addrspace(2)* %A, i32 1
-  %y = load i32 addrspace(2)* %arrayidx, align 4
-  ret i32 %y
-}
-
-define i32 @test_as3(i32 addrspace(3)* %A) {
-entry:
-; CHECK: %arrayidx = getelementptr i32 addrspace(3)* %A, i16 1
-  %arrayidx = getelementptr i32 addrspace(3)* %A, i32 1
-  %y = load i32 addrspace(3)* %arrayidx, align 4
-  ret i32 %y
-}
-
-define i32 @test_as4(i32 addrspace(4)* %A) {
-entry:
-; CHECK: %arrayidx = getelementptr i32 addrspace(4)* %A, i96 1
-  %arrayidx = getelementptr i32 addrspace(4)* %A, i32 1
-  %y = load i32 addrspace(4)* %arrayidx, align 4
-  ret i32 %y
-}
-
diff --git a/test/Transforms/InstCombine/constant-fold-gep-as-0.ll b/test/Transforms/InstCombine/constant-fold-gep-as-0.ll
deleted file mode 100644
index 74fe316137..0000000000
--- a/test/Transforms/InstCombine/constant-fold-gep-as-0.ll
+++ /dev/null
@@ -1,235 +0,0 @@
-; "PLAIN" - No optimizations. This tests the target-independent
-; constant folder.
-; RUN: opt -S -o - < %s | FileCheck --check-prefix=PLAIN %s
-
-target datalayout = "e-p:128:128:128-p1:32:32:32-p2:8:8:8-p3:16:16:16-p4:64:64:64-p5:96:96:96-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:32"
-
-; PLAIN: ModuleID = '<stdin>'
-
-; The automatic constant folder in opt does not have targetdata access, so
-; it can't fold gep arithmetic, in general. However, the constant folder run
-; from instcombine and global opt can use targetdata.
-; PLAIN: @G8 = global i8 addrspace(1)* getelementptr (i8 addrspace(1)* inttoptr (i32 1 to i8 addrspace(1)*), i32 -1)
-@G8 = global i8 addrspace(1)* getelementptr (i8 addrspace(1)* inttoptr (i32 1 to i8 addrspace(1)*), i32 -1)
-; PLAIN: @G1 = global i1 addrspace(2)* getelementptr (i1 addrspace(2)* inttoptr (i8 1 to i1 addrspace(2)*), i8 -1)
-@G1 = global i1 addrspace(2)* getelementptr (i1 addrspace(2)* inttoptr (i8 1 to i1 addrspace(2)*), i8 -1)
-; PLAIN: @F8 = global i8 addrspace(1)* getelementptr (i8 addrspace(1)* inttoptr (i32 1 to i8 addrspace(1)*), i32 -2)
-@F8 = global i8 addrspace(1)* getelementptr (i8 addrspace(1)* inttoptr (i32 1 to i8 addrspace(1)*), i32 -2)
-; PLAIN: @F1 = global i1 addrspace(2)* getelementptr (i1 addrspace(2)* inttoptr (i8 1 to i1 addrspace(2)*), i8 -2)
-@F1 = global i1 addrspace(2)* getelementptr (i1 addrspace(2)* inttoptr (i8 1 to i1 addrspace(2)*), i8 -2)
-; PLAIN: @H8 = global i8 addrspace(1)* getelementptr (i8 addrspace(1)* null, i32 -1)
-@H8 = global i8 addrspace(1)* getelementptr (i8 addrspace(1)* inttoptr (i32 0 to i8 addrspace(1)*), i32 -1)
-; PLAIN: @H1 = global i1 addrspace(2)* getelementptr (i1 addrspace(2)* null, i8 -1)
-@H1 = global i1 addrspace(2)* getelementptr (i1 addrspace(2)* inttoptr (i8 0 to i1 addrspace(2)*), i8 -1)
-
-
-; The target-independent folder should be able to do some clever
-; simplifications on sizeof, alignof, and offsetof expressions. The
-; target-dependent folder should fold these down to constants.
-; PLAIN-X: @a = constant i64 mul (i64 ptrtoint (double addrspace(4)* getelementptr (double addrspace(4)* null, i32 1) to i64), i64 2310)
-@a = constant i64 mul (i64 3, i64 mul (i64 ptrtoint ({[7 x double], [7 x double]} addrspace(4)* getelementptr ({[7 x double], [7 x double]} addrspace(4)* null, i64 11) to i64), i64 5))
-
-; PLAIN-X: @b = constant i64 ptrtoint (double addrspace(4)* getelementptr ({ i1, double }* null, i64 0, i32 1) to i64)
-@b = constant i64 ptrtoint ([13 x double] addrspace(4)* getelementptr ({i1, [13 x double]} addrspace(4)* null, i64 0, i32 1) to i64)
-
-; PLAIN-X: @c = constant i64 mul nuw (i64 ptrtoint (double addrspace(4)* getelementptr (double addrspace(4)* null, i32 1) to i64), i64 2)
-@c = constant i64 ptrtoint (double addrspace(4)* getelementptr ({double, double, double, double} addrspace(4)* null, i64 0, i32 2) to i64)
-
-; PLAIN-X: @d = constant i64 mul nuw (i64 ptrtoint (double addrspace(4)* getelementptr (double addrspace(4)* null, i32 1) to i64), i64 11)
-@d = constant i64 ptrtoint (double addrspace(4)* getelementptr ([13 x double] addrspace(4)* null, i64 0, i32 11) to i64)
-
-; PLAIN-X: @e = constant i64 ptrtoint (double addrspace(4)* getelementptr ({ double, float, double, double }* null, i64 0, i32 2) to i64)
-@e = constant i64 ptrtoint (double addrspace(4)* getelementptr ({double, float, double, double} addrspace(4)* null, i64 0, i32 2) to i64)
-
-; PLAIN-X: @f = constant i64 1
-@f = constant i64 ptrtoint (<{ i16, i128 }> addrspace(4)* getelementptr ({i1, <{ i16, i128 }>} addrspace(4)* null, i64 0, i32 1) to i64)
-
-; PLAIN-X: @g = constant i64 ptrtoint (double addrspace(4)* getelementptr ({ i1, double }* null, i64 0, i32 1) to i64)
-@g = constant i64 ptrtoint ({double, double} addrspace(4)* getelementptr ({i1, {double, double}} addrspace(4)* null, i64 0, i32 1) to i64)
-
-; PLAIN-X: @h = constant i64 ptrtoint (i1 addrspace(2)* getelementptr (i1 addrspace(2)* null, i32 1) to i64)
-@h = constant i64 ptrtoint (double addrspace(4)* getelementptr (double addrspace(4)* null, i64 1) to i64)
-
-; PLAIN-X: @i = constant i64 ptrtoint (i1 addrspace(2)* getelementptr ({ i1, i1 addrspace(2)* }* null, i64 0, i32 1) to i64)
-@i = constant i64 ptrtoint (double addrspace(4)* getelementptr ({i1, double} addrspace(4)* null, i64 0, i32 1) to i64)
-
-; The target-dependent folder should cast GEP indices to integer-sized pointers.
-
-; PLAIN: @M = constant i64 addrspace(5)* getelementptr (i64 addrspace(5)* null, i32 1)
-; PLAIN: @N = constant i64 addrspace(5)* getelementptr ({ i64, i64 } addrspace(5)* null, i32 0, i32 1)
-; PLAIN: @O = constant i64 addrspace(5)* getelementptr ([2 x i64] addrspace(5)* null, i32 0, i32 1)
-
-@M = constant i64 addrspace(5)* getelementptr (i64 addrspace(5)* null, i32 1)
-@N = constant i64 addrspace(5)* getelementptr ({ i64, i64 } addrspace(5)* null, i32 0, i32 1)
-@O = constant i64 addrspace(5)* getelementptr ([2 x i64] addrspace(5)* null, i32 0, i32 1)
-
-; Fold GEP of a GEP. Very simple cases are folded.
-
-; PLAIN-X: @Y = global [3 x { i32, i32 }]addrspace(3)* getelementptr inbounds ([3 x { i32, i32 }]addrspace(3)* @ext, i64 2)
-@ext = external addrspace(3) global [3 x { i32, i32 }]
-@Y = global [3 x { i32, i32 }]addrspace(3)* getelementptr inbounds ([3 x { i32, i32 }]addrspace(3)* getelementptr inbounds ([3 x { i32, i32 }]addrspace(3)* @ext, i64 1), i64 1)
-
-; PLAIN-X: @Z = global i32addrspace(3)* getelementptr inbounds (i32addrspace(3)* getelementptr inbounds ([3 x { i32, i32 }]addrspace(3)* @ext, i64 0, i64 1, i32 0), i64 1)
-@Z = global i32addrspace(3)* getelementptr inbounds (i32addrspace(3)* getelementptr inbounds ([3 x { i32, i32 }]addrspace(3)* @ext, i64 0, i64 1, i32 0), i64 1)
-
-
-; Duplicate all of the above as function return values rather than
-; global initializers.
-
-; PLAIN: define i8 addrspace(1)* @goo8() nounwind {
-; PLAIN:   %t = bitcast i8 addrspace(1)* getelementptr (i8 addrspace(1)* inttoptr (i32 1 to i8 addrspace(1)*), i32 -1) to i8 addrspace(1)*
-; PLAIN:   ret i8 addrspace(1)* %t
-; PLAIN: }
-; PLAIN: define i1 addrspace(2)* @goo1() nounwind {
-; PLAIN:   %t = bitcast i1 addrspace(2)* getelementptr (i1 addrspace(2)* inttoptr (i32 1 to i1 addrspace(2)*), i32 -1) to i1 addrspace(2)*
-; PLAIN:   ret i1 addrspace(2)* %t
-; PLAIN: }
-; PLAIN: define i8 addrspace(1)* @foo8() nounwind {
-; PLAIN:   %t = bitcast i8 addrspace(1)* getelementptr (i8 addrspace(1)* inttoptr (i32 1 to i8 addrspace(1)*), i32 -2) to i8 addrspace(1)*
-; PLAIN:   ret i8 addrspace(1)* %t
-; PLAIN: }
-; PLAIN: define i1 addrspace(2)* @foo1() nounwind {
-; PLAIN:   %t = bitcast i1 addrspace(2)* getelementptr (i1 addrspace(2)* inttoptr (i32 1 to i1 addrspace(2)*), i32 -2) to i1 addrspace(2)*
-; PLAIN:   ret i1 addrspace(2)* %t
-; PLAIN: }
-; PLAIN: define i8 addrspace(1)* @hoo8() nounwind {
-; PLAIN:   %t = bitcast i8 addrspace(1)* getelementptr (i8 addrspace(1)* null, i32 -1) to i8 addrspace(1)*
-; PLAIN:   ret i8 addrspace(1)* %t
-; PLAIN: }
-; PLAIN: define i1 addrspace(2)* @hoo1() nounwind {
-; PLAIN:   %t = bitcast i1 addrspace(2)* getelementptr (i1 addrspace(2)* null, i32 -1) to i1 addrspace(2)*
-; PLAIN:   ret i1 addrspace(2)* %t
-; PLAIN: }
-define i8 addrspace(1)* @goo8() nounwind {
-  %t = bitcast i8 addrspace(1)* getelementptr (i8 addrspace(1)* inttoptr (i32 1 to i8 addrspace(1)*), i32 -1) to i8 addrspace(1)*
-  ret i8 addrspace(1)* %t
-}
-define i1 addrspace(2)* @goo1() nounwind {
-  %t = bitcast i1 addrspace(2)* getelementptr (i1 addrspace(2)* inttoptr (i32 1 to i1 addrspace(2)*), i32 -1) to i1 addrspace(2)*
-  ret i1 addrspace(2)* %t
-}
-define i8 addrspace(1)* @foo8() nounwind {
-  %t = bitcast i8 addrspace(1)* getelementptr (i8 addrspace(1)* inttoptr (i32 1 to i8 addrspace(1)*), i32 -2) to i8 addrspace(1)*
-  ret i8 addrspace(1)* %t
-}
-define i1 addrspace(2)* @foo1() nounwind {
-  %t = bitcast i1 addrspace(2)* getelementptr (i1 addrspace(2)* inttoptr (i32 1 to i1 addrspace(2)*), i32 -2) to i1 addrspace(2)*
-  ret i1 addrspace(2)* %t
-}
-define i8 addrspace(1)* @hoo8() nounwind {
-  %t = bitcast i8 addrspace(1)* getelementptr (i8 addrspace(1)* inttoptr (i32 0 to i8 addrspace(1)*), i32 -1) to i8 addrspace(1)*
-  ret i8 addrspace(1)* %t
-}
-define i1 addrspace(2)* @hoo1() nounwind {
-  %t = bitcast i1 addrspace(2)* getelementptr (i1 addrspace(2)* inttoptr (i32 0 to i1 addrspace(2)*), i32 -1) to i1 addrspace(2)*
-  ret i1 addrspace(2)* %t
-}
-
-; PLAIN-X: define i64 @fa() nounwind {
-; PLAIN-X:   %t = bitcast i64 mul (i64 ptrtoint (double addrspace(4)* getelementptr (double addrspace(4)* null, i32 1) to i64), i64 2310) to i64
-; PLAIN-X:   ret i64 %t
-; PLAIN-X: }
-; PLAIN-X: define i64 @fb() nounwind {
-; PLAIN-X:   %t = bitcast i64 ptrtoint (double addrspace(4)* getelementptr ({ i1, double }* null, i64 0, i32 1) to i64) to i64
-; PLAIN-X:   ret i64 %t
-; PLAIN-X: }
-; PLAIN-X: define i64 @fc() nounwind {
-; PLAIN-X:   %t = bitcast i64 mul nuw (i64 ptrtoint (double addrspace(4)* getelementptr (double addrspace(4)* null, i32 1) to i64), i64 2) to i64
-; PLAIN-X:   ret i64 %t
-; PLAIN-X: }
-; PLAIN-X: define i64 @fd() nounwind {
-; PLAIN-X:   %t = bitcast i64 mul nuw (i64 ptrtoint (double addrspace(4)* getelementptr (double addrspace(4)* null, i32 1) to i64), i64 11) to i64
-; PLAIN-X:   ret i64 %t
-; PLAIN-X: }
-; PLAIN-X: define i64 @fe() nounwind {
-; PLAIN-X:   %t = bitcast i64 ptrtoint (double addrspace(4)* getelementptr ({ double, float, double, double }* null, i64 0, i32 2) to i64) to i64
-; PLAIN-X:   ret i64 %t
-; PLAIN-X: }
-; PLAIN-X: define i64 @ff() nounwind {
-; PLAIN-X:   %t = bitcast i64 1 to i64
-; PLAIN-X:   ret i64 %t
-; PLAIN-X: }
-; PLAIN-X: define i64 @fg() nounwind {
-; PLAIN-X:   %t = bitcast i64 ptrtoint (double addrspace(4)* getelementptr ({ i1, double }* null, i64 0, i32 1) to i64) to i64
-; PLAIN-X:   ret i64 %t
-; PLAIN-X: }
-; PLAIN-X: define i64 @fh() nounwind {
-; PLAIN-X:   %t = bitcast i64 ptrtoint (i1 addrspace(2)* getelementptr (i1 addrspace(2)* null, i32 1) to i64) to i64
-; PLAIN-X:   ret i64 %t
-; PLAIN-X: }
-; PLAIN-X: define i64 @fi() nounwind {
-; PLAIN-X:   %t = bitcast i64 ptrtoint (i1 addrspace(2)* getelementptr ({ i1, i1 addrspace(2)* }* null, i64 0, i32 1) to i64) to i64
-; PLAIN-X:   ret i64 %t
-; PLAIN-X: }
-define i64 @fa() nounwind {
-  %t = bitcast i64 mul (i64 3, i64 mul (i64 ptrtoint ({[7 x double], [7 x double]}* getelementptr ({[7 x double], [7 x double]}* null, i64 11) to i64), i64 5)) to i64
-  ret i64 %t
-}
-define i64 @fb() nounwind {
-  %t = bitcast i64 ptrtoint ([13 x double] addrspace(4)* getelementptr ({i1, [13 x double]} addrspace(4)* null, i64 0, i32 1) to i64) to i64
-  ret i64 %t
-}
-define i64 @fc() nounwind {
-  %t = bitcast i64 ptrtoint (double addrspace(4)* getelementptr ({double, double, double, double} addrspace(4)* null, i64 0, i32 2) to i64) to i64
-  ret i64 %t
-}
-define i64 @fd() nounwind {
-  %t = bitcast i64 ptrtoint (double addrspace(4)* getelementptr ([13 x double] addrspace(4)* null, i64 0, i32 11) to i64) to i64
-  ret i64 %t
-}
-define i64 @fe() nounwind {
-  %t = bitcast i64 ptrtoint (double addrspace(4)* getelementptr ({double, float, double, double} addrspace(4)* null, i64 0, i32 2) to i64) to i64
-  ret i64 %t
-}
-define i64 @ff() nounwind {
-  %t = bitcast i64 ptrtoint (<{ i16, i128 }> addrspace(4)* getelementptr ({i1, <{ i16, i128 }>} addrspace(4)* null, i64 0, i32 1) to i64) to i64
-  ret i64 %t
-}
-define i64 @fg() nounwind {
-  %t = bitcast i64 ptrtoint ({double, double} addrspace(4)* getelementptr ({i1, {double, double}} addrspace(4)* null, i64 0, i32 1) to i64) to i64
-  ret i64 %t
-}
-define i64 @fh() nounwind {
-  %t = bitcast i64 ptrtoint (double addrspace(4)* getelementptr (double addrspace(4)* null, i32 1) to i64) to i64
-  ret i64 %t
-}
-define i64 @fi() nounwind {
-  %t = bitcast i64 ptrtoint (double addrspace(4)* getelementptr ({i1, double}addrspace(4)* null, i64 0, i32 1) to i64) to i64
-  ret i64 %t
-}
-
-; PLAIN: define i64* @fM() nounwind {
-; PLAIN:   %t = bitcast i64* getelementptr (i64* null, i32 1) to i64*
-; PLAIN:   ret i64* %t
-; PLAIN: }
-; PLAIN: define i64* @fN() nounwind {
-; PLAIN:   %t = bitcast i64* getelementptr ({ i64, i64 }* null, i32 0, i32 1) to i64*
-; PLAIN:   ret i64* %t
-; PLAIN: }
-; PLAIN: define i64* @fO() nounwind {
-; PLAIN:   %t = bitcast i64* getelementptr ([2 x i64]* null, i32 0, i32 1) to i64*
-; PLAIN:   ret i64* %t
-; PLAIN: }
-
-define i64* @fM() nounwind {
-  %t = bitcast i64* getelementptr (i64* null, i32 1) to i64*
-  ret i64* %t
-}
-define i64* @fN() nounwind {
-  %t = bitcast i64* getelementptr ({ i64, i64 }* null, i32 0, i32 1) to i64*
-  ret i64* %t
-}
-define i64* @fO() nounwind {
-  %t = bitcast i64* getelementptr ([2 x i64]* null, i32 0, i32 1) to i64*
-  ret i64* %t
-}
-
-; PLAIN: define i32 addrspace(1)* @fZ() nounwind {
-; PLAIN:   %t = bitcast i32 addrspace(1)* getelementptr inbounds (i32 addrspace(1)* getelementptr inbounds ([3 x { i32, i32 }] addrspace(1)* @ext2, i64 0, i64 1, i32 0), i64 1) to i32 addrspace(1)*
-; PLAIN:   ret i32 addrspace(1)* %t
-; PLAIN: }
-@ext2 = external addrspace(1) global [3 x { i32, i32 }]
-define i32 addrspace(1)* @fZ() nounwind {
-  %t = bitcast i32 addrspace(1)* getelementptr inbounds (i32 addrspace(1)* getelementptr inbounds ([3 x { i32, i32 }] addrspace(1)* @ext2, i64 0, i64 1, i32 0), i64 1) to i32 addrspace(1)*
-  ret i32 addrspace(1)* %t
-}