Update lit tests for textual GEP changes.  Tests pass.

llvm-svn: 238046
diff --git a/poolalloc/test/dsa/callgraph/externfuncs.ll b/poolalloc/test/dsa/callgraph/externfuncs.ll
index cee9e89..025a384 100644
--- a/poolalloc/test/dsa/callgraph/externfuncs.ll
+++ b/poolalloc/test/dsa/callgraph/externfuncs.ll
@@ -34,7 +34,7 @@
   %0 = alloca i32* ()*
   store i32* ()* @externFunc2, i32* ()** %0
   %fp = load i32* ()*, i32* ()** %0
-  %res = call i32* ()* %fp() nounwind
+  %res = call i32* () %fp() nounwind
   ret void
 }
 
@@ -50,9 +50,9 @@
 define i32* ()* @getExternFP() nounwind {
 entry:
   %0 = alloca i32* ()*
-  %1 = call i32* ()* ()* @externFunc3() nounwind
-  %2 = call i32* ()* %1()
-  %3 = call i32* ()* ()* @externFunc3() nounwind
+  %1 = call i32* ()* () @externFunc3() nounwind
+  %2 = call i32* () %1()
+  %3 = call i32* ()* () @externFunc3() nounwind
   store i32* ()* %3, i32* ()** %0
   store i32* ()* @externFunc4, i32* ()** %0
   %res = load i32* ()*, i32* ()** %0
@@ -66,7 +66,7 @@
 ;RUN: dsaopt %s -dsa-eqtd -analyze -check-callees=callThroughExternFP,getExternFP,externFunc4
 define void @callThroughExternFP() nounwind {
 entry:
-  %0 = call i32* ()* ()* @getExternFP() nounwind
+  %0 = call i32* ()* () @getExternFP() nounwind
   %1 = call i32* %0() nounwind
   ret void
 }
diff --git a/poolalloc/test/dsa/callgraph/table_dispatch.ll b/poolalloc/test/dsa/callgraph/table_dispatch.ll
index c94cd78..c9eb0f0 100644
--- a/poolalloc/test/dsa/callgraph/table_dispatch.ll
+++ b/poolalloc/test/dsa/callgraph/table_dispatch.ll
@@ -60,7 +60,7 @@
   %4 = getelementptr inbounds %struct.parse_table, %struct.parse_table* %3, i32 0, i32 0 ; <i8**> [#uses=1]
   %5 = load i8*, i8** %4, align 8                      ; <i8*> [#uses=1]
   %6 = load i8*, i8** %s_addr, align 8                 ; <i8*> [#uses=1]
-  %7 = call i32 (...)* bitcast (i32 (i8*, i8*)* @strcmp to i32 (...)*)(i8* %5, i8* %6) nounwind readonly ; <i32> [#uses=1]
+  %7 = call i32 (...) bitcast (i32 (i8*, i8*)* @strcmp to i32 (...)*)(i8* %5, i8* %6) nounwind readonly ; <i32> [#uses=1]
   %8 = icmp eq i32 %7, 0                          ; <i1> [#uses=1]
   br i1 %8, label %bb1, label %bb2
 
@@ -112,7 +112,7 @@
   %0 = load i8**, i8*** %argv_addr, align 8             ; <i8**> [#uses=1]
   %1 = getelementptr inbounds i8*, i8** %0, i64 1      ; <i8**> [#uses=1]
   %2 = load i8*, i8** %1, align 1                      ; <i8*> [#uses=1]
-  %3 = call i32 ()* (i8*)* @find_p_func(i8* %2) nounwind ; <i32 ()*> [#uses=1]
+  %3 = call i32 ()* (i8*) @find_p_func(i8* %2) nounwind ; <i32 ()*> [#uses=1]
   store i32 ()* %3, i32 ()** %parse_func, align 8
   %4 = load i32 ()*, i32 ()** %parse_func, align 8         ; <i32 ()*> [#uses=1]
   %5 = icmp ne i32 ()* %4, null                   ; <i1> [#uses=1]
diff --git a/poolalloc/test/dsa/callgraph/table_dispatch1.ll b/poolalloc/test/dsa/callgraph/table_dispatch1.ll
index cbfeba8..89cdd2d 100644
--- a/poolalloc/test/dsa/callgraph/table_dispatch1.ll
+++ b/poolalloc/test/dsa/callgraph/table_dispatch1.ll
@@ -59,7 +59,7 @@
   %4 = getelementptr inbounds %struct.parse_table, %struct.parse_table* %3, i32 0, i32 0 ; <i8**> [#uses=1]
   %5 = load i8*, i8** %4, align 8                      ; <i8*> [#uses=1]
   %6 = load i8*, i8** %s_addr, align 8                 ; <i8*> [#uses=1]
-  %7 = call i32 (...)* bitcast (i32 (i8*, i8*)* @strcmp to i32 (...)*)(i8* %5, i8* %6) nounwind readonly ; <i32> [#uses=1]
+  %7 = call i32 (...) bitcast (i32 (i8*, i8*)* @strcmp to i32 (...)*)(i8* %5, i8* %6) nounwind readonly ; <i32> [#uses=1]
   %8 = icmp eq i32 %7, 0                          ; <i1> [#uses=1]
   br i1 %8, label %bb1, label %bb2
 
@@ -111,7 +111,7 @@
   %0 = load i8**, i8*** %argv_addr, align 8             ; <i8**> [#uses=1]
   %1 = getelementptr inbounds i8*, i8** %0, i64 1      ; <i8**> [#uses=1]
   %2 = load i8*, i8** %1, align 1                      ; <i8*> [#uses=1]
-  %3 = call i32 ()* (i8*)* @find_p_func(i8* %2) nounwind ; <i32 ()*> [#uses=1]
+  %3 = call i32 ()* (i8*) @find_p_func(i8* %2) nounwind ; <i32 ()*> [#uses=1]
   store i32 ()* %3, i32 ()** %parse_func, align 8
   %4 = load i32 ()*, i32 ()** %parse_func, align 8         ; <i32 ()*> [#uses=1]
   %5 = icmp ne i32 ()* %4, null                   ; <i1> [#uses=1]
diff --git a/poolalloc/test/dsa/callgraph/varargs.ll b/poolalloc/test/dsa/callgraph/varargs.ll
index 4b4c741..c82efd5 100644
--- a/poolalloc/test/dsa/callgraph/varargs.ll
+++ b/poolalloc/test/dsa/callgraph/varargs.ll
@@ -171,7 +171,7 @@
   %retval = alloca i32                            ; <i32*> [#uses=2]
   %0 = alloca i32                                 ; <i32*> [#uses=2]
   %"alloca point" = bitcast i32 0 to i32          ; <i32> [#uses=0]
-  call void (i32, ...)* @assign(i32 2, void ()* @A, void ()* @B) nounwind
+  call void (i32, ...) @assign(i32 2, void ()* @A, void ()* @B) nounwind
   store i32 1, i32* %0, align 4
   %1 = load i32, i32* %0, align 4                      ; <i32> [#uses=1]
   store i32 %1, i32* %retval, align 4
diff --git a/poolalloc/test/dsa/extern/extern.ll b/poolalloc/test/dsa/extern/extern.ll
index 918ece6..55c850f 100644
--- a/poolalloc/test/dsa/extern/extern.ll
+++ b/poolalloc/test/dsa/extern/extern.ll
@@ -35,7 +35,7 @@
 ;RUN: dsaopt %s -dsa-local -analyze -verify-flags "getPointerViaExtern:ptr+E"
 define i32* @getPointerViaExtern() nounwind {
 entry:
-  %ptr = tail call i32* (...)* @getPointerExtern() nounwind ; <i32*> [#uses=1]
+  %ptr = tail call i32* (...) @getPointerExtern() nounwind ; <i32*> [#uses=1]
   ret i32* %ptr
 }
 
@@ -52,9 +52,9 @@
 
 define i32 @main(i32 %argc, i8** nocapture %argv) nounwind {
 entry:
-  %ptr = tail call i32* ()* @getPointer() nounwind
-  %ptrExtern = tail call i32* (...)* @getPointerExtern() nounwind
-  %ptrViaExtern = tail call i32* ()* @getPointerViaExtern() nounwind
+  %ptr = tail call i32* () @getPointer() nounwind
+  %ptrExtern = tail call i32* (...) @getPointerExtern() nounwind
+  %ptrViaExtern = tail call i32* () @getPointerViaExtern() nounwind
   %val1 = load i32, i32* %ptr, align 4
   %val2 = load i32, i32* %ptrExtern, align 4
   %val3 = load i32, i32* %ptrViaExtern, align 4
diff --git a/poolalloc/test/dsa/extern/extern2.ll b/poolalloc/test/dsa/extern/extern2.ll
index dbb6578..af66df7 100644
--- a/poolalloc/test/dsa/extern/extern2.ll
+++ b/poolalloc/test/dsa/extern/extern2.ll
@@ -30,7 +30,7 @@
 
 define i32 @main(i32 %argc, i8** nocapture %argv) nounwind {
 entry:
-  %ptr = tail call i32* (...)* @getPointerExtern() nounwind
+  %ptr = tail call i32* (...) @getPointerExtern() nounwind
   %0 = tail call i32 @takesPointer(i32* %ptr) nounwind
   ret i32 %0
 }
diff --git a/poolalloc/test/dsa/extern/extern3.ll b/poolalloc/test/dsa/extern/extern3.ll
index 6723154..8cb5afa 100644
--- a/poolalloc/test/dsa/extern/extern3.ll
+++ b/poolalloc/test/dsa/extern/extern3.ll
@@ -64,7 +64,7 @@
 ;RUN: dsaopt %s -dsa-td -analyze -verify-flags "checkExterns:get+E-I"
 ;RUN: dsaopt %s -dsa-td -analyze -verify-flags "checkExterns:take+E-I"
 define void @checkExterns() nounwind {
-  %get = tail call i32* ()* @getPointerExtern() nounwind ; <i32*> [#uses=0]
+  %get = tail call i32* () @getPointerExtern() nounwind ; <i32*> [#uses=0]
   %1 = tail call noalias i8* @malloc(i64 4) nounwind ; <i8*> [#uses=2]
   %take = bitcast i8* %1 to i32*                     ; <i32*> [#uses=1]
   tail call void @takesPointerExtern(i32* %take) nounwind
@@ -78,7 +78,7 @@
 ;RUN: dsaopt %s -dsa-td -analyze -verify-flags "checkExternals:take-IE"
 define void @checkExternals() nounwind {
 entry:
-  %get = tail call i32* ()* @getPointer() nounwind ; <i32*> [#uses=0]
+  %get = tail call i32* () @getPointer() nounwind ; <i32*> [#uses=0]
   %0 = tail call noalias i8* @malloc(i64 4) nounwind ; <i8*> [#uses=2]
   %take = bitcast i8* %0 to i32*                     ; <i32*> [#uses=1]
   tail call i32 @takesPointer(i32* %take) nounwind
@@ -92,7 +92,7 @@
 ;RUN: dsaopt %s -dsa-td -analyze -verify-flags "checkInternals:take-IE"
 define void @checkInternals() nounwind {
 entry:
-  %get = tail call i32* ()* @getPointerInternal() nounwind ; <i32*> [#uses=0]
+  %get = tail call i32* () @getPointerInternal() nounwind ; <i32*> [#uses=0]
   %0 = tail call noalias i8* @malloc(i64 4) nounwind ; <i8*> [#uses=2]
   %take = bitcast i8* %0 to i32*                     ; <i32*> [#uses=1]
   tail call i32 @takesPointerInternal(i32* %take) nounwind
diff --git a/poolalloc/test/dsa/local/array_in_struct.ll b/poolalloc/test/dsa/local/array_in_struct.ll
index c8be647..4879074 100644
--- a/poolalloc/test/dsa/local/array_in_struct.ll
+++ b/poolalloc/test/dsa/local/array_in_struct.ll
@@ -20,7 +20,7 @@
   %r1 = alloca i32                                ; <i32*> [#uses=1]
   %r2 = alloca float                              ; <float*> [#uses=1]
   %"alloca point" = bitcast i32 0 to i32          ; <i32> [#uses=0]
-  %0 = call i32 (i8*, ...)* @scanf(i8* noalias getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0), i32* %z) nounwind ; <i32> [#uses=0]
+  %0 = call i32 (i8*, ...) @scanf(i8* noalias getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0), i32* %z) nounwind ; <i32> [#uses=0]
   %1 = load i32, i32* %z, align 4                      ; <i32> [#uses=1]
   %2 = getelementptr inbounds %struct.sType, %struct.sType* %arr, i32 0, i32 1 ; <[10 x i32]*> [#uses=1]
   %3 = sext i32 %1 to i64                         ; <i64> [#uses=1]
diff --git a/poolalloc/test/dsa/local/bitfields1.ll b/poolalloc/test/dsa/local/bitfields1.ll
index f1f760b..d6efb8a 100644
--- a/poolalloc/test/dsa/local/bitfields1.ll
+++ b/poolalloc/test/dsa/local/bitfields1.ll
@@ -28,7 +28,7 @@
   %5 = load %union.I_format_t*, %union.I_format_t** %ia, align 8      ; <%union.I_format_t*> [#uses=1]
   %6 = getelementptr inbounds %union.I_format_t, %union.I_format_t* %5, i32 0, i32 0 ; <i32*> [#uses=1]
   %7 = load i32, i32* %6, align 4                      ; <i32> [#uses=1]
-  %8 = call i32 (i8*, ...)* @printf(i8* noalias getelementptr inbounds ([18 x i8], [18 x i8]* @.str, i64 0, i64 0), i32 %7) nounwind ; <i32> [#uses=0]
+  %8 = call i32 (i8*, ...) @printf(i8* noalias getelementptr inbounds ([18 x i8], [18 x i8]* @.str, i64 0, i64 0), i32 %7) nounwind ; <i32> [#uses=0]
   %9 = load %union.I_format_t*, %union.I_format_t** %ia, align 8      ; <%union.I_format_t*> [#uses=1]
   %10 = getelementptr inbounds %union.I_format_t, %union.I_format_t* %9, i32 0, i32 0 ; <i32*> [#uses=1]
   %11 = bitcast i32* %10 to %struct.anon*         ; <%struct.anon*> [#uses=1]
@@ -38,7 +38,7 @@
   %15 = lshr i8 %14, 2                            ; <i8> [#uses=1]
   %16 = trunc i8 %15 to i6                        ; <i6> [#uses=1]
   %17 = zext i6 %16 to i32                        ; <i32> [#uses=1]
-  %18 = call i32 (i8*, ...)* @printf(i8* noalias getelementptr inbounds ([12 x i8], [12 x i8]* @.str1, i64 0, i64 0), i32 %17) nounwind ; <i32> [#uses=0]
+  %18 = call i32 (i8*, ...) @printf(i8* noalias getelementptr inbounds ([12 x i8], [12 x i8]* @.str1, i64 0, i64 0), i32 %17) nounwind ; <i32> [#uses=0]
   %19 = load %union.I_format_t*, %union.I_format_t** %ia, align 8     ; <%union.I_format_t*> [#uses=1]
   %20 = getelementptr inbounds %union.I_format_t, %union.I_format_t* %19, i32 0, i32 0 ; <i32*> [#uses=1]
   %21 = bitcast i32* %20 to %struct.anon*         ; <%struct.anon*> [#uses=1]
@@ -69,14 +69,14 @@
   %46 = lshr i32 %45, 27                          ; <i32> [#uses=1]
   %47 = trunc i32 %46 to i5                       ; <i5> [#uses=1]
   %48 = zext i5 %47 to i32                        ; <i32> [#uses=1]
-  %49 = call i32 (i8*, ...)* @printf(i8* noalias getelementptr inbounds ([23 x i8], [23 x i8]* @.str2, i64 0, i64 0), i32 %48, i32 %38, i32 %28) nounwind ; <i32> [#uses=0]
+  %49 = call i32 (i8*, ...) @printf(i8* noalias getelementptr inbounds ([23 x i8], [23 x i8]* @.str2, i64 0, i64 0), i32 %48, i32 %38, i32 %28) nounwind ; <i32> [#uses=0]
   %50 = load %union.I_format_t*, %union.I_format_t** %ia, align 8     ; <%union.I_format_t*> [#uses=1]
   %51 = getelementptr inbounds %union.I_format_t, %union.I_format_t* %50, i32 0, i32 0 ; <i32*> [#uses=1]
   %52 = bitcast i32* %51 to %struct.anon*         ; <%struct.anon*> [#uses=1]
   %53 = getelementptr inbounds %struct.anon, %struct.anon* %52, i32 0, i32 0 ; <i16*> [#uses=1]
   %54 = load i16, i16* %53, align 1                    ; <i16> [#uses=1]
   %55 = sext i16 %54 to i32                       ; <i32> [#uses=1]
-  %56 = call i32 (i8*, ...)* @printf(i8* noalias getelementptr inbounds ([11 x i8], [11 x i8]* @.str3, i64 0, i64 0), i32 %55) nounwind ; <i32> [#uses=0]
+  %56 = call i32 (i8*, ...) @printf(i8* noalias getelementptr inbounds ([11 x i8], [11 x i8]* @.str3, i64 0, i64 0), i32 %55) nounwind ; <i32> [#uses=0]
   store i32 0, i32* %0, align 4
   %57 = load i32, i32* %0, align 4                     ; <i32> [#uses=1]
   store i32 %57, i32* %retval, align 4
diff --git a/poolalloc/test/dsa/local/bitfields2.ll b/poolalloc/test/dsa/local/bitfields2.ll
index 6ff36e7..c185606 100644
--- a/poolalloc/test/dsa/local/bitfields2.ll
+++ b/poolalloc/test/dsa/local/bitfields2.ll
@@ -51,7 +51,7 @@
   store i32 %12, i32* %13, align 4
   %14 = getelementptr inbounds %union.mips_format_t, %union.mips_format_t* %ia, i32 0, i32 0 ; <i32*> [#uses=1]
   %15 = load i32, i32* %14, align 4                    ; <i32> [#uses=1]
-  %16 = call i32 (i8*, ...)* @printf(i8* noalias getelementptr inbounds ([18 x i8], [18 x i8]* @.str, i64 0, i64 0), i32 %15) nounwind ; <i32> [#uses=0]
+  %16 = call i32 (i8*, ...) @printf(i8* noalias getelementptr inbounds ([18 x i8], [18 x i8]* @.str, i64 0, i64 0), i32 %15) nounwind ; <i32> [#uses=0]
   %17 = getelementptr inbounds %union.mips_format_t, %union.mips_format_t* %ia, i32 0, i32 0 ; <i32*> [#uses=1]
   %18 = bitcast i32* %17 to %0*                   ; <%0*> [#uses=1]
   %19 = getelementptr inbounds %0, %0* %18, i32 0, i32 0 ; <i16*> [#uses=1]
@@ -60,7 +60,7 @@
   %22 = lshr i32 %21, 26                          ; <i32> [#uses=1]
   %23 = trunc i32 %22 to i6                       ; <i6> [#uses=1]
   %24 = zext i6 %23 to i32                        ; <i32> [#uses=1]
-  %25 = call i32 (i8*, ...)* @printf(i8* noalias getelementptr inbounds ([12 x i8], [12 x i8]* @.str1, i64 0, i64 0), i32 %24) nounwind ; <i32> [#uses=0]
+  %25 = call i32 (i8*, ...) @printf(i8* noalias getelementptr inbounds ([12 x i8], [12 x i8]* @.str1, i64 0, i64 0), i32 %24) nounwind ; <i32> [#uses=0]
   %26 = getelementptr inbounds %union.mips_format_t, %union.mips_format_t* %ia, i32 0, i32 0 ; <i32*> [#uses=1]
   %27 = bitcast i32* %26 to %0*                   ; <%0*> [#uses=1]
   %28 = getelementptr inbounds %0, %0* %27, i32 0, i32 0 ; <i16*> [#uses=1]
@@ -79,7 +79,7 @@
   %41 = lshr i32 %40, 27                          ; <i32> [#uses=1]
   %42 = trunc i32 %41 to i5                       ; <i5> [#uses=1]
   %43 = zext i5 %42 to i32                        ; <i32> [#uses=1]
-  %44 = call i32 (i8*, ...)* @printf(i8* noalias getelementptr inbounds ([15 x i8], [15 x i8]* @.str2, i64 0, i64 0), i32 %43, i32 %34) nounwind ; <i32> [#uses=0]
+  %44 = call i32 (i8*, ...) @printf(i8* noalias getelementptr inbounds ([15 x i8], [15 x i8]* @.str2, i64 0, i64 0), i32 %43, i32 %34) nounwind ; <i32> [#uses=0]
   %45 = getelementptr inbounds %union.mips_format_t, %union.mips_format_t* %ia, i32 0, i32 0 ; <i32*> [#uses=1]
   %46 = bitcast i32* %45 to %0*                   ; <%0*> [#uses=1]
   %47 = getelementptr inbounds %0, %0* %46, i32 0, i32 0 ; <i16*> [#uses=1]
@@ -114,7 +114,7 @@
   %73 = lshr i16 %72, 11                          ; <i16> [#uses=1]
   %74 = trunc i16 %73 to i5                       ; <i5> [#uses=1]
   %75 = zext i5 %74 to i32                        ; <i32> [#uses=1]
-  %76 = call i32 (i8*, ...)* @printf(i8* noalias getelementptr inbounds ([24 x i8], [24 x i8]* @.str3, i64 0, i64 0), i32 %75, i32 %68, i32 %60) nounwind ; <i32> [#uses=0]
+  %76 = call i32 (i8*, ...) @printf(i8* noalias getelementptr inbounds ([24 x i8], [24 x i8]* @.str3, i64 0, i64 0), i32 %75, i32 %68, i32 %60) nounwind ; <i32> [#uses=0]
   br label %bb3
 
 bb2:                                              ; preds = %bb
@@ -123,7 +123,7 @@
   %79 = getelementptr inbounds %0, %0* %78, i32 0, i32 0 ; <i16*> [#uses=1]
   %80 = load i16, i16* %79, align 1                    ; <i16> [#uses=1]
   %81 = sext i16 %80 to i32                       ; <i32> [#uses=1]
-  %82 = call i32 (i8*, ...)* @printf(i8* noalias getelementptr inbounds ([11 x i8], [11 x i8]* @.str4, i64 0, i64 0), i32 %81) nounwind ; <i32> [#uses=0]
+  %82 = call i32 (i8*, ...) @printf(i8* noalias getelementptr inbounds ([11 x i8], [11 x i8]* @.str4, i64 0, i64 0), i32 %81) nounwind ; <i32> [#uses=0]
   br label %bb3
 
 bb3:                                              ; preds = %bb2, %bb1
diff --git a/poolalloc/test/dsa/local/bitfields3.ll b/poolalloc/test/dsa/local/bitfields3.ll
index 756f90c..ec503b5 100644
--- a/poolalloc/test/dsa/local/bitfields3.ll
+++ b/poolalloc/test/dsa/local/bitfields3.ll
@@ -35,34 +35,34 @@
   %9 = and i32 %8, -61                            ; <i32> [#uses=1]
   %10 = or i32 %9, 28                             ; <i32> [#uses=1]
   store i32 %10, i32* %7, align 1
-  %11 = call i32 (i8*, ...)* @printf(i8* noalias getelementptr inbounds ([35 x i8], [35 x i8]* @.str, i64 0, i64 0), i64 4) nounwind ; <i32> [#uses=0]
+  %11 = call i32 (i8*, ...) @printf(i8* noalias getelementptr inbounds ([35 x i8], [35 x i8]* @.str, i64 0, i64 0), i64 4) nounwind ; <i32> [#uses=0]
   %12 = bitcast %struct.taxonomy* %t to %1*       ; <%1*> [#uses=1]
   %elt = getelementptr inbounds %1, %1* %12, i32 0, i32 0 ; <i64*> [#uses=1]
   %13 = bitcast i64* %elt to i32*                 ; <i32*> [#uses=1]
   %14 = load i32, i32* %13                             ; <i32> [#uses=1]
   %15 = zext i32 %14 to i64                       ; <i64> [#uses=1]
-  %16 = call i32 (i8*, ...)* @printf(i8* noalias getelementptr inbounds ([16 x i8], [16 x i8]* @.str1, i64 0, i64 0), i64 %15) nounwind ; <i32> [#uses=0]
+  %16 = call i32 (i8*, ...) @printf(i8* noalias getelementptr inbounds ([16 x i8], [16 x i8]* @.str1, i64 0, i64 0), i64 %15) nounwind ; <i32> [#uses=0]
   %17 = getelementptr inbounds %struct.taxonomy, %struct.taxonomy* %t, i32 0, i32 0 ; <i32*> [#uses=1]
   %18 = load i32, i32* %17, align 1                    ; <i32> [#uses=1]
   %19 = shl i32 %18, 30                           ; <i32> [#uses=1]
   %20 = lshr i32 %19, 30                          ; <i32> [#uses=1]
   %21 = trunc i32 %20 to i2                       ; <i2> [#uses=1]
   %22 = zext i2 %21 to i32                        ; <i32> [#uses=1]
-  %23 = call i32 (i8*, ...)* @printf(i8* noalias getelementptr inbounds ([13 x i8], [13 x i8]* @.str2, i64 0, i64 0), i32 %22) nounwind ; <i32> [#uses=0]
+  %23 = call i32 (i8*, ...) @printf(i8* noalias getelementptr inbounds ([13 x i8], [13 x i8]* @.str2, i64 0, i64 0), i32 %22) nounwind ; <i32> [#uses=0]
   %24 = getelementptr inbounds %struct.taxonomy, %struct.taxonomy* %t, i32 0, i32 0 ; <i32*> [#uses=1]
   %25 = load i32, i32* %24, align 1                    ; <i32> [#uses=1]
   %26 = shl i32 %25, 26                           ; <i32> [#uses=1]
   %27 = lshr i32 %26, 28                          ; <i32> [#uses=1]
   %28 = trunc i32 %27 to i4                       ; <i4> [#uses=1]
   %29 = zext i4 %28 to i32                        ; <i32> [#uses=1]
-  %30 = call i32 (i8*, ...)* @printf(i8* noalias getelementptr inbounds ([12 x i8], [12 x i8]* @.str3, i64 0, i64 0), i32 %29) nounwind ; <i32> [#uses=0]
+  %30 = call i32 (i8*, ...) @printf(i8* noalias getelementptr inbounds ([12 x i8], [12 x i8]* @.str3, i64 0, i64 0), i32 %29) nounwind ; <i32> [#uses=0]
   %31 = getelementptr inbounds %struct.taxonomy, %struct.taxonomy* %t, i32 0, i32 0 ; <i32*> [#uses=1]
   %32 = load i32, i32* %31, align 1                    ; <i32> [#uses=1]
   %33 = shl i32 %32, 14                           ; <i32> [#uses=1]
   %34 = lshr i32 %33, 20                          ; <i32> [#uses=1]
   %35 = trunc i32 %34 to i12                      ; <i12> [#uses=1]
   %36 = zext i12 %35 to i32                       ; <i32> [#uses=1]
-  %37 = call i32 (i8*, ...)* @printf(i8* noalias getelementptr inbounds ([11 x i8], [11 x i8]* @.str4, i64 0, i64 0), i32 %36) nounwind ; <i32> [#uses=0]
+  %37 = call i32 (i8*, ...) @printf(i8* noalias getelementptr inbounds ([11 x i8], [11 x i8]* @.str4, i64 0, i64 0), i32 %36) nounwind ; <i32> [#uses=0]
   store i32 0, i32* %0, align 4
   %38 = load i32, i32* %0, align 4                     ; <i32> [#uses=1]
   store i32 %38, i32* %retval, align 4
diff --git a/poolalloc/test/dsa/regression/2011-03-17-CBUAssert.ll b/poolalloc/test/dsa/regression/2011-03-17-CBUAssert.ll
index 2608f54..f83b487 100644
--- a/poolalloc/test/dsa/regression/2011-03-17-CBUAssert.ll
+++ b/poolalloc/test/dsa/regression/2011-03-17-CBUAssert.ll
@@ -11,7 +11,7 @@
 
 define %struct.regmatcher* @compile(i8* %expr) nounwind {
   entry:
-    %0 = call %struct.node* (...)* bitcast (%struct.node* ()* @end_node to %struct.node* (...)*)() nounwind ; <%struct.node*> [#uses=0]
+    %0 = call %struct.node* (...) bitcast (%struct.node* ()* @end_node to %struct.node* (...)*)() nounwind ; <%struct.node*> [#uses=0]
       unreachable
 }
 
diff --git a/poolalloc/test/dsa/regression/2012-11-19.MultipleVAStartAlias.ll b/poolalloc/test/dsa/regression/2012-11-19.MultipleVAStartAlias.ll
index 7718391..2e96426 100644
--- a/poolalloc/test/dsa/regression/2012-11-19.MultipleVAStartAlias.ll
+++ b/poolalloc/test/dsa/regression/2012-11-19.MultipleVAStartAlias.ll
@@ -114,8 +114,8 @@
 
 define i32 @main() nounwind uwtable {
 entry:
-  %call = tail call i32 (i32, ...)* @sum(i32 5, i32 1, i32 2, i32 3, i32 4, i32 5)
-  %call1 = tail call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0), i32 %call) nounwind
+  %call = tail call i32 (i32, ...) @sum(i32 5, i32 1, i32 2, i32 3, i32 4, i32 5)
+  %call1 = tail call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0), i32 %call) nounwind
   ret i32 0
 }
 
diff --git a/poolalloc/test/dsa/var_arg/basic.ll b/poolalloc/test/dsa/var_arg/basic.ll
index 7f681f6..ab5dba2 100644
--- a/poolalloc/test/dsa/var_arg/basic.ll
+++ b/poolalloc/test/dsa/var_arg/basic.ll
@@ -77,7 +77,7 @@
   %"alloca point" = bitcast i32 0 to i32          ; <i32> [#uses=0]
   store i32 5, i32* %stack_val, align 4
   store i8 97, i8* %stack_val1, align 1
-  %1 = call i32 (i32, ...)* @get(i32 0, i32* %stack_val, i8* %stack_val1) nounwind ; <i32> [#uses=1]
+  %1 = call i32 (i32, ...) @get(i32 0, i32* %stack_val, i8* %stack_val1) nounwind ; <i32> [#uses=1]
   store i32 %1, i32* %ret, align 4
   %2 = load i32, i32* %ret, align 4                    ; <i32> [#uses=1]
   %3 = sub nsw i32 %2, 5                          ; <i32> [#uses=1]
diff --git a/poolalloc/test/dsa/var_arg/basic_32.ll b/poolalloc/test/dsa/var_arg/basic_32.ll
index 5fc1fed..3e63983 100644
--- a/poolalloc/test/dsa/var_arg/basic_32.ll
+++ b/poolalloc/test/dsa/var_arg/basic_32.ll
@@ -65,7 +65,7 @@
   %ret = alloca i32                               ; <i32*> [#uses=2]
   %"alloca point" = bitcast i32 0 to i32          ; <i32> [#uses=0]
   store i32 5, i32* %stack_val, align 4
-  %1 = call i32 (i32, ...)* @get(i32 0, i32* %stack_val) nounwind ; <i32> [#uses=1]
+  %1 = call i32 (i32, ...) @get(i32 0, i32* %stack_val) nounwind ; <i32> [#uses=1]
   store i32 %1, i32* %ret, align 4
   %2 = load i32, i32* %ret, align 4                    ; <i32> [#uses=1]
   %3 = sub nsw i32 %2, 5                          ; <i32> [#uses=1]
diff --git a/poolalloc/test/dsa/var_arg/basic_64.ll b/poolalloc/test/dsa/var_arg/basic_64.ll
index bf4dab8..6d56da7 100644
--- a/poolalloc/test/dsa/var_arg/basic_64.ll
+++ b/poolalloc/test/dsa/var_arg/basic_64.ll
@@ -109,7 +109,7 @@
   %ret = alloca i32                               ; <i32*> [#uses=2]
   %"alloca point" = bitcast i32 0 to i32          ; <i32> [#uses=0]
   store i32 5, i32* %stack_val, align 4
-  %1 = call i32 (i32, ...)* @get(i32 0, i32* %stack_val) nounwind ; <i32> [#uses=1]
+  %1 = call i32 (i32, ...) @get(i32 0, i32* %stack_val) nounwind ; <i32> [#uses=1]
   store i32 %1, i32* %ret, align 4
   %2 = load i32, i32* %ret, align 4                    ; <i32> [#uses=1]
   %3 = sub nsw i32 %2, 5                          ; <i32> [#uses=1]
diff --git a/poolalloc/test/dsa/var_arg/print.ll b/poolalloc/test/dsa/var_arg/print.ll
index 24a3dae..44673e4 100644
--- a/poolalloc/test/dsa/var_arg/print.ll
+++ b/poolalloc/test/dsa/var_arg/print.ll
@@ -53,10 +53,10 @@
   %0 = call noalias i8* @malloc(i64 4) nounwind   ; <i8*> [#uses=1]
   %1 = bitcast i8* %0 to i32*                     ; <i32*> [#uses=1]
   store i32* %1, i32** %x, align 8
-  call void (i8*, ...)* @generic_sendmsg(i8* getelementptr inbounds ([22 x i8], [22 x i8]* @.str, i64 0, i64 0), i32 1234, i32 1234, double 1.232200e+02, double 1.234500e+02) nounwind
-  call void (i8*, ...)* @generic_sendmsg(i8* getelementptr inbounds ([12 x i8], [12 x i8]* @.str1, i64 0, i64 0), i8* getelementptr inbounds ([5 x i8], [5 x i8]* @.str2, i64 0, i64 0), i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str3, i64 0, i64 0), i8* getelementptr inbounds ([8 x i8], [8 x i8]* @.str4, i64 0, i64 0)) nounwind
+  call void (i8*, ...) @generic_sendmsg(i8* getelementptr inbounds ([22 x i8], [22 x i8]* @.str, i64 0, i64 0), i32 1234, i32 1234, double 1.232200e+02, double 1.234500e+02) nounwind
+  call void (i8*, ...) @generic_sendmsg(i8* getelementptr inbounds ([12 x i8], [12 x i8]* @.str1, i64 0, i64 0), i8* getelementptr inbounds ([5 x i8], [5 x i8]* @.str2, i64 0, i64 0), i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str3, i64 0, i64 0), i8* getelementptr inbounds ([8 x i8], [8 x i8]* @.str4, i64 0, i64 0)) nounwind
   %2 = load i32*, i32** %x, align 8                     ; <i32*> [#uses=1]
-  call void (i8*, ...)* @generic_sendmsg(i8* getelementptr inbounds ([15 x i8], [15 x i8]* @.str5, i64 0, i64 0), i8* getelementptr inbounds ([5 x i8], [5 x i8]* @.str2, i64 0, i64 0), i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str3, i64 0, i64 0), i8* getelementptr inbounds ([8 x i8], [8 x i8]* @.str4, i64 0, i64 0), i32* %2) nounwind
+  call void (i8*, ...) @generic_sendmsg(i8* getelementptr inbounds ([15 x i8], [15 x i8]* @.str5, i64 0, i64 0), i8* getelementptr inbounds ([5 x i8], [5 x i8]* @.str2, i64 0, i64 0), i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str3, i64 0, i64 0), i8* getelementptr inbounds ([8 x i8], [8 x i8]* @.str4, i64 0, i64 0), i32* %2) nounwind
   br label %return
 
 return:                                           ; preds = %entry
diff --git a/poolalloc/test/dsa/var_arg/va_copy_32.ll b/poolalloc/test/dsa/var_arg/va_copy_32.ll
index 193d7a4..c8857f5 100644
--- a/poolalloc/test/dsa/var_arg/va_copy_32.ll
+++ b/poolalloc/test/dsa/var_arg/va_copy_32.ll
@@ -83,7 +83,7 @@
   %ret = alloca i32                               ; <i32*> [#uses=2]
   %"alloca point" = bitcast i32 0 to i32          ; <i32> [#uses=0]
   store i32 5, i32* %stack_val, align 4
-  %1 = call i32 (i32, ...)* @get(i32 0, i32* %stack_val) nounwind ; <i32> [#uses=1]
+  %1 = call i32 (i32, ...) @get(i32 0, i32* %stack_val) nounwind ; <i32> [#uses=1]
   store i32 %1, i32* %ret, align 4
   %2 = load i32, i32* %ret, align 4                    ; <i32> [#uses=1]
   store i32 %2, i32* %0, align 4
diff --git a/poolalloc/test/dsa/var_arg/va_copy_64.ll b/poolalloc/test/dsa/var_arg/va_copy_64.ll
index 3c87dc9..e1793c6 100644
--- a/poolalloc/test/dsa/var_arg/va_copy_64.ll
+++ b/poolalloc/test/dsa/var_arg/va_copy_64.ll
@@ -156,7 +156,7 @@
   %ret = alloca i32                               ; <i32*> [#uses=2]
   %"alloca point" = bitcast i32 0 to i32          ; <i32> [#uses=0]
   store i32 5, i32* %stack_val, align 4
-  %1 = call i32 (i32, ...)* @get(i32 0, i32* %stack_val) nounwind ; <i32> [#uses=1]
+  %1 = call i32 (i32, ...) @get(i32 0, i32* %stack_val) nounwind ; <i32> [#uses=1]
   store i32 %1, i32* %ret, align 4
   %2 = load i32, i32* %ret, align 4                    ; <i32> [#uses=1]
   store i32 %2, i32* %0, align 4