Merge pull request #5214 from swiftwasm/main

[pull] swiftwasm from main

Author: kateinoigakukun

SwiftCompilerSources/Sources/Optimizer/Utilities/WalkUtils.swift

@@ -569,6 +569,11 @@ extension ValueUseDefWalker {
     switch def {
     case let str as StructInst:
       if let (index, path) = path.pop(kind: .structField) {
+        if index >= str.operands.count {
+          // This can happen if there is a type mismatch, e.g. two different concrete types of an existential
+          // are visited for the same path.
+          return unmatchedPath(value: str, path: path)
+        }
         return walkUp(value: str.operands[index].value, path: path)
       } else if path.popIfMatches(.anyValueFields, index: nil) != nil {
         return walkUpAllOperands(of: str, path: path)
@@ -577,6 +582,11 @@ extension ValueUseDefWalker {
       }
     case let t as TupleInst:
       if let (index, path) = path.pop(kind: .tupleField) {
+        if index >= t.operands.count {
+          // This can happen if there is a type mismatch, e.g. two different concrete types of an existential
+          // are visited for the same path.
+          return unmatchedPath(value: t, path: path)
+        }
         return walkUp(value: t.operands[index].value, path: path)
       } else if path.popIfMatches(.anyValueFields, index: nil) != nil {
         return walkUpAllOperands(of: t, path: path)

benchmark/cxx-source/ReadAccessor.swift

@@ -32,7 +32,7 @@ public let benchmarks = [
 
 @inline(never)
 public func run_ReadAccessor(_ N: Int) {
-  for i in 0...N {
+  for _ in 0...N {
     for j in 0..<100 {
       let row = vec![j];
       for k in 0..<1_000 {

benchmark/single-source/LuhnAlgoEager.swift

@@ -206,10 +206,10 @@ func mapEveryN<S: Sequence>(
 ) -> [S.Element] {
     let isNth = isMultipleOf(n)
     return source.enumerated().map {
-        (pair: (index: Int, elem: S.Element)) in
-        isNth(pair.index+1)
-            ? transform(pair.elem)
-            : pair.elem
+        (pair: (offset: Int, element: S.Element)) in
+        isNth(pair.offset+1)
+            ? transform(pair.element)
+            : pair.element
     }
 }
 

benchmark/single-source/LuhnAlgoLazy.swift

@@ -206,10 +206,10 @@ func mapEveryN<S: Sequence>(
 ) -> [S.Element] {
     let isNth = isMultipleOf(n)
     return source.enumerated().map {
-        (pair: (index: Int, elem: S.Element)) in
-        isNth(pair.index+1)
-            ? transform(pair.elem)
-            : pair.elem
+        (pair: (offset: Int, element: S.Element)) in
+        isNth(pair.offset+1)
+            ? transform(pair.element)
+            : pair.element
     }
 }
 

benchmark/single-source/PopFront.swift

@@ -52,7 +52,7 @@ public func run_PopFrontUnsafePointer(_ n: Int) {
       var count = arrayCount
       while count != 0 {
         result += a[0]
-        a.assign(from: a + 1, count: count - 1)
+        a.update(from: a + 1, count: count - 1)
         count -= 1
       }
       check(result == arrayCount)

benchmark/single-source/SetTests.swift

@@ -570,6 +570,7 @@ Types
   #if SWIFT_RUNTIME_VERSION >= 5.5
     type ::= 'Bj'                              // Builtin.Job
   #endif
+  type ::= 'BP'                              // Builtin.PackIndex
   type ::= 'BO'                              // Builtin.UnknownObject (no longer a distinct type, but still used for AnyObject)
   type ::= 'Bo'                              // Builtin.NativeObject
   type ::= 'Bp'                              // Builtin.RawPointer

docs/ABI/Mangling.rst

@@ -272,6 +272,9 @@ swiftscan_scan_invocation_get_argv(swiftscan_scan_invocation_t invocation);
 SWIFTSCAN_PUBLIC void
 swiftscan_string_set_dispose(swiftscan_string_set_t *set);
 
+SWIFTSCAN_PUBLIC void
+swiftscan_string_dispose(swiftscan_string_ref_t string);
+
 SWIFTSCAN_PUBLIC void
 swiftscan_dependency_graph_dispose(swiftscan_dependency_graph_t result);
 

include/swift-c/DependencyScan/DependencyScan.h

@@ -98,7 +98,6 @@ class AccessScope {
     }
     if (isPackage())
       return AS.isPublic();
-
     // If this is public, it can't be less than access level of AS
     // so return false
     return false;

include/swift/AST/AccessScope.h

@@ -60,6 +60,12 @@ enum class AccessLevel : uint8_t {
   FilePrivate,
   /// Internal access is limited to the current module.
   Internal,
+  /// Package access is not limited, but some capabilities may be
+  /// restricted outside of the current package containing modules.
+  /// It's similar to Public in that it's accessible from other modules
+  /// and subclassable only within the defining module as long as
+  /// the modules are in the same package.
+  Package,
   /// Public access is not limited, but some capabilities may be
   /// restricted outside of the current module.
   Public,

include/swift/AST/AttrKind.h

@@ -693,13 +693,14 @@ class alignas(1 << DeclAlignInBits) Decl : public ASTAllocated<Decl> {
     NumPathElements : 8
   );
 
-  SWIFT_INLINE_BITFIELD(ExtensionDecl, Decl, 3+1,
+  SWIFT_INLINE_BITFIELD(ExtensionDecl, Decl, 4+1,
     /// An encoding of the default and maximum access level for this extension.
+    /// The value 4 corresponds to AccessLevel::Public
     ///
     /// This is encoded as (1 << (maxAccess-1)) | (1 << (defaultAccess-1)),
     /// which works because the maximum is always greater than or equal to the
     /// default, and 'private' is never used. 0 represents an uncomputed value.
-    DefaultAndMaxAccessLevel : 3,
+    DefaultAndMaxAccessLevel : 4,
 
     /// Whether there is are lazily-loaded conformances for this extension.
     HasLazyConformances : 1