6502/llvm-6502
1
0 Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2026-04-27 04:18:42 +00:00
Code Issues Projects Releases Wiki Activity

Approved by Chris:

Browse Source 
$ svn merge -c 113820 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r113820 into '.':
U    test/Transforms/LICM/crash.ll
U    lib/Transforms/Scalar/LICM.cpp

Log:
fix PR8102, a case where we'd copyValue from a value that we already
deleted.  Fix this by doing the copyValue's before we delete stuff!



git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_28@113823 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling committed 2010-09-14 00:43:35 +00:00
1 parent 4bf8ecce67
commit 732d1a4c8f
2 files changed
+31 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/Transforms/Scalar/LICM.cpp
+11 -11
View File
@@ -852,6 +852,17 @@ void LICM::PromoteAliasSet(AliasSet &AS) {
ReplacedLoads[ALoad] = NewVal;
}
// If the preheader load is itself a pointer, we need to tell alias analysis
// about the new pointer we created in the preheader block and about any PHI
// nodes that just got inserted.
if (PreheaderLoad->getType()->isPointerTy()) {
// Copy any value stored to or loaded from a must-alias of the pointer.
CurAST->copyValue(SomeValue, PreheaderLoad);
for (unsigned i = 0, e = NewPHIs.size(); i != e; ++i)
CurAST->copyValue(SomeValue, NewPHIs[i]);
}
// Now that everything is rewritten, delete the old instructions from the body
// of the loop. They should all be dead now.
for (unsigned i = 0, e = LoopUses.size(); i != e; ++i) {
@@ -882,17 +893,6 @@ void LICM::PromoteAliasSet(AliasSet &AS) {
User->eraseFromParent();
}
// If the preheader load is itself a pointer, we need to tell alias analysis
// about the new pointer we created in the preheader block and about any PHI
// nodes that just got inserted.
if (PreheaderLoad->getType()->isPointerTy()) {
// Copy any value stored to or loaded from a must-alias of the pointer.
CurAST->copyValue(SomeValue, PreheaderLoad);
for (unsigned i = 0, e = NewPHIs.size(); i != e; ++i)
CurAST->copyValue(SomeValue, NewPHIs[i]);
}
// fwew, we're done!
}
test/Transforms/LICM/crash.ll
+20
View File
@@ -39,3 +39,23 @@ for.body: ; preds = %for.body, %entry
store i32 undef, i32* @g_8, align 4
br label %for.body
}
; PR8102
define void @test3() {
entry:
%__first = alloca { i32* }
br i1 undef, label %for.cond, label %for.end
for.cond: ; preds = %for.cond, %entry
%tmp1 = getelementptr { i32*}* %__first, i32 0, i32 0
%tmp2 = load i32** %tmp1, align 4
%call = tail call i32* @test3helper(i32* %tmp2)
%tmp3 = getelementptr { i32*}* %__first, i32 0, i32 0
store i32* %call, i32** %tmp3, align 4
br i1 false, label %for.cond, label %for.end
for.end: ; preds = %for.cond, %entry
ret void
}
declare i32* @test3helper(i32*)