Merge pull request #4883 from swiftwasm/main

[pull] swiftwasm from main

Author: kateinoigakukun

SwiftCompilerSources/Sources/SIL/Effects.swift

@@ -16,22 +16,22 @@ public struct ArgumentEffect : CustomStringConvertible, CustomReflectable {
   public typealias Path = SmallProjectionPath
 
   public enum Kind {
-    /// The selected argument value does not escape.
+    /// The argument value does not escape.
     ///
     /// Syntax examples:
-    ///    !%0       // argument 0 does not escape
-    ///    !%0.**    // argument 0 and all transitively contained values do not escape
+    ///    [%0: noescape]      // argument 0 does not escape
+    ///    [%0: noescape **]   // argument 0 and all transitively contained values do not escape
     ///
     case notEscaping
 
-    /// The selected argument value escapes to the specified selection (= first payload).
+    /// The argument value escapes to the function return value.
     ///
     /// Syntax examples:
-    ///    %0.s1 => %r   // field 2 of argument 0 exclusively escapes via return.
-    ///    %0.s1 -> %1   // field 2 of argument 0 - and other values - escape to argument 1.
+    ///    [%0: escape s1 => %r]   // field 2 of argument 0 exclusively escapes via return.
+    ///    [%0: escape s1 -> %r]   // field 2 of argument 0 - and other values - escape via return
     ///
-    /// The "exclusive" flag (= second payload) is true if only the selected argument escapes
-    /// to the specified selection, but nothing else escapes to it.
+    /// The "exclusive" flag (= second payload) is true if only the argument escapes,
+    /// but nothing else escapes to the return value.
     /// For example, "exclusive" is true for the following function:
     ///
     ///   @_effect(escaping c => return)
@@ -46,6 +46,14 @@ public struct ArgumentEffect : CustomStringConvertible, CustomReflectable {
     ///
     case escapingToReturn(Path, Bool)         // toPath, exclusive
 
+    /// Like `escapingToReturn`, but the argument escapes to another argument.
+    ///
+    /// Example: The argument effects of
+    ///   func argToArgEscape(_ r: inout Class, _ c: Class) { r = c }
+    ///
+    /// would be
+    ///    [%1: escape => %0]   // Argument 1 escapes to argument 0
+    ///
     case escapingToArgument(Int, Path, Bool)  // toArgumentIndex, toPath, exclusive
   }
 
@@ -111,21 +119,28 @@ public struct ArgumentEffect : CustomStringConvertible, CustomReflectable {
     return argumentIndex == rhsArgIdx && rhsPath.matches(pattern: pathPattern)
   }
 
-  public var description: String {
-    let selectedArg = "%\(argumentIndex)" + (pathPattern.isEmpty ? "" : ".\(pathPattern)")
+  public var headerDescription: String {
+    "%\(argumentIndex)\(isDerived ? "" : "!"): "
+  }
 
+  public var bodyDescription: String {
+    let patternStr = pathPattern.isEmpty ? "" : " \(pathPattern)"
     switch kind {
       case .notEscaping:
-        return "!\(selectedArg)"
+        return "noescape\(patternStr)"
       case .escapingToReturn(let toPath, let exclusive):
-        let pathStr = (toPath.isEmpty ? "" : ".\(toPath)")
-        return "\(selectedArg) \(exclusive ? "=>" : "->") %r\(pathStr)"
+        let toPathStr = (toPath.isEmpty ? "" : ".\(toPath)")
+        return "escape\(patternStr) \(exclusive ? "=>" : "->") %r\(toPathStr)"
       case .escapingToArgument(let toArgIdx, let toPath, let exclusive):
-        let pathStr = (toPath.isEmpty ? "" : ".\(toPath)")
-        return "\(selectedArg) \(exclusive ? "=>" : "->") %\(toArgIdx)\(pathStr)"
+        let toPathStr = (toPath.isEmpty ? "" : ".\(toPath)")
+        return "escape\(patternStr) \(exclusive ? "=>" : "->") %\(toArgIdx)\(toPathStr)"
     }
   }
 
+  public var description: String {
+    headerDescription + bodyDescription
+  }
+
   public var customMirror: Mirror { Mirror(self, children: []) }
 }
 
@@ -164,8 +179,27 @@ public struct FunctionEffects : CustomStringConvertible, CustomReflectable {
     argumentEffects = argumentEffects.filter { !$0.isDerived }
   }
 
+  public var argumentEffectsDescription: String {
+    var currentArgIdx = -1
+    var currentIsDerived = false
+    var result = ""
+    for effect in argumentEffects {
+      if effect.argumentIndex != currentArgIdx ||  effect.isDerived != currentIsDerived {
+        if currentArgIdx >= 0 { result += "]\n" }
+        result += "[\(effect.headerDescription)"
+        currentArgIdx = effect.argumentIndex
+        currentIsDerived = effect.isDerived
+      } else {
+        result += ", "
+      }
+      result += effect.bodyDescription
+    }
+    if currentArgIdx >= 0 { result += "]\n" }
+    return result
+  }
+
   public var description: String {
-    return "[" + argumentEffects.map { $0.description }.joined(separator: ", ") + "]"
+    return argumentEffectsDescription
   }
 
   public var customMirror: Mirror { Mirror(self, children: []) }
@@ -237,24 +271,37 @@ extension StringParser {
     return ArgumentEffect.Path()
   }
 
-  mutating func parseEffectFromSIL(for function: Function, isDerived: Bool) throws -> ArgumentEffect {
-    if consume("!") {
-      let argIdx = try parseArgumentIndexFromSIL()
-      let path = try parsePathPatternFromSIL()
-      return ArgumentEffect(.notEscaping, argumentIndex: argIdx, pathPattern: path, isDerived: isDerived)
+  mutating func parseEffectsFromSIL(to effects: inout FunctionEffects) throws {
+    let argumentIndex = try parseArgumentIndexFromSIL()
+    let isDerived = !consume("!")
+    if !consume(":") {
+      try throwError("expected ':'")
     }
-    let fromArgIdx = try parseArgumentIndexFromSIL()
-    let fromPath = try parsePathPatternFromSIL()
-    let exclusive = try parseEscapingArrow()
-    if consume("%r") {
-      let toPath = try parsePathPatternFromSIL()
-      return ArgumentEffect(.escapingToReturn(toPath, exclusive),
-                            argumentIndex: fromArgIdx, pathPattern: fromPath, isDerived: isDerived)
+    repeat {
+      let effect = try parseEffectFromSIL(argumentIndex: argumentIndex, isDerived: isDerived)
+      effects.argumentEffects.append(effect)
+    } while consume(",")
+  }
+
+  mutating func parseEffectFromSIL(argumentIndex: Int, isDerived: Bool) throws -> ArgumentEffect {
+    if consume("noescape") {
+      let path = try parseProjectionPathFromSIL()
+      return ArgumentEffect(.notEscaping, argumentIndex: argumentIndex, pathPattern: path, isDerived: isDerived)
+    }
+    if consume("escape") {
+      let fromPath = try parseProjectionPathFromSIL()
+      let exclusive = try parseEscapingArrow()
+      if consume("%r") {
+        let toPath = consume(".") ? try parseProjectionPathFromSIL() : ArgumentEffect.Path()
+        return ArgumentEffect(.escapingToReturn(toPath, exclusive),
+                              argumentIndex: argumentIndex, pathPattern: fromPath, isDerived: isDerived)
+      }
+      let toArgIdx = try parseArgumentIndexFromSIL()
+      let toPath = consume(".") ? try parseProjectionPathFromSIL() : ArgumentEffect.Path()
+      return ArgumentEffect(.escapingToArgument(toArgIdx, toPath, exclusive),
+                            argumentIndex: argumentIndex, pathPattern: fromPath, isDerived: isDerived)
     }
-    let toArgIdx = try parseArgumentIndexFromSIL()
-    let toPath = try parsePathPatternFromSIL()
-    return ArgumentEffect(.escapingToArgument(toArgIdx, toPath, exclusive),
-                          argumentIndex: fromArgIdx, pathPattern: fromPath, isDerived: isDerived)
+    try throwError("unknown effect")
   }
 
   mutating func parseArgumentIndexFromSIL() throws -> Int {
@@ -267,13 +314,6 @@ extension StringParser {
     try throwError("expected parameter")
   }
 
-  mutating func parsePathPatternFromSIL() throws -> ArgumentEffect.Path {
-    if consume(".") {
-      return try parseProjectionPathFromSIL()
-    }
-    return ArgumentEffect.Path()
-  }
-
   private mutating func parseEscapingArrow() throws -> Bool {
     if consume("=>") { return true }
     if consume("->") { return false }

SwiftCompilerSources/Sources/SIL/Function.swift

@@ -133,27 +133,36 @@ final public class Function : CustomStringConvertible, HasShortDescription, Hash
       },
       // writeFn
       { (f: BridgedFunction, os: BridgedOStream, idx: Int) in
-        let s = f.function.effects.argumentEffects[idx].description
+        let s: String
+        if idx >= 0 {
+          s = f.function.effects.argumentEffects[idx].bodyDescription
+        } else {
+          s = f.function.effects.argumentEffectsDescription
+        }
         s._withStringRef { OStream_write(os, $0) }
       },
       // parseFn:
-      { (f: BridgedFunction, str: llvm.StringRef, fromSIL: Int, isDerived: Int, paramNames: BridgedArrayRef) -> BridgedParsingError in
+      { (f: BridgedFunction, str: llvm.StringRef, fromSIL: Int, argumentIndex: Int, isDerived: Int, paramNames: BridgedArrayRef) -> BridgedParsingError in
         do {
           var parser = StringParser(str.string)
-          let effect: ArgumentEffect
-          if fromSIL != 0 {
-            effect = try parser.parseEffectFromSIL(for: f.function, isDerived: isDerived != 0)
+
+          if fromSIL != 0 && argumentIndex < 0 {
+            try parser.parseEffectsFromSIL(to: &f.function.effects)
           } else {
-            let paramToIdx = paramNames.withElements(ofType: llvm.StringRef.self) {
-                (buffer: UnsafeBufferPointer<llvm.StringRef>) -> Dictionary<String, Int> in
-              let keyValPairs = buffer.enumerated().lazy.map { ($0.1.string, $0.0) }
-              return Dictionary(uniqueKeysWithValues: keyValPairs)
+            let effect: ArgumentEffect
+            if fromSIL != 0 {
+              effect = try parser.parseEffectFromSIL(argumentIndex: argumentIndex, isDerived: isDerived != 0)
+            } else {
+              let paramToIdx = paramNames.withElements(ofType: llvm.StringRef.self) {
+                  (buffer: UnsafeBufferPointer<llvm.StringRef>) -> Dictionary<String, Int> in
+                let keyValPairs = buffer.enumerated().lazy.map { ($0.1.string, $0.0) }
+                return Dictionary(uniqueKeysWithValues: keyValPairs)
+              }
+              effect = try parser.parseEffectFromSource(for: f.function, params: paramToIdx)
             }
-            effect = try parser.parseEffectFromSource(for: f.function, params: paramToIdx)
+            f.function.effects.argumentEffects.append(effect)
           }
           if !parser.isEmpty() { try parser.throwError("syntax error") }
-
-          f.function.effects.argumentEffects.append(effect)
         } catch let error as ParsingError {
           return BridgedParsingError(message: error.message.utf8Start, position: error.position)
         } catch {
@@ -179,20 +188,14 @@ final public class Function : CustomStringConvertible, HasShortDescription, Hash
                           resultArgDelta: destResultArgs - srcResultArgs)
         return 1
       },
-      // getEffectFlags
-      {  (f: BridgedFunction, idx: Int) -> Int in
+      // getEffectInfo
+      {  (f: BridgedFunction, idx: Int) -> BridgedEffectInfo in
         let argEffects = f.function.effects.argumentEffects
-        if idx >= argEffects.count { return 0 }
-        let effect = argEffects[idx]
-        var flags = 0
-        switch effect.kind {
-          case .notEscaping, .escapingToArgument, .escapingToReturn:
-            flags |= Int(EffectsFlagEscape)
-        }
-        if effect.isDerived {
-          flags |= Int(EffectsFlagDerived)
+        if idx >= argEffects.count {
+          return BridgedEffectInfo(argumentIndex: -1, isDerived: false)
         }
-        return flags
+        let effect = argEffects[idx]
+        return BridgedEffectInfo(argumentIndex: effect.argumentIndex, isDerived: effect.isDerived)
       }
     )
   }

SwiftCompilerSources/Sources/SIL/SmallProjectionPath.swift

@@ -471,7 +471,7 @@ extension StringParser {
 
   mutating func parseProjectionPathFromSIL() throws -> SmallProjectionPath {
     var entries: [(SmallProjectionPath.FieldKind, Int)] = []
-    repeat {
+    while true {
       if consume("**") {
         entries.append((.anything, 0))
       } else if consume("c*") {
@@ -497,12 +497,10 @@ extension StringParser {
         entries.append((.structField, idx))
       } else if let tupleElemIdx = consumeInt() {
         entries.append((.tupleField, tupleElemIdx))
-      } else {
-        try throwError("expected selection path component")
+      } else if !consume(".") {
+        return try createPath(from: entries)
       }
-    } while consume(".")
- 
-    return try createPath(from: entries)
+    }
   }
 
   private func createPath(from entries: [(SmallProjectionPath.FieldKind, Int)]) throws -> SmallProjectionPath {

docs/ReferenceGuides/UnderscoredAttributes.md

@@ -159,7 +159,7 @@ that releases of the value may be hoisted without respect to deinit barriers.
 
 When applied to a type, indicates that all values which are _statically_
 instances of that type are themselves `@_eagerMove` as above, unless overridden
-with `@_lexical`.
+with `@_noEagerMove`.
 
 Aggregates all of whose fields are `@_eagerMove` or trivial are inferred to be
 `@_eagerMove`.
@@ -534,7 +534,7 @@ initializers from its superclass. This implies that all designated initializers
 overridden. This attribute is often printed alongside
 `@_hasMissingDesignatedInitializers` in this case.
 
-## `@_lexical`
+## `@_noEagerMove`
 
 When applied to a value, indicates that the value's lifetime is lexical, that
 releases of the value may not be hoisted over deinit barriers.  
@@ -544,7 +544,7 @@ This is the default behavior, unless the value's type is annotated
 annotation.
 
 When applied to a type, indicates that all values which are instances of that
-type are themselves `@_lexical` as above.
+type are themselves `@_noEagerMove` as above.
 
 This is the default behavior, unless the type annotated is an aggregate that
 consists entirely of `@_eagerMove` or trivial values, in which case the