6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-12 17:32:19 +00:00
Code Issues Projects Releases Wiki Activity

Add const to some methods and change TestMergedProgram to return the merged

Browse Source 
module and take a const BugDriver.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@109951 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2010-07-31 14:34:49 +00:00
parent 0114b9990a
commit 13793264e7
3 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/bugpoint/BugDriver.h
View File

@ -179,7 +179,7 @@ public:
std::string Bitcode,
const std::string &SharedObjects,
AbstractInterpreter *AI,
std::string *Error);
std::string *Error) const;
/// executeProgramSafely - Used to create reference output with the "safe"
/// backend, if reference output is not provided. If there is a problem with
@ -187,7 +187,8 @@ public:
/// Error.
///
std::string executeProgramSafely(const Module *Program,
std::string OutputFile, std::string *Error);
std::string OutputFile,
std::string *Error) const;
/// createReferenceFile - calls compileProgram and then records the output
/// into ReferenceOutputFile. Returns true if reference file created, false
@ -206,7 +207,7 @@ public:
const std::string &BitcodeFile = "",
const std::string &SharedObj = "",
bool RemoveBitcode = false,
std::string *Error = 0);
std::string *Error = 0) const;
/// EmitProgressBitcode - This function is used to output M to a file named
/// "bugpoint-ID.bc".

6
tools/bugpoint/ExecutionDriver.cpp
View File

@ -325,7 +325,7 @@ std::string BugDriver::executeProgram(const Module *Program,
std::string BitcodeFile,
const std::string &SharedObj,
AbstractInterpreter *AI,
std::string *Error) {
std::string *Error) const {
if (AI == 0) AI = Interpreter;
assert(AI && "Interpreter should have been created already!");
bool CreatedBitcode = false;
@ -402,7 +402,7 @@ std::string BugDriver::executeProgram(const Module *Program,
///
std::string BugDriver::executeProgramSafely(const Module *Program,
std::string OutputFile,
std::string *Error) {
std::string *Error) const {
return executeProgram(Program, OutputFile, "", "", SafeInterpreter, Error);
}
@ -466,7 +466,7 @@ bool BugDriver::diffProgram(const Module *Program,
const std::string &BitcodeFile,
const std::string &SharedObject,
bool RemoveBitcode,
std::string *ErrMsg) {
std::string *ErrMsg) const {
// Execute the program, generating an output file...
sys::Path Output(executeProgram(Program, "", BitcodeFile, SharedObject, 0,
ErrMsg));

42
tools/bugpoint/Miscompilation.cpp
View File

@ -204,13 +204,15 @@ namespace {
}
/// TestMergedProgram - Given two modules, link them together and run the
/// program, checking to see if the program matches the diff. If the diff
/// matches, return false, otherwise return true. If the DeleteInputs argument
/// is set to true then this function deletes both input modules before it
/// returns.
/// program, checking to see if the program matches the diff. If there is
/// an error, return NULL. If not, return the merged module. The Broken argument
/// will be set to true if the output is different. If the DeleteInputs
/// argument is set to true then this function deletes both input
/// modules before it returns.
///
static bool TestMergedProgram(BugDriver &BD, Module *M1, Module *M2,
bool DeleteInputs, std::string &Error) {
static Module *TestMergedProgram(const BugDriver &BD, Module *M1, Module *M2,
bool DeleteInputs, std::string &Error,
bool &Broken) {
// Link the two portions of the program back to together.
std::string ErrorMsg;
if (!DeleteInputs) {
@ -224,16 +226,14 @@ static bool TestMergedProgram(BugDriver &BD, Module *M1, Module *M2,
}
delete M2; // We are done with this module.
// Execute the program. If it does not match the expected output, we must
// return true.
bool Broken = BD.diffProgram(M1, "", "", false, &Error);
// Execute the program.
Broken = BD.diffProgram(M1, "", "", false, &Error);
if (!Error.empty()) {
// Delete the linked module
delete M1;
return NULL;
}
// Delete the original and set the new program.
delete BD.swapProgramIn(M1);
return Broken;
return M1;
}
/// TestFuncs - split functions in a Module into two groups: those that are
@ -329,10 +329,13 @@ static bool ExtractLoops(BugDriver &BD,
// has broken. If something broke, then we'll inform the user and stop
// extraction.
AbstractInterpreter *AI = BD.switchToSafeInterpreter();
bool Failure = TestMergedProgram(BD, ToOptimizeLoopExtracted, ToNotOptimize,
false, Error);
if (!Error.empty())
bool Failure;
Module *New = TestMergedProgram(BD, ToOptimizeLoopExtracted, ToNotOptimize,
false, Error, Failure);
if (!New)
return false;
// Delete the original and set the new program.
delete BD.swapProgramIn(New);
if (Failure) {
BD.switchToInterpreter(AI);
@ -695,8 +698,13 @@ static bool TestOptimizer(BugDriver &BD, Module *Test, Module *Safe,
delete Test;
outs() << " Checking to see if the merged program executes correctly: ";
bool Broken = TestMergedProgram(BD, Optimized, Safe, true, Error);
if (Error.empty()) outs() << (Broken ? " nope.\n" : " yup.\n");
bool Broken;
Module *New = TestMergedProgram(BD, Optimized, Safe, true, Error, Broken);
if (New) {
outs() << (Broken ? " nope.\n" : " yup.\n");
// Delete the original and set the new program.
delete BD.swapProgramIn(New);
}
return Broken;
}