updates

Author: elsh

include/swift/AST/DiagnosticsSema.def

@@ -1014,7 +1014,7 @@ ERROR(in_package_module_not_compiled_from_source,none,
 
 WARNING(in_package_module_not_compiled_locally,none,
         "module %0 is in package %1 but was loaded from SDK; "
-        "modules of the same package are expected to be loaded from local build directory: %2",
+        "modules of the same package should be built locally from source only: %2",
         (Identifier, Identifier, StringRef))
 
 ERROR(import_restriction_conflict,none,

lib/Sema/TypeCheckDeclPrimary.cpp

@@ -1962,13 +1962,14 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
 
     auto target = ID->getModule();
     if (target->isNonUserModule() && // target module is in distributed SDK
+        !getASTContext().LangOpts.PackageName.empty() &&
         getASTContext().LangOpts.PackageName == target->getPackageName().str()) {
       // If reached here, a binary module (.swiftmodule) instead of interface of the
       // target was loaded for the main module, where both belong to the same package;
       // this is an expected behavior, but it should have been loaded from the local
       // build directory, not from distributed SDK. In such case, we show a warning.
       auto &diags = ID->getASTContext().Diags;
-      diags.diagnose(target->getLoc(),
+      diags.diagnose(ID,
                      diag::in_package_module_not_compiled_locally,
                      target->getBaseIdentifier(),
                      target->getPackageName(),

test/Sema/import_package_module_from_sdk.swift

@@ -14,20 +14,18 @@
 
 // RUN: test -f %t/SDK/Frameworks/LibInSDK.framework/Modules/LibInSDK.swiftmodule/%module-target-triple.swiftmodule
 
-// RUN: %target-swift-frontend -typecheck %t/Client1.swift -package-name libPkg -sdk %t/SDK -I %t -I %t/SDK/Frameworks/LibInSDK.framework/Modules 2> %t/result.output
-// RUN: %FileCheck %s < %t/result.output
-// CHECK: warning: module 'LibInSDK' is in package 'libPkg' but was loaded from SDK; modules of the same package are expected to be loaded from local build directory: {{.*}}/SDK/Frameworks/LibInSDK.framework/Modules/LibInSDK.swiftmodule/{{.*}}.swiftmodule
+// RUN: %target-swift-frontend -typecheck -verify -verify-ignore-unknown %t/Client1.swift -package-name libPkg -sdk %t/SDK -I %t -I %t/SDK/Frameworks/LibInSDK.framework/Modules
 
 // RUN: %target-swift-frontend -module-name LibLocal -emit-module -emit-module-path %t/LibLocal.swiftmodule -parse-as-library %t/Lib.swift -package-name libPkg
 // RUN: test -f %t/LibLocal.swiftmodule
 
-// RUN: %target-swift-frontend -typecheck %t/Client2.swift -package-name libPkg -I %t
+// RUN: %target-swift-frontend -typecheck -verify %t/Client2.swift -package-name libPkg -I %t
 
 //--- Lib.swift
 package func log(level: Int) {}
 
 //--- Client1.swift
-import LibInSDK
+import LibInSDK // expected-warning {{module 'LibInSDK' is in package 'libPkg' but was loaded from SDK; modules of the same package should be built locally from source only}}
 
 func someFunc() {
   log(level: 1)