Author: hans Date: Fri Aug 14 20:30:22 2015 New Revision: 245143 URL: http://llvm.org/viewvc/llvm-project?rev=245143&view=rev Log: Merging r244502: ------------------------------------------------------------------------ r244502 | chh | 2015-08-10 13:58:54 -0700 (Mon, 10 Aug 2015) | 8 lines
Fix test case to work with -Asserts builds. When clang is built with -DLLVM_ENABLE_ASSERTIONS=Off, it does not create names for IR values. Differential Revision: http://reviews.llvm.org/D11437 ------------------------------------------------------------------------ Modified: cfe/branches/release_37/ (props changed) cfe/branches/release_37/test/CodeGen/x86_64-fp128.c Propchange: cfe/branches/release_37/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 14 20:30:22 2015 @@ -1,4 +1,4 @@ /cfe/branches/type-system-rewrite:134693-134817 -/cfe/trunk:242244,242285,242293,242297,242313,242382,242422,242499,242574,242600,242660,242662,242667,242678,242766,242854,242905,242973,243018,243048,243085,243098,243101,243105,243133,243144,243153,243196,243206,243277,243280,243285,243289,243343,243417,243463,243538,243594,243642-243644,243851,243945-243950,243964,244000,244193,244468,244719,244794 +/cfe/trunk:242244,242285,242293,242297,242313,242382,242422,242499,242574,242600,242660,242662,242667,242678,242766,242854,242905,242973,243018,243048,243085,243098,243101,243105,243133,243144,243153,243196,243206,243277,243280,243285,243289,243343,243417,243463,243538,243594,243642-243644,243851,243945-243950,243964,244000,244193,244468,244502,244719,244794 /cfe/trunk/test:170344 /cfe/trunk/test/SemaTemplate:126920 Modified: cfe/branches/release_37/test/CodeGen/x86_64-fp128.c URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_37/test/CodeGen/x86_64-fp128.c?rev=245143&r1=245142&r2=245143&view=diff ============================================================================== --- cfe/branches/release_37/test/CodeGen/x86_64-fp128.c (original) +++ cfe/branches/release_37/test/CodeGen/x86_64-fp128.c Fri Aug 14 20:30:22 2015 @@ -31,20 +31,20 @@ typedef __builtin_va_list va_list; int TestGetVarInt(va_list ap) { return __builtin_va_arg(ap, int); -// Since int can be passed in memory or in register there is a branch and a phi. +// Since int can be passed in memory or register there are two branches. // CHECK: define i32 @TestGetVarInt( -// CHECK: br -// CHECK: load {{.*}} %overflow_arg_area_p +// CHECK: br label +// CHECK: br label // CHECK: = phi // CHECK: ret i32 } double TestGetVarDouble(va_list ap) { return __builtin_va_arg(ap, double); -// Since double can be passed in memory or in register there is a branch and a phi. +// Since double can be passed in memory or register there are two branches. // CHECK: define double @TestGetVarDouble( -// CHECK: br -// CHECK: load {{.*}} %overflow_arg_area_p +// CHECK: br label +// CHECK: br label // CHECK: = phi // CHECK: ret double } @@ -54,10 +54,10 @@ long double TestGetVarLD(va_list ap) { // fp128 can be passed in memory or in register, but x86_fp80 is in memory. // ANDROID: define fp128 @TestGetVarLD( // GNU: define x86_fp80 @TestGetVarLD( -// ANDROID: br -// GNU-NOT: br -// CHECK: load {{.*}} %overflow_arg_area_p +// ANDROID: br label +// ANDROID: br label // ANDROID: = phi +// GNU-NOT: br // GNU-NOT: = phi // ANDROID: ret fp128 // GNU: ret x86_fp80 @@ -69,7 +69,6 @@ long double _Complex TestGetVarLDC(va_li // ANDROID: define void @TestGetVarLDC({ fp128, fp128 }* {{.*}}, %struct.__va_list_tag* // GNU: define { x86_fp80, x86_fp80 } @TestGetVarLDC( // CHECK-NOT: br -// CHECK: load {{.*}} %overflow_arg_area_p // CHECK-NOT: phi // ANDROID: ret void // GNU: ret { x86_fp80, x86_fp80 } @@ -106,11 +105,11 @@ void TestPassVarLD(long double x) { void TestPassVarLDC(long double _Complex x) { TestVarArg("A", x); // ANDROID: define void @TestPassVarLDC({ fp128, fp128 }* {{.*}} %x) -// ANDROID: store fp128 %x.{{.*}}, fp128* % -// ANDROID-NEXT: store fp128 %x.{{.*}}, fp128* % +// ANDROID: store fp128 %{{.*}}, fp128* % +// ANDROID-NEXT: store fp128 %{{.*}}, fp128* % // ANDROID-NEXT: call {{.*}} @TestVarArg(i8* {{.*}}, { fp128, fp128 }* {{.*}} % // GNU: define void @TestPassVarLDC({ x86_fp80, x86_fp80 }* {{.*}} %x) -// GNU: store x86_fp80 %x.{{.*}}, x86_fp80* % -// GNU-NEXT: store x86_fp80 %x.{{.*}}, x86_fp80* % +// GNU: store x86_fp80 %{{.*}}, x86_fp80* % +// GNU-NEXT: store x86_fp80 %{{.*}}, x86_fp80* % // GNGNU-NEXT: call {{.*}} @TestVarArg(i8* {{.*}}, { x86_fp80, x86_fp80 }* {{.*}} % } _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
