Fix tests after enabling -split-phi-edges.

object-size.c aws simply too fragile.

constructor-default-arg.cpp triggers an issue when LiveVariables is run before RALocal.

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

diff --git a/test/CodeGen/object-size.c b/test/CodeGen/object-size.c
index ec9e50d29638062dcf03b45709ae771ed33e9f74..038d8f98e5d53187d37690a9163eb37c0a952889 100644 (file)
--- a/test/CodeGen/object-size.c
+++ b/test/CodeGen/object-size.c
@@ -15,32 +15,32 @@ int gi, gj;
 
 void test1() {
   // CHECK:       movabsq $59, %rdx
-  // CHECK-NEXT:  movq    %rax, %rdi
-  // CHECK-NEXT:  movq    %rcx, %rsi
+  // CHECK-NEXT:  movq
+  // CHECK-NEXT:  movq
   // CHECK-NEXT:  call    ___strcpy_chk
   strcpy(&gbuf[4], "Hi there");
 }
 
 void test2() {
   // CHECK:       movabsq $63, %rdx
-  // CHECK-NEXT:  movq    %rax, %rdi
-  // CHECK-NEXT:  movq    %rcx, %rsi
+  // CHECK-NEXT:  movq
+  // CHECK-NEXT:  movq
   // CHECK-NEXT:  call    ___strcpy_chk
   strcpy(gbuf, "Hi there");
 }
 
 void test3() {
   // CHECK:       movabsq $0, %rdx
-  // CHECK-NEXT:  movq    %rax, %rdi
-  // CHECK-NEXT:  movq    %rcx, %rsi
+  // CHECK-NEXT:  movq
+  // CHECK-NEXT:  movq
   // CHECK-NEXT:  call    ___strcpy_chk
   strcpy(&gbuf[100], "Hi there");
 }
 
 void test4() {
   // CHECK:       movabsq $0, %rdx
-  // CHECK-NEXT:  movq    %rax, %rdi
-  // CHECK-NEXT:  movq    %rcx, %rsi
+  // CHECK-NEXT:  movq
+  // CHECK-NEXT:  movq
   // CHECK-NEXT:  call    ___strcpy_chk
   strcpy((char*)(void*)&gbuf[-1], "Hi there");
 }
@@ -56,8 +56,8 @@ void test6() {
   char buf[57];
 
   // CHECK:       movabsq $53, %rdx
-  // CHECK-NEXT:  movq    %rax, %rdi
-  // CHECK-NEXT:  movq    %rcx, %rsi
+  // CHECK-NEXT:  movq
+  // CHECK-NEXT:  movq
   // CHECK-NEXT:  call    ___strcpy_chk
   strcpy(&buf[4], "Hi there");
 }

diff --git a/test/CodeGenCXX/constructor-default-arg.cpp b/test/CodeGenCXX/constructor-default-arg.cpp
index c494149d11105a25bc3eb2108f88b6aef0562c95..2bf82da391ddc3d19e0f346787bdab5db3fd7d47 100644 (file)
--- a/test/CodeGenCXX/constructor-default-arg.cpp
+++ b/test/CodeGenCXX/constructor-default-arg.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
+// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -split-phi-edges=0 -S %s -o %t-64.s
 // RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
 // RUN: clang-cc -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
 // RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s