Skip to content

Fix the wrong location of DebugFunctionDefinition inst #6198

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
s-perron merged 4 commits into from
Jun 30, 2025
Merged

Fix the wrong location of DebugFunctionDefinition inst #6198

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0f0f42
Fix the wrong location of DebugFunctionDefinition inst
kaizhangNV Jun 25, 2025
fb61df3
add a unit test
kaizhangNV Jun 27, 2025
8843ebf
address comment
kaizhangNV Jun 30, 2025
849c8c1
format and fix mem leak issue
kaizhangNV Jun 30, 2025
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
6 changes: 4 additions & 2 deletions source/opt/merge_return_pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,10 +828,12 @@ BasicBlock* MergeReturnPass::CreateContinueTarget(uint32_t header_label_id) {

bool MergeReturnPass::CreateSingleCaseSwitch(BasicBlock* merge_target) {
// Insert the switch before any code is run. We have to split the entry
// block to make sure the OpVariable instructions remain in the entry block.
// block to make sure the OpVariable instructions and DebugFunctionDefinition
// instructions remain in the entry block.
BasicBlock* start_block = &*function_->begin();
auto split_pos = start_block->begin();
while (split_pos->opcode() == spv::Op::OpVariable) {
while ((split_pos->opcode() == spv::Op::OpVariable) ||
(split_pos->GetShader100DebugOpcode() == NonSemanticShaderDebugInfo100DebugFunctionDefinition)) {
Comment thread
s-perron marked this conversation as resolved.
Outdated
++split_pos;
}

Expand Down