RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-02-20 04:55:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some unnoticed/unwanted behavior change from r222319.

Browse Source 
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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@228109 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Frederic Riss 2015-02-04 03:10:03 +00:00
parent 8fa9947e4d
commit 1638ca5493
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
View File

@ -4132,7 +4132,7 @@ bool AArch64AsmParser::parseDirectiveReq(StringRef Name, SMLoc L) {
Parser.Lex(); // Consume the EndOfStatement
auto pair = std::make_pair(IsVector, RegNum);
if (!RegisterReqs.insert(std::make_pair(Name, pair)).second)
if (RegisterReqs.insert(std::make_pair(Name, pair)).first->second != pair)
Warning(L, "ignoring redefinition of register alias '" + Name + "'");
return true;

2
lib/Target/ARM/AsmParser/ARMAsmParser.cpp
View File

@ -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;
}

4
test/MC/AArch64/dot-req.s
View File

@ -1,7 +1,9 @@
// RUN: llvm-mc -triple=aarch64-none-linux-gnu -show-encoding < %s | FileCheck %s
// RUN: llvm-mc -triple=aarch64-none-linux-gnu -show-encoding < %s 2>&1 | FileCheck %s
bar:
fred .req x5
// CHECK-NOT: ignoring redefinition of register alias 'fred'
fred .req x5
mov fred, x11
.unreq fred
fred .req w6

3
test/MC/ARM/dot-req.s
View File

@ -1,6 +1,9 @@
@ RUN: llvm-mc -triple=armv7-apple-darwin -show-encoding < %s | FileCheck %s
.syntax unified
bar:
@ The line is duplicated on purpose, it is legal to redefine a req with
@ the same value.
fred .req r5
fred .req r5
mov r11, fred
.unreq fred