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

Transforms: address some late comments

Browse Source 
We already use the llvm namespace.  Remove the unnecessary prefix.  Use the
StringRef::equals method to compare with C strings rather than instantiating
std::strings.

Addresses late review comments from David Majnemer.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@221564 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Saleem Abdulrasool
2014-11-08 00:00:50 +00:00
parent 8724a6db6b
commit bbfcec17e4
2 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/CodeGen/Passes.cpp
View File

@ -446,7 +446,7 @@ void TargetPassConfig::addPassesToHandleExceptions() {
void TargetPassConfig::addCodeGenPrepare() { void TargetPassConfig::addCodeGenPrepare() {
if (getOptLevel() != CodeGenOpt::None && !DisableCGP) if (getOptLevel() != CodeGenOpt::None && !DisableCGP)
addPass(createCodeGenPreparePass(TM)); addPass(createCodeGenPreparePass(TM));
addPass(llvm::createRewriteSymbolsPass()); addPass(createRewriteSymbolsPass());
} }
/// Add common passes that perform LLVM IR to IR transforms in preparation for /// Add common passes that perform LLVM IR to IR transforms in preparation for

43
lib/Transforms/Utils/SymbolRewriter.cpp
View File

@ -245,10 +245,6 @@ bool RewriteMapParser::parse(std::unique_ptr<MemoryBuffer> &MapFile,
bool RewriteMapParser::parseEntry(yaml::Stream &YS, yaml::KeyValueNode &Entry, bool RewriteMapParser::parseEntry(yaml::Stream &YS, yaml::KeyValueNode &Entry,
RewriteDescriptorList *DL) { RewriteDescriptorList *DL) {
const std::string kRewriteTypeFunction = "function";
const std::string kRewriteTypeGlobalVariable = "global variable";
const std::string kRewriteTypeGlobalAlias = "global alias";
yaml::ScalarNode *Key; yaml::ScalarNode *Key;
yaml::MappingNode *Value; yaml::MappingNode *Value;
SmallString<32> KeyStorage; SmallString<32> KeyStorage;
@ -267,11 +263,11 @@ bool RewriteMapParser::parseEntry(yaml::Stream &YS, yaml::KeyValueNode &Entry,
} }
RewriteType = Key->getValue(KeyStorage); RewriteType = Key->getValue(KeyStorage);
if (RewriteType == kRewriteTypeFunction) if (RewriteType.equals("function"))
return parseRewriteFunctionDescriptor(YS, Key, Value, DL); return parseRewriteFunctionDescriptor(YS, Key, Value, DL);
else if (RewriteType == kRewriteTypeGlobalVariable) else if (RewriteType.equals("global variable"))
return parseRewriteGlobalVariableDescriptor(YS, Key, Value, DL); return parseRewriteGlobalVariableDescriptor(YS, Key, Value, DL);
else if (RewriteType == kRewriteTypeGlobalAlias) else if (RewriteType.equals("global alias"))
return parseRewriteGlobalAliasDescriptor(YS, Key, Value, DL); return parseRewriteGlobalAliasDescriptor(YS, Key, Value, DL);
YS.printError(Entry.getKey(), "unknown rewrite type"); YS.printError(Entry.getKey(), "unknown rewrite type");
@ -282,11 +278,6 @@ bool RewriteMapParser::
parseRewriteFunctionDescriptor(yaml::Stream &YS, yaml::ScalarNode *K, parseRewriteFunctionDescriptor(yaml::Stream &YS, yaml::ScalarNode *K,
yaml::MappingNode *Descriptor, yaml::MappingNode *Descriptor,
RewriteDescriptorList *DL) { RewriteDescriptorList *DL) {
const std::string kDescriptorFieldSource = "source";
const std::string kDescriptorFieldTarget = "target";
const std::string kDescriptorFieldTransform = "transform";
const std::string kDescriptorFieldNaked = "naked";
bool Naked = false; bool Naked = false;
std::string Source; std::string Source;
std::string Target; std::string Target;
@ -312,7 +303,7 @@ parseRewriteFunctionDescriptor(yaml::Stream &YS, yaml::ScalarNode *K,
} }
KeyValue = Key->getValue(KeyStorage); KeyValue = Key->getValue(KeyStorage);
if (KeyValue == kDescriptorFieldSource) { if (KeyValue.equals("source")) {
std::string Error; std::string Error;
Source = Value->getValue(ValueStorage); Source = Value->getValue(ValueStorage);
@ -320,11 +311,11 @@ parseRewriteFunctionDescriptor(yaml::Stream &YS, yaml::ScalarNode *K,
YS.printError(Field.getKey(), "invalid regex: " + Error); YS.printError(Field.getKey(), "invalid regex: " + Error);
return false; return false;
} }
} else if (KeyValue == kDescriptorFieldTarget) { } else if (KeyValue.equals("target")) {
Target = Value->getValue(ValueStorage); Target = Value->getValue(ValueStorage);
} else if (KeyValue == kDescriptorFieldTransform) { } else if (KeyValue.equals("transform")) {
Transform = Value->getValue(ValueStorage); Transform = Value->getValue(ValueStorage);
} else if (KeyValue == kDescriptorFieldNaked) { } else if (KeyValue.equals("naked")) {
std::string Undecorated; std::string Undecorated;
Undecorated = Value->getValue(ValueStorage); Undecorated = Value->getValue(ValueStorage);
@ -355,10 +346,6 @@ bool RewriteMapParser::
parseRewriteGlobalVariableDescriptor(yaml::Stream &YS, yaml::ScalarNode *K, parseRewriteGlobalVariableDescriptor(yaml::Stream &YS, yaml::ScalarNode *K,
yaml::MappingNode *Descriptor, yaml::MappingNode *Descriptor,
RewriteDescriptorList *DL) { RewriteDescriptorList *DL) {
const std::string kDescriptorFieldSource = "source";
const std::string kDescriptorFieldTarget = "target";
const std::string kDescriptorFieldTransform = "transform";
std::string Source; std::string Source;
std::string Target; std::string Target;
std::string Transform; std::string Transform;
@ -383,7 +370,7 @@ parseRewriteGlobalVariableDescriptor(yaml::Stream &YS, yaml::ScalarNode *K,
} }
KeyValue = Key->getValue(KeyStorage); KeyValue = Key->getValue(KeyStorage);
if (KeyValue == kDescriptorFieldSource) { if (KeyValue.equals("source")) {
std::string Error; std::string Error;
Source = Value->getValue(ValueStorage); Source = Value->getValue(ValueStorage);
@ -391,9 +378,9 @@ parseRewriteGlobalVariableDescriptor(yaml::Stream &YS, yaml::ScalarNode *K,
YS.printError(Field.getKey(), "invalid regex: " + Error); YS.printError(Field.getKey(), "invalid regex: " + Error);
return false; return false;
} }
} else if (KeyValue == kDescriptorFieldTarget) { } else if (KeyValue.equals("target")) {
Target = Value->getValue(ValueStorage); Target = Value->getValue(ValueStorage);
} else if (KeyValue == kDescriptorFieldTransform) { } else if (KeyValue.equals("transform")) {
Transform = Value->getValue(ValueStorage); Transform = Value->getValue(ValueStorage);
} else { } else {
YS.printError(Field.getKey(), "unknown Key for Global Variable"); YS.printError(Field.getKey(), "unknown Key for Global Variable");
@ -421,10 +408,6 @@ bool RewriteMapParser::
parseRewriteGlobalAliasDescriptor(yaml::Stream &YS, yaml::ScalarNode *K, parseRewriteGlobalAliasDescriptor(yaml::Stream &YS, yaml::ScalarNode *K,
yaml::MappingNode *Descriptor, yaml::MappingNode *Descriptor,
RewriteDescriptorList *DL) { RewriteDescriptorList *DL) {
const std::string kDescriptorFieldSource = "source";
const std::string kDescriptorFieldTarget = "target";
const std::string kDescriptorFieldTransform = "transform";
std::string Source; std::string Source;
std::string Target; std::string Target;
std::string Transform; std::string Transform;
@ -449,7 +432,7 @@ parseRewriteGlobalAliasDescriptor(yaml::Stream &YS, yaml::ScalarNode *K,
} }
KeyValue = Key->getValue(KeyStorage); KeyValue = Key->getValue(KeyStorage);
if (KeyValue == kDescriptorFieldSource) { if (KeyValue.equals("source")) {
std::string Error; std::string Error;
Source = Value->getValue(ValueStorage); Source = Value->getValue(ValueStorage);
@ -457,9 +440,9 @@ parseRewriteGlobalAliasDescriptor(yaml::Stream &YS, yaml::ScalarNode *K,
YS.printError(Field.getKey(), "invalid regex: " + Error); YS.printError(Field.getKey(), "invalid regex: " + Error);
return false; return false;
} }
} else if (KeyValue == kDescriptorFieldTarget) { } else if (KeyValue.equals("target")) {
Target = Value->getValue(ValueStorage); Target = Value->getValue(ValueStorage);
} else if (KeyValue == kDescriptorFieldTransform) { } else if (KeyValue.equals("transform")) {
Transform = Value->getValue(ValueStorage); Transform = Value->getValue(ValueStorage);
} else { } else {
YS.printError(Field.getKey(), "unknown key for Global Alias"); YS.printError(Field.getKey(), "unknown key for Global Alias");