6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-14 15:28:20 +00:00
Code Issues Projects Releases Wiki Activity

fix more AST updating bugs, correcting miscompilation in PR8041

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@112878 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2010-09-02 22:19:10 +00:00
parent 4caef6001d
commit 9c282011e6
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Transforms/Scalar/LICM.cpp
View File

@@ -583,7 +583,7 @@ void LICM::sink(Instruction &I) {
// Update CurAST for NewPHIs if I had pointer type. // Update CurAST for NewPHIs if I had pointer type.
if (I.getType()->isPointerTy()) if (I.getType()->isPointerTy())
for (unsigned i = 0, e = NewPHIs.size(); i != e; ++i) for (unsigned i = 0, e = NewPHIs.size(); i != e; ++i)
CurAST->copyValue(NewPHIs[i], &I); CurAST->copyValue(&I, NewPHIs[i]);
// Finally, remove the instruction from CurAST. It is no longer in the loop. // Finally, remove the instruction from CurAST. It is no longer in the loop.
CurAST->deleteValue(&I); CurAST->deleteValue(&I);
@@ -843,7 +843,9 @@ void LICM::PromoteAliasSet(AliasSet &AS) {
// inserting PHI nodes as necessary. // inserting PHI nodes as necessary.
for (unsigned i = 0, e = LiveInLoads.size(); i != e; ++i) { for (unsigned i = 0, e = LiveInLoads.size(); i != e; ++i) {
LoadInst *ALoad = LiveInLoads[i]; LoadInst *ALoad = LiveInLoads[i];
ALoad->replaceAllUsesWith(SSA.GetValueInMiddleOfBlock(ALoad->getParent())); Value *NewVal = SSA.GetValueInMiddleOfBlock(ALoad->getParent());
ALoad->replaceAllUsesWith(NewVal);
CurAST->copyValue(ALoad, NewVal);
} }
// Now that everything is rewritten, delete the old instructions from the body // Now that everything is rewritten, delete the old instructions from the body

47
test/Transforms/LICM/scalar_promote.ll
View File

@@ -71,3 +71,50 @@ Out: ; preds = %Loop
ret void ret void
} }
; PR8041
define void @test4(i8* %x, i8 %n) {
; CHECK: @test4
%handle1 = alloca i8*
%handle2 = alloca i8*
store i8* %x, i8** %handle1
br label %loop
loop:
%tmp = getelementptr i8* %x, i64 8
store i8* %tmp, i8** %handle2
br label %subloop
subloop:
%count = phi i8 [ 0, %loop ], [ %nextcount, %subloop ]
%offsetx2 = load i8** %handle2
store i8 %n, i8* %offsetx2
%newoffsetx2 = getelementptr i8* %offsetx2, i64 -1
store i8* %newoffsetx2, i8** %handle2
%nextcount = add i8 %count, 1
%innerexitcond = icmp sge i8 %nextcount, 8
br i1 %innerexitcond, label %innerexit, label %subloop
; Should have promoted 'handle2' accesses.
; CHECK: subloop:
; CHECK-NEXT: phi i8* [
; CHECK-NEXT: %count = phi i8 [
; CHECK-NEXT: store i8 %n
; CHECK-NOT: store
; CHECK: br i1
innerexit:
%offsetx1 = load i8** %handle1
%val = load i8* %offsetx1
%cond = icmp eq i8 %val, %n
br i1 %cond, label %exit, label %loop
; Should not have promoted offsetx1 loads.
; CHECK: innerexit:
; CHECK: %val = load i8* %offsetx1
; CHECK: %cond = icmp eq i8 %val, %n
; CHECK: br i1 %cond, label %exit, label %loop
exit:
ret void
}