From: Kevin Enderby Date: Tue, 24 Aug 2010 21:14:47 +0000 (+0000) Subject: Change the parsing of .loc back to allow the LineNumber field to be optional as X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6d8f1a9a18f07ec099d6f6e9e8e9376e6885c8ea;p=oota-llvm.git Change the parsing of .loc back to allow the LineNumber field to be optional as it is with other assemblers. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@111967 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp index c65becf9741..f83cd5eb2a1 100644 --- a/lib/MC/MCParser/AsmParser.cpp +++ b/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)) {