r351665 - [FIX] Generalize the expected results for callback clang tests

[Johannes Doerfert via cfe-commits]

Author: jdoerfert
Date: Sat Jan 19 12:46:10 2019
New Revision: 351665

URL: http://llvm.org/viewvc/llvm-project?rev=351665&view=rev
Log:
[FIX] Generalize the expected results for callback clang tests

Modified:
    cfe/trunk/test/CodeGen/callback_annotated.c
    cfe/trunk/test/CodeGen/callback_pthread_create.c

Modified: cfe/trunk/test/CodeGen/callback_annotated.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/callback_annotated.c?rev=351665&r1=351664&r2=351665&view=diff
==============================================================================
--- cfe/trunk/test/CodeGen/callback_annotated.c (original)
+++ cfe/trunk/test/CodeGen/callback_annotated.c Sat Jan 19 12:46:10 2019
@@ -30,22 +30,20 @@ __attribute__((callback(4, d, 5, 2))) vo
 
 static void *VoidPtr2VoidPtr(void *payload) {
   // RUN2: ret i8* %payload
-  // IPCP:  ret i8* null
+  // IPCP: ret i8* null
   return payload;
 }
 
 static int ThreeInt2Int(int a, int b, int c) {
-  // RUN2:      define internal i32 @ThreeInt2Int(i32 %a, i32 %b, i32 %c)
-  // RUN2-NEXT: entry:
-  // RUN2-NEXT:     %mul = mul nsw i32 %b, %a
-  // RUN2-NEXT:     %add = add nsw i32 %mul, %c
-  // RUN2-NEXT:     ret i32 %add
+  // RUN2:   define internal i32 @ThreeInt2Int(i32 %a, i32 %b, i32 %c)
+  // RUN2:     %mul = mul nsw i32 %b, %a
+  // RUN2:     %add = add nsw i32 %mul, %c
+  // RUN2:     ret i32 %add
 
-  // IPCP:       define internal i32 @ThreeInt2Int(i32 %a, i32 %b, i32 %c)
-  // IPCP-NEXT:  entry:
-  // IPCP-NEXT:      %mul = mul nsw i32 4, %a
-  // IPCP-NEXT:      %add = add nsw i32 %mul, %c
-  // IPCP-NEXT:      ret i32 %add
+  // IPCP:   define internal i32 @ThreeInt2Int(i32 %a, i32 %b, i32 %c)
+  // IPCP:     %mul = mul nsw i32 4, %a
+  // IPCP:     %add = add nsw i32 %mul, %c
+  // IPCP:     ret i32 %add
 
   return a * b + c;
 }

Modified: cfe/trunk/test/CodeGen/callback_pthread_create.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/callback_pthread_create.c?rev=351665&r1=351664&r2=351665&view=diff
==============================================================================
--- cfe/trunk/test/CodeGen/callback_pthread_create.c (original)
+++ cfe/trunk/test/CodeGen/callback_pthread_create.c Sat Jan 19 12:46:10 2019
@@ -14,15 +14,13 @@ const int GlobalVar = 0;
 
 static void *callee0(void *payload) {
 // IPCP:      define internal i8* @callee0
-// IPCP-NEXT:   entry:
-// IPCP-NEXT:     ret i8* null
+// IPCP:        ret i8* null
   return payload;
 }
 
 static void *callee1(void *payload) {
 // IPCP:      define internal i8* @callee1
-// IPCP-NEXT:   entry:
-// IPCP-NEXT:     ret i8* bitcast (i32* @GlobalVar to i8*)
+// IPCP:        ret i8* bitcast (i32* @GlobalVar to i8*)
   return payload;
 }