[IDE] Print imports of submodules from other TLMs

We previously excluded all submodule imports when printing the module
interface, to avoid inheriting incidental imports of other submodules as
an artifact of clang submodules collectively being imported into the top
level module. This also excluded explicit imports of submodules however.
This change includes imports of submodules from another top level module
in the module interface. "Real" imports of other submodules under the
same top level module are unfortunately still excluded.

Author: hnrklssn

lib/IDE/ModuleInterfacePrinting.cpp

@@ -348,6 +348,10 @@ static bool shouldPrintImport(ImportDecl *ImportD, ModuleDecl *OrigMod,
     return true;
   if (ImportedClangMod == OrigClangMod)
     return false;
+  // We don't want to print modules that just happen to be part of our TLM,
+  // but submodules from other TLMs should still be included
+  if (!ImportedClangMod->isSubModuleOf(OrigClangMod->getTopLevelModule()))
+    return true;
   return ImportedClangMod->isSubModuleOf(OrigClangMod);
 }
 

test/Interop/C/swiftify-import/clang-includes-aliasing-imports.swift

@@ -86,7 +86,8 @@ typedef int aliasing4_t;
 #include "Aliasing3.h"
 #include "Aliasing4.h"
 
-// CHECK-A2-NOT: import
+// CHECK-A2: import A3.Aliasing
+// CHECK-A2: import A4.Aliasing
 
 #define __sized_by(s) __attribute__((__sized_by__(s)))
 

test/Interop/C/swiftify-import/clang-includes-indirect-explicit-modules.swift

@@ -86,7 +86,9 @@ typedef int d1_t;
 #include "C1.h"
 #include "D1.h"
 
-// CHECK-B2-NOT: import
+// CHECK-B2: import A1.B1
+// CHECK-B2: import A1.B1.C1
+// CHECK-B2: import A1.B1.C1.D1
 
 b1_t b2b(void * _Nonnull __sized_by(size), int size);
 c1_t b2c(void * _Nonnull __sized_by(size), int size);

test/Interop/C/swiftify-import/clang-includes-noexport.swift

@@ -10,6 +10,9 @@ import ClangIncludesNoExportModule
 
 // CHECK:      import ModuleA
 // CHECK-NEXT: import ModuleB
+// CHECK-NEXT: import ModuleDeep.ModuleDeepNested.ModuleDeepNestedNested
+// CHECK-NEXT: import ModuleOuter.ModuleC
+// CHECK-NEXT: import ModuleOuter.ModuleD
 // CHECK-NOT:  import
 // CHECK-EMPTY:
 

test/Interop/C/swiftify-import/clang-includes-redundant-imports.swift

@@ -179,6 +179,9 @@ typedef int g1_t;
 #include "D1.h"
 
 // CHECK-B2: import A1
+// CHECK-B2: import A1.B1
+// CHECK-B2: import A1.B1.C1
+// CHECK-B2: import A1.B1.C1.D1
 // CHECK-B2: import A2.B2.C2
 
 
@@ -192,6 +195,8 @@ c2_t b2_2(void * _Nonnull __sized_by(size), int size);
 #include "B1.h"
 #include "C1.h"
 
+// CHECK-C2: import A1.B1
+// CHECK-C2: import A1.B1.C1
 // CHECK-C2: @_exported import A2.B2.C2.D2
 
 typedef int c2_t;

test/Interop/C/swiftify-import/clang-includes.swift

@@ -10,6 +10,9 @@ import ClangIncludesModule
 
 // CHECK:      @_exported import ModuleA
 // CHECK-NEXT: @_exported import ModuleB
+// CHECK-NEXT: @_exported import ModuleDeep.ModuleDeepNested.ModuleDeepNestedNested
+// CHECK-NEXT: @_exported import ModuleOuter.ModuleC
+// CHECK-NEXT: @_exported import ModuleOuter.ModuleD
 // CHECK-NOT:  import
 // CHECK-EMPTY: