summaryrefslogtreecommitdiffstats
path: root/llvm/lib/MC/MCParser/AsmParser.cpp
diff options
context:
space:
mode:
authorKevin Enderby <enderby@apple.com>2010-08-24 21:14:47 +0000
committerKevin Enderby <enderby@apple.com>2010-08-24 21:14:47 +0000
commita71ab07e144b1db72f3dcefbb7312f9e96b05223 (patch)
treeb6d5249d2b7383115f6f9a4f2e9d6e963bc85441 /llvm/lib/MC/MCParser/AsmParser.cpp
parent4b2164cab83bcd6133e45883f8250dd63a5f86cc (diff)
downloadbcm5719-llvm-a71ab07e144b1db72f3dcefbb7312f9e96b05223.tar.gz
bcm5719-llvm-a71ab07e144b1db72f3dcefbb7312f9e96b05223.zip
Change the parsing of .loc back to allow the LineNumber field to be optional as
it is with other assemblers. llvm-svn: 111967
Diffstat (limited to 'llvm/lib/MC/MCParser/AsmParser.cpp')
-rw-r--r--llvm/lib/MC/MCParser/AsmParser.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/llvm/lib/MC/MCParser/AsmParser.cpp b/llvm/lib/MC/MCParser/AsmParser.cpp
index c65becf9741..f83cd5eb2a1 100644
--- a/llvm/lib/MC/MCParser/AsmParser.cpp
+++ b/llvm/lib/MC/MCParser/AsmParser.cpp
@@ -1838,7 +1838,7 @@ bool GenericAsmParser::ParseDirectiveLine(StringRef, SMLoc DirectiveLoc) {
/// ParseDirectiveLoc
-/// ::= .loc FileNumber LineNumber [ColumnPos] [basic_block] [prologue_end]
+/// ::= .loc FileNumber [LineNumber] [ColumnPos] [basic_block] [prologue_end]
/// [epilogue_begin] [is_stmt VALUE] [isa VALUE]
/// The first number is a file number, must have been previously assigned with
/// a .file directive, the second number is the line number and optionally the
@@ -1855,12 +1855,13 @@ bool GenericAsmParser::ParseDirectiveLoc(StringRef, SMLoc DirectiveLoc) {
return TokError("unassigned file number in '.loc' directive");
Lex();
- if (getLexer().isNot(AsmToken::Integer))
- return TokError("unexpected token in '.loc' directive");
- int64_t LineNumber = getTok().getIntVal();
- if (LineNumber < 1)
- return TokError("line number less than one in '.loc' directive");
- Lex();
+ int64_t LineNumber = 0;
+ if (getLexer().is(AsmToken::Integer)) {
+ LineNumber = getTok().getIntVal();
+ if (LineNumber < 1)
+ return TokError("line number less than one in '.loc' directive");
+ Lex();
+ }
int64_t ColumnPos = 0;
if (getLexer().is(AsmToken::Integer)) {
OpenPOWER on IntegriCloud