Land the long talked about "type system rewrite" patch. This

patch brings numerous advantages to LLVM.  One way to look at it
is through diffstat:
 109 files changed, 3005 insertions(+), 5906 deletions(-)

Removing almost 3K lines of code is a good thing.  Other advantages
include:

1. Value::getType() is a simple load that can be CSE'd, not a mutating
   union-find operation.
2. Types a uniqued and never move once created, defining away PATypeHolder.
3. Structs can be "named" now, and their name is part of the identity that
   uniques them.  This means that the compiler doesn't merge them structurally
   which makes the IR much less confusing.
4. Now that there is no way to get a cycle in a type graph without a named
   struct type, "upreferences" go away.
5. Type refinement is completely gone, which should make LTO much MUCH faster
   in some common cases with C++ code.
6. Types are now generally immutable, so we can use "Type *" instead 
   "const Type *" everywhere.

Downsides of this patch are that it removes some functions from the C API,
so people using those will have to upgrade to (not yet added) new API.  
"LLVM 3.0" is the right time to do this.

There are still some cleanups pending after this, this patch is large enough
as-is.

llvm-svn: 134829

17 files changed, 78 insertions, 103 deletions

diff --git a/llvm/test/Transforms/ConstProp/extractvalue.ll b/llvm/test/Transforms/ConstProp/extractvalue.ll
index 32d529181b1..f947b22f23a 100644
--- a/llvm/test/Transforms/ConstProp/extractvalue.ll
+++ b/llvm/test/Transforms/ConstProp/extractvalue.ll
@@ -1,7 +1,6 @@
 ; RUN: opt < %s -constprop -S | FileCheck %s
 
 %struct = type { i32, [4 x i8] }
-%array = type [3 x %struct]
 
 define i32 @test1() {
   %A = extractvalue %struct { i32 2, [4 x i8] c"foo\00" }, 0
@@ -18,7 +17,7 @@ define i8 @test2() {
 }
 
 define i32 @test3() {
-  %A = extractvalue %array [ %struct { i32 0, [4 x i8] c"aaaa" }, %struct { i32 1, [4 x i8] c"bbbb" }, %struct { i32 2, [4 x i8] c"cccc" } ], 1, 0
+  %A = extractvalue [3 x %struct] [ %struct { i32 0, [4 x i8] c"aaaa" }, %struct { i32 1, [4 x i8] c"bbbb" }, %struct { i32 2, [4 x i8] c"cccc" } ], 1, 0
   ret i32 %A
 ; CHECK: @test3
 ; CHECK: ret i32 1
@@ -39,7 +38,7 @@ define i8 @zeroinitializer-test2() {
 }
 
 define i32 @zeroinitializer-test3() {
-  %A = extractvalue %array zeroinitializer, 1, 0
+  %A = extractvalue [3 x %struct] zeroinitializer, 1, 0
   ret i32 %A
 ; CHECK: @zeroinitializer-test3
 ; CHECK: ret i32 0
@@ -60,7 +59,7 @@ define i8 @undef-test2() {
 }
 
 define i32 @undef-test3() {
-  %A = extractvalue %array undef, 1, 0
+  %A = extractvalue [3 x %struct] undef, 1, 0
   ret i32 %A
 ; CHECK: @undef-test3
 ; CHECK: ret i32 undef
diff --git a/llvm/test/Transforms/ConstProp/insertvalue.ll b/llvm/test/Transforms/ConstProp/insertvalue.ll
index f0eb553b214..a4b7bb1019c 100644
--- a/llvm/test/Transforms/ConstProp/insertvalue.ll
+++ b/llvm/test/Transforms/ConstProp/insertvalue.ll
@@ -1,7 +1,6 @@
 ; RUN: opt < %s -constprop -S | FileCheck %s
 
 %struct = type { i32, [4 x i8] }
-%array = type [3 x %struct]
 
 define %struct @test1() {
   %A = insertvalue %struct { i32 2, [4 x i8] c"foo\00" }, i32 1, 0
@@ -17,11 +16,11 @@ define %struct @test2() {
 ; CHECK: ret %struct { i32 2, [4 x i8] c"fo\01\00" }
 }
 
-define %array @test3() {
-  %A = insertvalue %array [ %struct { i32 0, [4 x i8] c"aaaa" }, %struct { i32 1, [4 x i8] c"bbbb" }, %struct { i32 2, [4 x i8] c"cccc" } ], i32 -1, 1, 0
-  ret %array %A
+define [3 x %struct] @test3() {
+  %A = insertvalue [3 x %struct] [ %struct { i32 0, [4 x i8] c"aaaa" }, %struct { i32 1, [4 x i8] c"bbbb" }, %struct { i32 2, [4 x i8] c"cccc" } ], i32 -1, 1, 0
+  ret [3 x %struct] %A
 ; CHECK: @test3
-; CHECK:ret %array [%struct { i32 0, [4 x i8] c"aaaa" }, %struct { i32 -1, [4 x i8] c"bbbb" }, %struct { i32 2, [4 x i8] c"cccc" }]
+; CHECK:ret [3 x %struct] [%struct { i32 0, [4 x i8] c"aaaa" }, %struct { i32 -1, [4 x i8] c"bbbb" }, %struct { i32 2, [4 x i8] c"cccc" }]
 }
 
 define %struct @zeroinitializer-test1() {
@@ -38,11 +37,11 @@ define %struct @zeroinitializer-test2() {
 ; CHECK: ret %struct { i32 0, [4 x i8] c"\00\00\01\00" }
 }
 
-define %array @zeroinitializer-test3() {
-  %A = insertvalue %array zeroinitializer, i32 1, 1, 0
-  ret %array %A
+define [3 x %struct] @zeroinitializer-test3() {
+  %A = insertvalue [3 x %struct] zeroinitializer, i32 1, 1, 0
+  ret [3 x %struct] %A
 ; CHECK: @zeroinitializer-test3
-; CHECK: ret %array [%struct zeroinitializer, %struct { i32 1, [4 x i8] zeroinitializer }, %struct zeroinitializer]
+; CHECK: ret [3 x %struct] [%struct zeroinitializer, %struct { i32 1, [4 x i8] zeroinitializer }, %struct zeroinitializer]
 }
 
 define %struct @undef-test1() {
@@ -59,10 +58,10 @@ define %struct @undef-test2() {
 ; CHECK: ret %struct { i32 undef, [4 x i8] [i8 undef, i8 undef, i8 0, i8 undef] }
 }
 
-define %array @undef-test3() {
-  %A = insertvalue %array undef, i32 0, 1, 0
-  ret %array %A
+define [3 x %struct] @undef-test3() {
+  %A = insertvalue [3 x %struct] undef, i32 0, 1, 0
+  ret [3 x %struct] %A
 ; CHECK: @undef-test3
-; CHECK: ret %array [%struct undef, %struct { i32 0, [4 x i8] undef }, %struct undef]
+; CHECK: ret [3 x %struct] [%struct undef, %struct { i32 0, [4 x i8] undef }, %struct undef]
 }
 
diff --git a/llvm/test/Transforms/ConstProp/overflow-ops.ll b/llvm/test/Transforms/ConstProp/overflow-ops.ll
index d1cc2eb90a8..849bf9ef75b 100644
--- a/llvm/test/Transforms/ConstProp/overflow-ops.ll
+++ b/llvm/test/Transforms/ConstProp/overflow-ops.ll
@@ -1,6 +1,5 @@
 ; RUN: opt < %s -constprop -S | FileCheck %s
 
-%i8i1 = type {i8, i1}
 
 declare {i8, i1} @llvm.uadd.with.overflow.i8(i8, i8)
 declare {i8, i1} @llvm.usub.with.overflow.i8(i8, i8)
@@ -20,7 +19,7 @@ entry:
   ret {i8, i1} %t
 
 ; CHECK: @uadd_1
-; CHECK: ret %i8i1 { i8 -114, i1 false }
+; CHECK: ret { i8, i1 } { i8 -114, i1 false }
 }
 
 define {i8, i1} @uadd_2() nounwind {
@@ -29,7 +28,7 @@ entry:
   ret {i8, i1} %t
 
 ; CHECK: @uadd_2
-; CHECK: ret %i8i1 { i8 6, i1 true }
+; CHECK: ret { i8, i1 } { i8 6, i1 true }
 }
 
 ;;-----------------------------
@@ -42,7 +41,7 @@ entry:
   ret {i8, i1} %t
 
 ; CHECK: @usub_1
-; CHECK: ret %i8i1 { i8 2, i1 false }
+; CHECK: ret { i8, i1 } { i8 2, i1 false }
 }
 
 define {i8, i1} @usub_2() nounwind {
@@ -51,7 +50,7 @@ entry:
   ret {i8, i1} %t
 
 ; CHECK: @usub_2
-; CHECK: ret %i8i1 { i8 -2, i1 true }
+; CHECK: ret { i8, i1 } { i8 -2, i1 true }
 }
 
 ;;-----------------------------
@@ -64,7 +63,7 @@ entry:
   ret {i8, i1} %t
 
 ; CHECK: @umul_1
-; CHECK: ret %i8i1 { i8 44, i1 true }
+; CHECK: ret { i8, i1 } { i8 44, i1 true }
 }
 
 define {i8, i1} @umul_2() nounwind {
@@ -73,7 +72,7 @@ entry:
   ret {i8, i1} %t
 
 ; CHECK: @umul_2
-; CHECK: ret %i8i1 { i8 -56, i1 false }
+; CHECK: ret { i8, i1 } { i8 -56, i1 false }
 }
 
 ;;-----------------------------
@@ -86,7 +85,7 @@ entry:
   ret {i8, i1} %t
 
 ; CHECK: @sadd_1
-; CHECK: ret %i8i1 { i8 44, i1 false }
+; CHECK: ret { i8, i1 } { i8 44, i1 false }
 }
 
 define {i8, i1} @sadd_2() nounwind {
@@ -95,7 +94,7 @@ entry:
   ret {i8, i1} %t
 
 ; CHECK: @sadd_2
-; CHECK: ret %i8i1 { i8 -126, i1 true }
+; CHECK: ret { i8, i1 } { i8 -126, i1 true }
 }
 
 define {i8, i1} @sadd_3() nounwind {
@@ -104,7 +103,7 @@ entry:
   ret {i8, i1} %t
 
 ; CHECK: @sadd_3
-; CHECK: ret %i8i1 { i8 -110, i1 false }
+; CHECK: ret { i8, i1 } { i8 -110, i1 false }
 }
 
 define {i8, i1} @sadd_4() nounwind {
@@ -113,7 +112,7 @@ entry:
   ret {i8, i1} %t
 
 ; CHECK: @sadd_4
-; CHECK: ret %i8i1 { i8 126, i1 true }
+; CHECK: ret { i8, i1 } { i8 126, i1 true }
 }
 
 define {i8, i1} @sadd_5() nounwind {
@@ -122,7 +121,7 @@ entry:
   ret {i8, i1} %t
 
 ; CHECK: @sadd_5
-; CHECK: ret %i8i1 { i8 -8, i1 false }
+; CHECK: ret { i8, i1 } { i8 -8, i1 false }
 }
 
 
@@ -136,7 +135,7 @@ entry:
   ret {i8, i1} %t
 
 ; CHECK: @ssub_1
-; CHECK: ret %i8i1 { i8 2, i1 false }
+; CHECK: ret { i8, i1 } { i8 2, i1 false }
 }
 
 define {i8, i1} @ssub_2() nounwind {
@@ -145,7 +144,7 @@ entry:
   ret {i8, i1} %t
 
 ; CHECK: @ssub_2
-; CHECK: ret %i8i1 { i8 -2, i1 false }
+; CHECK: ret { i8, i1 } { i8 -2, i1 false }
 }
 
 define {i8, i1} @ssub_3() nounwind {
@@ -154,7 +153,7 @@ entry:
   ret {i8, i1} %t
 
 ; CHECK: @ssub_3
-; CHECK: ret %i8i1 { i8 126, i1 true }
+; CHECK: ret { i8, i1 } { i8 126, i1 true }
 }
 
 define {i8, i1} @ssub_3b() nounwind {
@@ -163,7 +162,7 @@ entry:
   ret {i8, i1} %t
 
 ; CHECK: @ssub_3b
-; CHECK: ret %i8i1 { i8 -20, i1 false }
+; CHECK: ret { i8, i1 } { i8 -20, i1 false }
 }
 
 define {i8, i1} @ssub_4() nounwind {
@@ -172,7 +171,7 @@ entry:
   ret {i8, i1} %t
 
 ; CHECK: @ssub_4
-; CHECK: ret %i8i1 { i8 -126, i1 true }
+; CHECK: ret { i8, i1 } { i8 -126, i1 true }
 }
 
 define {i8, i1} @ssub_4b() nounwind {
@@ -181,7 +180,7 @@ entry:
   ret {i8, i1} %t
 
 ; CHECK: @ssub_4b
-; CHECK: ret %i8i1 { i8 30, i1 false }
+; CHECK: ret { i8, i1 } { i8 30, i1 false }
 }
 
 define {i8, i1} @ssub_5() nounwind {
@@ -190,7 +189,7 @@ entry:
   ret {i8, i1} %t
 
 ; CHECK: @ssub_5
-; CHECK: ret %i8i1 { i8 -10, i1 false }
+; CHECK: ret { i8, i1 } { i8 -10, i1 false }
 }
 
 ;;-----------------------------
@@ -204,5 +203,5 @@ entry:
   ret {i8, i1} %t
 
 ; CHECK: @smul_1
-; CHECK: ret %i8i1 { i8 -56, i1 true }
+; CHECK: ret { i8, i1 } { i8 -56, i1 true }
 }
diff --git a/llvm/test/Transforms/DeadArgElim/keepalive.ll b/llvm/test/Transforms/DeadArgElim/keepalive.ll
index b0b9bf3fa13..4d6aae37a3e 100644
--- a/llvm/test/Transforms/DeadArgElim/keepalive.ll
+++ b/llvm/test/Transforms/DeadArgElim/keepalive.ll
@@ -1,6 +1,6 @@
 ; RUN: opt < %s -deadargelim -S > %t
 ; RUN: grep {define internal zeroext i32 @test1() nounwind} %t
-; RUN: grep {define internal %Ty @test2} %t
+; RUN: grep {define internal <{ i32, i32 }> @test2} %t
 
 %Ty = type <{ i32, i32 }>
 
diff --git a/llvm/test/Transforms/GlobalOpt/2005-09-27-Crash.ll b/llvm/test/Transforms/GlobalOpt/2005-09-27-Crash.ll
index ab2077a43c6..43597bfd368 100644
--- a/llvm/test/Transforms/GlobalOpt/2005-09-27-Crash.ll
+++ b/llvm/test/Transforms/GlobalOpt/2005-09-27-Crash.ll
@@ -2,7 +2,7 @@
         %RPyString = type { i32, %arraytype.Char }
         %arraytype.Char = type { i32, [0 x i8] }
         %arraytype.Signed = type { i32, [0 x i32] }
-        %functiontype.1 = type %RPyString* (i32)
+        %functiontype.1 = type { %RPyString* (i32) *} 
         %structtype.test = type { i32, %arraytype.Signed }
 @structinstance.test = internal global { i32, { i32, [2 x i32] } } { i32 41, { i32, [2 x i32] } { i32 2, [2 x i32] [ i32 100, i32 101 ] } }              ; <{ i32, { i32, [2 x i32] } }*> [#uses=1]
 
diff --git a/llvm/test/Transforms/InstCombine/2007-11-07-OpaqueAlignCrash.ll b/llvm/test/Transforms/InstCombine/2007-11-07-OpaqueAlignCrash.ll
index e1549a0fe54..e6c9bcd01e5 100644
--- a/llvm/test/Transforms/InstCombine/2007-11-07-OpaqueAlignCrash.ll
+++ b/llvm/test/Transforms/InstCombine/2007-11-07-OpaqueAlignCrash.ll
@@ -5,8 +5,8 @@ target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f3
 target triple = "i686-pc-linux-gnu"
 
 %opaque_t = type opaque
-
-%op_ts = type {opaque, i32}
+%opaque2 = type opaque
+%op_ts = type {%opaque2, i32}
 
 @g = external global %opaque_t
 @h = external global %op_ts
diff --git a/llvm/test/Transforms/InstCombine/getelementptr.ll b/llvm/test/Transforms/InstCombine/getelementptr.ll
index b86939287fb..aa2eba177b1 100644
--- a/llvm/test/Transforms/InstCombine/getelementptr.ll
+++ b/llvm/test/Transforms/InstCombine/getelementptr.ll
@@ -40,7 +40,7 @@ define i32* @test4({ i32 }* %I) {
         %B = getelementptr { i32 }* %A, i64 0, i32 0
         ret i32* %B
 ; CHECK: @test4
-; CHECK: getelementptr %intstruct* %I, i64 1, i32 0
+; CHECK: getelementptr { i32 }* %I, i64 1, i32 0
 }
 
 define void @test5(i8 %B) {
@@ -86,7 +86,7 @@ define i1 @test10({ i32, i32 }* %x, { i32, i32 }* %y) {
         %tmp.4 = icmp eq i32* %tmp.1, %tmp.3       
         ret i1 %tmp.4
 ; CHECK: @test10
-; CHECK: icmp eq %pair* %x, %y
+; CHECK: icmp eq { i32, i32 }* %x, %y
 }
 
 define i1 @test11({ i32, i32 }* %X) {
@@ -94,7 +94,7 @@ define i1 @test11({ i32, i32 }* %X) {
         %Q = icmp eq i32* %P, null             
         ret i1 %Q
 ; CHECK: @test11
-; CHECK: icmp eq %pair* %X, null
+; CHECK: icmp eq { i32, i32 }* %X, null
 }
 
 
@@ -228,19 +228,6 @@ define i1 @test23() {
 ; CHECK: ret i1 false
 }
 
-%"java/lang/Object" = type { %struct.llvm_java_object_base }
-%"java/lang/StringBuffer" = type { %"java/lang/Object", i32, { %"java/lang/Object", i32, [0 x i16] }*, i1 }
-%struct.llvm_java_object_base = type opaque
-
-define void @test24() {
-bc0:
-        %tmp53 = getelementptr %"java/lang/StringBuffer"* null, i32 0, i32 1            ; <i32*> [#uses=1]
-        store i32 0, i32* %tmp53
-        ret void
-; CHECK: @test24
-; CHECK: store i32 0, i32* getelementptr (%"java/lang/StringBuffer"* null, i64 0, i32 1)
-}
-
 define void @test25() {
 entry:
         %tmp = getelementptr { i64, i64, i64, i64 }* null, i32 0, i32 3         ; <i64*> [#uses=1]
diff --git a/llvm/test/Transforms/InstCombine/phi.ll b/llvm/test/Transforms/InstCombine/phi.ll
index cd865ae81ba..219545c2eaa 100644
--- a/llvm/test/Transforms/InstCombine/phi.ll
+++ b/llvm/test/Transforms/InstCombine/phi.ll
@@ -139,7 +139,7 @@ BB2:
 ; CHECK: @test8
 ; CHECK-NOT: phi
 ; CHECK: BB2:
-; CHECK-NEXT: %B = getelementptr %0 
+; CHECK-NEXT: %B = getelementptr { i32, i32 }* %A 
 ; CHECK-NEXT: ret i32* %B
 }
 
diff --git a/llvm/test/Transforms/InstCombine/vec_narrow.ll b/llvm/test/Transforms/InstCombine/vec_narrow.ll
index c05c8021885..2be4359923c 100644
--- a/llvm/test/Transforms/InstCombine/vec_narrow.ll
+++ b/llvm/test/Transforms/InstCombine/vec_narrow.ll
@@ -1,12 +1,10 @@
-; RUN: opt < %s -instcombine -S | \
-; RUN:   grep {fadd float}
+; RUN: opt < %s -instcombine -S | grep {fadd float}
 
-        %V = type <4 x float>
 
-define float @test(%V %A, %V %B, float %f) {
-        %C = insertelement %V %A, float %f, i32 0               ; <%V> [#uses=1]
-        %D = fadd %V %C, %B              ; <%V> [#uses=1]
-        %E = extractelement %V %D, i32 0                ; <float> [#uses=1]
+define float @test(<4 x float> %A, <4 x float> %B, float %f) {
+        %C = insertelement <4 x float> %A, float %f, i32 0               ; <%V> [#uses=1]
+        %D = fadd <4 x float> %C, %B              ; <%V> [#uses=1]
+        %E = extractelement <4 x float> %D, i32 0                ; <float> [#uses=1]
         ret float %E
 }
 
diff --git a/llvm/test/Transforms/InstCombine/vec_shuffle.ll b/llvm/test/Transforms/InstCombine/vec_shuffle.ll
index bd36e9ecb1e..896cb881760 100644
--- a/llvm/test/Transforms/InstCombine/vec_shuffle.ll
+++ b/llvm/test/Transforms/InstCombine/vec_shuffle.ll
@@ -1,28 +1,25 @@
 ; RUN: opt < %s -instcombine -S | FileCheck %s
 
-%T = type <4 x float>
-
-
-define %T @test1(%T %v1) {
+define <4 x float> @test1(<4 x float> %v1) {
 ; CHECK: @test1
-; CHECK: ret %T %v1
-  %v2 = shufflevector %T %v1, %T undef, <4 x i32> <i32 0, i32 1, i32 2, i32 3>
-  ret %T %v2
+; CHECK: ret <4 x float> %v1
+  %v2 = shufflevector <4 x float> %v1, <4 x float> undef, <4 x i32> <i32 0, i32 1, i32 2, i32 3>
+  ret <4 x float> %v2
 }
 
-define %T @test2(%T %v1) {
+define <4 x float> @test2(<4 x float> %v1) {
 ; CHECK: @test2
-; CHECK: ret %T %v1
-  %v2 = shufflevector %T %v1, %T %v1, <4 x i32> <i32 0, i32 5, i32 2, i32 7>
-  ret %T %v2
+; CHECK: ret <4 x float> %v1
+  %v2 = shufflevector <4 x float> %v1, <4 x float> %v1, <4 x i32> <i32 0, i32 5, i32 2, i32 7>
+  ret <4 x float> %v2
 }
 
-define float @test3(%T %A, %T %B, float %f) {
+define float @test3(<4 x float> %A, <4 x float> %B, float %f) {
 ; CHECK: @test3
 ; CHECK: ret float %f
-        %C = insertelement %T %A, float %f, i32 0
-        %D = shufflevector %T %C, %T %B, <4 x i32> <i32 5, i32 0, i32 2, i32 7>
-        %E = extractelement %T %D, i32 1
+        %C = insertelement <4 x float> %A, float %f, i32 0
+        %D = shufflevector <4 x float> %C, <4 x float> %B, <4 x i32> <i32 5, i32 0, i32 2, i32 7>
+        %E = extractelement <4 x float> %D, i32 1
         ret float %E
 }
 
@@ -57,7 +54,7 @@ define float @test6(<4 x float> %X) {
 
 define <4 x float> @test7(<4 x float> %tmp45.i) {
 ; CHECK: @test7
-; CHECK-NEXT: ret %T %tmp45.i
+; CHECK-NEXT: ret <4 x float> %tmp45.i
         %tmp1642.i = shufflevector <4 x float> %tmp45.i, <4 x float> undef, <4 x i32> < i32 0, i32 1, i32 6, i32 7 >
         ret <4 x float> %tmp1642.i
 }
diff --git a/llvm/test/Transforms/LowerSetJmp/simpletest.ll b/llvm/test/Transforms/LowerSetJmp/simpletest.ll
index 1430dffdfe3..dece8405f28 100644
--- a/llvm/test/Transforms/LowerSetJmp/simpletest.ll
+++ b/llvm/test/Transforms/LowerSetJmp/simpletest.ll
@@ -1,6 +1,5 @@
 ; RUN: opt < %s -lowersetjmp -S | grep invoke
 
-	%JmpBuf = type i32
 @.str_1 = internal constant [13 x i8] c"returned %d\0A\00"		; <[13 x i8]*> [#uses=1]
 
 declare void @llvm.longjmp(i32*, i32)
diff --git a/llvm/test/Transforms/MemCpyOpt/memcpy.ll b/llvm/test/Transforms/MemCpyOpt/memcpy.ll
index 12519ef76cf..71d4d4e8a11 100644
--- a/llvm/test/Transforms/MemCpyOpt/memcpy.ll
+++ b/llvm/test/Transforms/MemCpyOpt/memcpy.ll
@@ -6,7 +6,7 @@ target triple = "i686-apple-darwin9"
 %0 = type { x86_fp80, x86_fp80 }
 %1 = type { i32, i32 }
 
-define void @test1({ x86_fp80, x86_fp80 }* sret  %agg.result, x86_fp80 %z.0, x86_fp80 %z.1) nounwind  {
+define void @test1(%0* sret  %agg.result, x86_fp80 %z.0, x86_fp80 %z.1) nounwind  {
 entry:
   %tmp2 = alloca %0
   %memtmp = alloca %0, align 16
@@ -29,7 +29,7 @@ entry:
 ; CHECK: ret void
 }
 
-declare void @ccoshl({ x86_fp80, x86_fp80 }* sret , x86_fp80, x86_fp80) nounwind 
+declare void @ccoshl(%0* sret , x86_fp80, x86_fp80) nounwind 
 
 
 ; The intermediate alloca and one of the memcpy's should be eliminated, the
@@ -49,9 +49,9 @@ define void @test2(i8* %P, i8* %Q) nounwind  {
 
 
 
-@x = external global { x86_fp80, x86_fp80 }
+@x = external global %0
 
-define void @test3({ x86_fp80, x86_fp80 }* noalias sret %agg.result) nounwind  {
+define void @test3(%0* noalias sret %agg.result) nounwind  {
   %x.0 = alloca %0
   %x.01 = bitcast %0* %x.0 to i8*
   call void @llvm.memcpy.p0i8.p0i8.i32(i8* %x.01, i8* bitcast (%0* @x to i8*), i32 32, i32 16, i1 false)
diff --git a/llvm/test/Transforms/Reassociate/2011-01-26-UseAfterFree.ll b/llvm/test/Transforms/Reassociate/2011-01-26-UseAfterFree.ll
index e6c76b34448..003fbb1b3bb 100644
--- a/llvm/test/Transforms/Reassociate/2011-01-26-UseAfterFree.ll
+++ b/llvm/test/Transforms/Reassociate/2011-01-26-UseAfterFree.ll
@@ -3,8 +3,6 @@
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32"
 target triple = "i386-gnu-linux"
 
-%ada__tags__T15s = type void ()
-
 define void @exp_averages_intraday__deviation() {
 entry:
   %0 = load i32* undef, align 4
diff --git a/llvm/test/Transforms/SCCP/ipsccp-basic.ll b/llvm/test/Transforms/SCCP/ipsccp-basic.ll
index a3c7637f986..b9e3f42fdbd 100644
--- a/llvm/test/Transforms/SCCP/ipsccp-basic.ll
+++ b/llvm/test/Transforms/SCCP/ipsccp-basic.ll
@@ -126,7 +126,7 @@ B:
 
 ; CHECK: define i64 @test5b()
 ; CHECK:     A:
-; CHECK-NEXT:  %c = call i64 @test5c(%0 %a)
+; CHECK-NEXT:  %c = call i64 @test5c({ i64, i64 } %a)
 ; CHECK-NEXT:  ret i64 5
 
 define internal i64 @test5c({i64,i64} %a) {
@@ -153,7 +153,7 @@ define i64 @test6b() {
 
 %T = type {i32,i32}
 
-define internal {i32, i32} @test7a(i32 %A) {
+define internal %T @test7a(i32 %A) {
   %X = add i32 1, %A
   %mrv0 = insertvalue %T undef, i32 %X, 0
   %mrv1 = insertvalue %T %mrv0, i32 %A, 1
@@ -164,8 +164,8 @@ define internal {i32, i32} @test7a(i32 %A) {
 }
 
 define i32 @test7b() {
-	%X = call {i32, i32} @test7a(i32 17)
-        %Y = extractvalue {i32, i32} %X, 0
+	%X = call %T @test7a(i32 17)
+        %Y = extractvalue %T %X, 0
 	%Z = add i32 %Y, %Y
 	ret i32 %Z
 ; CHECK: define i32 @test7b
diff --git a/llvm/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll b/llvm/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll
index 24e6a3195f1..d75498716df 100644
--- a/llvm/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll
+++ b/llvm/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll
@@ -6,10 +6,10 @@ declare i32 @.callback_1(i8*)
 declare void @.iter_2(i32 (i8*)*, i8*)
 
 define i32 @main() {
-	%d = alloca { [80 x i8], i32, i32 }		; <{ [80 x i8], i32, i32 }*> [#uses=2]
-	%tmp.0 = getelementptr { [80 x i8], i32, i32 }* %d, i64 0, i32 2		; <i32*> [#uses=1]
+	%d = alloca %T		; <{ [80 x i8], i32, i32 }*> [#uses=2]
+	%tmp.0 = getelementptr %T* %d, i64 0, i32 2		; <i32*> [#uses=1]
 	store i32 0, i32* %tmp.0
-	%tmp.1 = getelementptr { [80 x i8], i32, i32 }* %d, i64 0, i32 0, i64 0		; <i8*> [#uses=1]
+	%tmp.1 = getelementptr %T* %d, i64 0, i32 0, i64 0		; <i8*> [#uses=1]
 	call void @.iter_2( i32 (i8*)* @.callback_1, i8* %tmp.1 )
 	ret i32 0
 }
diff --git a/llvm/test/Transforms/ScalarRepl/copy-aggregate.ll b/llvm/test/Transforms/ScalarRepl/copy-aggregate.ll
index 997da4bdb2f..51ba8109b39 100644
--- a/llvm/test/Transforms/ScalarRepl/copy-aggregate.ll
+++ b/llvm/test/Transforms/ScalarRepl/copy-aggregate.ll
@@ -68,16 +68,15 @@ define i128 @test4(float %a, float %b) nounwind {
 ;; If the elements of a struct or array alloca contain padding, SROA can still
 ;; split up the alloca as long as there is no padding between the elements.
 %padded = type { i16, i8 }
-%arr = type [4 x %padded]
-define void @test5(%arr* %p, %arr* %q) {
+define void @test5([4 x %padded]* %p, [4 x %padded]* %q) {
 entry:
 ; CHECK: test5
 ; CHECK-NOT: i128
-  %var = alloca %arr, align 4
-  %vari8 = bitcast %arr* %var to i8*
-  %pi8 = bitcast %arr* %p to i8*
+  %var = alloca [4 x %padded], align 4
+  %vari8 = bitcast [4 x %padded]* %var to i8*
+  %pi8 = bitcast [4 x %padded]* %p to i8*
   call void @llvm.memcpy.p0i8.p0i8.i32(i8* %vari8, i8* %pi8, i32 16, i32 4, i1 false)
-  %qi8 = bitcast %arr* %q to i8*
+  %qi8 = bitcast [4 x %padded]* %q to i8*
   call void @llvm.memcpy.p0i8.p0i8.i32(i8* %qi8, i8* %vari8, i32 16, i32 4, i1 false)
   ret void
 }
diff --git a/llvm/test/Transforms/ScalarRepl/phi-select.ll b/llvm/test/Transforms/ScalarRepl/phi-select.ll
index fa3972de90a..ffe0b1dd5f4 100644
--- a/llvm/test/Transforms/ScalarRepl/phi-select.ll
+++ b/llvm/test/Transforms/ScalarRepl/phi-select.ll
@@ -65,9 +65,9 @@ entry:
   %A = alloca %PairTy
   ; CHECK: @test4
   ; CHECK: %A = alloca %PairTy
-  %B = getelementptr {i32, i32}* %A, i32 0, i32 0
+  %B = getelementptr %PairTy* %A, i32 0, i32 0
   store i32 1, i32* %B
-  %C = getelementptr {i32, i32}* %A, i32 0, i32 1
+  %C = getelementptr %PairTy* %A, i32 0, i32 1
   store i32 2, i32* %B
   
   %X = select i1 %c, i32* %B, i32* %C