Merge pull request #9461 from adrian-prantl/31926379-4.0

Fix the hash function for SILDebugScopes to handle the empty scopes

Author: adrian-prantl

lib/IRGen/IRGenDebugInfo.cpp

@@ -97,8 +97,8 @@ static clang::CodeGenerator *createClangCodeGenerator(ASTContext &Context,
     CGO.setDebugInfo(clang::codegenoptions::DebugInfoKind::DebugLineTablesOnly);
     break;
   case IRGenDebugInfoKind::ASTTypes:
-    // TODO: Enable -gmodules for the clang code generator.
   case IRGenDebugInfoKind::DwarfTypes:
+    CGO.DebugTypeExtRefs = true;
     CGO.setDebugInfo(clang::codegenoptions::DebugInfoKind::FullDebugInfo);
     break;
   }
@@ -380,7 +380,8 @@ IRGenModule::IRGenModule(IRGenerator &irgen,
   UseSwiftCC = (SwiftCC == llvm::CallingConv::Swift);
 
   if (IRGen.Opts.DebugInfoKind > IRGenDebugInfoKind::None)
-    DebugInfo = new IRGenDebugInfo(IRGen.Opts, *CI, *this, Module, SF);
+    DebugInfo = IRGenDebugInfo::createIRGenDebugInfo(IRGen.Opts, *CI, *this,
+                                                     Module, SF);
 
   initClangTypeConverter();
 

lib/IRGen/IRGenDebugInfo.h

@@ -16,6 +16,7 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "irgensil"
+#include "llvm/IR/DIBuilder.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/Instructions.h"

lib/IRGen/IRGenModule.cpp

@@ -1,13 +1,12 @@
-// RUN: rm -rf %t && mkdir -p %t
-// REQUIRES: OS=macosx
+// RUN: %target-swift-frontend -emit-ir %s -g -I %S/Inputs -o - | %FileCheck %s
 
-// RUN: %target-swift-frontend -emit-ir %s -g -o - | %FileCheck %s
+// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "Bar",
+// CHECK-SAME:             scope: ![[SUBMODULE:[0-9]+]]
 
-// CHECK: !DIImportedEntity(
-// CHECK: tag: DW_TAG_imported_module{{.*}}entity: ![[C:.*]], line: [[@LINE+1]])
-import Darwin.C
+// CHECK: ![[SUBMODULE]] = !DIModule(scope: ![[CLANGMODULE:[0-9]+]],
+// CHECK-SAME:                       name: "SubModule",
+// CHECK: ![[CLANGMODULE]] = !DIModule(scope: null, name: "ClangModule",
+// CHECK: !DIImportedEntity({{.*}}, entity: ![[SUBMODULE]], line: [[@LINE+1]])
+import ClangModule.SubModule
 
-let irrational = sqrt(2 as Double)
-
-// CHECK: ![[C]] = !DIModule(scope: ![[Darwin:.*]], name: "C",
-// CHECK: ![[Darwin]] = !DIModule(scope: null, name: "Darwin",
+let bar = Bar()

lib/IRGen/IRGenSIL.cpp

@@ -0,0 +1 @@
+struct Bar {};

test/DebugInfo/ImportClangSubmodule.swift

@@ -1,3 +1,8 @@
 module ClangModule {
   header "ClangModule.h"
+  export *
+  module SubModule {
+    header "SubModule.h"
+    export *
+  }
 }

test/DebugInfo/Inputs/SubModule.h

@@ -18,8 +18,9 @@ class MyObject : NSObject {
   var MyArr = NSArray()
 // IMPORT-CHECK: filename: "test-foundation.swift"
 // IMPORT-CHECK-DAG: [[FOUNDATION:[0-9]+]] = !DIModule({{.*}} name: "Foundation",{{.*}} includePath:
-// IMPORT-CHECK-DAG: !DICompositeType(tag: DW_TAG_structure_type, name: "NSArray", scope: ![[FOUNDATION]]
-// IMPORT-CHECK-DAG: !DIImportedEntity(tag: DW_TAG_imported_module, {{.*}}entity: ![[FOUNDATION]]
+  // IMPORT-CHECK-DAG: !DICompositeType(tag: DW_TAG_structure_type, name: "NSArray", scope: ![[NSARRAY:[0-9]+]]
+  //  IMPORT-CHECK-DAG: ![[NSARRAY]] = !DIModule(scope: ![[FOUNDATION:[0-9]+]], name: "NSArray"
+  // IMPORT-CHECK-DAG: !DIImportedEntity(tag: DW_TAG_imported_module, {{.*}}entity: ![[FOUNDATION]]
 
   func foo(_ obj: MyObject) {
     return obj.foo(obj)