Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

lib/FrontendTool/FrontendTool.cpp

@@ -589,8 +589,9 @@ void ABIDependencyEvaluator::computeABIDependenciesForClangModule(
     }
     if (import->isNonSwiftModule()
         && module->getTopLevelModule() == import->getTopLevelModule()
-        && !import->findUnderlyingClangModule()
-                  ->isSubModuleOf(module->findUnderlyingClangModule())) {
+        && (module == import
+            || !import->findUnderlyingClangModule()
+                      ->isSubModuleOf(module->findUnderlyingClangModule()))) {
       continue;
     }
     computeABIDependenciesForModule(import);

test/Driver/Inputs/imported_modules/SelfImport/module.modulemap

@@ -0,0 +1,6 @@
+module Outer {
+ module Inner {
+  export Outer.Inner
+ }
+ export Outer
+}

test/Driver/loaded_module_trace_self_cycle.swift

@@ -0,0 +1,4 @@
+// Check that this doesn't crash due to a self-cycle. rdar://67435472
+// RUN: %target-swift-frontend %s -emit-module -o /dev/null -emit-loaded-module-trace-path /dev/null -I %S/Inputs/imported_modules/SelfImport
+
+import Outer