mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-06-21 18:24:23 +00:00
Fix a somewhat subtle pair of issues with JumpThreading I introduced in
r220178. First, the creation routine doesn't insert prior to the terminator of the basic block provided, but really at the end of the basic block. Instead, get the terminator and insert before that. The next issue was that we need to ensure multiple PHI node entries for a single predecessor re-use the same cast instruction rather than creating new ones. All of the logic here was without tests previously. I've reduced and added a test case from the test suite that crashed without both of these fixes. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@220186 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@ -1035,10 +1035,13 @@ bool JumpThreading::SimplifyPartiallyRedundantLoad(LoadInst *LI) {
|
||||
"Didn't find entry for predecessor!");
|
||||
|
||||
// If we have an available predecessor but it requires casting, insert the
|
||||
// cast in the predecessor and use the cast.
|
||||
Value *PredV = I->second;
|
||||
// cast in the predecessor and use the cast. Note that we have to update the
|
||||
// AvailablePreds vector as we go so that all of the PHI entries for this
|
||||
// predecessor use the same bitcast.
|
||||
Value *&PredV = I->second;
|
||||
if (PredV->getType() != LI->getType())
|
||||
PredV = CastInst::Create(CastInst::BitCast, PredV, LI->getType(), "", P);
|
||||
PredV = CastInst::Create(CastInst::BitCast, PredV, LI->getType(), "",
|
||||
P->getTerminator());
|
||||
|
||||
PN->addIncoming(PredV, I->first);
|
||||
}
|
||||
|
Reference in New Issue
Block a user