diff options
| author | Frederic Riss <friss@apple.com> | 2015-02-04 03:10:03 +0000 |
|---|---|---|
| committer | Frederic Riss <friss@apple.com> | 2015-02-04 03:10:03 +0000 |
| commit | b61f01f1c2faed05d8d78a5dc920e1a857a80721 (patch) | |
| tree | 4f6aecb2de36ebe25c8b7519930799e10cb1655a /llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp | |
| parent | eebe962edad753551a8807434c42f0fd8c173579 (diff) | |
| download | bcm5719-llvm-b61f01f1c2faed05d8d78a5dc920e1a857a80721.tar.gz bcm5719-llvm-b61f01f1c2faed05d8d78a5dc920e1a857a80721.zip | |
Fix some unnoticed/unwanted behavior change from r222319.
The ARM assembler allows register alias redefinitions as long as it
targets the same register. r222319 broke that. In the AArch64 case
it would just produce a new warning, but in the ARM case it would
error out on previously accepted assembler.
llvm-svn: 228109
Diffstat (limited to 'llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp index c35b0ef311f..3b7a67d0d1f 100644 --- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -9010,7 +9010,7 @@ bool ARMAsmParser::parseDirectiveReq(StringRef Name, SMLoc L) { Parser.Lex(); // Consume the EndOfStatement - if (!RegisterReqs.insert(std::make_pair(Name, Reg)).second) { + if (RegisterReqs.insert(std::make_pair(Name, Reg)).first->second != Reg) { Error(SRegLoc, "redefinition of '" + Name + "' does not match original."); return false; } |
