RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-19 11:41:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

change llvm::MergeBlockIntoPredecessor to not merge two blocks BB1->BB2

Browse Source 
when BB2 has its address taken.  Since it ends up doing BB2->rauw(BB1),
this can cause the address of the entry block to be taken.  Since it is
generally undesirable to nuke blocks whose address is taken, even when
we can, just unconditionally stop this xform.

llvm-svn: 85708
This commit is contained in:
Chris Lattner 2009-11-01 04:57:33 +00:00
parent 746b4c0b20
commit c340ce422d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Transforms/Utils/BasicBlockUtils.cpp
View File

@ -94,10 +94,14 @@ void llvm::DeleteDeadPHIs(BasicBlock *BB) {
/// MergeBlockIntoPredecessor - Attempts to merge a block into its predecessor,
/// if possible. The return value indicates success or failure.
bool llvm::MergeBlockIntoPredecessor(BasicBlock* BB, Pass* P) {
bool llvm::MergeBlockIntoPredecessor(BasicBlock *BB, Pass *P) {
pred_iterator PI(pred_begin(BB)), PE(pred_end(BB));
// Can't merge the entry block.
if (pred_begin(BB) == pred_end(BB)) return false;
// Can't merge the entry block. Don't merge away blocks who have their
// address taken: this is a bug if the predecessor block is the entry node
// (because we'd end up taking the address of the entry) and undesirable in
// any case.
if (pred_begin(BB) == pred_end(BB) ||
BB->hasAddressTaken()) return false;
BasicBlock *PredBB = *PI++;
for (; PI != PE; ++PI) // Search all predecessors, see if they are all same