Update clang tests to accomendate discriminator changes.

[danielcdh]

Summary

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

[dnovillo]

LGTM. Thanks.

test/CodeGen/debug-info-scope.c

 // RUN: %clang_cc1 -dwarf-version=4 -debug-info-kind=limited -emit-llvm < %s | FileCheck %s
 // RUN: %clang_cc1 -dwarf-version=4 -debug-info-kind=line-tables-only -emit-llvm < %s | FileCheck --check-prefix=GMLT %s
 // Two variables with same name in separate scope.
 // Radar 8330217.
 int main() {
   int j = 0;
   int k = 0;
 // CHECK: !DILocalVariable(name: "i"
 // CHECK-NEXT: !DILexicalBlock(
 
 // 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
   for (int i = 0; i < 10; i++)
     j++;
 // CHECK: !DILocalVariable(name: "i"
 // CHECK-NEXT: !DILexicalBlock(
 // GMLT-NOT: !DILexicalBlock
   for (int i = 0; i < 10; i++)
     k++;
   return 0;
 }

test/CodeGenObjC/arc-linetable.m

 // CHECK: ret {{.*}} !dbg ![[RET6:[0-9]+]]
 
 // CHECK: define {{.*}}testNoCleanupSideEffect
 // CHECK: @objc_msgSend{{.*}} !dbg ![[MSG7:[0-9]+]]
 // CHECK: ret {{.*}} !dbg ![[RET7:[0-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;
 
 @interface NSObject
 + (id)alloc;
 - (id)init;
 - (id)retain;
 @end
if (!skip_all) {
     if (!skip) {
       return;
     }
     NSString *s = @"bar";
     if (!skip) {
       [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:
 }
 
 
 @end
 
 
 int main(int argc, const char** argv) {
   AppDelegate *o = [[AppDelegate alloc] init];
   return [o testMultiline :@"foo"];
 }