From 1fa0280bb9fe197ef5f94c45475a9622ec2e54fd Mon Sep 17 00:00:00 2001
From: Justin Lebar <jlebar@google.com>
Date: Wed, 10 Feb 2016 00:38:15 +0000
Subject: [PATCH] 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
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@260334 91177308-0d34-0410-b5e6-96231b3b80d8
---
test/CodeGenCXX/optnone-and-attributes.cpp | 2 +-
test/CodeGenCXX/optnone-class-members.cpp | 4 ++--
test/CodeGenCXX/optnone-def-decl.cpp | 4 ++--
test/CodeGenCXX/optnone-templates.cpp | 2 +-
test/Modules/ModuleDebugInfo.cpp | 26 +++++++++++++---------
test/Modules/ModuleDebugInfo.m | 15 ++++++++-----
6 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/test/CodeGenCXX/optnone-and-attributes.cpp b/test/CodeGenCXX/optnone-and-attributes.cpp
index 56173b5a360..870d5e9496f 100644
--- a/test/CodeGenCXX/optnone-and-attributes.cpp
+++ b/test/CodeGenCXX/optnone-and-attributes.cpp
@@ -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
diff --git a/test/CodeGenCXX/optnone-class-members.cpp b/test/CodeGenCXX/optnone-class-members.cpp
index 147b8219676..751f3dd2bf0 100644
--- a/test/CodeGenCXX/optnone-class-members.cpp
+++ b/test/CodeGenCXX/optnone-class-members.cpp
@@ -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
diff --git a/test/CodeGenCXX/optnone-def-decl.cpp b/test/CodeGenCXX/optnone-def-decl.cpp
index cb3a6779364..0240189c508 100644
--- a/test/CodeGenCXX/optnone-def-decl.cpp
+++ b/test/CodeGenCXX/optnone-def-decl.cpp
@@ -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
diff --git a/test/CodeGenCXX/optnone-templates.cpp b/test/CodeGenCXX/optnone-templates.cpp
index 45a72b3b176..9f97d832c1e 100644
--- a/test/CodeGenCXX/optnone-templates.cpp
+++ b/test/CodeGenCXX/optnone-templates.cpp
@@ -100,5 +100,5 @@ void container3()
// CHECK: attributes [[NORMAL]] =
-// CHECK-SAME-NOT: optnone
+// CHECK-NOT: optnone
// CHECK: attributes [[OPTNONE]] = {{.*}} optnone
diff --git a/test/Modules/ModuleDebugInfo.cpp b/test/Modules/ModuleDebugInfo.cpp
index 73443972409..f5341514494 100644
--- a/test/Modules/ModuleDebugInfo.cpp
+++ b/test/Modules/ModuleDebugInfo.cpp
@@ -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: )
// 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",
diff --git a/test/Modules/ModuleDebugInfo.m b/test/Modules/ModuleDebugInfo.m
index 6bca67656ae..af2edcfc049 100644
--- a/test/Modules/ModuleDebugInfo.m
+++ b/test/Modules/ModuleDebugInfo.m
@@ -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: )
// 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]],
--
GitLab