Merge pull request #4463 from swiftwasm/katei/merge-main-2022-04-20

Merge main 2022-04-20

Author: kateinoigakukun

benchmark/scripts/run_smoke_bench

@@ -307,11 +307,12 @@ def report_code_size(opt_level, old_dir, new_dir, architecture, platform, output
 
 
 def get_codesize(filename):
-    output = subprocess.check_output(["size", filename]).splitlines()
-    header_line = output[0]
-    data_line = output[1]
+    output = subprocess.check_output(["size", filename])
+    lines = output.decode('utf-8').splitlines()
+    header_line = lines[0]
+    data_line = lines[1]
     if header_line.find("__TEXT") != 0:
-        sys.exit("unexpected output from size command:\n" + output)
+        sys.exit("unexpected output from size command:\n" + lines)
     return int(data_line.split("\t")[0])
 
 
@@ -361,7 +362,8 @@ performance team (@eeckstein).
   <summary><strong>Hardware Overview</strong></summary>
 
 """
-    po = subprocess.check_output(["system_profiler", "SPHardwareDataType"])
+    output = subprocess.check_output(["system_profiler", "SPHardwareDataType"])
+    po = output.decode('utf-8')
     for line in po.splitlines():
         selection = [
             "Model Name",

benchmark/utils/TestsUtils.swift

@@ -324,11 +324,13 @@ public func someProtocolFactory() -> SomeProtocol { return MyStruct() }
 // It's important that this function is in another module than the tests
 // which are using it.
 @inline(never)
+@_semantics("optimize.no.crossmodule")
 public func blackHole<T>(_ x: T) {
 }
 
 // Return the passed argument without letting the optimizer know that.
 @inline(never)
+@_semantics("optimize.no.crossmodule")
 public func identity<T>(_ x: T) -> T {
   return x
 }
@@ -337,12 +339,15 @@ public func identity<T>(_ x: T) -> T {
 // It's important that this function is in another module than the tests
 // which are using it.
 @inline(never)
+@_semantics("optimize.no.crossmodule")
 public func getInt(_ x: Int) -> Int { return x }
 
 // The same for String.
 @inline(never)
+@_semantics("optimize.no.crossmodule")
 public func getString(_ s: String) -> String { return s }
 
 // The same for Substring.
 @inline(never)
+@_semantics("optimize.no.crossmodule")
 public func getSubstring(_ s: Substring) -> Substring { return s }

cmake/modules/StandaloneOverlay.cmake

@@ -132,7 +132,6 @@ include(SwiftConfigureSDK)
 include(SwiftComponents)
 include(DarwinSDKs)
 
-find_package(Python2 COMPONENTS Interpreter REQUIRED)
 find_package(Python3 COMPONENTS Interpreter REQUIRED)
 
 # Without this line, installing components is broken. This needs refactoring.

docs/ABI/Mangling.rst

@@ -305,7 +305,7 @@ witness functions for a type.
   AUTODIFF-FUNCTION-KIND ::= 'd'        // differential
   AUTODIFF-FUNCTION-KIND ::= 'p'        // pullback
 
-``<AUTODIFF-FUNCTION-KIND>`` differentiates the kinds of functions assocaited
+``<AUTODIFF-FUNCTION-KIND>`` differentiates the kinds of functions associated
 with a differentiable function used for differentiable programming.
 
 ::
@@ -596,7 +596,7 @@ Types
   FUNCTION-KIND ::= 'zB' C-TYPE              // objc block type with non-canonical C type
   FUNCTION-KIND ::= 'L'                      // objc block function type with canonical C type (escaping) (DWARF only; otherwise use 'B' or 'zB' C-TYPE)
   FUNCTION-KIND ::= 'C'                      // C function pointer / C++ method type
-  FUNCTION-KIND ::= 'zC' C-TYPE              // C function pointer / C++ method type with with non-canonical C type
+  FUNCTION-KIND ::= 'zC' C-TYPE              // C function pointer / C++ method type with non-canonical C type
   FUNCTION-KIND ::= 'A'                      // @auto_closure function type (escaping)
   FUNCTION-KIND ::= 'E'                      // function type (noescape)
 

docs/CppInteroperability/CppInteroperabilityManifesto.md

@@ -1625,7 +1625,7 @@ is ergonomics.
 
 While Swift structs are a bad match for non-movable C++ classes, Swift classes
 match semantics better. For example, instances of Swift classes, once allocated,
-stay at the same address until `deinit`. Instances of Swift clasess are always
+stay at the same address until `deinit`. Instances of Swift classes are always
 worked with indirectly, eliminating the need to move them around in memory.
 
 Although user-defined Swift classes have a certain memory layout determined by
@@ -2524,7 +2524,7 @@ there the Swift compiler infers the attribute for all users.
 This analysis relies on over-approximating the dynamic callgraph with the static
 callgraph. The static callgraph is feasible to compute in most cases, since
 Swift has very limited ways to abstract over an unspecialized generic function.
-Speicifically, Swift does not have generic closures. Swift does allow protocols
+Specifically, Swift does not have generic closures. Swift does allow protocols
 to have requirements for generic functions though.
 
 ### Function templates: importing as real generic functions
@@ -2963,7 +2963,7 @@ This brief sketch obviously leaves many questions unanswered on the detailed
 semantics that a `throws!` feature would have, for example whether user-written
 Swift code should be allowed to use `throws!` -- see also [this forum
 discussion](https://forums.swift.org/t/handling-c-exceptions/34823). Before we
-take any steps towards implementing C++ exception proagation, we will submit a
+take any steps towards implementing C++ exception propagation, we will submit a
 formal Swift Evolution proposal for the `throws!` feature.
 
 The other question to answer is how we would map the C++ exception to a

docs/CppInteroperability/GettingStartedWithC++Interop.md

@@ -18,7 +18,7 @@ This document is designed to get you started with bidirectional API-level intero
 ```
 //In module.modulemap
 module Cxx {
-    //note that your header should be the file that containts your method implementations
+    //note that your header should be the file that contains your method implementations
     header "Cxx.hpp"
     requires cplusplus
 }

docs/CppInteroperability/InteropOddities.md

@@ -12,7 +12,7 @@ are bridged as value types. ⚠️ This will change as soon as Swift has a way t
 
 Currently, lifetimes are extended to the end of the lexical scope if any unsafe pointers are used in that scope. TODO: 
 this should be updated to extend lifetimes whenever a C++ type is used in that scope. Currently, if there is no 
-unsafe pointer used in teh scope, then normal Swift lifetime rules apply.   
+unsafe pointer used in the scope, then normal Swift lifetime rules apply.   
 
 **Borrowing Self**
 

docs/DebuggingTheCompiler.md

@@ -599,7 +599,7 @@ find MyProject/Sources -name '*.swift' -type f > input-files.txt
 # In some cases, projects may use multiple files with the same
 # name but in different directories (for different schemes),
 # which can be a problem. Having a file list makes working around
-# this convenient as you can manually manually edit out the files
+# this convenient as you can manually edit out the files
 # that are not of interest at this stage.
 
 mkdir Output

docs/DevelopmentTips.md

@@ -42,7 +42,7 @@ Given the size of artifacts generated, you might also want to bump the cache siz
 
 You can run some compiles to see if it is actually doing something by running `sccache --show-stats`. Depending on the exact compilation task you're running, you might see very different cache hit rates. For example, `sccache` is particularly effective if you're rebuilding LLVM, which doesn't change so frequently from the Swift compiler's perspective. On the other hand, if you're changing the compiler's AST, the cache hit rate is likely to be much lower.
 
-One known issue with `sccache` is that you might occassionally get an "error: Connection to server timed out", even though you didn't stop the server. Simply re-running the build command usually works.
+One known issue with `sccache` is that you might occasionally get an "error: Connection to server timed out", even though you didn't stop the server. Simply re-running the build command usually works.
 
 ## Memory usage
 

docs/Lexicon.md

@@ -239,7 +239,7 @@ Describes contributions which fix code that is not executed
 Provides context for interpreting a type that may have generic parameters
 in it. Generic parameter types are normally just represented as "first
 generic parameter in the outermost context" (or similar), so it's up to the
-generic environment to note that that type must be a Collection. (Another
+generic environment to note that type must be a Collection. (Another
 way of looking at it is that the generic environment connects
 [interface types](#interface-type) with
 [contextual types](#contextual-type)).