Merge pull request #4166 from swiftwasm/main

[pull] swiftwasm from main

Author: MaxDesiatov

CHANGELOG.md

@@ -3,15 +3,15 @@ CHANGELOG
 
 _**Note:** This is in reverse chronological order, so newer entries are added to the top._
 
-## Swift Next
+## Swift 5.7
 
 * [SE-0328][]:
 
   Opaque types (expressed with 'some') can now be used in structural positions
   within a result type, including having multiple opaque types in the same
   result. For example:
 
-  ```
+  ```swift
   func getSomeDictionary() -> [some Hashable: some Codable] {
     return [ 1: "One", 2: "Two" ]
   }

CMakeLists.txt

@@ -175,7 +175,7 @@ set(SWIFT_ANALYZE_CODE_COVERAGE FALSE CACHE STRING
 # SWIFT_VERSION is deliberately /not/ cached so that an existing build directory
 # can be reused when a new version of Swift comes out (assuming the user hasn't
 # manually set it as part of their own CMake configuration).
-set(SWIFT_VERSION "5.6")
+set(SWIFT_VERSION "5.7")
 
 set(SWIFT_VENDOR "" CACHE STRING
     "The vendor name of the Swift compiler")

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/CMakeLists.txt

@@ -11,4 +11,5 @@ swift_compiler_sources(Optimizer
   SILPrinter.swift
   MergeCondFails.swift
   ReleaseDevirtualizer.swift
+  RunUnitTests.swift
 )

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/ReleaseDevirtualizer.swift

@@ -204,7 +204,7 @@ private extension StructExtractInst {
     let structType = operand.type
 
     var nonTrivialFieldsCount = 0
-    for field in structType.getStructFields(in: function) {
+    for field in structType.getNominalFields(in: function) {
       if field.isTrivial(in: function) {
         nonTrivialFieldsCount += 1
       }

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/RunUnitTests.swift

@@ -0,0 +1,24 @@
+//===--- UnitTests.swift - A pseudo pass for running the unit tests -------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2021 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
+
+/// This pass should only be used by sil-opt to run all the unit tests.
+///
+let runUnitTests = FunctionPass(name: "run-unit-tests", {
+  (function: Function, context: PassContext) in
+
+  print("--- Run unit tests ---")
+  
+  print("test ProjectionPath")
+  SmallProjectionPath.runUnitTests()
+})

SwiftCompilerSources/Sources/Optimizer/PassManager/PassRegistration.swift

@@ -51,5 +51,6 @@ private func registerSwiftPasses() {
   registerPass(simplifyStrongRetainPass, { simplifyStrongRetainPass.run($0) })
   registerPass(simplifyStrongReleasePass, { simplifyStrongReleasePass.run($0) })
   registerPass(assumeSingleThreadedPass, { assumeSingleThreadedPass.run($0) })
+  registerPass(runUnitTests, { runUnitTests.run($0) })
   registerPass(releaseDevirtualizerPass, { releaseDevirtualizerPass.run($0) })
 }

SwiftCompilerSources/Sources/Optimizer/PassManager/PassUtils.swift

@@ -123,6 +123,11 @@ struct PassContext {
   func getContextSubstitutionMap(for type: Type) -> SubstitutionMap {
     SubstitutionMap(PassContext_getContextSubstitutionMap(_bridged, type.bridged))
   }
+
+  func modifyEffects(in function: Function, _ body: (inout FunctionEffects) -> ()) {
+    function._modifyEffects(body)
+    // TODO: do we need to notify any changes?
+  }
 }
 
 struct FunctionPass {

SwiftCompilerSources/Sources/SIL/CMakeLists.txt

@@ -11,12 +11,14 @@ add_swift_compiler_module(SIL
   Argument.swift
   BasicBlock.swift
   Builder.swift
+  Effects.swift
   Function.swift
   GlobalVariable.swift
   Instruction.swift
   Location.swift
   Operand.swift
   Registration.swift
+  SmallProjectionPath.swift
   SubstitutionMap.swift
   Type.swift
   Utils.swift