dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-06-07 07:35:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix LLVM assert in use_begin

Browse Source
This commit is contained in:
oltolm 2026-04-05 16:55:30 +02:00 committed by Elad
parent 09554c43ba
commit fb194241d5
1 changed files with 47 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
rpcs3/Emu/CPU/CPUTranslator.cpp
View File

@ -244,36 +244,48 @@ llvm::Value* cpu_translator::bitcast(llvm::Value* val, llvm::Type* type, std::so
} }
} }
for (auto it = source_val->use_begin(); it != source_val->use_end(); ++it) // Skip use iteration for values that don't have use lists
#if LLVM_VERSION_MAJOR >= 21
if (source_val->hasUseList())
#endif
{ {
llvm::Value* it_val = *it; for (llvm::Value* it_val : source_val->uses())
if (!it_val)
{ {
continue; if (!it_val)
}
llvm::CastInst* bci = llvm::dyn_cast_or_null<llvm::CastInst>(it_val);
// Walk through bitcasts
while (bci && bci->getOpcode() == llvm::Instruction::BitCast)
{
if (bci->getParent() != m_ir->GetInsertBlock())
{ {
break; continue;
} }
if (bci->getType() == type) llvm::CastInst* bci = llvm::dyn_cast_or_null<llvm::CastInst>(it_val);
{
return bci;
}
if (bci->use_begin() == bci->use_end()) // Walk through bitcasts
while (bci && bci->getOpcode() == llvm::Instruction::BitCast)
{ {
break; if (bci->getParent() != m_ir->GetInsertBlock())
} {
break;
}
bci = llvm::dyn_cast_or_null<llvm::CastInst>(*bci->use_begin()); if (bci->getType() == type)
{
return bci;
}
// Check if bci has use list before accessing use_begin()
#if LLVM_VERSION_MAJOR >= 21
if (!bci->hasUseList())
{
break;
}
#endif
if (bci->use_begin() == bci->use_end())
{
break;
}
bci = llvm::dyn_cast_or_null<llvm::CastInst>(*bci->use_begin());
}
} }
} }
@ -553,14 +565,25 @@ void cpu_translator::erase_stores(llvm::ArrayRef<llvm::Value*> args)
{ {
for (auto v : args) for (auto v : args)
{ {
for (auto it = v->use_begin(); it != v->use_end(); ++it) // Skip use iteration for values that don't have use lists
#if LLVM_VERSION_MAJOR >= 21
if (!v->hasUseList())
continue;
#endif
for (llvm::Value* i : v->uses())
{ {
llvm::Value* i = *it;
llvm::CastInst* bci = nullptr; llvm::CastInst* bci = nullptr;
// Walk through bitcasts // Walk through bitcasts
while (i && (bci = llvm::dyn_cast<llvm::CastInst>(i)) && bci->getOpcode() == llvm::Instruction::BitCast) while (i && (bci = llvm::dyn_cast<llvm::CastInst>(i)) && bci->getOpcode() == llvm::Instruction::BitCast)
{ {
// Check if bci has use list before accessing use_begin()
#if LLVM_VERSION_MAJOR >= 21
if (!bci->hasUseList())
break;
#endif
i = *bci->use_begin(); i = *bci->use_begin();
} }