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

[Chad Rosier]

Author: mcrosier
Date: Fri Oct 19 19:47:08 2012
New Revision: 166357

URL: http://llvm.org/viewvc/llvm-project?rev=166357&view=rev
Log:
[ms-inline asm] If the state of the parser is ignore, then don't parse the
inline assembly.  Also make sure the remove the ignored statements from the IR.


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=166357&r1=166356&r2=166357&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCParser/AsmParser.cpp (original)
+++ llvm/trunk/lib/MC/MCParser/AsmParser.cpp Fri Oct 19 19:47:08 2012
@@ -1138,7 +1138,7 @@
     return ParseDirectiveEndIf(IDLoc);
 
   // If we are in a ".if 0" block, ignore this statement.
-  if (TheCondState.Ignore && !ParsingInlineAsm) {
+  if (TheCondState.Ignore) {
     EatToEndOfStatement();
     return false;
   }
@@ -3579,7 +3579,8 @@
    AOK_Imm,
    AOK_Input,
    AOK_Output,
-   AOK_SizeDirective
+   AOK_SizeDirective,
+   AOK_Skip
 };
 
 struct AsmOpRewrite {
@@ -3619,9 +3620,24 @@
     // Clear the opcode.
     setOpcode(~0x0);
 
+    // Save the conditional ignore state of the parser prior to parsing the statement.
+    bool PreParseCondStateIgnore = TheCondState.Ignore;
+
+    // Save the starting point of this statement in case we need to skip it.
+    SMLoc Start = getLexer().getLoc();
+
     if (ParseStatement())
       return true;
 
+    // If PreParseCondStateIgnore is false, but TheCondState.Ignore is true, then we
+    // just parsed a directive that changed the state to ignore.  Don't skip 
+    // emitting this directive.
+    if (PreParseCondStateIgnore && TheCondState.Ignore) {
+      unsigned Len = getLexer().getLoc().getPointer() - Start.getPointer();
+      AsmStrRewrites.push_back(AsmOpRewrite(AOK_Skip, Start, Len));
+      continue;
+    }
+
     if (isInstruction()) {
       const MCInstrDesc &Desc = MII->get(getOpcode());
 
@@ -3727,8 +3743,15 @@
       OS << StringRef(Start, Loc - Start);
     PrevKind = Kind;
 
+    // Skip the original expression.
+    if (Kind == AOK_Skip) {
+      Start = Loc + (*I).Len;
+      continue;
+    }
+
     // Rewrite expressions in $N notation.
     switch (Kind) {
+    default: break;
     case AOK_Imm:
       OS << Twine("$$") + StringRef(Loc, (*I).Len);
       break;