RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2026-07-19 23:23:38 -04:00
Code Issues Packages Projects Releases 10 Wiki Activity

Functions with differing phis should not be merged.

Browse Source 
Check that the incoming blocks of phi nodes are identical, and block
function merging if they are not.

rdar://problem/26255167

Differential Revision: http://reviews.llvm.org/D20462

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@270250 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Mark Lacey
2016-05-20 18:39:11 +00:00
parent 8cd572cb8f
commit 04be7e88ef
2 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Transforms/IPO/MergeFunctions.cpp
+11
View File
@@ -1050,6 +1050,17 @@ int FunctionComparator::cmpOperations(const Instruction *L,
return cmpNumbers(RMWI->getSynchScope(),
cast<AtomicRMWInst>(R)->getSynchScope());
}
if (const PHINode *PNL = dyn_cast<PHINode>(L)) {
const PHINode *PNR = cast<PHINode>(R);
// Ensure that in addition to the incoming values being identical
// (checked by the caller of this function), the incoming blocks
// are also identical.
for (unsigned i = 0, e = PNL->getNumIncomingValues(); i != e; ++i) {
if (int Res =
cmpValues(PNL->getIncomingBlock(i), PNR->getIncomingBlock(i)))
return Res;
}
}
return 0;
}
test/Transforms/MergeFunc/phi-check-blocks.ll
+50
View File
@@ -0,0 +1,50 @@
; RUN: opt -S -mergefunc < %s | FileCheck %s
; Ensure that we do not merge functions that are identical with the
; exception of the order of the incoming blocks to a phi.
; CHECK-LABEL: define linkonce_odr hidden i1 @first(i2)
define linkonce_odr hidden i1 @first(i2) {
entry:
; CHECK: switch i2
switch i2 %0, label %default [
i2 0, label %L1
i2 1, label %L2
i2 -2, label %L3
]
default:
unreachable
L1:
br label %done
L2:
br label %done
L3:
br label %done
done:
%result = phi i1 [ true, %L1 ], [ false, %L2 ], [ false, %L3 ]
; CHECK: ret i1
ret i1 %result
}
; CHECK-LABEL: define linkonce_odr hidden i1 @second(i2)
define linkonce_odr hidden i1 @second(i2) {
entry:
; CHECK: switch i2
switch i2 %0, label %default [
i2 0, label %L1
i2 1, label %L2
i2 -2, label %L3
]
default:
unreachable
L1:
br label %done
L2:
br label %done
L3:
br label %done
done:
%result = phi i1 [ true, %L3 ], [ false, %L2 ], [ false, %L1 ]
; CHECK: ret i1
ret i1 %result
}