Merge remote-tracking branch 'upstream/main'

Author: MAJKFL

.github/CODEOWNERS

@@ -70,7 +70,7 @@
 /include/swift/AST/Evaluator*                      @CodaFi @slavapestov
 /include/swift/Basic/                              @DougGregor
 /include/swift/Basic/Features.def                  @DougGregor @hborla
-/include/swift/ClangImporter                       @zoecarver @hyp @egorzhdan @beccadax @ian-twilightcoder
+/include/swift/ClangImporter                       @zoecarver @hyp @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun
 /include/swift/DependencyScan                      @artemcm
 /include/swift/Driver*/                            @artemcm
 /include/swift/Frontend*/                          @artemcm @tshortli
@@ -81,7 +81,7 @@
 /include/swift/Migrator/                           @nkcsgexi
 /include/swift/Option/*Options*                    @tshortli
 /include/swift/Parse/                              @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
-/include/swift/PrintAsClang                        @zoecarver @hyp @egorzhdan
+/include/swift/PrintAsClang                        @zoecarver @hyp @egorzhdan @Xazax-hun
 /include/swift/Refactoring                         @ahoppen @bnbarham @hamishknight @rintaro
 /include/swift/Runtime/                            @rjmccall
 /include/swift/SIL/                                @jckarter
@@ -116,7 +116,7 @@
 /lib/ASTGen/                                        @ahoppen @bnbarham @CodaFi @hamishknight @rintaro
 /lib/Basic/                                         @DougGregor
 /lib/Basic/Windows                                  @compnerd
-/lib/ClangImporter                                  @zoecarver @hyp @egorzhdan @beccadax @ian-twilightcoder
+/lib/ClangImporter                                  @zoecarver @hyp @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun
 /lib/ClangImporter/DWARFImporter*                   @adrian-prantl
 /lib/DependencyScan                                 @artemcm
 /lib/Driver*/                                       @artemcm
@@ -135,7 +135,7 @@
 /lib/Markup/                                        @nkcsgexi
 /lib/Migrator/                                      @nkcsgexi
 /lib/Parse/                                         @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
-/lib/PrintAsClang                                   @zoecarver @hyp @egorzhdan
+/lib/PrintAsClang                                   @zoecarver @hyp @egorzhdan @Xazax-hun
 /lib/Refactoring/                                   @ahoppen @bnbarham @hamishknight @rintaro
 /lib/SIL/                                           @jckarter
 /lib/SIL/**/*DebugInfo*                             @adrian-prantl
@@ -177,7 +177,7 @@
 /stdlib/public/*Demangl*/                 @rjmccall
 /stdlib/public/Backtracing/               @al45tair
 /stdlib/public/Concurrency/               @ktoso
-/stdlib/public/Cxx/                       @zoecarver @hyp @egorzhdan
+/stdlib/public/Cxx/                       @zoecarver @hyp @egorzhdan @Xazax-hun
 /stdlib/public/Distributed/               @ktoso
 /stdlib/public/Observation/               @phausler
 /stdlib/public/SwiftRemoteMirror/         @slavapestov
@@ -202,7 +202,7 @@
 /test/IDE/                                          @ahoppen @bnbarham @hamishknight @rintaro
 /test/IRGen/                                        @rjmccall
 /test/Index/                                        @ahoppen @bnbarham @hamishknight @rintaro
-/test/Interop/                                      @zoecarver @hyp @egorzhdan
+/test/Interop/                                      @zoecarver @hyp @egorzhdan @Xazax-hun
 /test/Migrator/                                     @nkcsgexi
 /test/Parse/                                        @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
 /test/Profiler                                      @ahoppen @bnbarham @hamishknight @rintaro

CHANGELOG.md

@@ -5,6 +5,22 @@
 
 ## Swift (next)
 
+* [SE-0444][]:
+  When the upcoming feature `MemberImportVisibility` is enabled, Swift will
+  require that a module be directly imported in a source file when resolving
+  member declarations from that module:
+  
+  ```swift
+  let recipe = "2 slices of bread, 1.5 tbs peanut butter".parse()
+  // error: instance method 'parse()' is inaccessible due to missing import of
+  //        defining module 'RecipeKit'
+  // note:  add import of module 'RecipeKit'
+  ```
+  
+  This new behavior prevents ambiguities from arising when a transitively
+  imported module declares a member that conflicts with a member of a directly
+  imported module.
+
 * Syntactic SourceKit queries no longer attempt to provide information
   within the inactive `#if` regions. For example, given:
 
@@ -10629,6 +10645,7 @@ using the `.dynamicType` member to retrieve the type of an expression should mig
 [SE-0428]: https://github.com/apple/swift-evolution/blob/main/proposals/0428-resolve-distributed-actor-protocols.md
 [SE-0431]: https://github.com/apple/swift-evolution/blob/main/proposals/0431-isolated-any-functions.md
 [SE-0442]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0442-allow-taskgroup-childtaskresult-type-to-be-inferred.md
+[SE-0444]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0444-member-import-visibility.md
 [#64927]: <https://github.com/apple/swift/issues/64927>
 [#42697]: <https://github.com/apple/swift/issues/42697>
 [#42728]: <https://github.com/apple/swift/issues/42728>

CMakeLists.txt

@@ -155,6 +155,8 @@ else()
     set(SWIFT_HOST_VARIANT_SDK_default "ANDROID")
   elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
     set(SWIFT_HOST_VARIANT_SDK_default "OSX")
+  elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "WASI")
+    set(SWIFT_HOST_VARIANT_SDK_default "WASI")
   else()
     message(FATAL_ERROR "Unable to detect SDK for host system: ${CMAKE_SYSTEM_NAME}")
   endif()
@@ -419,11 +421,21 @@ set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY
   ${SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default}
   CACHE STRING "MSVC Runtime Library for the standard library")
 
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows" AND BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS" AND
+    CMAKE_BUILD_TYPE STREQUAL "Debug")
+  # Building with the host Swift toolchain requires linking just-built binaries
+  # against the host Swift runtime. In debug builds, that means linking a debug
+  # binary against a release binary. The MSVC linker does not normally permit
+  # this, since debug builds enable bounds-checked C++ iterators by default,
+  # which are not ABI-compatible with regular iterators. Let's instruct MSVC to
+  # disable bounds-checked iterators to make it possible to do a debug build of
+  # the Swift compiler with a host toolchain.
+  add_definitions(-D_ITERATOR_DEBUG_LEVEL=0)
+endif()
 
 if(BRIDGING_MODE STREQUAL "DEFAULT" OR NOT BRIDGING_MODE)
   if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR "${SWIFT_HOST_VARIANT_SDK}" STREQUAL "WINDOWS" OR (CMAKE_Swift_COMPILER AND CMAKE_Swift_COMPILER_VERSION VERSION_LESS 5.8))
     # In debug builds, to workaround a problem with LLDB's `po` command (rdar://115770255).
-    # On Windows, to workaround a build problem.
     # If the host Swift version is less than 5.8, use pure mode to workaround a C++ interop compiler crash.
     set(BRIDGING_MODE "PURE")
   else()

SwiftCompilerSources/CMakeLists.txt

@@ -177,6 +177,8 @@ function(add_swift_compiler_modules_library name)
   if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     list(APPEND swift_compile_options "-static")
     list(APPEND sdk_option "-sdk" "${SWIFT_PATH_TO_SWIFT_SDK}")
+    # For "swift/shims/*.h".
+    list(APPEND sdk_option "-I" "${SWIFT_PATH_TO_SWIFT_SDK}/usr/lib")
 
     # Workaround a crash in the LoadableByAddress pass
     # https://github.com/apple/swift/issues/73254
@@ -188,6 +190,12 @@ function(add_swift_compiler_modules_library name)
     if (CMAKE_Swift_COMPILER_VERSION VERSION_LESS 6.0)
       list(APPEND swift_compile_options "-Xcc" "-D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH")
     endif()
+
+    # Make 'offsetof()' a const value.
+    list(APPEND swift_compile_options "-Xcc" "-D_CRT_USE_BUILTIN_OFFSETOF")
+
+    # Workaround for https://github.com/swiftlang/llvm-project/issues/7172
+    list(APPEND swift_compile_options "-Xcc" "-Xclang" "-Xcc" "-fmodule-format=raw")
   else()
     list(APPEND sdk_option "-I" "${swift_exec_bin_dir}/../lib" "-I" "${sdk_path}/usr/lib")
   endif()

SwiftCompilerSources/Package.swift

@@ -58,9 +58,6 @@ private extension Target {
 let package = Package(
   name: "SwiftCompilerSources",
   platforms: [
-    // We need at least macOS 13 here to avoid hitting an availability error
-    // for CxxStdlib. It's only needed for the package though, the CMake build
-    // works fine with a lower deployment target.
     .macOS(.v13),
   ],
   products: [

SwiftCompilerSources/Sources/AST/CMakeLists.txt

@@ -0,0 +1,17 @@
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2024 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See http://swift.org/LICENSE.txt for license information
+# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+add_swift_compiler_module(AST
+  DEPENDS
+    Basic
+  SOURCES
+    Declarations.swift
+    Conformance.swift
+    Registration.swift
+    SubstitutionMap.swift
+    Type.swift)

SwiftCompilerSources/Sources/AST/Conformance.swift

@@ -0,0 +1,88 @@
+//===--- Conformance.swift ------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2024 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import Basic
+import ASTBridging
+
+/// Describes how a particular type conforms to a given protocol, providing the mapping from the protocol
+/// members to the type (or extension) members that provide the functionality for the concrete type.
+///
+///  TODO: Ideally, `Conformance` should be an enum
+public struct Conformance: CustomStringConvertible, NoReflectionChildren {
+  public let bridged: BridgedConformance
+
+  public init(bridged: BridgedConformance) {
+    self.bridged = bridged
+  }
+
+  public var description: String {
+    return String(taking: bridged.getDebugDescription())
+  }
+
+  public var isConcrete: Bool { bridged.isConcrete() }
+
+  public var isValid: Bool { bridged.isValid() }
+
+  public var type: Type {
+    assert(isConcrete)
+    return Type(bridged: bridged.getType())
+  }
+
+  public var isSpecialized: Bool {
+    assert(isConcrete)
+    return bridged.isSpecializedConformance()
+  }
+
+  public var genericConformance: Conformance {
+    assert(isSpecialized)
+    return bridged.getGenericConformance().conformance
+  }
+
+  public var isInherited: Bool {
+    assert(isConcrete)
+    return bridged.isInheritedConformance()
+  }
+
+  public var inheritedConformance: Conformance {
+    assert(isInherited)
+    return bridged.getInheritedConformance().conformance
+  }
+
+  public var specializedSubstitutions: SubstitutionMap {
+    assert(isSpecialized)
+    return SubstitutionMap(bridged: bridged.getSpecializedSubstitutions())
+  }
+}
+
+public struct ConformanceArray : RandomAccessCollection, CustomReflectable {
+  public let bridged: BridgedConformanceArray
+
+  public var startIndex: Int { return 0 }
+  public var endIndex: Int { return bridged.getCount() }
+
+  public init(bridged: BridgedConformanceArray) {
+    self.bridged = bridged
+  }
+
+  public subscript(_ index: Int) -> Conformance {
+    bridged.getAt(index).conformance
+  }
+
+  public var customMirror: Mirror {
+    let c: [Mirror.Child] = map { (label: nil, value: $0) }
+    return Mirror(self, children: c)
+  }
+}
+
+extension BridgedConformance {
+  public var conformance: Conformance { Conformance(bridged: self) }
+}

SwiftCompilerSources/Sources/AST/Declarations.swift

@@ -0,0 +1,136 @@
+//===--- Declarations.swift -----------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2024 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import Basic
+import ASTBridging
+
+/// The base class for all declarations in Swift.
+@_semantics("arc.immortal")
+public class Decl: CustomStringConvertible, Hashable {
+  public var bridged: BridgedDeclObj { BridgedDeclObj(SwiftObject(self)) }
+
+  public var description: String { String(taking: bridged.getDebugDescription()) }
+
+  public static func ==(lhs: Decl, rhs: Decl) -> Bool { lhs === rhs }
+
+  public func hash(into hasher: inout Hasher) {
+    hasher.combine(ObjectIdentifier(self))
+  }
+}
+
+public class ValueDecl: Decl {
+  final public var nameLoc: SourceLoc? { SourceLoc(bridged: bridged.Value_getNameLoc()) }
+  final public var userFacingName: StringRef { StringRef(bridged: bridged.Value_getUserFacingName()) }
+  final public var isObjC: Bool { bridged.Value_isObjC() }
+}
+
+public class TypeDecl: ValueDecl {
+  final public var name: StringRef { StringRef(bridged: bridged.Type_getName()) }
+}
+
+public class GenericTypeDecl: TypeDecl {
+  final public var isGenericAtAnyLevel: Bool { bridged.GenericType_isGenericAtAnyLevel() }
+}
+
+public class NominalTypeDecl: GenericTypeDecl {
+  final public var isGlobalActor: Bool { bridged.NominalType_isGlobalActor() }
+
+  final public var valueTypeDestructor: DestructorDecl? {
+    bridged.NominalType_getValueTypeDestructor().getAs(DestructorDecl.self)
+  }
+}
+
+final public class EnumDecl: NominalTypeDecl {}
+
+final public class StructDecl: NominalTypeDecl {
+  public var hasUnreferenceableStorage: Bool { bridged.Struct_hasUnreferenceableStorage() }
+}
+
+final public class ClassDecl: NominalTypeDecl {
+  public var superClass: Type? { Type(bridgedOrNil: bridged.Class_getSuperclass()) }
+}
+
+final public class ProtocolDecl: NominalTypeDecl {}
+
+final public class BuiltinTupleDecl: NominalTypeDecl {}
+
+final public class OpaqueTypeDecl: GenericTypeDecl {}
+
+final public class TypeAliasDecl: GenericTypeDecl {}
+
+final public class GenericTypeParamDecl: TypeDecl {}
+
+final public class AssociatedTypeDecl: TypeDecl {}
+
+final public class ModuleDecl: TypeDecl {}
+
+public class AbstractStorageDecl: ValueDecl {}
+
+public class VarDecl: AbstractStorageDecl {}
+
+final public class ParamDecl: VarDecl {}
+
+final public class SubscriptDecl: AbstractStorageDecl {}
+
+public class AbstractFunctionDecl: ValueDecl {}
+
+final public class ConstructorDecl: AbstractFunctionDecl {}
+
+final public class DestructorDecl: AbstractFunctionDecl {}
+
+public class FuncDecl: AbstractFunctionDecl {}
+
+final public class AccessorDecl: FuncDecl {}
+
+final public class MacroDecl: ValueDecl {}
+
+final public class EnumElementDecl: ValueDecl {}
+
+final public class ExtensionDecl: Decl {}
+
+final public class TopLevelCodeDecl: Decl {}
+
+final public class ImportDecl: Decl {}
+
+final public class PoundDiagnosticDecl: Decl {}
+
+final public class PrecedenceGroupDecl: Decl {}
+
+final public class MissingDecl: Decl {}
+
+final public class MissingMemberDecl: Decl {}
+
+final public class PatternBindingDecl: Decl {}
+
+final public class EnumCaseDecl: Decl {}
+
+public class OperatorDecl: Decl {}
+
+final public class InfixOperatorDecl: OperatorDecl {}
+
+final public class PrefixOperatorDecl: OperatorDecl {}
+
+final public class PostfixOperatorDecl: OperatorDecl {}
+
+final public class MacroExpansionDecl: Decl {}
+
+// Bridging utilities
+
+extension BridgedDeclObj {
+  public var decl: Decl { obj.getAs(Decl.self) }
+  public func getAs<T: Decl>(_ declType: T.Type) -> T { obj.getAs(T.self) }
+}
+
+extension OptionalBridgedDeclObj {
+  public var decl: Decl? { obj.getAs(Decl.self) }
+  public func getAs<T: Decl>(_ declType: T.Type) -> T? { obj.getAs(T.self) }
+}