Swift SIL: add a few Builder functions

* add `createAllocStack`
* add `createDeallocStack`
* add `createCopyAddr`
* add `@discardableResult` to the existing `createDeallocStackRef`

Author: eeckstein

SwiftCompilerSources/Sources/Optimizer/FunctionPasses/StackPromotion.swift

@@ -175,13 +175,13 @@ func tryPromoteAlloc(_ allocRef: AllocRefInstBase,
   for exitInst in innerRange.exits {
     if !deadEndBlocks.isDeadEnd(exitInst.block) {
       let builder = Builder(at: exitInst, context)
-      _ = builder.createDeallocStackRef(allocRef)
+      builder.createDeallocStackRef(allocRef)
     }
   }
 
   for endInst in innerRange.ends {
     Builder.insert(after: endInst, location: allocRef.location, context) {
-      (builder) in _ = builder.createDeallocStackRef(allocRef)
+      (builder) in builder.createDeallocStackRef(allocRef)
     }
   }
 

SwiftCompilerSources/Sources/SIL/Builder.swift

@@ -82,7 +82,23 @@ public struct Builder {
     let literal = SILBuilder_createIntegerLiteral(bridged, type.bridged, value)
     return literal.getAs(IntegerLiteralInst.self)
   }
-  
+
+  public func createAllocStack(_ type: Type, hasDynamicLifetime: Bool = false,
+                               isLexical: Bool = false, wasMoved: Bool = false) -> AllocStackInst {
+    notifyInstructionsChanged()
+    let dr = SILBuilder_createAllocStack(bridged, type.bridged, hasDynamicLifetime ? 1 : 0,
+                                         isLexical ? 1 : 0, wasMoved ? 1 : 0)
+    return dr.getAs(AllocStackInst.self)
+  }
+
+  @discardableResult
+  public func createDeallocStack(_ operand: Value) -> DeallocStackInst {
+    notifyInstructionsChanged()
+    let dr = SILBuilder_createDeallocStack(bridged, operand.bridged)
+    return dr.getAs(DeallocStackInst.self)
+  }
+
+  @discardableResult
   public func createDeallocStackRef(_ operand: Value) -> DeallocStackRefInst {
     notifyInstructionsChanged()
     let dr = SILBuilder_createDeallocStackRef(bridged, operand.bridged)
@@ -113,6 +129,14 @@ public struct Builder {
     return SILBuilder_createCopyValue(bridged, operand.bridged).getAs(CopyValueInst.self)
   }
 
+  @discardableResult
+  public func createCopyAddr(from fromAddr: Value, to toAddr: Value,
+                             takeSource: Bool = false, initializeDest: Bool = false) -> CopyAddrInst {
+    notifyInstructionsChanged()
+    return SILBuilder_createCopyAddr(bridged, fromAddr.bridged, toAddr.bridged,
+                                     takeSource ? 1 : 0, initializeDest ? 1 : 0).getAs(CopyAddrInst.self)
+  }
+
   @discardableResult
   public func createDestroyValue(operand: Value) -> DestroyValueInst {
     notifyInstructionsChanged()

include/swift/SIL/SILBridging.h

@@ -412,6 +412,11 @@ BridgedInstruction SILBuilder_createCondFail(BridgedBuilder builder,
           BridgedValue condition, llvm::StringRef message);
 BridgedInstruction SILBuilder_createIntegerLiteral(BridgedBuilder builder,
           BridgedType type, SwiftInt value);
+BridgedInstruction SILBuilder_createAllocStack(BridgedBuilder builder,
+          BridgedType type, SwiftInt hasDynamicLifetime, SwiftInt isLexical,
+          SwiftInt wasMoved);
+BridgedInstruction SILBuilder_createDeallocStack(BridgedBuilder builder,
+          BridgedValue operand);
 BridgedInstruction SILBuilder_createDeallocStackRef(BridgedBuilder builder,
           BridgedValue operand);
 BridgedInstruction SILBuilder_createUncheckedRefCast(BridgedBuilder builder,
@@ -422,6 +427,9 @@ BridgedInstruction SILBuilder_createFunctionRef(BridgedBuilder builder,
           BridgedFunction function);
 BridgedInstruction SILBuilder_createCopyValue(BridgedBuilder builder,
           BridgedValue op);
+BridgedInstruction SILBuilder_createCopyAddr(BridgedBuilder builder,
+          BridgedValue from, BridgedValue to,
+          SwiftInt takeSource, SwiftInt initializeDest);
 BridgedInstruction SILBuilder_createDestroyValue(BridgedBuilder builder,
           BridgedValue op);
 BridgedInstruction SILBuilder_createApply(BridgedBuilder builder,

lib/SIL/Utils/SILBridging.cpp

@@ -960,6 +960,23 @@ BridgedInstruction SILBuilder_createIntegerLiteral(BridgedBuilder b,
                                        getSILType(type), value)};
 }
 
+BridgedInstruction SILBuilder_createAllocStack(BridgedBuilder b,
+          BridgedType type, SwiftInt hasDynamicLifetime, SwiftInt isLexical,
+          SwiftInt wasMoved) {
+  SILBuilder builder(castToInst(b.insertBefore), castToBasicBlock(b.insertAtEnd),
+                     getSILDebugScope(b.loc));
+  return {builder.createAllocStack(getRegularLocation(b.loc), getSILType(type),
+            None, hasDynamicLifetime != 0, isLexical != 0, wasMoved != 0)};
+}
+
+BridgedInstruction SILBuilder_createDeallocStack(BridgedBuilder b,
+          BridgedValue operand) {
+  SILBuilder builder(castToInst(b.insertBefore), castToBasicBlock(b.insertAtEnd),
+                     getSILDebugScope(b.loc));
+  return {builder.createDeallocStack(getRegularLocation(b.loc),
+                                     castToSILValue(operand))};
+}
+
 BridgedInstruction SILBuilder_createDeallocStackRef(BridgedBuilder b,
           BridgedValue operand) {
   SILBuilder builder(castToInst(b.insertBefore), castToBasicBlock(b.insertAtEnd),
@@ -1005,6 +1022,16 @@ BridgedInstruction SILBuilder_createCopyValue(BridgedBuilder b,
                                   castToSILValue(op))};
 }
 
+BridgedInstruction SILBuilder_createCopyAddr(BridgedBuilder b,
+          BridgedValue from, BridgedValue to,
+          SwiftInt takeSource, SwiftInt initializeDest) {
+  SILBuilder builder(castToInst(b.insertBefore), castToBasicBlock(b.insertAtEnd),
+                     getSILDebugScope(b.loc));
+  return {builder.createCopyAddr(getRegularLocation(b.loc), castToSILValue(from),
+            castToSILValue(to), IsTake_t(takeSource != 0),
+                                IsInitialization_t(initializeDest != 0))};
+}
+
 BridgedInstruction SILBuilder_createDestroyValue(BridgedBuilder b,
                                                  BridgedValue op) {
   SILBuilder builder(castToInst(b.insertBefore), castToBasicBlock(b.insertAtEnd),