[llvm-commits] [llvm] r152967 - in /llvm/trunk: lib/MC/MCParser/AsmParser.cpp test/MC/AsmParser/macro-args.s

Jim Grosbach grosbach at apple.com
Fri Mar 16 17:11:42 PDT 2012


Author: grosbach
Date: Fri Mar 16 19:11:42 2012
New Revision: 152967

URL: http://llvm.org/viewvc/llvm-project?rev=152967&view=rev
Log:
MC asm parser macro argument count was wrong when empty.

 evaluated to '1' when the argument list was empty (should be '0').

rdar://11057257

Modified:
    llvm/trunk/lib/MC/MCParser/AsmParser.cpp
    llvm/trunk/test/MC/AsmParser/macro-args.s

Modified: llvm/trunk/lib/MC/MCParser/AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/AsmParser.cpp?rev=152967&r1=152966&r2=152967&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCParser/AsmParser.cpp (original)
+++ llvm/trunk/lib/MC/MCParser/AsmParser.cpp Fri Mar 16 19:11:42 2012
@@ -1528,6 +1528,11 @@
     }
     Lex();
   }
+  // If there weren't any arguments, erase the token vector so everything
+  // else knows that. Leaving around the vestigal empty token list confuses
+  // things.
+  if (MacroArguments.size() == 1 && MacroArguments.back().empty())
+    MacroArguments.clear();
 
   // Macro instantiation is lexical, unfortunately. We construct a new buffer
   // to hold the macro body with substitutions.

Modified: llvm/trunk/test/MC/AsmParser/macro-args.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/macro-args.s?rev=152967&r1=152966&r2=152967&view=diff
==============================================================================
--- llvm/trunk/test/MC/AsmParser/macro-args.s (original)
+++ llvm/trunk/test/MC/AsmParser/macro-args.s Fri Mar 16 19:11:42 2012
@@ -8,3 +8,13 @@
 GET    is_sse, %eax
 
 // CHECK: movl	is_sse at GOTOFF(%ebx), %eax
+
+.macro bar
+    .long $n
+.endm
+
+bar 1, 2, 3
+bar
+
+// CHECK: .long 3
+// CHECK: .long 0





More information about the llvm-commits mailing list