[PATCH] D64526: [NFC] Unforget a colon in a few CHECK: directives.

Artem Dergachev via Phabricator via cfe-commits Wed, 10 Jul 2019 13:52:27 -0700

NoQ updated this revision to Diff 209060.
NoQ added reviewers: davidxl, aprantl, JDevlieghere.
NoQ set the repository for this revision to rL LLVM.
NoQ added a project: LLVM.
NoQ added a comment.
Herald added a subscriber: llvm-commits.


Add three more fixes - two with `CHECK-NEXT` and one with `CHECK-NOT`, in LLVM 
and compiler-rt.

One of the LLVM changes doesn't pass after the fix, so i added a FIXME instead.

I didn't immediately figure out how to compile compiler-rt so i didn't really 
have a look if the test passes; could use some help or i guess the buildbots 
will eventually tell me :)


Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D64526/new/

https://reviews.llvm.org/D64526

Files:
  clang/test/Analysis/cfg-rich-constructors.cpp
  clang/test/CodeGenCXX/noescape.cpp
  clang/test/CodeGenObjC/externally-retained.m
  compiler-rt/test/profile/instrprof-merge.c
  llvm/test/tools/dsymutil/X86/modules.m
  llvm/test/tools/dsymutil/X86/odr-fwd-declaration.cpp


Index: llvm/test/tools/dsymutil/X86/odr-fwd-declaration.cpp
===================================================================
--- llvm/test/tools/dsymutil/X86/odr-fwd-declaration.cpp
+++ llvm/test/tools/dsymutil/X86/odr-fwd-declaration.cpp
@@ -49,7 +49,7 @@
 // CHECK: AT_name{{.*}} "S"
 // CHECK-NOT: {{DW_TAG|NULL}}
 // CHECK: AT_declaration
-// CHECK-NOT AT_byte_size
+// CHECK-NOT: AT_byte_size
 
 #elif defined(FILE2)
 # 1 "Header.h" 1
Index: llvm/test/tools/dsymutil/X86/modules.m
===================================================================
--- llvm/test/tools/dsymutil/X86/modules.m
+++ llvm/test/tools/dsymutil/X86/modules.m
@@ -116,6 +116,7 @@
 // CHECK:       DW_AT_type {{.*}}{0x{{0*}}[[PTR:.*]]}
 //
 // CHECK: 0x{{0*}}[[PTR]]: DW_TAG_pointer_type
+// FIXME: The next line doesn't work.
 // CHECK-NEXT   DW_AT_type [DW_FORM_ref_addr] {0x{{0*}}[[INTERFACE]]
 extern int odr_violation;
 
Index: compiler-rt/test/profile/instrprof-merge.c
===================================================================
--- compiler-rt/test/profile/instrprof-merge.c
+++ compiler-rt/test/profile/instrprof-merge.c
@@ -89,8 +89,8 @@
 // Not profiled
 // CHECK-LABEL:  bar:
 // CHECK:         Counters: 1
-// CHECK-NEXT     Function count: 0
-// CHECK-NEXT     Block counts: []
+// CHECK-NEXT:    Function count: 0
+// CHECK-NEXT:    Block counts: []
 
 // Not profiled
 // CHECK-LABEL:  main:
Index: clang/test/CodeGenObjC/externally-retained.m
===================================================================
--- clang/test/CodeGenObjC/externally-retained.m
+++ clang/test/CodeGenObjC/externally-retained.m
@@ -22,7 +22,7 @@
 void param(ObjTy *p) EXT_RET {
   // CHECK-LABEL: define void @param
   // CHECK-NOT: llvm.objc.
-  // CHECK ret
+  // CHECK: ret
 }
 
 void local() {
Index: clang/test/CodeGenCXX/noescape.cpp
===================================================================
--- clang/test/CodeGenCXX/noescape.cpp
+++ clang/test/CodeGenCXX/noescape.cpp
@@ -45,7 +45,7 @@
 }
 
 // CHECK-LABEL: define i8* @_Z5test1Pv(
-// CHECK : %call = call {{.*}} @_ZnwmPv({{.*}}, {{.*}} nocapture {{.*}})
+// CHECK: %call = call {{.*}} @_ZnwmPv({{.*}}, {{.*}} nocapture {{.*}})
 void *test1(void *p0) {
   return ::operator new(16, p0);
 }
Index: clang/test/Analysis/cfg-rich-constructors.cpp
===================================================================
--- clang/test/Analysis/cfg-rich-constructors.cpp
+++ clang/test/Analysis/cfg-rich-constructors.cpp
@@ -459,7 +459,7 @@
 // TODO: Should provide construction context for the constructor,
 // even if there is no specific trigger statement here.
 // CHECK: void simpleTemporary()
-// CHECK           1: C() (CXXConstructExpr, class C)
+// CHECK:          1: C() (CXXConstructExpr, class C)
 void simpleTemporary() {
   C();
 }

Index: llvm/test/tools/dsymutil/X86/odr-fwd-declaration.cpp
===================================================================
--- llvm/test/tools/dsymutil/X86/odr-fwd-declaration.cpp
+++ llvm/test/tools/dsymutil/X86/odr-fwd-declaration.cpp
@@ -49,7 +49,7 @@
 // CHECK: AT_name{{.*}} "S"
 // CHECK-NOT: {{DW_TAG|NULL}}
 // CHECK: AT_declaration
-// CHECK-NOT AT_byte_size
+// CHECK-NOT: AT_byte_size
 
 #elif defined(FILE2)
 # 1 "Header.h" 1
Index: llvm/test/tools/dsymutil/X86/modules.m
===================================================================
--- llvm/test/tools/dsymutil/X86/modules.m
+++ llvm/test/tools/dsymutil/X86/modules.m
@@ -116,6 +116,7 @@
 // CHECK:       DW_AT_type {{.*}}{0x{{0*}}[[PTR:.*]]}
 //
 // CHECK: 0x{{0*}}[[PTR]]: DW_TAG_pointer_type
+// FIXME: The next line doesn't work.
 // CHECK-NEXT   DW_AT_type [DW_FORM_ref_addr] {0x{{0*}}[[INTERFACE]]
 extern int odr_violation;
 
Index: compiler-rt/test/profile/instrprof-merge.c
===================================================================
--- compiler-rt/test/profile/instrprof-merge.c
+++ compiler-rt/test/profile/instrprof-merge.c
@@ -89,8 +89,8 @@
 // Not profiled
 // CHECK-LABEL:  bar:
 // CHECK:         Counters: 1
-// CHECK-NEXT     Function count: 0
-// CHECK-NEXT     Block counts: []
+// CHECK-NEXT:    Function count: 0
+// CHECK-NEXT:    Block counts: []
 
 // Not profiled
 // CHECK-LABEL:  main:
Index: clang/test/CodeGenObjC/externally-retained.m
===================================================================
--- clang/test/CodeGenObjC/externally-retained.m
+++ clang/test/CodeGenObjC/externally-retained.m
@@ -22,7 +22,7 @@
 void param(ObjTy *p) EXT_RET {
   // CHECK-LABEL: define void @param
   // CHECK-NOT: llvm.objc.
-  // CHECK ret
+  // CHECK: ret
 }
 
 void local() {
Index: clang/test/CodeGenCXX/noescape.cpp
===================================================================
--- clang/test/CodeGenCXX/noescape.cpp
+++ clang/test/CodeGenCXX/noescape.cpp
@@ -45,7 +45,7 @@
 }
 
 // CHECK-LABEL: define i8* @_Z5test1Pv(
-// CHECK : %call = call {{.*}} @_ZnwmPv({{.*}}, {{.*}} nocapture {{.*}})
+// CHECK: %call = call {{.*}} @_ZnwmPv({{.*}}, {{.*}} nocapture {{.*}})
 void *test1(void *p0) {
   return ::operator new(16, p0);
 }
Index: clang/test/Analysis/cfg-rich-constructors.cpp
===================================================================
--- clang/test/Analysis/cfg-rich-constructors.cpp
+++ clang/test/Analysis/cfg-rich-constructors.cpp
@@ -459,7 +459,7 @@
 // TODO: Should provide construction context for the constructor,
 // even if there is no specific trigger statement here.
 // CHECK: void simpleTemporary()
-// CHECK           1: C() (CXXConstructExpr, class C)
+// CHECK:          1: C() (CXXConstructExpr, class C)
 void simpleTemporary() {
   C();
 }

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D64526: [NFC] Unforget a colon in a few CHECK: directives.

Reply via email to