RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-01-20 15:40:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

gcn shader: fix segfault in getOrCreateLabel

Browse source
This commit is contained in:
DH 2025-09-20 23:27:01 +03:00
parent 9a193b11b0
commit 644e3bf954
1 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
rpcsx/gpu/lib/gcn-shader/src/gcn.cpp
View file

@ -270,8 +270,22 @@ gcn::Context::getOrCreateLabel(ir::Location loc, ir::Region body,
return {it->second.staticCast<ir::Value>(), false};
}
auto injectedLabel =
Builder::createInsertBefore(*this, it->second).createSpvLabel(loc);
Builder builder;
{
auto labelIt = it;
while (labelIt != instructions.end() && labelIt->second == nullptr) {
++labelIt;
}
if (labelIt != instructions.end()) {
builder = Builder::createInsertBefore(*this, labelIt->second);
} else {
builder = Builder::createAppend(*this, body);
}
}
auto injectedLabel = builder.createSpvLabel(loc);
it->second = injectedLabel;
return {injectedLabel, false};
}
@ -280,8 +294,21 @@ gcn::Context::getOrCreateLabel(ir::Location loc, ir::Region body,
if (it == instructions.end()) {
newLabel = Builder::createAppend(*this, body).createSpvLabel(loc);
} else {
newLabel =
Builder::createInsertBefore(*this, it->second).createSpvLabel(loc);
Builder builder;
{
while (it != instructions.end() && it->second == nullptr) {
++it;
}
if (it != instructions.end()) {
builder = Builder::createInsertBefore(*this, it->second);
} else {
builder = Builder::createAppend(*this, body);
}
}
newLabel = builder.createSpvLabel(loc);
}
instructions.emplace_hint(it, address, newLabel);
@ -1897,7 +1924,6 @@ gcn::deserialize(gcn::Context &context, const gcn::Environment &environment,
.createSpvBranch(label.getLocation(), label.staticCast<ir::Value>());
}
auto exitLabel = context.epilogue.getFirst().staticCast<ir::Value>();
// create label with return instead of jump to epilogue for cfg
{