6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-09-24 23:28:41 +00:00
Code Issues Projects Releases Wiki Activity

Fix nondeterministic behavior.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@93038 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Julien Lerouge
2010-01-09 01:06:49 +00:00
parent 7f9664699e
commit c5dd34209b
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Transforms/Utils/CodeExtractor.cpp
View File

@@ -29,6 +29,7 @@
#include "llvm/Support/Debug.h" #include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
#include "llvm/ADT/SetVector.h"
#include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringExtras.h"
#include <algorithm> #include <algorithm>
#include <set> #include <set>
@@ -45,7 +46,7 @@ AggregateArgsOpt("aggregate-extracted-args", cl::Hidden,
namespace { namespace {
class CodeExtractor { class CodeExtractor {
typedef std::vector<Value*> Values; typedef std::vector<Value*> Values;
std::set<BasicBlock*> BlocksToExtract; SetVector<BasicBlock*> BlocksToExtract;
DominatorTree* DT; DominatorTree* DT;
bool AggregateArgs; bool AggregateArgs;
unsigned NumExitBlocks; unsigned NumExitBlocks;
@@ -135,7 +136,7 @@ void CodeExtractor::severSplitPHINodes(BasicBlock *&Header) {
// We only want to code extract the second block now, and it becomes the new // We only want to code extract the second block now, and it becomes the new
// header of the region. // header of the region.
BasicBlock *OldPred = Header; BasicBlock *OldPred = Header;
BlocksToExtract.erase(OldPred); BlocksToExtract.remove(OldPred);
BlocksToExtract.insert(NewBB); BlocksToExtract.insert(NewBB);
Header = NewBB; Header = NewBB;
@@ -180,7 +181,7 @@ void CodeExtractor::severSplitPHINodes(BasicBlock *&Header) {
} }
void CodeExtractor::splitReturnBlocks() { void CodeExtractor::splitReturnBlocks() {
for (std::set<BasicBlock*>::iterator I = BlocksToExtract.begin(), for (SetVector<BasicBlock*>::iterator I = BlocksToExtract.begin(),
E = BlocksToExtract.end(); I != E; ++I) E = BlocksToExtract.end(); I != E; ++I)
if (ReturnInst *RI = dyn_cast<ReturnInst>((*I)->getTerminator())) { if (ReturnInst *RI = dyn_cast<ReturnInst>((*I)->getTerminator())) {
BasicBlock *New = (*I)->splitBasicBlock(RI, (*I)->getName()+".ret"); BasicBlock *New = (*I)->splitBasicBlock(RI, (*I)->getName()+".ret");
@@ -206,7 +207,7 @@ void CodeExtractor::splitReturnBlocks() {
// //
void CodeExtractor::findInputsOutputs(Values &inputs, Values &outputs) { void CodeExtractor::findInputsOutputs(Values &inputs, Values &outputs) {
std::set<BasicBlock*> ExitBlocks; std::set<BasicBlock*> ExitBlocks;
for (std::set<BasicBlock*>::const_iterator ci = BlocksToExtract.begin(), for (SetVector<BasicBlock*>::const_iterator ci = BlocksToExtract.begin(),
ce = BlocksToExtract.end(); ci != ce; ++ci) { ce = BlocksToExtract.end(); ci != ce; ++ci) {
BasicBlock *BB = *ci; BasicBlock *BB = *ci;
@@ -482,7 +483,7 @@ emitCallAndSwitchStatement(Function *newFunction, BasicBlock *codeReplacer,
std::map<BasicBlock*, BasicBlock*> ExitBlockMap; std::map<BasicBlock*, BasicBlock*> ExitBlockMap;
unsigned switchVal = 0; unsigned switchVal = 0;
for (std::set<BasicBlock*>::const_iterator i = BlocksToExtract.begin(), for (SetVector<BasicBlock*>::const_iterator i = BlocksToExtract.begin(),
e = BlocksToExtract.end(); i != e; ++i) { e = BlocksToExtract.end(); i != e; ++i) {
TerminatorInst *TI = (*i)->getTerminator(); TerminatorInst *TI = (*i)->getTerminator();
for (unsigned i = 0, e = TI->getNumSuccessors(); i != e; ++i) for (unsigned i = 0, e = TI->getNumSuccessors(); i != e; ++i)
@@ -633,7 +634,7 @@ void CodeExtractor::moveCodeToFunction(Function *newFunction) {
Function::BasicBlockListType &oldBlocks = oldFunc->getBasicBlockList(); Function::BasicBlockListType &oldBlocks = oldFunc->getBasicBlockList();
Function::BasicBlockListType &newBlocks = newFunction->getBasicBlockList(); Function::BasicBlockListType &newBlocks = newFunction->getBasicBlockList();
for (std::set<BasicBlock*>::const_iterator i = BlocksToExtract.begin(), for (SetVector<BasicBlock*>::const_iterator i = BlocksToExtract.begin(),
e = BlocksToExtract.end(); i != e; ++i) { e = BlocksToExtract.end(); i != e; ++i) {
// Delete the basic block from the old function, and the list of blocks // Delete the basic block from the old function, and the list of blocks
oldBlocks.remove(*i); oldBlocks.remove(*i);