From 3b29901b1d106789e04ce8c4cdfebe72b251db4b Mon Sep 17 00:00:00 2001 From: Sean Callanan Date: Fri, 18 Dec 2009 00:04:09 +0000 Subject: [PATCH] Testcase fixes to reflect instruction table changes in the LLVM backend (http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20091214/092780.html) The instruction fixes were checked and approved by Chris Lattner, but these testcase fixes are mine; please yell at me if there are any problems with either. * PR5050-constructor-conversion.cpp * array-construction.cpp * constructor-conversion.cpp * cast-conversion.cpp * constructor-default-arg.cpp * derived-to-base-conv.cpp * ptr-to-member-function.cpp * call-arg-zero-temp.cpp * default-destructor-synthesis.cpp * global-array-destruction.cpp * array-operator-delete-call.cpp * decl-ref-init.cpp * default-constructor-for-members.cpp * convert-to-fptr.cpp * constructor-for-array-members.cpp * conversion-function.cpp * objc-read-weak-byref.m Fixed testcase to reflect call qualifier git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@91640 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../CodeGenCXX/PR5050-constructor-conversion.cpp | 2 +- test/CodeGenCXX/array-construction.cpp | 2 +- test/CodeGenCXX/array-operator-delete-call.cpp | 2 +- test/CodeGenCXX/call-arg-zero-temp.cpp | 2 +- test/CodeGenCXX/cast-conversion.cpp | 12 ++++++------ test/CodeGenCXX/constructor-conversion.cpp | 6 +++--- test/CodeGenCXX/constructor-default-arg.cpp | 6 +++--- .../CodeGenCXX/constructor-for-array-members.cpp | 2 +- test/CodeGenCXX/conversion-function.cpp | 12 ++++++------ test/CodeGenCXX/convert-to-fptr.cpp | 4 ++-- test/CodeGenCXX/decl-ref-init.cpp | 4 ++-- .../default-constructor-for-members.cpp | 2 +- test/CodeGenCXX/default-destructor-synthesis.cpp | 4 ++-- test/CodeGenCXX/derived-to-base-conv.cpp | 8 ++++---- test/CodeGenCXX/global-array-destruction.cpp | 16 ++++++++-------- test/CodeGenCXX/ptr-to-member-function.cpp | 4 ++-- test/CodeGenObjC/objc-read-weak-byref.m | 4 ++-- 17 files changed, 46 insertions(+), 46 deletions(-) diff --git a/test/CodeGenCXX/PR5050-constructor-conversion.cpp b/test/CodeGenCXX/PR5050-constructor-conversion.cpp index aa7165a166..9103b8321f 100644 --- a/test/CodeGenCXX/PR5050-constructor-conversion.cpp +++ b/test/CodeGenCXX/PR5050-constructor-conversion.cpp @@ -11,7 +11,7 @@ A f(const B &b) { return b; } -// CHECK-LP64: call __ZN1AC1ERKS_i +// CHECK-LP64: callq __ZN1AC1ERKS_i // CHECK-LP32: call L__ZN1AC1ERKS_i diff --git a/test/CodeGenCXX/array-construction.cpp b/test/CodeGenCXX/array-construction.cpp index 12975fe4f0..ab46be72d8 100644 --- a/test/CodeGenCXX/array-construction.cpp +++ b/test/CodeGenCXX/array-construction.cpp @@ -30,7 +30,7 @@ int main() { h, i, j, array[h][i][j].i, array[h][i][j].f); } -// CHECK-LP64: call __ZN4xptoC1Ev +// CHECK-LP64: callq __ZN4xptoC1Ev // CHECK-LP32: call L__ZN4xptoC1Ev diff --git a/test/CodeGenCXX/array-operator-delete-call.cpp b/test/CodeGenCXX/array-operator-delete-call.cpp index bef514a7be..acb85d23b3 100644 --- a/test/CodeGenCXX/array-operator-delete-call.cpp +++ b/test/CodeGenCXX/array-operator-delete-call.cpp @@ -57,7 +57,7 @@ int main() } COST c2; -// CHECK-LP64: call __ZdaPv +// CHECK-LP64: callq __ZdaPv // CHECK-LP32: call L__ZdaPv diff --git a/test/CodeGenCXX/call-arg-zero-temp.cpp b/test/CodeGenCXX/call-arg-zero-temp.cpp index 7d99533fec..ed8118e07d 100644 --- a/test/CodeGenCXX/call-arg-zero-temp.cpp +++ b/test/CodeGenCXX/call-arg-zero-temp.cpp @@ -17,6 +17,6 @@ int main() { foo(obj()); } -// CHECK-LP64: call __Z3foo3obj +// CHECK-LP64: callq __Z3foo3obj // CHECK-LP32: call __Z3foo3obj diff --git a/test/CodeGenCXX/cast-conversion.cpp b/test/CodeGenCXX/cast-conversion.cpp index ae43f19ee3..6dc6de6018 100644 --- a/test/CodeGenCXX/cast-conversion.cpp +++ b/test/CodeGenCXX/cast-conversion.cpp @@ -17,12 +17,12 @@ int main () { static_cast(10); } -// CHECK-LP64: call __ZN1AC1Ei -// CHECK-LP64: call __ZN1BC1E1A -// CHECK-LP64: call __ZN1AC1Ei -// CHECK-LP64: call __ZN1BC1E1A -// CHECK-LP64: call __ZN1AC1Ei -// CHECK-LP64: call __ZN1BC1E1A +// CHECK-LP64: callq __ZN1AC1Ei +// CHECK-LP64: callq __ZN1BC1E1A +// CHECK-LP64: callq __ZN1AC1Ei +// CHECK-LP64: callq __ZN1BC1E1A +// CHECK-LP64: callq __ZN1AC1Ei +// CHECK-LP64: callq __ZN1BC1E1A // CHECK-LP32: call L__ZN1AC1Ei // CHECK-LP32: call L__ZN1BC1E1A diff --git a/test/CodeGenCXX/constructor-conversion.cpp b/test/CodeGenCXX/constructor-conversion.cpp index b680bca181..f135da5e85 100644 --- a/test/CodeGenCXX/constructor-conversion.cpp +++ b/test/CodeGenCXX/constructor-conversion.cpp @@ -45,9 +45,9 @@ int main() { g(3); // g(X(3)) } -// CHECK-LP64: call __ZN1XC1Ei -// CHECK-LP64: call __ZN1XC1EPKci -// CHECK-LP64: call __ZN1XC1Ev +// CHECK-LP64: callq __ZN1XC1Ei +// CHECK-LP64: callq __ZN1XC1EPKci +// CHECK-LP64: callq __ZN1XC1Ev // CHECK-LP32: call L__ZN1XC1Ei // CHECK-LP32: call L__ZN1XC1EPKci diff --git a/test/CodeGenCXX/constructor-default-arg.cpp b/test/CodeGenCXX/constructor-default-arg.cpp index bf3106d065..ec0b8da69b 100644 --- a/test/CodeGenCXX/constructor-default-arg.cpp +++ b/test/CodeGenCXX/constructor-default-arg.cpp @@ -30,9 +30,9 @@ int main() { X d(a, 5, 6); } -// CHECK-LP64: call __ZN1XC1ERKS_iii -// CHECK-LP64: call __ZN1XC1ERKS_iii -// CHECK-LP64: call __ZN1XC1ERKS_iii +// CHECK-LP64: callq __ZN1XC1ERKS_iii +// CHECK-LP64: callq __ZN1XC1ERKS_iii +// CHECK-LP64: callq __ZN1XC1ERKS_iii // CHECK-LP32: call L__ZN1XC1ERKS_iii // CHECK-LP32: call L__ZN1XC1ERKS_iii diff --git a/test/CodeGenCXX/constructor-for-array-members.cpp b/test/CodeGenCXX/constructor-for-array-members.cpp index 3f16ba1ec8..b981da4973 100644 --- a/test/CodeGenCXX/constructor-for-array-members.cpp +++ b/test/CodeGenCXX/constructor-for-array-members.cpp @@ -38,6 +38,6 @@ int main() { m1.pr(); } -// CHECK-LP64: call __ZN1SC1Ev +// CHECK-LP64: callq __ZN1SC1Ev // CHECK-LP32: call L__ZN1SC1Ev diff --git a/test/CodeGenCXX/conversion-function.cpp b/test/CodeGenCXX/conversion-function.cpp index 9ba94a9026..ef45fc2342 100644 --- a/test/CodeGenCXX/conversion-function.cpp +++ b/test/CodeGenCXX/conversion-function.cpp @@ -97,12 +97,12 @@ void f(Yb& a) { // CHECK-LP64: .globl __ZN1ScviEv // CHECK-LP64-NEXT: __ZN1ScviEv: -// CHECK-LP64: call __ZN1Ycv1ZEv -// CHECK-LP64: call __ZN1Zcv1XEv -// CHECK-LP64: call __ZN1XcviEv -// CHECK-LP64: call __ZN1XcvfEv -// CHECK-LP64: call __ZN2XBcviEv -// CHECK-LP64: call __ZN2YbcvcEv +// CHECK-LP64: callq __ZN1Ycv1ZEv +// CHECK-LP64: callq __ZN1Zcv1XEv +// CHECK-LP64: callq __ZN1XcviEv +// CHECK-LP64: callq __ZN1XcvfEv +// CHECK-LP64: callq __ZN2XBcviEv +// CHECK-LP64: callq __ZN2YbcvcEv // CHECK-LP32: .globl __ZN1ScviEv // CHECK-LP32-NEXT: __ZN1ScviEv: diff --git a/test/CodeGenCXX/convert-to-fptr.cpp b/test/CodeGenCXX/convert-to-fptr.cpp index 2812b0e002..dc49401af9 100644 --- a/test/CodeGenCXX/convert-to-fptr.cpp +++ b/test/CodeGenCXX/convert-to-fptr.cpp @@ -38,8 +38,8 @@ int main() return 0; } -// CHECK-LP64: call __ZN1AcvPFiiEEv -// CHECK-LP64: call __ZN1BcvRFiiEEv +// CHECK-LP64: callq __ZN1AcvPFiiEEv +// CHECK-LP64: callq __ZN1BcvRFiiEEv // CHECK-LP32: call L__ZN1AcvPFiiEEv // CHECK-LP32: call L__ZN1BcvRFiiEEv diff --git a/test/CodeGenCXX/decl-ref-init.cpp b/test/CodeGenCXX/decl-ref-init.cpp index 50ac49d8d2..c215b1b9be 100644 --- a/test/CodeGenCXX/decl-ref-init.cpp +++ b/test/CodeGenCXX/decl-ref-init.cpp @@ -23,8 +23,8 @@ int main() { const A& rca2 = d(); } -// CHECK-LP64: call __ZN1BcvR1AEv -// CHECK-LP64: call __ZN1BcvR1AEv +// CHECK-LP64: callq __ZN1BcvR1AEv +// CHECK-LP64: callq __ZN1BcvR1AEv // CHECK-LP32: call L__ZN1BcvR1AEv // CHECK-LP32: call L__ZN1BcvR1AEv diff --git a/test/CodeGenCXX/default-constructor-for-members.cpp b/test/CodeGenCXX/default-constructor-for-members.cpp index cbd119bd22..1f17746023 100644 --- a/test/CodeGenCXX/default-constructor-for-members.cpp +++ b/test/CodeGenCXX/default-constructor-for-members.cpp @@ -18,6 +18,6 @@ int main() { M m1; } -// CHECK-LP64: call __ZN1SC1Ev +// CHECK-LP64: callq __ZN1SC1Ev // CHECK-LP32: call L__ZN1SC1Ev diff --git a/test/CodeGenCXX/default-destructor-synthesis.cpp b/test/CodeGenCXX/default-destructor-synthesis.cpp index 0c937bf8a6..098458d35d 100644 --- a/test/CodeGenCXX/default-destructor-synthesis.cpp +++ b/test/CodeGenCXX/default-destructor-synthesis.cpp @@ -45,8 +45,8 @@ M gm; int main() {M m1;} -// CHECK-LP64: call __ZN1MC1Ev -// CHECK-LP64: call __ZN1MD1Ev +// CHECK-LP64: callq __ZN1MC1Ev +// CHECK-LP64: callq __ZN1MD1Ev // CHECK-LP64: .globl __ZN1MD1Ev // CHECK-LP64-NEXT: .weak_definition __ZN1MD1Ev // CHECK-LP64-NEXT: __ZN1MD1Ev: diff --git a/test/CodeGenCXX/derived-to-base-conv.cpp b/test/CodeGenCXX/derived-to-base-conv.cpp index 0a29d45e72..c1a0caa758 100644 --- a/test/CodeGenCXX/derived-to-base-conv.cpp +++ b/test/CodeGenCXX/derived-to-base-conv.cpp @@ -65,12 +65,12 @@ void foo(Base) {} void test(Derived bb) { - // CHECK-LP64-NOT: call __ZN4BasecvR7DerivedEv - // CHECK-LP32-NOT: call L__ZN4BasecvR7DerivedEv + // CHECK-LP64-NOT: callq __ZN4BasecvR7DerivedEv + // CHECK-LP32-NOT: callq L__ZN4BasecvR7DerivedEv foo(bb); } -// CHECK-LP64: call __ZN1XcvR1BEv -// CHECK-LP64: call __ZN1AC1ERKS_ +// CHECK-LP64: callq __ZN1XcvR1BEv +// CHECK-LP64: callq __ZN1AC1ERKS_ // CHECK-LP32: call L__ZN1XcvR1BEv // CHECK-LP32: call L__ZN1AC1ERKS_ diff --git a/test/CodeGenCXX/global-array-destruction.cpp b/test/CodeGenCXX/global-array-destruction.cpp index 7b1566af8c..c77551cb32 100644 --- a/test/CodeGenCXX/global-array-destruction.cpp +++ b/test/CodeGenCXX/global-array-destruction.cpp @@ -23,11 +23,11 @@ static S sarr1[4]; S s2; S arr3[3]; -// CHECK-LP64: call ___cxa_atexit -// CHECK-LP64: call ___cxa_atexit -// CHECK-LP64: call ___cxa_atexit -// CHECK-LP64: call ___cxa_atexit -// CHECK-LP64: call ___cxa_atexit -// CHECK-LP64: call ___cxa_atexit -// CHECK-LP64: call ___cxa_atexit -// CHECK-LP64: call ___cxa_atexit +// CHECK-LP64: callq ___cxa_atexit +// CHECK-LP64: callq ___cxa_atexit +// CHECK-LP64: callq ___cxa_atexit +// CHECK-LP64: callq ___cxa_atexit +// CHECK-LP64: callq ___cxa_atexit +// CHECK-LP64: callq ___cxa_atexit +// CHECK-LP64: callq ___cxa_atexit +// CHECK-LP64: callq ___cxa_atexit diff --git a/test/CodeGenCXX/ptr-to-member-function.cpp b/test/CodeGenCXX/ptr-to-member-function.cpp index f6e5a2b511..e3912fe908 100644 --- a/test/CodeGenCXX/ptr-to-member-function.cpp +++ b/test/CodeGenCXX/ptr-to-member-function.cpp @@ -63,8 +63,8 @@ int main() B1 c = B1(2); } -// CHECK-LP64: call __ZN1XcvM1BFvvEEv -// CHECK-LP64: call __Z1gM1CFvvE +// CHECK-LP64: callq __ZN1XcvM1BFvvEEv +// CHECK-LP64: callq __Z1gM1CFvvE // CHECK-LP32: call L__ZN1XcvM1BFvvEEv // CHECK-LP32: call __Z1gM1CFvvE diff --git a/test/CodeGenObjC/objc-read-weak-byref.m b/test/CodeGenObjC/objc-read-weak-byref.m index 62b1fb3838..1ddbcaffac 100644 --- a/test/CodeGenObjC/objc-read-weak-byref.m +++ b/test/CodeGenObjC/objc-read-weak-byref.m @@ -18,8 +18,8 @@ int main() { return 0; } -// CHECK-LP64: call _objc_read_weak -// CHECK-LP64: call _objc_read_weak +// CHECK-LP64: callq _objc_read_weak +// CHECK-LP64: callq _objc_read_weak // CHECK-LP32: call L_objc_read_weak // CHECK-LP32: call L_objc_read_weak -- 2.40.0