Merge pull request #3942 from swiftwasm/main

Author: MaxDesiatov

lib/DependencyScan/ScanDependencies.cpp

@@ -336,7 +336,7 @@ static void discoverCrosssImportOverlayDependencies(
 template <typename T>
 void writeJSONSingleField(llvm::raw_ostream &out, StringRef fieldName,
                           const T &value, unsigned indentLevel,
-                          bool trailingComma);
+                          bool trailingComma, bool nested = false);
 
 /// Write a string value as JSON.
 void writeJSONValue(llvm::raw_ostream &out, StringRef value,
@@ -442,11 +442,31 @@ void writeJSONValue(llvm::raw_ostream &out, const std::vector<T> &values,
 template <typename T>
 void writeJSONSingleField(llvm::raw_ostream &out, StringRef fieldName,
                           const T &value, unsigned indentLevel,
-                          bool trailingComma) {
+                          bool trailingComma, bool nested) {
   out.indent(indentLevel * 2);
   writeJSONValue(out, fieldName, indentLevel);
   out << ": ";
-  writeJSONValue(out, value, indentLevel);
+  auto updatedIndentLevel = indentLevel;
+  
+  if (nested) {
+    // This is a hack to "fix" a format for a value that should be a nested
+    // set of strings. Currently only capturedPCMArgs (clang) is expected to
+    // in the nested format, which supposedly only contains one set of strings.
+    // Adjust the indentation to account for the nested brackets.
+    updatedIndentLevel += 1;
+    out << "[\n";
+    out.indent(updatedIndentLevel * 2);
+  }
+
+  writeJSONValue(out, value, updatedIndentLevel);
+
+  if (nested) {
+    // If nested, add an extra closing brack with a correct indentation.
+    out << "\n";
+    out.indent(indentLevel * 2);
+    out << "]";
+  }
+
   if (trailingComma)
     out << ",";
   out << "\n";
@@ -720,7 +740,7 @@ static void writeJSON(llvm::raw_ostream &out,
 
       // Captured PCM arguments.
       writeJSONSingleField(out, "capturedPCMArgs", clangDeps->captured_pcm_args, 5,
-                           /*trailingComma=*/false);
+                           /*trailingComma=*/false, /*nested=*/true);
     }
 
     out.indent(4 * 2);

lib/Serialization/ModuleFile.cpp

@@ -165,10 +165,15 @@ Status ModuleFile::associateWithFileContext(FileUnit *file, SourceLoc diagLoc,
     return error(status);
   }
 
-  for (const auto &searchPath : Core->SearchPaths) {
-    ctx.addSearchPath(
+  StringRef SDKPath = ctx.SearchPathOpts.SDKPath;
+  if (SDKPath.empty() ||
+      !Core->ModuleInputBuffer->getBufferIdentifier().startswith(SDKPath)) {
+    for (const auto &searchPath : Core->SearchPaths) {
+      ctx.addSearchPath(
         ctx.SearchPathOpts.SearchPathRemapper.remapPath(searchPath.Path),
-        searchPath.IsFramework, searchPath.IsSystem);
+        searchPath.IsFramework,
+        searchPath.IsSystem);
+    }
   }
 
   auto clangImporter = static_cast<ClangImporter *>(ctx.getClangModuleLoader());

test/Concurrency/predates_concurrency_swift6.swift

@@ -1,5 +1,6 @@
 // RUN: %target-typecheck-verify-swift  -disable-availability-checking -swift-version 6
 // REQUIRES: concurrency
+// REQUIRES: asserts
 
 @_predatesConcurrency func unsafelySendableClosure(_ closure: @Sendable () -> Void) { }
 

test/ScanDependencies/module_deps.swift

@@ -137,8 +137,10 @@ import SubE
 // CHECK-NEXT: "C"
 
 // CHECK: "capturedPCMArgs": [
-// CHECK-NEXT:   "-Xcc",
-// CHECK-NEXT:   "-fapinotes-swift-version=4"
+// CHECK-NEXT:   [,
+// CHECK-NEXT:     "-Xcc",
+// CHECK-NEXT:     "-fapinotes-swift-version=4"
+// CHECK-NEXT:   ]
 // CHECK-NEXT: ]
 
 /// --------Swift module E

test/Serialization/search-paths-sdk.swift

@@ -0,0 +1,16 @@
+// REQUIRES: VENDOR=apple
+// RUN: %empty-directory(%t)
+// RUN: %empty-directory(%t/mock-sdk/usr/lib/swift/SystemLibrary.swiftmodule)
+// RUN: %empty-directory(%t/secret)
+
+// RUN: %target-swift-frontend -emit-module %S/../Inputs/empty.swift -o %t/secret/SecretLibrary.swiftmodule
+// RUN: %target-swift-frontend -emit-module %S/../Inputs/empty.swift -o %t/mock-sdk/usr/lib/swift/SystemLibrary.swiftmodule/%target-swiftmodule-name -module-name SystemLibrary -I %t/secret -serialize-debugging-options
+
+// We pick up search paths from normal imports...
+// RUN: %target-swift-frontend -typecheck %s -I %t/mock-sdk/usr/lib/swift/
+
+// ...but not from content in the SDK.
+// RUN: %target-swift-frontend -typecheck %s -sdk %t/mock-sdk -verify -show-diagnostics-after-fatal
+
+import SystemLibrary
+import SecretLibrary // expected-error {{no such module 'SecretLibrary'}}

tools/CMakeLists.txt

@@ -2,11 +2,15 @@ include(CheckIncludeFiles)
 check_include_files("xpc/xpc.h" HAVE_XPC_H)
 
 if(HAVE_XPC_H AND SWIFT_BUILD_SOURCEKIT)
-  set(BUILD_SOURCEKIT_XPC_SERVICE TRUE)
+  set(BUILD_SOURCEKIT_XPC_SERVICE_default TRUE)
 else()
-  set(BUILD_SOURCEKIT_XPC_SERVICE FALSE)
+  set(BUILD_SOURCEKIT_XPC_SERVICE_default FALSE)
 endif()
 
+option(BUILD_SOURCEKIT_XPC_SERVICE
+  "Whether or not the SourceKit XPC service should be built"
+  ${BUILD_SOURCEKIT_XPC_SERVICE_default})
+
 # Add generated libSyntax headers to global dependencies.
 list(APPEND LLVM_COMMON_DEPENDS swift-syntax-generated-headers)
 if(SWIFT_BUILD_SOURCEKIT)

tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake

@@ -11,6 +11,10 @@ function(add_sourcekit_default_compiler_flags target)
   if(${SWIFT_HOST_VARIANT_SDK} STREQUAL WINDOWS)
     swift_windows_include_for_arch(${SWIFT_HOST_VARIANT_ARCH}
       ${SWIFT_HOST_VARIANT_ARCH}_INCLUDE)
+    if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.22)
+      set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-I")
+      set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-I")
+    endif()
     target_include_directories(${target} SYSTEM PRIVATE
       ${${SWIFT_HOST_VARIANT_ARCH}_INCLUDE})
   endif()

utils/build-script

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 # This source file is part of the Swift.org open source project
 #
@@ -8,10 +8,14 @@
 # See https://swift.org/LICENSE.txt for license information
 # See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
+
 """
 The ultimate tool for building Swift.
 """
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import json
 import os
 import platform
@@ -28,6 +32,8 @@ from build_swift.build_swift.constants import SWIFT_BUILD_ROOT
 from build_swift.build_swift.constants import SWIFT_REPO_NAME
 from build_swift.build_swift.constants import SWIFT_SOURCE_ROOT
 
+import six
+
 from swift_build_support.swift_build_support import build_script_invocation
 from swift_build_support.swift_build_support import shell
 from swift_build_support.swift_build_support import targets
@@ -113,7 +119,7 @@ class JSONDumper(json.JSONEncoder):
     def default(self, o):
         if hasattr(o, '__dict__'):
             return vars(o)
-        return str(o)
+        return six.text_type(o)
 
 
 def print_xcodebuild_versions(file=sys.stdout):
@@ -499,7 +505,7 @@ def main_preset():
     try:
         preset_parser.read_files(args.preset_file_names)
     except presets.PresetError as e:
-        fatal_error(str(e))
+        fatal_error(six.text_type(e))
 
     if args.show_presets:
         for name in sorted(preset_parser.preset_names,
@@ -520,7 +526,7 @@ def main_preset():
             args.preset,
             vars=args.preset_substitutions)
     except presets.PresetError as e:
-        fatal_error(str(e))
+        fatal_error(six.text_type(e))
 
     preset_args = migration.migrate_swift_sdks(preset.args)
 

utils/swift_build_support/swift_build_support/productpipeline_list_builder.py

@@ -141,7 +141,7 @@ def infer(self):
 
             # Filter out any of the pipelines that before inference were not
             # selected.
-            enabled_pipeline = [p for p in pipeline if p is not None]
+            enabled_pipeline = filter(lambda x: x is not None, pipeline)
 
             if self.args.verbose_build:
                 print("-- Build Graph Inference --")