diff options
author | Jim Grosbach <grosbach@apple.com> | 2012-01-27 00:37:08 +0000 |
---|---|---|
committer | Jim Grosbach <grosbach@apple.com> | 2012-01-27 00:37:08 +0000 |
commit | ebd4c05c3cbd61215366d4d16f1c1a2e57e7156d (patch) | |
tree | 97d9f1a971c21688223b77711c5541748ae0c7f6 /lib/MC/MCParser/AsmParser.cpp | |
parent | 3b0714d993a37c722603f7cbfab71848a99e91cd (diff) |
Better diagnostic for malformed .org assembly directive.
Provide source line number information.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@149101 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC/MCParser/AsmParser.cpp')
-rw-r--r-- | lib/MC/MCParser/AsmParser.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp index 64d0dd8563..1af7cd9ee0 100644 --- a/lib/MC/MCParser/AsmParser.cpp +++ b/lib/MC/MCParser/AsmParser.cpp @@ -1970,6 +1970,7 @@ bool AsmParser::ParseDirectiveOrg() { CheckForValidSection(); const MCExpr *Offset; + SMLoc Loc = getTok().getLoc(); if (ParseExpression(Offset)) return true; @@ -1989,9 +1990,11 @@ bool AsmParser::ParseDirectiveOrg() { Lex(); - // FIXME: Only limited forms of relocatable expressions are accepted here, it - // has to be relative to the current section. - getStreamer().EmitValueToOffset(Offset, FillExpr); + // Only limited forms of relocatable expressions are accepted here, it + // has to be relative to the current section. The streamer will return + // 'true' if the expression wasn't evaluatable. + if (getStreamer().EmitValueToOffset(Offset, FillExpr)) + return Error(Loc, "expected assembly-time absolute expression"); return false; } |