Merge pull request #4097 from swiftwasm/main

[pull] swiftwasm from main

Author: pull[bot]

SwiftCompilerSources/README.md

@@ -135,7 +135,7 @@ No yet implemented instruction classes are mapped to a "placeholder" instruction
 
 Similar to SIL, the optimizer also uses a small bridging layer (`OptimizerBridging.h`).
 Passes are registered in `registerSwiftPasses()`, called from `initializeSwiftModules()`.
-The C++ PassManager can then call a Swift pass like any other `SILFunctionTransform` pass.
+The C++ `PassManager` can then call a Swift pass like any other `SILFunctionTransform` pass.
 
 To add a new function pass:
 
@@ -160,7 +160,7 @@ To add a new instruction pass:
 * create a new Swift file in `SwiftCompilerSources/Optimizer/InstructionPasses`
 * add an `InstructionPass` global
 * register the pass in `registerSwiftPasses()`
-* if this passes replaces an existing `SILCombiner` visit function, remove the old visit function
+* if this pass replaces an existing `SILCombiner` visit function, remove the old visit function
 
 ## Performance
 

SwiftCompilerSources/Sources/Optimizer/Analysis/AliasAnalysis.swift

@@ -15,7 +15,7 @@ import SIL
 
 struct AliasAnalysis {
   let bridged: BridgedAliasAnalysis
-  
+
   func mayRead(_ inst: Instruction, fromAddress: Value) -> Bool {
     switch AliasAnalysis_getMemBehavior(bridged, inst.bridged, fromAddress.bridged) {
       case MayReadBehavior, MayReadWriteBehavior, MayHaveSideEffectsBehavior:

SwiftCompilerSources/Sources/Optimizer/Analysis/CalleeAnalysis.swift

@@ -23,7 +23,7 @@ public struct CalleeAnalysis {
 
 public struct FunctionArray : RandomAccessCollection, CustomReflectable {
   fileprivate let bridged: BridgedCalleeList
-  
+
   public var startIndex: Int { 0 }
   public var endIndex: Int { BridgedFunctionArray_size(bridged) }
 

SwiftCompilerSources/Sources/Optimizer/InstructionPasses/SimplifyGlobalValue.swift

@@ -31,7 +31,7 @@ let simplifyGlobalValuePass = InstructionPass<GlobalValueInst>(
     users.removeAll()
   }
 })
-  
+
 /// Returns true if reference counting and debug_value users of a global_value
 /// can be deleted.
 private func checkUsers(of val: Value, users: inout StackList<Instruction>) -> Bool {

SwiftCompilerSources/Sources/Optimizer/InstructionPasses/SimplifyStrongRetainRelease.swift

@@ -44,7 +44,7 @@ let simplifyStrongRetainPass = InstructionPass<StrongRetainInst>(
     }
   }
 })
-  
+
 let simplifyStrongReleasePass = InstructionPass<StrongReleaseInst>(
   name: "simplify-strong_release", {
   (release: StrongReleaseInst, context: PassContext) in
@@ -65,7 +65,7 @@ let simplifyStrongReleasePass = InstructionPass<StrongReleaseInst>(
     }
   }
 })
-  
+
 /// Returns true if \p value is something where reference counting instructions
 /// don't have any effect.
 private func isNotReferenceCounted(value: Value, context: PassContext) -> Bool {

SwiftCompilerSources/Sources/Optimizer/PassManager/PassUtils.swift

@@ -21,16 +21,16 @@ public typealias BridgedInstructionPassCtxt =
 struct PassContext {
 
   fileprivate let passContext: BridgedPassContext
-  
+
   var isSwift51RuntimeAvailable: Bool {
     PassContext_isSwift51RuntimeAvailable(passContext) != 0
   }
-  
+
   var aliasAnalysis: AliasAnalysis {
     let bridgedAA = PassContext_getAliasAnalysis(passContext)
     return AliasAnalysis(bridged: bridgedAA)
   }
-  
+
   var calleeAnalysis: CalleeAnalysis {
     let bridgeCA = PassContext_getCalleeAnalysis(passContext)
     return CalleeAnalysis(bridged: bridgeCA)
@@ -52,7 +52,7 @@ struct PassContext {
           }
         }
     }
-  
+
     if instruction is FullApplySite {
       PassContext_notifyChanges(passContext, callsChanged)
     }

SwiftCompilerSources/Sources/SIL/BasicBlock.swift

@@ -31,13 +31,13 @@ final public class BasicBlock : ListNode, CustomStringConvertible {
   public var reverseInstructions: ReverseList<Instruction> {
     ReverseList(startAt: SILBasicBlock_lastInst(bridged).instruction)
   }
-  
+
   public var terminator: TermInst {
     SILBasicBlock_lastInst(bridged).instruction as! TermInst
   }
 
   public var successors: SuccessorArray { terminator.successors }
-  
+
   public var predecessors: PredecessorList {
     PredecessorList(startAt: SILBasicBlock_getFirstPred(bridged))
   }
@@ -60,7 +60,7 @@ final public class BasicBlock : ListNode, CustomStringConvertible {
     }
     fatalError()
   }
-  
+
   public var label: String { "bb\(index)" }
 
   var bridged: BridgedBasicBlock { BridgedBasicBlock(obj: SwiftObject(self)) }
@@ -82,20 +82,20 @@ public struct ArgumentArray : RandomAccessCollection {
 
 public struct SuccessorArray : RandomAccessCollection, CustomReflectable {
   private let succArray: BridgedArrayRef
-  
+
   init(succArray: BridgedArrayRef) {
     self.succArray = succArray
   }
-  
+
   public var startIndex: Int { return 0 }
   public var endIndex: Int { return Int(succArray.numElements) }
-  
+
   public subscript(_ index: Int) -> BasicBlock {
     precondition(index >= 0 && index < endIndex)
     let s = BridgedSuccessor(succ: succArray.data + index &* BridgedSuccessorSize);
     return SILSuccessor_getTargetBlock(s).block
   }
-  
+
   public var customMirror: Mirror {
     let c: [Mirror.Child] = map { (label: nil, value: $0.label) }
     return Mirror(self, children: c)
@@ -104,7 +104,7 @@ public struct SuccessorArray : RandomAccessCollection, CustomReflectable {
 
 public struct PredecessorList : Sequence, IteratorProtocol, CustomReflectable {
   private var currentSucc: OptionalBridgedSuccessor
-  
+
   public init(startAt: OptionalBridgedSuccessor) { currentSucc = startAt }
 
   public mutating func next() -> BasicBlock? {

SwiftCompilerSources/Sources/SIL/Builder.swift

@@ -60,7 +60,7 @@ public struct Builder {
       return cf.getAs(CondFailInst.self)
     }
   }
-  
+
   public func createIntegerLiteral(_ value: Int, type: Type) -> IntegerLiteralInst {
     notifyInstructionsChanged()
     let literal = SILBuilder_createIntegerLiteral(

include/swift/AST/KnownIdentifiers.def

@@ -266,6 +266,8 @@ IDENTIFIER(using)
 IDENTIFIER(assignID)
 IDENTIFIER(resignID)
 IDENTIFIER(resolve)
+IDENTIFIER(remoteCall)
+IDENTIFIER(makeInvocation)
 IDENTIFIER(system)
 IDENTIFIER(ID)
 IDENTIFIER(id)

include/swift/Demangling/Demangle.h

@@ -258,6 +258,10 @@ class Node {
   // Reverses the order of children.
   void reverseChildren(size_t StartingAt = 0);
 
+  // Find a node by its kind, traversing the node depth-first,
+  // and bailing out early if not found at the 'maxDepth'.
+  NodePointer findByKind(Node::Kind kind, int maxDepth);
+
   /// Prints the whole node tree in readable form to stderr.
   ///
   /// Useful to be called from the debugger.

include/swift/Demangling/TypeDecoder.h

@@ -1262,6 +1262,7 @@ return {}; // Not Implemented!
     // TODO: Handle OpaqueReturnType, when we're in the middle of reconstructing
     // the defining decl
     default:
+
       return MAKE_NODE_TYPE_ERROR0(Node, "unexpected kind");
     }
   }

lib/Demangling/Demangler.cpp

@@ -417,6 +417,20 @@ void Node::reverseChildren(size_t StartingAt) {
   }
 }
 
+Node* Node::findByKind(Node::Kind kind, int maxDepth) {
+  if (getKind() == kind)
+    return this;
+
+  if (maxDepth <= 0)
+    return nullptr;
+
+  for (auto node : *this)
+    if (auto matchingChild = node->findByKind(kind, maxDepth - 1))
+      return matchingChild;
+
+  return nullptr;
+}
+
 //////////////////////////////////
 // NodeFactory member functions //
 //////////////////////////////////

lib/IRGen/Callee.h

@@ -176,6 +176,7 @@ namespace irgen {
       AsyncLetGetThrowing,
       AsyncLetFinish,
       TaskGroupWaitNext,
+      DistributedExecuteTarget,
     };
 
     class Kind {
@@ -221,6 +222,7 @@ namespace irgen {
         case SpecialKind::AsyncLetWait:
         case SpecialKind::AsyncLetWaitThrowing:
         case SpecialKind::TaskGroupWaitNext:
+        case SpecialKind::DistributedExecuteTarget:
           return false;
         }
 
@@ -243,6 +245,7 @@ namespace irgen {
         case SpecialKind::AsyncLetGetThrowing:
         case SpecialKind::AsyncLetFinish:
         case SpecialKind::TaskGroupWaitNext:
+        case SpecialKind::DistributedExecuteTarget:
           return true;
         }
         llvm_unreachable("covered switch");

lib/IRGen/GenDistributed.cpp

@@ -210,7 +210,7 @@ void DistributedAccessor::computeArguments(llvm::Value *argumentBuffer,
         Address(currentOffset, IGM.getPointerAlignment()),
         IGM.getStoragePointerType(paramTy));
 
-    // 3. Adjust typed pointer to the alignement of the type.
+    // 3. Adjust typed pointer to the alignment of the type.
     auto alignedOffset = typeInfo.roundUpToTypeAlignment(IGF, eltPtr, paramTy);
 
     if (paramTy.isObject()) {

lib/IRGen/IRGenModule.h

@@ -401,7 +401,7 @@ class IRGenerator {
   /// Emit type metadata records for types without explicit protocol conformance.
   void emitTypeMetadataRecords();
 
-  /// Emit type metadata recrods for functions that can be looked up by name at
+  /// Emit type metadata records for functions that can be looked up by name at
   /// runtime.
   void emitAccessibleFunctions();
 

lib/IRGen/IRGenSIL.cpp

@@ -2573,6 +2573,9 @@ FunctionPointer::Kind irgen::classifyFunctionPointerKind(SILFunction *fn) {
 
     if (name.equals("swift_taskGroup_wait_next_throwing"))
       return SpecialKind::TaskGroupWaitNext;
+
+    if (name.equals("swift_distributed_execute_target"))
+      return SpecialKind::DistributedExecuteTarget;
   }
 
   return fn->getLoweredFunctionType();