mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-19 11:02:59 +02:00
Fix a bug in the checkin where I adjusted this code to work when
LinkModules nukes the second module argument. llvm-svn: 17986
This commit is contained in:
parent
c385bbef7b
commit
b1263d42f8
@ -295,6 +295,7 @@ static bool ExtractLoops(BugDriver &BD,
|
||||
std::vector<std::pair<std::string, const FunctionType*> > MisCompFunctions;
|
||||
for (Module::iterator I = ToOptimizeLoopExtracted->begin(),
|
||||
E = ToOptimizeLoopExtracted->end(); I != E; ++I)
|
||||
if (!I->isExternal())
|
||||
MisCompFunctions.push_back(std::make_pair(I->getName(),
|
||||
I->getFunctionType()));
|
||||
|
||||
@ -432,6 +433,7 @@ static bool ExtractBlocks(BugDriver &BD,
|
||||
std::vector<std::pair<std::string, const FunctionType*> > MisCompFunctions;
|
||||
for (Module::iterator I = Extracted->begin(), E = Extracted->end();
|
||||
I != E; ++I)
|
||||
if (!I->isExternal())
|
||||
MisCompFunctions.push_back(std::make_pair(I->getName(),
|
||||
I->getFunctionType()));
|
||||
|
||||
@ -624,11 +626,10 @@ static void CleanupAndPrepareModules(BugDriver &BD, Module *&Test,
|
||||
|
||||
// Call the old main function and return its result
|
||||
BasicBlock *BB = new BasicBlock("entry", newMain);
|
||||
CallInst *call = new CallInst(oldMainProto, args);
|
||||
BB->getInstList().push_back(call);
|
||||
CallInst *call = new CallInst(oldMainProto, args, "", BB);
|
||||
|
||||
// If the type of old function wasn't void, return value of call
|
||||
new ReturnInst(oldMain->getReturnType() != Type::VoidTy ? call : 0, BB);
|
||||
new ReturnInst(call, BB);
|
||||
}
|
||||
|
||||
// The second nasty issue we must deal with in the JIT is that the Safe
|
||||
|
Loading…
Reference in New Issue
Block a user