r260334 - Get rid of CHECK-SAME-NOT in tests.

Justin Lebar via cfe-commits cfe-commits at lists.llvm.org
Tue Feb 9 17:38:36 PST 2016


> The paren check looks redundant.
> And this one.

Fixed in r260346.

On Tue, Feb 9, 2016 at 5:29 PM, Robinson, Paul
<Paul_Robinson at playstation.sony.com> wrote:
> Well I'll be-- thanks!
> See post-commit comments, see below, tidying up just a bit.
> --paulr
>
>> -----Original Message-----
>> From: cfe-commits [mailto:cfe-commits-bounces at lists.llvm.org] On Behalf Of
>> Justin Lebar via cfe-commits
>> Sent: Tuesday, February 09, 2016 4:38 PM
>> To: cfe-commits at lists.llvm.org
>> Subject: r260334 - Get rid of CHECK-SAME-NOT in tests.
>>
>> Author: jlebar
>> Date: Tue Feb  9 18:38:15 2016
>> New Revision: 260334
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=260334&view=rev
>> Log:
>> Get rid of CHECK-SAME-NOT in tests.
>>
>> Summary: This isn't a FileCheck directive; it does nothing.
>>
>> Reviewers: jroelofs
>>
>> Subscribers: cfe-commits, majnemer
>>
>> Differential Revision: http://reviews.llvm.org/D17051
>>
>> Modified:
>>     cfe/trunk/test/CodeGenCXX/optnone-and-attributes.cpp
>>     cfe/trunk/test/CodeGenCXX/optnone-class-members.cpp
>>     cfe/trunk/test/CodeGenCXX/optnone-def-decl.cpp
>>     cfe/trunk/test/CodeGenCXX/optnone-templates.cpp
>>     cfe/trunk/test/Modules/ModuleDebugInfo.cpp
>>     cfe/trunk/test/Modules/ModuleDebugInfo.m
>>
>> Modified: cfe/trunk/test/CodeGenCXX/optnone-and-attributes.cpp
>> URL: http://llvm.org/viewvc/llvm-
>> project/cfe/trunk/test/CodeGenCXX/optnone-and-
>> attributes.cpp?rev=260334&r1=260333&r2=260334&view=diff
>> ==========================================================================
>> ====
>> --- cfe/trunk/test/CodeGenCXX/optnone-and-attributes.cpp (original)
>> +++ cfe/trunk/test/CodeGenCXX/optnone-and-attributes.cpp Tue Feb  9
>> 18:38:15 2016
>> @@ -79,4 +79,4 @@ int exported_optnone_func(int a) {
>>  // CHECK: attributes [[NORETURN]] = { noinline noreturn {{.*}} optnone
>>
>>  // CHECK: attributes [[DLLIMPORT]] =
>> -// CHECK-SAME-NOT: optnone
>> +// CHECK-NOT: optnone
>>
>> Modified: cfe/trunk/test/CodeGenCXX/optnone-class-members.cpp
>> URL: http://llvm.org/viewvc/llvm-
>> project/cfe/trunk/test/CodeGenCXX/optnone-class-
>> members.cpp?rev=260334&r1=260333&r2=260334&view=diff
>> ==========================================================================
>> ====
>> --- cfe/trunk/test/CodeGenCXX/optnone-class-members.cpp (original)
>> +++ cfe/trunk/test/CodeGenCXX/optnone-class-members.cpp Tue Feb  9
>> 18:38:15 2016
>> @@ -159,6 +159,6 @@ int bar() {
>>
>>
>>  // CHECK: attributes [[NORMAL]] =
>> -// CHECK-SAME-NOT: noinline
>> -// CHECK-SAME-NOT: optnone
>> +// CHECK-NOT: noinline
>> +// CHECK-NOT: optnone
>>  // CHECK: attributes [[OPTNONE]] = {{.*}} noinline {{.*}} optnone
>>
>> Modified: cfe/trunk/test/CodeGenCXX/optnone-def-decl.cpp
>> URL: http://llvm.org/viewvc/llvm-
>> project/cfe/trunk/test/CodeGenCXX/optnone-def-
>> decl.cpp?rev=260334&r1=260333&r2=260334&view=diff
>> ==========================================================================
>> ====
>> --- cfe/trunk/test/CodeGenCXX/optnone-def-decl.cpp (original)
>> +++ cfe/trunk/test/CodeGenCXX/optnone-def-decl.cpp Tue Feb  9 18:38:15
>> 2016
>> @@ -91,5 +91,5 @@ int user_of_forceinline_optnone_function
>>
>>  // CHECK: attributes [[OPTNONE]] = { noinline nounwind optnone {{.*}} }
>>  // CHECK: attributes [[NORMAL]] =
>> -// CHECK-SAME-NOT: noinline
>> -// CHECK-SAME-NOT: optnone
>> +// CHECK-NOT: noinline
>> +// CHECK-NOT: optnone
>>
>> Modified: cfe/trunk/test/CodeGenCXX/optnone-templates.cpp
>> URL: http://llvm.org/viewvc/llvm-
>> project/cfe/trunk/test/CodeGenCXX/optnone-
>> templates.cpp?rev=260334&r1=260333&r2=260334&view=diff
>> ==========================================================================
>> ====
>> --- cfe/trunk/test/CodeGenCXX/optnone-templates.cpp (original)
>> +++ cfe/trunk/test/CodeGenCXX/optnone-templates.cpp Tue Feb  9 18:38:15
>> 2016
>> @@ -100,5 +100,5 @@ void container3()
>>
>>
>>  // CHECK: attributes [[NORMAL]] =
>> -// CHECK-SAME-NOT: optnone
>> +// CHECK-NOT: optnone
>>  // CHECK: attributes [[OPTNONE]] = {{.*}} optnone
>>
>> Modified: cfe/trunk/test/Modules/ModuleDebugInfo.cpp
>> URL: http://llvm.org/viewvc/llvm-
>> project/cfe/trunk/test/Modules/ModuleDebugInfo.cpp?rev=260334&r1=260333&r2
>> =260334&view=diff
>> ==========================================================================
>> ====
>> --- cfe/trunk/test/Modules/ModuleDebugInfo.cpp (original)
>> +++ cfe/trunk/test/Modules/ModuleDebugInfo.cpp Tue Feb  9 18:38:15 2016
>> @@ -20,25 +20,29 @@
>>
>>  // CHECK: distinct !DICompileUnit(language: DW_LANG_{{.*}}C_plus_plus,
>>  // CHECK-SAME:                    isOptimized: false,
>> -// CHECK-SAME-NOT:                splitDebugFilename:
>> -// CHECK:                         dwoId:
>> +// CHECK-NOT:                     splitDebugFilename:
>> +// CHECK-SAME:                    dwoId:
>> +// CHECK-SAME:                    )
>
> The paren check looks redundant.
>
>>
>>  // CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "Enum"
>>  // CHECK-SAME:             identifier: "_ZTSN8DebugCXX4EnumE")
>>  // CHECK: !DINamespace(name: "DebugCXX"
>>
>>  // CHECK: !DICompositeType(tag: DW_TAG_enumeration_type,
>> -// CHECK-SAME-NOT:         name:
>> +// CHECK-NOT:              name:
>> +// CHECK-SAME:             )
>>
>>  // CHECK: !DICompositeType(tag: DW_TAG_enumeration_type,
>> -// CHECK-SAME-NOT:         name:
>> +// CHECK-NOT:              name:
>> +// CHECK-SAME:             )
>>
>>  // CHECK: !DICompositeType(tag: DW_TAG_enumeration_type,
>> -// CHECK-SAME-NOT:         name:
>> +// CHECK-NOT:              name:
>>  // CHECK-SAME:             identifier: "_ZTS11TypedefEnum")
>>
>>  // CHECK: !DICompositeType(tag: DW_TAG_enumeration_type,
>> -// CHECK-SAME-NOT:         name:
>> +// CHECK-NOT:              name:
>> +// CHECK-SAME:             )
>>  // CHECK: !DIEnumerator(name: "e5", value: 5)
>>
>>  // CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "Struct"
>> @@ -61,11 +65,11 @@
>>  // CHECK: !DIDerivedType(tag: DW_TAG_member, name: "_vptr$FwdVirtual"
>>
>>  // CHECK: !DICompositeType(tag: DW_TAG_union_type,
>> -// CHECK-SAME-NOT:         name:
>> +// CHECK-NOT:              name:
>>  // CHECK-SAME:             identifier: "_ZTS12TypedefUnion")
>>
>>  // CHECK: !DICompositeType(tag: DW_TAG_structure_type,
>> -// CHECK-SAME-NOT:         name:
>> +// CHECK-NOT:              name:
>>  // CHECK-SAME:             identifier: "_ZTS13TypedefStruct")
>>
>>  // CHECK: !DIDerivedType(tag: DW_TAG_typedef, name: "FloatInstatiation"
>> @@ -75,10 +79,12 @@
>>  // no mangled name here yet.
>>
>>  // CHECK: !DICompositeType(tag: DW_TAG_union_type,
>> -// CHECK-SAME-NOT:         name:
>> +// CHECK-NOT:              name:
>> +// CHECK-SAME:             )
>>
>>  // CHECK: !DICompositeType(tag: DW_TAG_structure_type,
>> -// CHECK-SAME-NOT:         name:
>> +// CHECK-NOT:              name:
>> +// CHECK-SAME:             )
>>
>>  // CHECK: !DICompositeType(tag: DW_TAG_structure_type,
>>  // CHECK-SAME:             name: "InAnonymousNamespace",
>>
>> Modified: cfe/trunk/test/Modules/ModuleDebugInfo.m
>> URL: http://llvm.org/viewvc/llvm-
>> project/cfe/trunk/test/Modules/ModuleDebugInfo.m?rev=260334&r1=260333&r2=2
>> 60334&view=diff
>> ==========================================================================
>> ====
>> --- cfe/trunk/test/Modules/ModuleDebugInfo.m (original)
>> +++ cfe/trunk/test/Modules/ModuleDebugInfo.m Tue Feb  9 18:38:15 2016
>> @@ -31,8 +31,9 @@
>>  // CHECK: ![[MODULE]] = !DIModule(scope: null, name: "DebugObjC
>>
>>  // CHECK: ![[TD_ENUM:.*]] = !DICompositeType(tag:
>> DW_TAG_enumeration_type,
>> -// CHECK-SAME-NOT:         name:
>> +// CHECK-NOT:              name:
>>  // CHECK-SAME:             elements:
>> +// CHECK-SAME:             )
>>
>>  // CHECK: !DICompositeType(tag: DW_TAG_structure_type,
>>  // CHECK-SAME:             name: "FwdDecl",
>> @@ -45,8 +46,9 @@
>>  // CHECK-SAME:             elements:
>>
>>  // CHECK: ![[TD_UNION:.*]] = !DICompositeType(tag: DW_TAG_union_type,
>> -// CHECK-SAME-NOT:         name:
>> +// CHECK-NOT:              name:
>>  // CHECK-SAME:             elements:
>> +// CHECK-SAME:             )
>>
>>  // CHECK: !DIDerivedType(tag: DW_TAG_typedef, name: "TypedefUnion",
>>  // CHECK-SAME:           baseType: ![[TD_UNION]])
>> @@ -55,16 +57,19 @@
>>  // CHECK-SAME:           baseType: ![[TD_ENUM:.*]])
>>
>>  // CHECK: ![[TD_STRUCT:.*]] = !DICompositeType(tag:
>> DW_TAG_structure_type,
>> -// CHECK-SAME-NOT:         name:
>> +// CHECK-NOT:              name:
>>  // CHECK-SAME:             elements:
>> +// CHECK-SAME:             )
>
> And this one.
>
>>  // CHECK: !DIDerivedType(tag: DW_TAG_typedef, name: "TypedefStruct",
>>  // CHECK-SAME:           baseType: ![[TD_STRUCT]])
>>
>>  // CHECK: !DICompositeType(tag: DW_TAG_union_type,
>> -// CHECK-SAME-NOT:         name:
>> +// CHECK-NOT:              name:
>> +// CHECK-SAME:             )
>>
>>  // CHECK: !DICompositeType(tag: DW_TAG_structure_type,
>> -// CHECK-SAME-NOT:         name:
>> +// CHECK-NOT:              name:
>> +// CHECK-SAME:             )
>>
>>  // CHECK: !DISubprogram(name: "+[ObjCClass classMethod]",
>>  // CHECK-SAME:          scope: ![[MODULE]],
>>
>>
>> _______________________________________________
>> cfe-commits mailing list
>> cfe-commits at lists.llvm.org
>> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


More information about the cfe-commits mailing list