Retain more debug info in optimized builds #85244
Conversation
aidan-hall
changed the title
aidan-hall
force-pushed
the
fixing-debug-info-rebase
branch
3 times, most recently
from
d1aece3 to
53b21e3
Compare
SwiftCompilerSources/Sources/Optimizer/FunctionPasses/TempLValueElimination.swift
Show resolved
Hide resolved
SwiftCompilerSources/Sources/Optimizer/Utilities/OptUtils.swift
Outdated
Show resolved
Hide resolved
aidan-hall
force-pushed
the
fixing-debug-info-rebase
branch
3 times, most recently
from
3faa1e9 to
fb593f4
Compare
| } | ||
| } | ||
|
|
||
| first.salvageDebugInfo(self) |
There was a problem hiding this comment.
I'm wondering why this is needed.
The following replace calls erase(instruction:) which itself calls salvageDebugInfo
There was a problem hiding this comment.
The replace is for the second instruction, while this salvage is for the first instruction. It should only be necessary in optimized builds, so I'm changing this code. The test for this case is DebugInfo/simplify_struct_extract.sil.
aidan-hall
force-pushed
the
fixing-debug-info-rebase
branch
3 times, most recently
from
118f114 to
af515fd
Compare
| if !preserveDebugInfo { | ||
| first.salvageDebugInfo(self) | ||
| } | ||
| erase(instructionIncludingDebugUses: first) |
There was a problem hiding this comment.
@eeckstein erase(instructionIncludingDebugUses:) calls erase(instructionIncludingAllUsers:), which seems to have a postcondition that the operands of the erased instruction have no users. I'm not sure if that's relevant here though, since replacement is informally assumed to be one of first's operands, and this function replaces uses of second with replacement.
aidan-hall
left a comment
aidan-hall
left a comment
There was a problem hiding this comment.
one point of confusion
|
@swift-ci smoke test |
1 similar comment
|
@swift-ci smoke test |
Specifically, improved debug info retention in: * tryReplaceRedundantInstructionPair, * splitAggregateLoad, * TempLValueElimination, * Mem2Reg, * salvageDebugInfo (added case for unchecked_enum_data instructions), * ConstantFolding. The changes to Mem2Reg allow debug info to be retained in the case tested by self-nostorage.swift in -O builds, so we have just enabled -O in that file instead of writing a new test for it.
aidan-hall
force-pushed
the
fixing-debug-info-rebase
branch
from
af515fd to
9240379
Compare
|
macOS & Windows passed, but Linux had a crash in my new |
|
@swift-ci smoke test linux |
|
@swift-ci smoke test macos |
3 participants
Depends on #85237: Ignore b353bb3 in this PR.