6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-12 02:33:33 +00:00
Code Issues Projects Releases Wiki Activity

ARM: improve diagnostics for .word directive

Browse Source 
If a complex expression was passed to the .word directive and the first part of
the directive failed to parse, a secondary diagnostic would be produced that
would clutter the error diagnostics.  Improve the diagnostics by consuming the
remainder of the statement.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200160 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Saleem Abdulrasool 2014-01-26 22:29:50 +00:00
parent 10096880c8
commit 4fefc13b5e
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8093,8 +8093,10 @@ bool ARMAsmParser::parseDirectiveWord(unsigned Size, SMLoc L) {
if (getLexer().isNot(AsmToken::EndOfStatement)) { if (getLexer().isNot(AsmToken::EndOfStatement)) {
for (;;) { for (;;) {
const MCExpr *Value; const MCExpr *Value;
if (getParser().parseExpression(Value)) if (getParser().parseExpression(Value)) {
Parser.eatToEndOfStatement();
return false; return false;
}
getParser().getStreamer().EmitValue(Value, Size); getParser().getStreamer().EmitValue(Value, Size);

12
test/MC/ARM/directive-word-diagnostics.s Normal file
View File

@ -0,0 +1,12 @@
@ RUN: not llvm-mc -triple armv7-eabi -filetype asm -o /dev/null 2>&1 %s \
@ RUN: | FileCheck %s
.cpu armv7
.type double_diagnostics,%function
double_diagnostics:
.word invalid(invalid) + 32
@ CHECK: error: invalid variant 'invalid'
@ CHECK-NOT: error: unexpected token at start of statement