SIL: let Builder.createAllocStack specify a debugVariable

Author: eeckstein

SwiftCompilerSources/Sources/SIL/Builder.swift

@@ -122,10 +122,18 @@ public struct Builder {
     }
   }
 
-  public func createAllocStack(_ type: Type, hasDynamicLifetime: Bool = false,
+  public func createAllocStack(_ type: Type,
+                               debugVariable: DebugVariableInstruction.DebugVariable? = nil,
+                               hasDynamicLifetime: Bool = false,
                                isLexical: Bool = false, isFromVarDecl: Bool = false,
                                usesMoveableValueDebugInfo: Bool = false) -> AllocStackInst {
-    let dr = bridged.createAllocStack(type.bridged, hasDynamicLifetime, isLexical,
+    let bridgedDebugVar: OptionalBridgedSILDebugVariable
+    if let debugVariable = debugVariable {
+      bridgedDebugVar = OptionalBridgedSILDebugVariable(debugVariable)
+    } else {
+      bridgedDebugVar = OptionalBridgedSILDebugVariable()
+    }
+    let dr = bridged.createAllocStack(type.bridged, bridgedDebugVar, hasDynamicLifetime, isLexical,
                                       isFromVarDecl, usesMoveableValueDebugInfo)
     return notifyNew(dr.getAs(AllocStackInst.self))
   }

include/swift/SIL/SILBridging.h

@@ -630,13 +630,22 @@ struct BridgedGenericSpecializationInformation {
 struct BridgedSILDebugVariable {
   uint64_t storage[16];
 
+  BRIDGED_INLINE BridgedSILDebugVariable() {}
   BRIDGED_INLINE BridgedSILDebugVariable(const swift::SILDebugVariable &var);
   BRIDGED_INLINE BridgedSILDebugVariable(const BridgedSILDebugVariable &rhs);
   BRIDGED_INLINE ~BridgedSILDebugVariable();
   BRIDGED_INLINE BridgedSILDebugVariable &operator=(const BridgedSILDebugVariable &rhs);
   BRIDGED_INLINE swift::SILDebugVariable unbridge() const;
 };
 
+struct OptionalBridgedSILDebugVariable {
+  BridgedSILDebugVariable debugVar;
+  bool hasDebugVar = false;
+
+  OptionalBridgedSILDebugVariable() {}
+  OptionalBridgedSILDebugVariable(BridgedSILDebugVariable d) : debugVar(d), hasDebugVar(true) {}
+};
+
 struct BridgedInstruction {
   SwiftObject obj;
 
@@ -1159,8 +1168,8 @@ struct BridgedBuilder{
     BridgedSILTypeArray elementTypes, BridgedValueArray elementCountOperands) const;
 
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedInstruction
-  createAllocStack(BridgedType type, bool hasDynamicLifetime, bool isLexical,
-                   bool isFromVarDecl, bool wasMoved) const;
+  createAllocStack(BridgedType type, OptionalBridgedSILDebugVariable debugVar,
+                   bool hasDynamicLifetime, bool isLexical, bool isFromVarDecl, bool wasMoved) const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedInstruction createAllocVector(BridgedValue capacity,
                                                                           BridgedType type) const;
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedInstruction createDeallocStack(BridgedValue operand) const;

include/swift/SIL/SILBridgingImpl.h

@@ -2162,12 +2162,16 @@ BridgedInstruction BridgedBuilder::createAllocRef(BridgedType type,
 }
 
 BridgedInstruction BridgedBuilder::createAllocStack(BridgedType type,
+                                                    OptionalBridgedSILDebugVariable debugVar,
                                                     bool hasDynamicLifetime,
                                                     bool isLexical,
                                                     bool isFromVarDecl,
                                                     bool wasMoved) const {
+  std::optional<swift::SILDebugVariable> var = std::nullopt;
+  if (debugVar.hasDebugVar)
+    var = debugVar.debugVar.unbridge();
   return {unbridged().createAllocStack(
-      regularLoc(), type.unbridged(), std::nullopt,
+      regularLoc(), type.unbridged(), var,
       swift::HasDynamicLifetime_t(hasDynamicLifetime),
       swift::IsLexical_t(isLexical), swift::IsFromVarDecl_t(isFromVarDecl),
       swift::UsesMoveableValueDebugInfo_t(wasMoved), /*skipVarDeclAssert=*/ true)};