[llvm-commits] [llvm] r111967 - /llvm/trunk/lib/MC/MCParser/AsmParser.cpp

[Kevin Enderby]

Author: enderby
Date: Tue Aug 24 16:14:47 2010
New Revision: 111967

URL: http://llvm.org/viewvc/llvm-project?rev=111967&view=rev
Log:
Change the parsing of .loc back to allow the LineNumber field to be optional as
it is with other assemblers.

Modified:
    llvm/trunk/lib/MC/MCParser/AsmParser.cpp

Modified: llvm/trunk/lib/MC/MCParser/AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/AsmParser.cpp?rev=111967&r1=111966&r2=111967&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCParser/AsmParser.cpp (original)
+++ llvm/trunk/lib/MC/MCParser/AsmParser.cpp Tue Aug 24 16:14:47 2010
@@ -1838,7 +1838,7 @@
 
 
 /// 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 @@
     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)) {