maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Detabify. 

llvm-svn: 47596
This commit is contained in:
Bill Wendling 2008-02-26 10:46:10 +00:00
parent e65d2afdb1
commit 8ff4320071
5 changed files with 55 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/tools/bugpoint/BugDriver.cpp
View File

@ -184,7 +184,7 @@ bool BugDriver::run() {
if (ReferenceOutputFile.empty()) {
std::cout << "Generating reference output from raw program: ";
if(!createReferenceFile(Program)){
return debugCodeGeneratorCrash();
return debugCodeGeneratorCrash();
}
CreatedOutput = true;
}

21
llvm/tools/bugpoint/ListReducer.h
View File

@ -80,18 +80,17 @@ Backjump:
std::cerr << "\n\n*** Reduction Interrupted, cleaning up...\n\n";
return true;
}
// If the loop doesn't make satisfying progress, try shuffling.
// The purpose of shuffling is to avoid the heavy tails of the
// distribution (improving the speed of convergence).
if (ShufflingEnabled &&
NumOfIterationsWithoutProgress > MaxIterations) {
std::vector<ElTy> ShuffledList(TheList);
std::random_shuffle(ShuffledList.begin(), ShuffledList.end());
std::cerr << "\n\n*** Testing shuffled set...\n\n";
// Check that random shuffle doesn't loose the bug
if (doTest(ShuffledList, empty) == KeepPrefix) {
NumOfIterationsWithoutProgress > MaxIterations) {
std::vector<ElTy> ShuffledList(TheList);
std::random_shuffle(ShuffledList.begin(), ShuffledList.end());
std::cerr << "\n\n*** Testing shuffled set...\n\n";
// Check that random shuffle doesn't loose the bug
if (doTest(ShuffledList, empty) == KeepPrefix) {
// If the bug is still here, use the shuffled list.
TheList.swap(ShuffledList);
MidTop = TheList.size();
@ -99,11 +98,11 @@ Backjump:
// probability of inifinite looping without making progress.
MaxIterations += 2;
std::cerr << "\n\n*** Shuffling does not hide the bug...\n\n";
} else {
} else {
ShufflingEnabled = false; // Disable shuffling further on
std::cerr << "\n\n*** Shuffling hides the bug...\n\n";
}
NumOfIterationsWithoutProgress = 0;
}
NumOfIterationsWithoutProgress = 0;
}
unsigned Mid = MidTop / 2;

2
llvm/tools/bugpoint/OptimizerDriver.cpp
View File

@ -157,7 +157,7 @@ bool BugDriver::runPasses(const std::vector<const PassInfo*> &Passes,
// setup the child process' arguments
const char** args = (const char**)
alloca(sizeof(const char*) *
(Passes.size()+13+2*PluginLoader::getNumPlugins()+NumExtraArgs));
(Passes.size()+13+2*PluginLoader::getNumPlugins()+NumExtraArgs));
int n = 0;
sys::Path tool = sys::Program::FindProgramByName(ToolName);
if (UseValgrind) {

72
llvm/tools/llvmc/CompilerDriver.cpp
View File

@ -259,43 +259,43 @@ private:
if (programName[0] == '%' && programName.length() >2) {
switch(programName[1]){
case 'b':
if (programName.substr(0,8) == "%bindir%") {
std::string tmp(LLVM_BINDIR);
tmp.append(programName.substr(8));
pat->program.set(tmp);
}
break;
if (programName.substr(0,8) == "%bindir%") {
std::string tmp(LLVM_BINDIR);
tmp.append(programName.substr(8));
pat->program.set(tmp);
}
break;
case 'l':
if (programName.substr(0,12) == "%llvmgccdir%"){
std::string tmp(LLVMGCCDIR);
tmp.append(programName.substr(12));
pat->program.set(tmp);
}else if (programName.substr(0,13) == "%llvmgccarch%"){
std::string tmp(LLVMGCCARCH);
tmp.append(programName.substr(13));
pat->program.set(tmp);
}else if (programName.substr(0,9) == "%llvmgcc%"){
std::string tmp(LLVMGCC);
tmp.append(programName.substr(9));
pat->program.set(tmp);
}else if (programName.substr(0,9) == "%llvmgxx%"){
std::string tmp(LLVMGXX);
tmp.append(programName.substr(9));
pat->program.set(tmp);
}else if (programName.substr(0,9) == "%llvmcc1%"){
std::string tmp(LLVMCC1);
tmp.append(programName.substr(9));
pat->program.set(tmp);
}else if (programName.substr(0,13) == "%llvmcc1plus%"){
std::string tmp(LLVMCC1PLUS);
tmp.append(programName.substr(13));
pat->program.set(tmp);
}else if (programName.substr(0,8) == "%libdir%") {
std::string tmp(LLVM_LIBDIR);
tmp.append(programName.substr(8));
pat->program.set(tmp);
}
break;
if (programName.substr(0,12) == "%llvmgccdir%"){
std::string tmp(LLVMGCCDIR);
tmp.append(programName.substr(12));
pat->program.set(tmp);
}else if (programName.substr(0,13) == "%llvmgccarch%"){
std::string tmp(LLVMGCCARCH);
tmp.append(programName.substr(13));
pat->program.set(tmp);
}else if (programName.substr(0,9) == "%llvmgcc%"){
std::string tmp(LLVMGCC);
tmp.append(programName.substr(9));
pat->program.set(tmp);
}else if (programName.substr(0,9) == "%llvmgxx%"){
std::string tmp(LLVMGXX);
tmp.append(programName.substr(9));
pat->program.set(tmp);
}else if (programName.substr(0,9) == "%llvmcc1%"){
std::string tmp(LLVMCC1);
tmp.append(programName.substr(9));
pat->program.set(tmp);
}else if (programName.substr(0,13) == "%llvmcc1plus%"){
std::string tmp(LLVMCC1PLUS);
tmp.append(programName.substr(13));
pat->program.set(tmp);
}else if (programName.substr(0,8) == "%libdir%") {
std::string tmp(LLVM_LIBDIR);
tmp.append(programName.substr(8));
pat->program.set(tmp);
}
break;
}
}
action->program = pat->program;

14
llvm/tools/llvmc/Configuration.cpp
View File

@ -116,8 +116,8 @@ namespace {
result.clear();
while (next_is_real()) {
switch (token ) {
case LLVMGCCDIR_SUBST:
case LLVMGCCARCH_SUBST:
case LLVMGCCDIR_SUBST:
case LLVMGCCARCH_SUBST:
case STRING :
case OPTION :
result += ConfigLexerState.StringVal;
@ -262,11 +262,11 @@ namespace {
str.clear();
do {
switch (token) {
case BINDIR_SUBST:
case LLVMGCC_SUBST:
case LLVMGXX_SUBST:
case LLVMCC1_SUBST:
case LLVMCC1PLUS_SUBST:
case BINDIR_SUBST:
case LLVMGCC_SUBST:
case LLVMGXX_SUBST:
case LLVMCC1_SUBST:
case LLVMCC1PLUS_SUBST:
case OPTION:
case STRING:
case ARGS_SUBST: