Skip to content

SILBridging: remove OptionalBridgedSILDebugVariable #82678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 1, 2025
Merged

SILBridging: remove OptionalBridgedSILDebugVariable #82678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions SwiftCompilerSources/Sources/SIL/Builder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,15 +127,15 @@ public struct Builder {
hasDynamicLifetime: Bool = false,
isLexical: Bool = false, isFromVarDecl: Bool = false,
usesMoveableValueDebugInfo: Bool = false) -> AllocStackInst {
let bridgedDebugVar: OptionalBridgedSILDebugVariable
let allocStack: BridgedInstruction
if let debugVariable = debugVariable {
bridgedDebugVar = OptionalBridgedSILDebugVariable(debugVariable)
allocStack = bridged.createAllocStack(type.bridged, debugVariable, hasDynamicLifetime, isLexical,
isFromVarDecl, usesMoveableValueDebugInfo)
} else {
bridgedDebugVar = OptionalBridgedSILDebugVariable()
allocStack = bridged.createAllocStack(type.bridged, hasDynamicLifetime, isLexical,
isFromVarDecl, usesMoveableValueDebugInfo)
}
let dr = bridged.createAllocStack(type.bridged, bridgedDebugVar, hasDynamicLifetime, isLexical,
isFromVarDecl, usesMoveableValueDebugInfo)
return notifyNew(dr.getAs(AllocStackInst.self))
return notifyNew(allocStack.getAs(AllocStackInst.self))
}

@discardableResult
Expand Down
12 changes: 3 additions & 9 deletions include/swift/SIL/SILBridging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,14 +636,6 @@ struct BridgedSILDebugVariable {
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;

Expand Down Expand Up @@ -1170,8 +1162,10 @@ struct BridgedBuilder{
BridgedSILTypeArray elementTypes, BridgedValueArray elementCountOperands) const;

SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedInstruction
createAllocStack(BridgedType type, OptionalBridgedSILDebugVariable debugVar,
createAllocStack(BridgedType type, BridgedSILDebugVariable debugVar,
bool hasDynamicLifetime, bool isLexical, bool isFromVarDecl, bool wasMoved) const;
SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedInstruction
createAllocStack(BridgedType type, 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;
Expand Down
19 changes: 14 additions & 5 deletions include/swift/SIL/SILBridgingImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2184,16 +2184,25 @@ BridgedInstruction BridgedBuilder::createAllocRef(BridgedType type,
}

BridgedInstruction BridgedBuilder::createAllocStack(BridgedType type,
OptionalBridgedSILDebugVariable debugVar,
BridgedSILDebugVariable 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(), var,
regularLoc(), type.unbridged(), debugVar.unbridge(),
swift::HasDynamicLifetime_t(hasDynamicLifetime),
swift::IsLexical_t(isLexical), swift::IsFromVarDecl_t(isFromVarDecl),
swift::UsesMoveableValueDebugInfo_t(wasMoved), /*skipVarDeclAssert=*/ true)};
}

BridgedInstruction BridgedBuilder::createAllocStack(BridgedType type,
bool hasDynamicLifetime,
bool isLexical,
bool isFromVarDecl,
bool wasMoved) const {
return {unbridged().createAllocStack(
regularLoc(), type.unbridged(), std::nullopt,
swift::HasDynamicLifetime_t(hasDynamicLifetime),
swift::IsLexical_t(isLexical), swift::IsFromVarDecl_t(isFromVarDecl),
swift::UsesMoveableValueDebugInfo_t(wasMoved), /*skipVarDeclAssert=*/ true)};
Expand Down