[llvm-branch-commits] [llvm-branch] r142539 - in /llvm/branches/release_30: ./ lib/MC/MCParser/AsmParser.cpp test/MC/AsmParser/line_with_hash.s

[Bill Wendling]

Author: void
Date: Wed Oct 19 14:48:46 2011
New Revision: 142539

URL: http://llvm.org/viewvc/llvm-project?rev=142539&view=rev
Log:
Merging r142537:
------------------------------------------------------------------------
r142537 | rafael | 2011-10-19 11:48:52 -0700 (Wed, 19 Oct 2011) | 1 line

Fix parsing of a line with only a # in it.
------------------------------------------------------------------------

Added:
    llvm/branches/release_30/test/MC/AsmParser/line_with_hash.s
      - copied unchanged from r142537, llvm/trunk/test/MC/AsmParser/line_with_hash.s
Modified:
    llvm/branches/release_30/   (props changed)
    llvm/branches/release_30/lib/MC/MCParser/AsmParser.cpp

Propchange: llvm/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 14:48:46 2011
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:142039,142055,142058,142112,142123,142125,142165,142243,142482,142486,142489
+/llvm/trunk:142039,142055,142058,142112,142123,142125,142165,142243,142482,142486,142489,142537

Modified: llvm/branches/release_30/lib/MC/MCParser/AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_30/lib/MC/MCParser/AsmParser.cpp?rev=142539&r1=142538&r2=142539&view=diff
==============================================================================
--- llvm/branches/release_30/lib/MC/MCParser/AsmParser.cpp (original)
+++ llvm/branches/release_30/lib/MC/MCParser/AsmParser.cpp Wed Oct 19 14:48:46 2011
@@ -1225,7 +1225,8 @@
 /// EatToEndOfLine uses the Lexer to eat the characters to the end of the line
 /// since they may not be able to be tokenized to get to the end of line token.
 void AsmParser::EatToEndOfLine() {
- Lexer.LexUntilEndOfLine();
+  if (!Lexer.is(AsmToken::EndOfStatement))
+    Lexer.LexUntilEndOfLine();
  // Eat EOL.
  Lex();
 }