//
// The LLVM Compiler Infrastructure
//
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
#include "llvm/Function.h"
#include "llvm/Instructions.h"
#include "llvm/Type.h"
+#include "llvm/ADT/SmallVector.h"
+#include "llvm/ADT/StringExtras.h"
using namespace llvm;
-const int UnifyFunctionExitNodes::ID = 0;
+char UnifyFunctionExitNodes::ID = 0;
static RegisterPass<UnifyFunctionExitNodes>
X("mergereturn", "Unify function exit nodes");
AU.addPreservedID(BreakCriticalEdgesID);
// This is a cluster of orthogonal Transforms
AU.addPreservedID(PromoteMemoryToRegisterID);
- AU.addPreservedID(LowerSelectID);
AU.addPreservedID(LowerSwitchID);
}
} else if (UnwindingBlocks.size() == 1) {
UnwindBlock = UnwindingBlocks.front();
} else {
- UnwindBlock = new BasicBlock("UnifiedUnwindBlock", &F);
+ UnwindBlock = BasicBlock::Create("UnifiedUnwindBlock", &F);
new UnwindInst(UnwindBlock);
for (std::vector<BasicBlock*>::iterator I = UnwindingBlocks.begin(),
E = UnwindingBlocks.end(); I != E; ++I) {
BasicBlock *BB = *I;
BB->getInstList().pop_back(); // Remove the unwind insn
- new BranchInst(UnwindBlock, BB);
+ BranchInst::Create(UnwindBlock, BB);
}
}
} else if (UnreachableBlocks.size() == 1) {
UnreachableBlock = UnreachableBlocks.front();
} else {
- UnreachableBlock = new BasicBlock("UnifiedUnreachableBlock", &F);
+ UnreachableBlock = BasicBlock::Create("UnifiedUnreachableBlock", &F);
new UnreachableInst(UnreachableBlock);
for (std::vector<BasicBlock*>::iterator I = UnreachableBlocks.begin(),
E = UnreachableBlocks.end(); I != E; ++I) {
BasicBlock *BB = *I;
BB->getInstList().pop_back(); // Remove the unreachable inst.
- new BranchInst(UnreachableBlock, BB);
+ BranchInst::Create(UnreachableBlock, BB);
}
}
}
// Otherwise, we need to insert a new basic block into the function, add a PHI
- // node (if the function returns a value), and convert all of the return
+ // nodes (if the function returns values), and convert all of the return
// instructions into unconditional branches.
//
- BasicBlock *NewRetBlock = new BasicBlock("UnifiedReturnBlock", &F);
-
- PHINode *PN = 0;
- if (F.getReturnType() != Type::VoidTy) {
+ BasicBlock *NewRetBlock = BasicBlock::Create("UnifiedReturnBlock", &F);
+
+ SmallVector<Value *, 4> Phis;
+ unsigned NumRetVals = ReturningBlocks[0]->getTerminator()->getNumOperands();
+ if (NumRetVals == 0)
+ ReturnInst::Create(NULL, NewRetBlock);
+ else if (const StructType *STy = dyn_cast<StructType>(F.getReturnType())) {
+ Instruction *InsertPt = NewRetBlock->getFirstNonPHI();
+ for (unsigned i = 0; i < NumRetVals; ++i) {
+ PHINode *PN = PHINode::Create(STy->getElementType(i), "UnifiedRetVal."
+ + utostr(i), InsertPt);
+ Phis.push_back(PN);
+ }
+ ReturnInst::Create(&Phis[0], NumRetVals);
+ }
+ else {
// If the function doesn't return void... add a PHI node to the block...
- PN = new PHINode(F.getReturnType(), "UnifiedRetVal");
+ PHINode *PN = PHINode::Create(F.getReturnType(), "UnifiedRetVal");
NewRetBlock->getInstList().push_back(PN);
+ Phis.push_back(PN);
+ ReturnInst::Create(PN, NewRetBlock);
}
- new ReturnInst(PN, NewRetBlock);
// Loop over all of the blocks, replacing the return instruction with an
// unconditional branch.
// Add an incoming element to the PHI node for every return instruction that
// is merging into this new block...
- if (PN) PN->addIncoming(BB->getTerminator()->getOperand(0), BB);
+ if (!Phis.empty()) {
+ for (unsigned i = 0; i < NumRetVals; ++i)
+ cast<PHINode>(Phis[i])->addIncoming(BB->getTerminator()->getOperand(i),
+ BB);
+ }
BB->getInstList().pop_back(); // Remove the return insn
- new BranchInst(NewRetBlock, BB);
+ BranchInst::Create(NewRetBlock, BB);
}
ReturnBlock = NewRetBlock;
return true;