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

[NoQ]

Summary

I noticed that people occasionally forget that unlike CHECK:, directives CHECK and CHECK : are not reacted upon by FileCheck. Tests still pass, but they don't actually test anything.

So i grepped real quick and found these four missing colons, one of which (the one in Analysis/cfg-rich-constructors.cpp) is mine. All four are in clang; there aren't any missing colons in other projects in the monorepo.

I'm not entirely sure about the change OpenMP/sections_lastprivate_codegen.cpp: it seems that replacing CHECK: with CHECK is a common way of making FIXME tests, but there's no indication anywhere that this is a known issue. The test was added in D11619.

[ABataev]

clang/test/OpenMP/sections_lastprivate_codegen.cpp

31 ↗

(On Diff #209037)

I'll fix this test.

[NoQ]

Found one more forgotten colon by grepping for //CHECK instead of // CHECK .

Removed the FIXME for @ABataev so that not to cause merge conflicts when he fixes the test.

P.S. I didn't grep for custom FileCheck prefixes. Those may have more bugs.

[NoQ]

clang/test/OpenMP/sections_lastprivate_codegen.cpp

31 ↗

(On Diff #209037)

Yay!

[thakis]

(previously: D58061)

[NoQ]

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 :)

[NoQ]

In D64526#1579174, @thakis wrote:

(previously: D58061)

Aha, that explains why most of these are new :)

[NoQ]

Yeah, and i removed the one in addrspace-operators.cl because it has already been fixed in rC365666.

[JDevlieghere]

The dsymutil part LGTM

[ahatanak]

I didn't know spaces are not allowed between "CHECK" and ":". CodeGen tests LGTM.

[NoQ]

Thanks all! I guess i'll commit.

cfe/trunk/test/Analysis/cfg-rich-constructors.cpp

 
 } // end namespace return_stmt_with_dtor
 
 namespace temporary_object_expr_without_dtors {
 
 // 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();
 }
 
 // CHECK: void temporaryInCondition()
 // CHECK:          1: C() (CXXConstructExpr, [B2.2], class C)
 // CHECK-NEXT:     2: [B2.1]
 // CHECK-NEXT:     3: [B2.2] (ImplicitCastExpr, NoOp, const class C)

cfe/trunk/test/CodeGenCXX/noescape.cpp

 }
 
 // CHECK: define {{.*}} @_ZnwmPv({{.*}}, {{.*}} nocapture {{.*}})
 void *operator new(std::size_t, void * __attribute__((noescape)) p) {
   return p;
 }
 
 // CHECK-LABEL: define i8* @_Z5test1Pv(
-// CHECK : %call = call {{.*}} @_ZnwmPv({{.*}}, {{.*}} nocapture {{.*}})
+// CHECK: %call = call {{.*}} @_ZnwmPv({{.*}}, {{.*}} nocapture {{.*}})
 void *test1(void *p0) {
   return ::operator new(16, p0);
 }
 
 // CHECK-LABEL: define void @_Z5test2PiS_(
 // CHECK: call void @"_ZZ5test2PiS_ENK3$_0clES_S_"({{.*}}, {{.*}}, {{.*}} nocapture {{.*}})
 // CHECK: define internal void @"_ZZ5test2PiS_ENK3$_0clES_S_"({{.*}}, {{.*}}, {{.*}} nocapture)
 void test2(int *p0, int *p1) {

cfe/trunk/test/CodeGenObjC/externally-retained.m

 extern "C" void esc(void (^)());
 extern "C" void escp(void (^)(ObjTy *));
 extern "C" void block_param();
 #endif
 
 void param(ObjTy *p) EXT_RET {
   // CHECK-LABEL: define void @param
   // CHECK-NOT: llvm.objc.
-  // CHECK ret
+  // CHECK: ret
 }
 
 void local() {
   EXT_RET ObjTy *local = global;
   // CHECK-LABEL: define void @local
   // CHECK-NOT: llvm.objc.
   // CHECK: ret
 }

compiler-rt/trunk/test/profile/instrprof-merge.c

 // CHECK-LABEL:  foo:
 // CHECK:         Counters: 2
 // CHECK-NEXT:    Function count: 2
 // CHECK-NEXT:    Block counts: [2]
 
 // 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:
 // CHECK:         Counters: 6
 // CHECK-NEXT:    Function count: 0
 // CHECK-NEXT:    Block counts: [0, 0, 0, 0, 0]

llvm/trunk/test/tools/dsymutil/X86/modules.m

 // CHECK:       DW_AT_type [DW_FORM_ref_addr] (0x{{0*}}[[BARTD]]
 // CHECK:     DW_TAG_variable
 // CHECK-NOT:   DW_TAG
 // CHECK:       DW_AT_name{{.*}}"foo"
 // CHECK-NOT:   DW_TAG
 // 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;
 
 @import Foo;
 int main(int argc, char **argv) {
   Bar bar;
   Foo *foo = 0;
   bar.value = odr_violation;

llvm/trunk/test/tools/dsymutil/X86/odr-fwd-declaration.cpp

 // CHECK-NOT: {{DW_TAG|NULL}}
 // CHECK: AT_type{{.*}}0x{{0*}}[[FWDSTRUCT:[a-f0-9]*]]
 //
 // CHECK: [[FWDSTRUCT]]:{{.*}}TAG_structure_type
 // CHECK-NOT: {{DW_TAG|NULL}}
 // 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
 typedef struct S *Sptr;
 typedef Sptr *Sptrptr;
 # 3 "Source2.cpp" 2
 struct S {
   int field;