mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2026-04-26 12:20:42 +00:00
Fix PR3807 by inserting 'insertelement' instructions in the normal dest of
an invoke instead of after the invoke (in its block), which is invalid. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@67139 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -798,9 +798,13 @@ bool DAE::RemoveDeadStuffFromFunction(Function *F) {
|
||||
// Replace by null for now.
|
||||
Call->replaceAllUsesWith(Constant::getNullValue(Call->getType()));
|
||||
} else {
|
||||
assert(isa<StructType>(RetTy) && "Return type changed, but not into a"
|
||||
"void. The old return type must have"
|
||||
"been a struct!");
|
||||
assert(isa<StructType>(RetTy) &&
|
||||
"Return type changed, but not into a void. The old return type"
|
||||
" must have been a struct!");
|
||||
Instruction *InsertPt = Call;
|
||||
if (InvokeInst *II = dyn_cast<InvokeInst>(Call))
|
||||
InsertPt = II->getNormalDest()->begin();
|
||||
|
||||
// We used to return a struct. Instead of doing smart stuff with all the
|
||||
// uses of this struct, we will just rebuild it using
|
||||
// extract/insertvalue chaining and let instcombine clean that up.
|
||||
@@ -813,12 +817,13 @@ bool DAE::RemoveDeadStuffFromFunction(Function *F) {
|
||||
if (RetTypes.size() > 1)
|
||||
// We are still returning a struct, so extract the value from our
|
||||
// return value
|
||||
V = ExtractValueInst::Create(New, NewRetIdxs[i], "newret", Call);
|
||||
V = ExtractValueInst::Create(New, NewRetIdxs[i], "newret",
|
||||
InsertPt);
|
||||
else
|
||||
// We are now returning a single element, so just insert that
|
||||
V = New;
|
||||
// Insert the value at the old position
|
||||
RetVal = InsertValueInst::Create(RetVal, V, i, "oldret", Call);
|
||||
RetVal = InsertValueInst::Create(RetVal, V, i, "oldret", InsertPt);
|
||||
}
|
||||
// Now, replace all uses of the old call instruction with the return
|
||||
// struct we built
|
||||
|
||||
Reference in New Issue
Block a user