Update clang tests to accomendate discriminator changes.

Summary: The discriminator change in http://reviews.llvm.org/D14738 will fail these clang tests. Update the test to accomendate the discriminator change.

Reviewers: dblaikie, davidxl, dnovillo

Differential Revision: http://reviews.llvm.org/D14836

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@253595 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/CodeGen/debug-info-scope.c b/test/CodeGen/debug-info-scope.c
index af4b49b8fcf8acfd85b9a1ddada393117f39230b..40cb192ccc762c6a894138c177bca19eb837ac44 100644 (file)
--- a/test/CodeGen/debug-info-scope.c
+++ b/test/CodeGen/debug-info-scope.c
@@ -10,6 +10,7 @@ int main() {
 
 // GMLT-NOT: !DILexicalBlock
 // GMLT: !DILexicalBlockFile({{.*}}, discriminator: 1)
+// GMLT: !DILexicalBlockFile({{.*}}, discriminator: 2)
 // Make sure we don't have any more lexical blocks because we don't need them in
 // -gmlt.
 // GMLT-NOT: !DILexicalBlock

diff --git a/test/CodeGenObjC/arc-linetable.m b/test/CodeGenObjC/arc-linetable.m
index 94acec404f85c7ada7400a2e58eaa4ad35a2d4d0..22ab1d7688ac4dff572ac64c6f80a6693b974166 100644 (file)
--- a/test/CodeGenObjC/arc-linetable.m
+++ b/test/CodeGenObjC/arc-linetable.m
@@ -34,9 +34,9 @@
 
 // CHECK: define {{.*}}testCleanupVoid
 // CHECK: icmp ne {{.*}}!dbg ![[SKIP1:[0-9]+]]
-// CHECK: store i32 0, i32* {{.*}}, !dbg ![[RET8:[0-9]+]]
+// CHECK: store i32 0, i32* {{.*}}, !dbg ![[STORE8:[0-9]+]]
 // CHECK: @objc_storeStrong{{.*}}, !dbg ![[ARC8:[0-9]+]]
-// CHECK: ret {{.*}} !dbg ![[RET8]]
+// CHECK: ret {{.*}} !dbg ![[RET8:[0-9]+]]
 
 typedef signed char BOOL;
 
@@ -112,8 +112,9 @@ typedef signed char BOOL;
       [delegate testVoid :s];
     }
   }
-  // CHECK: ![[RET8]] = !DILocation(line: [[@LINE+2]], scope:
-  // CHECK: ![[ARC8]] = !DILocation(line: [[@LINE+1]], scope:
+  // CHECK: ![[STORE8]] = !DILocation(line: [[@LINE+3]], scope:
+  // CHECK: ![[ARC8]] = !DILocation(line: [[@LINE+2]], scope:
+  // CHECK: ![[RET8]] = !DILocation(line: [[@LINE+1]], scope:
 }