Merge pull request #62559 from xymus/index-system-modules-without-sdk

[Index] Index any system module when no SDK path is defined

Author: xymus

lib/Index/IndexRecord.cpp

@@ -451,7 +451,8 @@ static void addModuleDependencies(ArrayRef<ImportedModule> imports,
             // We don't officially support binary swift modules, so normally
             // the index data for user modules would get generated while
             // building them.
-            bool isDistributedModule = mod->isSDKModule();
+            bool isDistributedModule = mod->isSDKModule() ||
+                      mod->getASTContext().SearchPathOpts.getSDKPath().empty();
             if (mod->isSystemModule() && indexSystemModules &&
                 (isDistributedModule || mod->isStdlibModule()) &&
                 (!skipStdlib || !mod->isStdlibModule())) {

test/Index/index_swift_only_systemmodule.swift

@@ -2,6 +2,7 @@ import SomeModule
 print(someFunc())
 
 // UNIT: Record | system | SomeModule |
+// SKIP-NOT: Record | system | SomeModule |
 
 // RUN: %empty-directory(%t)
 //
@@ -43,6 +44,38 @@ print(someFunc())
 //
 // --- Check the index.
 // RUN: c-index-test core -print-unit %t/idx | %FileCheck -check-prefix=UNIT %s
+//
+// --- Built with indexing, SomeModule is outside of the SDK so it's skipped.
+// RUN: %empty-directory(%t/idx)
+// RUN: %empty-directory(%t/modulecache)
+// RUN: %target-swift-frontend \
+// RUN:     -typecheck \
+// RUN:     -index-system-modules \
+// RUN:     -index-ignore-stdlib \
+// RUN:     -index-store-path %t/idx \
+// RUN:     -sdk %t/NotTheActualSDK \
+// RUN:     -Fsystem %t/SDK/Frameworks \
+// RUN:     -module-cache-path %t/modulecache \
+// RUN:     %s
+//
+// --- Check the index.
+// RUN: c-index-test core -print-unit %t/idx | %FileCheck -check-prefix=SKIP %s
+
+// --- Built with indexing, without an SDK path SomeModule is indexed.
+// RUN: %empty-directory(%t/idx)
+// RUN: %empty-directory(%t/modulecache)
+// RUN: %target-swift-frontend \
+// RUN:     -typecheck \
+// RUN:     -index-system-modules \
+// RUN:     -index-ignore-stdlib \
+// RUN:     -index-store-path %t/idx \
+// RUN:     -sdk "" \
+// RUN:     -Fsystem %t/SDK/Frameworks \
+// RUN:     -module-cache-path %t/modulecache \
+// RUN:     %s
+//
+// --- Check the index.
+// RUN: c-index-test core -print-unit %t/idx | %FileCheck -check-prefix=UNIT %s
 
 // -----------------------------------------------------------------------------
 // --- Prepare SDK (.swiftinterface).