mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-07-25 13:24:46 +00:00
Revert "Replace some uses of std:map<std::string,...> with StringMap."
StringMap iterators are not deterministic, and that's more important here than speed or memory. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@155039 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -724,7 +724,7 @@ void AsmWriterEmitter::EmitPrintAliasInstruction(raw_ostream &O) {
|
|||||||
Records.getAllDerivedDefinitions("InstAlias");
|
Records.getAllDerivedDefinitions("InstAlias");
|
||||||
|
|
||||||
// Create a map from the qualified name to a list of potential matches.
|
// Create a map from the qualified name to a list of potential matches.
|
||||||
StringMap<std::vector<CodeGenInstAlias*> > AliasMap;
|
std::map<std::string, std::vector<CodeGenInstAlias*> > AliasMap;
|
||||||
for (std::vector<Record*>::iterator
|
for (std::vector<Record*>::iterator
|
||||||
I = AllInstAliases.begin(), E = AllInstAliases.end(); I != E; ++I) {
|
I = AllInstAliases.begin(), E = AllInstAliases.end(); I != E; ++I) {
|
||||||
CodeGenInstAlias *Alias = new CodeGenInstAlias(*I, Target);
|
CodeGenInstAlias *Alias = new CodeGenInstAlias(*I, Target);
|
||||||
@@ -738,9 +738,9 @@ void AsmWriterEmitter::EmitPrintAliasInstruction(raw_ostream &O) {
|
|||||||
|
|
||||||
// A map of which conditions need to be met for each instruction operand
|
// A map of which conditions need to be met for each instruction operand
|
||||||
// before it can be matched to the mnemonic.
|
// before it can be matched to the mnemonic.
|
||||||
StringMap<std::vector<IAPrinter*> > IAPrinterMap;
|
std::map<std::string, std::vector<IAPrinter*> > IAPrinterMap;
|
||||||
|
|
||||||
for (StringMap<std::vector<CodeGenInstAlias*> >::iterator
|
for (std::map<std::string, std::vector<CodeGenInstAlias*> >::iterator
|
||||||
I = AliasMap.begin(), E = AliasMap.end(); I != E; ++I) {
|
I = AliasMap.begin(), E = AliasMap.end(); I != E; ++I) {
|
||||||
std::vector<CodeGenInstAlias*> &Aliases = I->second;
|
std::vector<CodeGenInstAlias*> &Aliases = I->second;
|
||||||
|
|
||||||
@@ -828,7 +828,7 @@ void AsmWriterEmitter::EmitPrintAliasInstruction(raw_ostream &O) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (CantHandle) continue;
|
if (CantHandle) continue;
|
||||||
IAPrinterMap[I->first()].push_back(IAP);
|
IAPrinterMap[I->first].push_back(IAP);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -842,7 +842,7 @@ void AsmWriterEmitter::EmitPrintAliasInstruction(raw_ostream &O) {
|
|||||||
std::string Cases;
|
std::string Cases;
|
||||||
raw_string_ostream CasesO(Cases);
|
raw_string_ostream CasesO(Cases);
|
||||||
|
|
||||||
for (StringMap<std::vector<IAPrinter*> >::iterator
|
for (std::map<std::string, std::vector<IAPrinter*> >::iterator
|
||||||
I = IAPrinterMap.begin(), E = IAPrinterMap.end(); I != E; ++I) {
|
I = IAPrinterMap.begin(), E = IAPrinterMap.end(); I != E; ++I) {
|
||||||
std::vector<IAPrinter*> &IAPs = I->second;
|
std::vector<IAPrinter*> &IAPs = I->second;
|
||||||
std::vector<IAPrinter*> UniqueIAPs;
|
std::vector<IAPrinter*> UniqueIAPs;
|
||||||
@@ -865,7 +865,7 @@ void AsmWriterEmitter::EmitPrintAliasInstruction(raw_ostream &O) {
|
|||||||
|
|
||||||
if (UniqueIAPs.empty()) continue;
|
if (UniqueIAPs.empty()) continue;
|
||||||
|
|
||||||
CasesO.indent(2) << "case " << I->first() << ":\n";
|
CasesO.indent(2) << "case " << I->first << ":\n";
|
||||||
|
|
||||||
for (std::vector<IAPrinter*>::iterator
|
for (std::vector<IAPrinter*>::iterator
|
||||||
II = UniqueIAPs.begin(), IE = UniqueIAPs.end(); II != IE; ++II) {
|
II = UniqueIAPs.begin(), IE = UniqueIAPs.end(); II != IE; ++II) {
|
||||||
|
Reference in New Issue
Block a user