Merge branch 'main' into elsh/pkg-sil-verify

Author: elsh

CMakeLists.txt

@@ -108,8 +108,9 @@ if(CMAKE_Swift_COMPILER)
   enable_language(Swift)
   set(DEFAULT_SWIFT_MIN_RUNTIME_VERSION "${CMAKE_Swift_COMPILER_VERSION}")
 else()
-  message(STATUS "WARNING! Did not find a host compiler swift?! Can not build
-                  any compiler host sources written in Swift")
+  message(WARNING "Swift compiler not found on path.
+  Cannot build compiler sources written in Swift.
+  If this is unexpected, please pass the path to the swiftc binary by defining the `CMAKE_Swift_COMPILER` variable.")
   set(DEFAULT_SWIFT_MIN_RUNTIME_VERSION)
 endif()
 
@@ -124,7 +125,7 @@ set(SWIFT_DARWIN_EMBEDDED_VARIANTS "^(iphoneos|iphonesimulator|appletvos|appletv
 #  if("${SWIFT_HOST_VARIANT_SDK}" IN_LIST SWIFT_DARWIN_PLATFORMS)
 #    ...
 #  endif()
-set(SWIFT_DARWIN_PLATFORMS "IOS" "IOS_SIMULATOR" "TVOS" "TVOS_SIMULATOR" "WATCHOS" "WATCHOS_SIMULATOR" "OSX")
+set(SWIFT_DARWIN_PLATFORMS "IOS" "IOS_SIMULATOR" "TVOS" "TVOS_SIMULATOR" "WATCHOS" "WATCHOS_SIMULATOR" "OSX" "XROS" "XROS_SIMULATOR")
 
 set(SWIFT_APPLE_PLATFORMS ${SWIFT_DARWIN_PLATFORMS})
 if(SWIFT_FREESTANDING_FLAVOR STREQUAL "apple")
@@ -543,6 +544,9 @@ set(SWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS "11.0" CACHE STRING
 set(SWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS "4.0" CACHE STRING
     "Minimum deployment target version for watchOS")
 
+set(SWIFT_DARWIN_DEPLOYMENT_VERSION_XROS "1.0" CACHE STRING
+    "Minimum deployment target version for xrOS")
+
 #
 #  Compatibility library deployment versions
 #
@@ -551,6 +555,7 @@ set(COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX "10.9")
 set(COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS "7.0")
 set(COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_TVOS "9.0")
 set(COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_WATCHOS "2.0")
+set(COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_XROS "1.0")
 set(COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_MACCATALYST "13.1")
 
 #
@@ -596,7 +601,7 @@ option(SWIFT_REPORT_STATISTICS
     FALSE)
 
 # Only Darwin platforms enable ObjC interop by default.
-if("${SWIFT_HOST_VARIANT_SDK}" MATCHES "(OSX|IOS*|TVOS*|WATCHOS*)")
+if("${SWIFT_HOST_VARIANT_SDK}" MATCHES "(OSX|IOS*|TVOS*|WATCHOS*|XROS*)")
   set(SWIFT_STDLIB_ENABLE_OBJC_INTEROP_default TRUE)
 else()
   set(SWIFT_STDLIB_ENABLE_OBJC_INTEROP_default FALSE)
@@ -692,6 +697,10 @@ option(SWIFT_ENABLE_GLOBAL_ISEL_ARM64
   "Enable global isel on arm64"
   FALSE)
 
+option(SWIFT_ENABLE_EXPERIMENTAL_PARSER_VALIDATION
+  "Enable experimental SwiftParser validation by default"
+  FALSE)
+
 cmake_dependent_option(SWIFT_BUILD_SOURCEKIT
   "Build SourceKit" TRUE
   "SWIFT_ENABLE_DISPATCH" FALSE)
@@ -959,6 +968,12 @@ if(XCODE)
   swift_common_xcode_cxx_config()
 endif()
 
+# Check what linux distribution is being used.
+# This can be used to determine the default linker to use.
+if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.22")
+  cmake_host_system_information(RESULT DISTRO_NAME  QUERY DISTRIB_PRETTY_NAME)
+endif()
+
 # Which default linker to use. Prefer LLVM_USE_LINKER if it set, otherwise use
 # our own defaults. This should only be possible in a unified (not stand alone)
 # build environment.
@@ -970,6 +985,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND NOT CMAKE_HOST_SYSTEM_NAME STREQ
   set(SWIFT_USE_LINKER_default "lld")
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   set(SWIFT_USE_LINKER_default "")
+elseif(DISTRO_NAME STREQUAL "Amazon Linux 2023")
+  set(SWIFT_USE_LINKER_default "lld")
 else()
   set(SWIFT_USE_LINKER_default "gold")
 endif()
@@ -1136,7 +1153,7 @@ elseif("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "WASI")
   set(SWIFT_PRIMARY_VARIANT_SDK_default  "${SWIFT_HOST_VARIANT_SDK}")
   set(SWIFT_PRIMARY_VARIANT_ARCH_default "${SWIFT_HOST_VARIANT_ARCH}")
 
-elseif("${SWIFT_HOST_VARIANT_SDK}" MATCHES "(OSX|IOS*|TVOS*|WATCHOS*)")
+elseif("${SWIFT_HOST_VARIANT_SDK}" MATCHES "(OSX|IOS*|TVOS*|WATCHOS*|XROS*)")
 
   set(SWIFT_HOST_VARIANT "macosx" CACHE STRING
       "Deployment OS for Swift host tools (the compiler) [macosx, iphoneos].")

SwiftCompilerSources/CMakeLists.txt

@@ -98,13 +98,6 @@ function(add_swift_compiler_modules_library name)
                         "DEPENDS"
                         ${ARGN})
 
-  # Prior to 5.9, we have to use the experimental flag for C++ interop.
-  if (CMAKE_Swift_COMPILER_VERSION VERSION_LESS 5.9)
-    set(cxx_interop_flag "-enable-experimental-cxx-interop")
-  else()
-    set(cxx_interop_flag "-cxx-interoperability-mode=default")
-  endif()
-
   set(swift_compile_options
       "-color-diagnostics"
       "-Xfrontend" "-validate-tbd-against-ir=none"
@@ -113,6 +106,12 @@ function(add_swift_compiler_modules_library name)
       "-Xcc" "-std=c++17"
       "-Xcc" "-DCOMPILED_WITH_SWIFT" "-Xcc" "-DSWIFT_TARGET"
       "-Xcc" "-UIBOutlet" "-Xcc" "-UIBAction" "-Xcc" "-UIBInspectable")
+  # Prior to 5.9, we have to use the experimental flag for C++ interop.
+  if (CMAKE_Swift_COMPILER_VERSION VERSION_LESS 5.9)
+    list(APPEND swift_compile_options "-Xfrontend" "-enable-experimental-cxx-interop")
+  else()
+    list(APPEND swift_compile_options "-cxx-interoperability-mode=default")
+  endif()
 
   if (NOT BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
     if(SWIFT_MIN_RUNTIME_VERSION)
@@ -129,7 +128,9 @@ function(add_swift_compiler_modules_library name)
     list(APPEND swift_compile_options "-O" "-cross-module-optimization")
   endif()
 
-  if(NOT LLVM_ENABLE_ASSERTIONS)
+  if(LLVM_ENABLE_ASSERTIONS)
+    list(APPEND swift_compile_options "-Xcc" "-UNDEBUG")
+  else()
     list(APPEND swift_compile_options "-Xcc" "-DNDEBUG")
   endif()
 
@@ -304,7 +305,7 @@ else()
 
   elseif(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")
 
-    set(b0_deps swift-frontend-bootstrapping0 symlink-headers-bootstrapping0)
+    set(b0_deps swift-frontend-bootstrapping0 symlink-headers-bootstrapping0 copy-legacy-layouts)
     set(b1_deps swift-frontend-bootstrapping1 symlink-headers-bootstrapping1)
     if(BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING")
       list(APPEND b0_deps swiftCore-bootstrapping0)

SwiftCompilerSources/Sources/Optimizer/DataStructures/Set.swift

@@ -228,3 +228,16 @@ struct OperandSet : IntrusiveSet {
     context.freeOperandSet(bridged)
   }
 }
+
+extension IntrusiveSet {
+  mutating func insert(contentsOf source: some Sequence<Element>) {
+    for element in source {
+      _ = insert(element)
+    }
+  }
+
+  init(insertContentsOf source: some Sequence<Element>, _ context: some Context) {
+    self.init(context)
+    insert(contentsOf: source)
+  }
+}

SwiftCompilerSources/Sources/Optimizer/InstructionSimplification/CMakeLists.txt

@@ -31,6 +31,7 @@ swift_compiler_sources(Optimizer
   SimplifyStrongRetainRelease.swift
   SimplifyStructExtract.swift
   SimplifySwitchEnum.swift
+  SimplifyTuple.swift
   SimplifyTupleExtract.swift
   SimplifyUncheckedEnumData.swift
   SimplifyValueToBridgeObject.swift)

SwiftCompilerSources/Sources/Optimizer/InstructionSimplification/SimplifyBranch.swift

@@ -49,7 +49,15 @@ private extension BranchInst {
     let parentBB = parentBlock
 
     for (argIdx, op) in operands.enumerated() {
-      targetBB.arguments[argIdx].uses.replaceAll(with: op.value, context)
+      let arg = targetBB.arguments[argIdx]
+      if let phi = Phi(arg),
+         let bfi = phi.borrowedFrom
+      {
+        bfi.uses.replaceAll(with: op.value, context)
+        context.erase(instruction: bfi)
+      } else {
+        arg.uses.replaceAll(with: op.value, context)
+      }
     }
     targetBB.eraseAllArguments(context)
 

SwiftCompilerSources/Sources/Optimizer/InstructionSimplification/SimplifySwitchEnum.swift

@@ -48,12 +48,14 @@ extension SwitchEnumInst : OnoneSimplifyable {
       precondition(enumInst.payload == nil || !parentFunction.hasOwnership,
                    "missing payload argument in switch_enum case block")
       builder.createBranch(to: caseBlock)
+      context.erase(instruction: self)
     case 1:
       builder.createBranch(to: caseBlock, arguments: [enumInst.payload!])
+      context.erase(instruction: self)
+      updateBorrowedFrom(for: [Phi(caseBlock.arguments[0])!], context)
     default:
       fatalError("case block of switch_enum cannot have more than 1 argument")
     }
-    context.erase(instruction: self)
 
     if canEraseEnumInst {
       context.erase(instructionIncludingDebugUses: enumInst)

SwiftCompilerSources/Sources/Optimizer/InstructionSimplification/SimplifyTuple.swift

@@ -0,0 +1,75 @@
+//===--- SimplifyTuple.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 SIL
+
+extension TupleInst : OnoneSimplifyable {
+  func simplify(_ context: SimplifyContext) {
+
+    // Eliminate the redundant instruction pair
+    // ```
+    //   (%3, %4, %5) = destructure_tuple %input
+    //   %output = tuple (%3, %4, %5)
+    // ```
+    // and replace the result %output with %input
+    //
+    var destructure: DestructureTupleInst?
+    for operand in operands {
+      guard let def = operand.value.definingInstruction as? DestructureTupleInst else {
+        return
+      }
+      guard let destructure else {
+        destructure = def
+        continue
+      }
+      if destructure != def {
+        return
+      }
+    }
+    guard let destructure else {
+      return
+    }
+    guard destructure.operand.value.type == type else {
+      return
+    }
+    // The destructure's operand having the same type as the tuple ensures that
+    // the count of results of the destructure is equal to the count of operands
+    // of the tuple.
+    assert(destructure.results.count == operands.count)
+    for (result, operand) in zip(destructure.results, operands) {
+      if result != operand.value {
+        return
+      }
+    }
+    tryReplaceDestructConstructPair(destruct: destructure, construct: self, context)
+  }
+}
+
+private func tryReplaceDestructConstructPair(destruct: MultipleValueInstruction & UnaryInstruction,
+                                             construct: SingleValueInstruction,
+                                             _ context: SimplifyContext) {
+  let everyResultUsedOnce = context.preserveDebugInfo
+                    ? destruct.results.allSatisfy { $0.uses.singleUse != nil }
+                    : destruct.results.allSatisfy { $0.uses.ignoreDebugUses.singleUse != nil }
+  let anyOwned = destruct.results.contains { $0.ownership == .owned }
+
+  if !everyResultUsedOnce && construct.parentFunction.hasOwnership && anyOwned {
+    // We cannot add more uses to this destructure without inserting a copy.
+    return
+  }
+
+  construct.uses.replaceAll(with: destruct.operand.value, context)
+
+  if everyResultUsedOnce {
+    context.erase(instructionIncludingDebugUses: construct)
+  }
+}

SwiftCompilerSources/Sources/Optimizer/PassManager/PassRegistration.swift

@@ -117,6 +117,7 @@ private func registerSwiftPasses() {
   registerPass(rangeDumper, { rangeDumper.run($0) })
   registerPass(runUnitTests, { runUnitTests.run($0) })
   registerPass(testInstructionIteration, { testInstructionIteration.run($0) })
+  registerPass(updateBorrowedFromPass, { updateBorrowedFromPass.run($0) })
 }
 
 private func registerSwiftAnalyses() {
@@ -126,4 +127,5 @@ private func registerSwiftAnalyses() {
 
 private func registerUtilities() {
   registerVerifier()
+  registerBorrowedFromUpdater()
 }