Merge pull request #21777 from dcci/rdar46686369-2

[SILGen] Create a new debug scope for top-level code.

Author: dcci

lib/SILGen/SILGen.cpp

@@ -1487,6 +1487,8 @@ void SILGenModule::visitTopLevelCodeDecl(TopLevelCodeDecl *td) {
 
   TopLevelSGF->emitProfilerIncrement(td->getBody());
 
+  DebugScope DS(*TopLevelSGF, CleanupLocation(td));
+
   for (auto &ESD : td->getBody()->getElements()) {
     if (!TopLevelSGF->B.hasValidInsertionPoint()) {
       if (auto *S = ESD.dyn_cast<Stmt*>()) {

test/DebugInfo/for.swift

@@ -7,7 +7,7 @@ for i in 0 ..< 3 {
 }
 
 for i in 0 ..< 3 {
-// CHECK-DAG: ![[SCOPE2:[0-9]+]] = {{.*}}Block(scope: ![[MAIN]],{{.*}}line: [[@LINE-1]]
+// CHECK-DAG: ![[SCOPE2:[0-9]+]] = {{.*}}Block(scope: ![[MAIN2:[0-9]+]],{{.*}}line: [[@LINE-1]]
 // CHECK-DAG: !DILocalVariable(name: "i", scope: ![[SCOPE1]]
 // CHECK-DAG: !DILocalVariable(name: "i", scope: ![[SCOPE2]]
 }

test/DebugInfo/foreach.swift

@@ -3,7 +3,7 @@
 // Verify that variables bound in the foreach statements are in distinct scopes.
 let values = [1, 2, 3]
 // CHECK-DAG: ![[SCOPE1:[0-9]+]] ={{.*}}Block(scope: ![[MAIN:[0-9]+]],{{.*}}line: 7,
-// CHECK-DAG: ![[SCOPE2:[0-9]+]] ={{.*}}Block(scope: ![[MAIN]], {{.*}}line: 10,
+// CHECK-DAG: ![[SCOPE2:[0-9]+]] ={{.*}}Block(scope: ![[MAIN2:[0-9]+]], {{.*}}line: 10,
 for val in values {
 // CHECK-DAG: !DILocalVariable(name: "val", scope: ![[SCOPE1]]
 }

test/DebugInfo/if.swift

@@ -9,5 +9,5 @@ if let val = yieldValue() {
 }
 if let val = yieldValue() {
 // CHECK: !DILocalVariable(name: "val", scope: ![[SCOPE2:[0-9]+]]
-// CHECK: ![[SCOPE2]] = distinct !DILexicalBlock(scope: ![[MAIN]]
+// CHECK: ![[SCOPE2]] = distinct !DILexicalBlock(scope: ![[MAIN2:[0-9]+]]
 }

test/DebugInfo/transparent.swift

@@ -22,8 +22,8 @@ use(z)
 // CHECK-NEXT: !dbg ![[ZERO]]
 // CHECK-NEXT: }
 
+// CHECK: ![[FILE:[0-9]+]] = {{.*}}"<compiler-generated>"
 // CHECK: ![[SP]] = {{.*}}name: "transparent"
 // CHECK-SAME: file: ![[FILE:[0-9]+]]
 // CHECK-NOT: line:
-// CHECK: ![[FILE]] = {{.*}}"<compiler-generated>"
 // CHECK: ![[ZERO]] = !DILocation(line: 0,

test/DebugInfo/while.swift

@@ -9,5 +9,5 @@ while let val = yieldValues() {
 }
 while let val = yieldValues() {
 // CHECK: !DILocalVariable(name: "val", scope: ![[SCOPE2:[0-9]+]]
-// CHECK: ![[SCOPE2]] = distinct !DILexicalBlock(scope: ![[MAIN]]
+// CHECK: ![[SCOPE2]] = distinct !DILexicalBlock(scope: ![[MAIN2:[0-9]+]]
 }