From f88d08f7c5c8305929259b283103419d3954a126 Mon Sep 17 00:00:00 2001 From: Oliver Stannard Date: Mon, 16 Nov 2015 10:25:19 +0000 Subject: [PATCH] [AArch64] ldr= pseudo-instruction silently ignored if register invalid The AArch64 assembler was silently ignoring instructions like this: ldr foo, =bar AArch64AsmParser::parseOperand was returning true as the parse failed, but was not calling AArch64AsmParser::Error to report this to the user, so the instruction was ignored without printing an error message. Differential Revision: http://reviews.llvm.org/D14651 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@253193 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../AArch64/AsmParser/AArch64AsmParser.cpp | 2 +- test/MC/AArch64/ldr-pseudo-diagnostics.s | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp b/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp index 278c4b8f489..a1f32e099e3 100644 --- a/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp +++ b/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp @@ -3178,7 +3178,7 @@ bool AArch64AsmParser::parseOperand(OperandVector &Operands, bool isCondCode, if (Operands.size() < 2 || !static_cast(*Operands[1]).isReg()) - return true; + return Error(Loc, "Only valid when first operand is register"); bool IsXReg = AArch64MCRegisterClasses[AArch64::GPR64allRegClassID].contains( diff --git a/test/MC/AArch64/ldr-pseudo-diagnostics.s b/test/MC/AArch64/ldr-pseudo-diagnostics.s index e32c5167952..e83ca93f6d2 100644 --- a/test/MC/AArch64/ldr-pseudo-diagnostics.s +++ b/test/MC/AArch64/ldr-pseudo-diagnostics.s @@ -12,3 +12,21 @@ f2: // CHECK-ERROR: error: Immediate too large for register // CHECK-ERROR: ldr w0, =-0x80000001 // CHECK-ERROR: ^ + +f3: + ldr foo, =1 +// CHECK-ERROR: error: Only valid when first operand is register +// CHECK-ERROR: ldr foo, =1 +// CHECK-ERROR: ^ + +f4: + add r0, r0, =1 +// CHECK-ERROR: error: unexpected token in operand +// CHECK-ERROR: add r0, r0, =1 +// CHECK-ERROR: ^ + +f5: + ldr x0, =()) +// CHECK-ERROR: error: unknown token in expression +// CHECK-ERROR: ldr x0, =()) +// CHECK-ERROR: ^ -- 2.34.1