Fix PR1146: parameter attributes are longer part of

the function type, instead they belong to functions
and function calls.  This is an updated and slightly
corrected version of Reid Spencer's original patch.
The only known problem is that auto-upgrading of
bitcode files doesn't seem to work properly (see
test/Bitcode/AutoUpgradeIntrinsics.ll).  Hopefully
a bitcode guru (who might that be? :) ) will fix it.


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

7 files changed, 11 insertions, 8 deletions

diff --git a/test/Assembler/2006-05-26-VarargsCallEncode.ll b/test/Assembler/2006-05-26-VarargsCallEncode.ll
index c87b19d3d3..c36bcfa220 100644
--- a/test/Assembler/2006-05-26-VarargsCallEncode.ll
+++ b/test/Assembler/2006-05-26-VarargsCallEncode.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | \
-; RUN:    grep {tail call void (\{  \}\\* sret}
+; RUN:    grep {tail call void.*sret  null}
 
 declare csretcc void %foo({}*, ...)
 
diff --git a/test/Assembler/2007-02-07-UpgradeCSRETCC.ll b/test/Assembler/2007-02-07-UpgradeCSRETCC.ll
index 745c499d3f..da6faa6970 100644
--- a/test/Assembler/2007-02-07-UpgradeCSRETCC.ll
+++ b/test/Assembler/2007-02-07-UpgradeCSRETCC.ll
@@ -1,7 +1,5 @@
-; For PR1187
 ; RUN: llvm-upgrade < %s > /dev/null
-; XFAIL: *
-; Un-XFAIL this when PR1146 is fixed.
+; PR1187
 
 %mystruct = type { int, double }
 %glob = global %mystruct { int 3, double 42.0 }
diff --git a/test/Assembler/2007-11-26-AttributeOverload.ll b/test/Assembler/2007-11-26-AttributeOverload.ll
new file mode 100644
index 0000000000..9aec8d9510
--- /dev/null
+++ b/test/Assembler/2007-11-26-AttributeOverload.ll
@@ -0,0 +1,4 @@
+; RUN: not llvm-as < %s
+
+declare i32 @atoi(i8*) nounwind readonly
+declare i32 @atoi(i8*)
diff --git a/test/Assembler/2007-11-27-AutoUpgradeAttributes.ll b/test/Assembler/2007-11-27-AutoUpgradeAttributes.ll
new file mode 100644
index 0000000000..ee260eadb7
--- /dev/null
+++ b/test/Assembler/2007-11-27-AutoUpgradeAttributes.ll
@@ -0,0 +1,3 @@
+; RUN: llvm-as < %s
+
+@FP = weak global i8 (...) signext * null
diff --git a/test/Feature/paramattrs.ll b/test/Feature/paramattrs.ll
index 24c46dc22c..3bee6177e0 100644
--- a/test/Feature/paramattrs.ll
+++ b/test/Feature/paramattrs.ll
@@ -14,7 +14,7 @@ declare void @exit(i32) noreturn nounwind
 
 define i32 @main(i32 inreg %argc, i8 ** inreg %argv) nounwind {
     %val = trunc i32 %argc to i16
-    %res1 = call i16 (i16 signext) signext *@test(i16 %val)
+    %res1 = call i16 (i16 signext) signext *@test(i16 signext %val) signext
     %two = add i16 %res1, %res1
     %res2 = call i8 @test2(i16 %two zeroext) zeroext 
     %retVal = sext i16 %two to i32
diff --git a/test/Integer/paramattrs_bt.ll b/test/Integer/paramattrs_bt.ll
index e5b6a3e65b..47ef7539b3 100644
--- a/test/Integer/paramattrs_bt.ll
+++ b/test/Integer/paramattrs_bt.ll
@@ -11,7 +11,7 @@ declare i8  @"test2" (i16 zeroext %a2) zeroext
 
 define i33 @main(i33 %argc, i8 **%argv) {
     %val = trunc i33 %argc to i16
-    %res = call i16 (i16 signext) signext *@test(i16 %val)
+    %res = call i16 (i16 signext) signext *@test(i16 signext %val) signext
     %two = add i16 %res, %res
     %res2 = call i8 @test2(i16 %two zeroext) zeroext 
     %retVal = sext i16 %two to i33
diff --git a/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll b/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll
index 48a1458508..d067ac0994 100644
--- a/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll
+++ b/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll
@@ -1,6 +1,4 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg -disable-output
-; XFAIL: *
-; Un-XFAIL this when PR1146 is finished.
 
 	%struct..4._102 = type { %struct.QVectorData* }
 	%struct..5._125 = type { %struct.QMapData* }