diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/bugpoint/ExecutionDriver.cpp | 2 | ||||
| -rw-r--r-- | tools/bugpoint/Miscompilation.cpp | 12 | ||||
| -rw-r--r-- | tools/llvmc/CompilerDriver.cpp | 2 | ||||
| -rw-r--r-- | tools/llvmc/llvmc.cpp | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/tools/bugpoint/ExecutionDriver.cpp b/tools/bugpoint/ExecutionDriver.cpp index 142faeef7d..852b4891ad 100644 --- a/tools/bugpoint/ExecutionDriver.cpp +++ b/tools/bugpoint/ExecutionDriver.cpp @@ -324,7 +324,7 @@ bool BugDriver::diffProgram(const std::string &BytecodeFile, Output.eraseFromDisk(); // Remove the bytecode file if we are supposed to. - if (RemoveBytecode) + if (RemoveBytecode) sys::Path(BytecodeFile).eraseFromDisk(); return FilesDifferent; } diff --git a/tools/bugpoint/Miscompilation.cpp b/tools/bugpoint/Miscompilation.cpp index 9be7cd5d57..dc43126670 100644 --- a/tools/bugpoint/Miscompilation.cpp +++ b/tools/bugpoint/Miscompilation.cpp @@ -692,7 +692,7 @@ static void CleanupAndPrepareModules(BugDriver &BD, Module *&Test, GlobalVariable *Cache = new GlobalVariable(F->getType(), false,GlobalValue::InternalLinkage, NullPtr,F->getName()+".fpcache", F->getParent()); - + // Construct a new stub function that will re-route calls to F const FunctionType *FuncTy = F->getFunctionType(); Function *FuncWrapper = new Function(FuncTy, @@ -702,13 +702,13 @@ static void CleanupAndPrepareModules(BugDriver &BD, Module *&Test, BasicBlock *EntryBB = new BasicBlock("entry", FuncWrapper); BasicBlock *DoCallBB = new BasicBlock("usecache", FuncWrapper); BasicBlock *LookupBB = new BasicBlock("lookupfp", FuncWrapper); - + // Check to see if we already looked up the value. Value *CachedVal = new LoadInst(Cache, "fpcache", EntryBB); Value *IsNull = new SetCondInst(Instruction::SetEQ, CachedVal, NullPtr, "isNull", EntryBB); new BranchInst(LookupBB, DoCallBB, IsNull, EntryBB); - + // Resolve the call to function F via the JIT API: // // call resolver(GetElementPtr...) @@ -721,11 +721,11 @@ static void CleanupAndPrepareModules(BugDriver &BD, Module *&Test, // Save the value in our cache. new StoreInst(CastedResolver, Cache, LookupBB); new BranchInst(DoCallBB, LookupBB); - + PHINode *FuncPtr = new PHINode(NullPtr->getType(), "fp", DoCallBB); FuncPtr->addIncoming(CastedResolver, LookupBB); FuncPtr->addIncoming(CachedVal, EntryBB); - + // Save the argument list. std::vector<Value*> Args; for (Function::arg_iterator i = FuncWrapper->arg_begin(), @@ -740,7 +740,7 @@ static void CleanupAndPrepareModules(BugDriver &BD, Module *&Test, CallInst *Call = new CallInst(FuncPtr, Args, "retval", DoCallBB); new ReturnInst(Call, DoCallBB); } - + // Use the wrapper function instead of the old function F->replaceAllUsesWith(FuncWrapper); } diff --git a/tools/llvmc/CompilerDriver.cpp b/tools/llvmc/CompilerDriver.cpp index ff7c48a077..352d64f83f 100644 --- a/tools/llvmc/CompilerDriver.cpp +++ b/tools/llvmc/CompilerDriver.cpp @@ -302,7 +302,7 @@ private: tmp.replace(0,9,LLVMGXX); else if (*PI == "%llvmcc1%") tmp.replace(0,9,LLVMCC1); - else if (*PI == "%llvmcc1plus%") + else if (*PI == "%llvmcc1plus%") tmp.replace(0,9,LLVMCC1); else found = false; diff --git a/tools/llvmc/llvmc.cpp b/tools/llvmc/llvmc.cpp index 7cf89d320c..7eaa98eedc 100644 --- a/tools/llvmc/llvmc.cpp +++ b/tools/llvmc/llvmc.cpp @@ -343,7 +343,7 @@ int main(int argc, char **argv) { if (filePos != 0 && (libPos == 0 || filePos < libPos)) { // Add a source file - InpList.push_back(std::make_pair(*fileIt, + InpList.push_back(std::make_pair(*fileIt, GetFileType(*fileIt, filePos))); ++fileIt; } else if ( libPos != 0 && (filePos == 0 || libPos < filePos) ) { |