RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

MergeFunctions: Clear GlobalNumbers ValueMap

Browse Source 
Otherwise, the map will observe changes as long as MergeFunctions is alive. This
is bad because follow-up passes could replace-all-uses-with on the key of an
entry in the map. The value handle callback of ValueMap however asserts that the
key type matches.

rdar://22971893

llvm-svn: 249327
This commit is contained in:
Arnold Schwaighofer 2015-10-05 17:26:36 +00:00
parent 9091dc1c0e
commit 0e64b55852
2 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Transforms/IPO/MergeFunctions.cpp
View File

@ -164,6 +164,9 @@ class GlobalNumberState {
NextNumber++;
return MapIter->second;
}
void clear() {
GlobalNumbers.clear();
}
};
/// FunctionComparator - Compares two functions to determine whether or not
@ -1546,6 +1549,7 @@ bool MergeFunctions::runOnModule(Module &M) {
} while (!Deferred.empty());
FnTree.clear();
GlobalNumbers.clear();
return Changed;
}

54
test/Transforms/MergeFunc/crash2.ll Normal file
View File

@ -0,0 +1,54 @@
; RUN: opt %s -mergefunc -globalopt -S -o - | FileCheck %s
; Make sure we don't crash on this example. This test is supposed to test that
; MergeFunctions clears its GlobalNumbers value map. If this map still contains
; entries when running globalopt and the MergeFunctions instance is still alive
; the optimization of @G would cause an assert because globalopt would do an
; RAUW on @G which still exists as an entry in the GlobalNumbers ValueMap which
; causes an assert in the ValueHandle call back because we are RAUWing with a
; different type (AllocaInst) than its key type (GlobalValue).
@G = internal global i8** null
@G2 = internal global i8** null
define i32 @main(i32 %argc, i8** %argv) {
; CHECK: alloca
store i8** %argv, i8*** @G
ret i32 0
}
define internal i8** @dead1(i64 %p) {
call void @right(i64 %p)
call void @right(i64 %p)
call void @right(i64 %p)
call void @right(i64 %p)
%tmp = load i8**, i8*** @G
ret i8** %tmp
}
define internal i8** @dead2(i64 %p) {
call void @right(i64 %p)
call void @right(i64 %p)
call void @right(i64 %p)
call void @right(i64 %p)
%tmp = load i8**, i8*** @G2
ret i8** %tmp
}
define void @left(i64 %p) {
entry-block:
call void @right(i64 %p)
call void @right(i64 %p)
call void @right(i64 %p)
call void @right(i64 %p)
ret void
}
define void @right(i64 %p) {
entry-block:
call void @left(i64 %p)
call void @left(i64 %p)
call void @left(i64 %p)
call void @left(i64 %p)
ret void
}