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

[PM] Fix a bunch of bugs I spotted by inspection when working on this

Browse Source 
code. Copious tests added to cover these cases.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199039 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chandler Carruth
2014-01-12 10:02:02 +00:00
parent e7687650c9
commit 83bdd1d763
2 changed files with 65 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tools/opt/Passes.cpp
View File

@@ -50,7 +50,6 @@ static bool isFunctionPassName(StringRef Name) {
}
static bool parseModulePassName(ModulePassManager &MPM, StringRef Name) {
assert(isModulePassName(Name));
if (Name == "no-op-module") {
MPM.addPass(NoOpModulePass());
return true;
@@ -59,7 +58,6 @@ static bool parseModulePassName(ModulePassManager &MPM, StringRef Name) {
}
static bool parseFunctionPassName(FunctionPassManager &FPM, StringRef Name) {
assert(isFunctionPassName(Name));
if (Name == "no-op-function") {
FPM.addPass(NoOpFunctionPass());
return true;
@@ -76,9 +74,10 @@ static bool parseFunctionPassPipeline(FunctionPassManager &FPM,
// Parse the inner pipeline inte the nested manager.
PipelineText = PipelineText.substr(strlen("function("));
if (!parseFunctionPassPipeline(NestedFPM, PipelineText))
if (!parseFunctionPassPipeline(NestedFPM, PipelineText) ||
PipelineText.empty())
return false;
assert(!PipelineText.empty() && PipelineText[0] == ')');
assert(PipelineText[0] == ')');
PipelineText = PipelineText.substr(1);
// Add the nested pass manager with the appropriate adaptor.
@@ -109,9 +108,10 @@ static bool parseModulePassPipeline(ModulePassManager &MPM,
// Parse the inner pipeline into the nested manager.
PipelineText = PipelineText.substr(strlen("module("));
if (!parseModulePassPipeline(NestedMPM, PipelineText))
if (!parseModulePassPipeline(NestedMPM, PipelineText) ||
PipelineText.empty())
return false;
assert(!PipelineText.empty() && PipelineText[0] == ')');
assert(PipelineText[0] == ')');
PipelineText = PipelineText.substr(1);
// Now add the nested manager as a module pass.
@@ -121,9 +121,10 @@ static bool parseModulePassPipeline(ModulePassManager &MPM,
// Parse the inner pipeline inte the nested manager.
PipelineText = PipelineText.substr(strlen("function("));
if (!parseFunctionPassPipeline(NestedFPM, PipelineText))
if (!parseFunctionPassPipeline(NestedFPM, PipelineText) ||
PipelineText.empty())
return false;
assert(!PipelineText.empty() && PipelineText[0] == ')');
assert(PipelineText[0] == ')');
PipelineText = PipelineText.substr(1);
// Add the nested pass manager with the appropriate adaptor.
@@ -151,23 +152,24 @@ static bool parseModulePassPipeline(ModulePassManager &MPM,
bool llvm::parsePassPipeline(ModulePassManager &MPM, StringRef PipelineText) {
// Look at the first entry to figure out which layer to start parsing at.
if (PipelineText.startswith("module("))
return parseModulePassPipeline(MPM, PipelineText);
return parseModulePassPipeline(MPM, PipelineText) && PipelineText.empty();
if (PipelineText.startswith("function(")) {
FunctionPassManager FPM;
if (!parseFunctionPassPipeline(FPM, PipelineText))
if (!parseFunctionPassPipeline(FPM, PipelineText) || !PipelineText.empty())
return false;
MPM.addPass(createModuleToFunctionPassAdaptor(FPM));
return true;
}
// This isn't a direct pass manager name, look for the end of a pass name.
StringRef FirstName = PipelineText.substr(0, PipelineText.find_first_of(","));
StringRef FirstName =
PipelineText.substr(0, PipelineText.find_first_of(",)"));
if (isModulePassName(FirstName))
return parseModulePassPipeline(MPM, PipelineText);
return parseModulePassPipeline(MPM, PipelineText) && PipelineText.empty();
if (isFunctionPassName(FirstName)) {
FunctionPassManager FPM;
if (!parseFunctionPassPipeline(FPM, PipelineText))
if (!parseFunctionPassPipeline(FPM, PipelineText) || !PipelineText.empty())
return false;
MPM.addPass(createModuleToFunctionPassAdaptor(FPM));
return true;