<div dir="ltr">Fixed both in r216565.</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Aug 27, 2014 at 7:22 PM, Nico Weber <span dir="ltr"><<a href="mailto:thakis@chromium.org" target="_blank">thakis@chromium.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Thanks! One comment below:<div class="gmail_extra"><br><br><div class="gmail_quote"><div><div class="h5">
On Tue, Aug 26, 2014 at 4:15 PM, Daniel Jasper <span dir="ltr"><<a href="mailto:djasper@google.com" target="_blank">djasper@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Author: djasper<br>
Date: Tue Aug 26 18:15:12 2014<br>
New Revision: 216501<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=216501&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=216501&view=rev</a><br>
Log:<br>
clang-format: Don't butcher __asm blocks.<br>
<br>
Instead completely cop out of formatting them for now.<br>
<br>
This fixes <a href="http://llvm.org/PR20618" target="_blank">llvm.org/PR20618</a>.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Format/UnwrappedLineParser.cpp<br>
    cfe/trunk/unittests/Format/FormatTest.cpp<br>
<br>
Modified: cfe/trunk/lib/Format/UnwrappedLineParser.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/UnwrappedLineParser.cpp?rev=216501&r1=216500&r2=216501&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/UnwrappedLineParser.cpp?rev=216501&r1=216500&r2=216501&view=diff</a><br>


==============================================================================<br>
--- cfe/trunk/lib/Format/UnwrappedLineParser.cpp (original)<br>
+++ cfe/trunk/lib/Format/UnwrappedLineParser.cpp Tue Aug 26 18:15:12 2014<br>
@@ -658,6 +658,21 @@ void UnwrappedLineParser::parseStructura<br>
       break;<br>
     }<br>
     break;<br>
+  case tok::kw_asm:<br>
+    FormatTok->Finalized = true;<br>
+    nextToken();<br>
+    if (FormatTok->is(tok::l_brace)) {<br>
+      FormatTok->Finalized = true;<br>
+      while (FormatTok) {<br></blockquote><div><br></div></div></div><div>That looks like it might be an infinite loop…yes, `echo '__asm { int 3' | bin/clang-format` seems to hang.</div><div><div class="h5">







<div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
+        FormatTok->Finalized = true;<br>
+        if (FormatTok->is(tok::r_brace)) {<br>
+          nextToken();<br>
+          break;<br>
+        }<br>
+        nextToken();<br>
+      }<br>
+    }<br>
+    break;<br>
   case tok::kw_namespace:<br>
     parseNamespace();<br>
     return;<br>
<br>
Modified: cfe/trunk/unittests/Format/FormatTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=216501&r1=216500&r2=216501&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=216501&r1=216500&r2=216501&view=diff</a><br>


==============================================================================<br>
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
+++ cfe/trunk/unittests/Format/FormatTest.cpp Tue Aug 26 18:15:12 2014<br>
@@ -2070,6 +2070,21 @@ TEST_F(FormatTest, FormatsInlineASM) {<br>
       "    \"xchgq\\t%%rbx, %%rsi\\n\\t\"\n"<br>
       "    : \"=a\"(*rEAX), \"=S\"(*rEBX), \"=c\"(*rECX), \"=d\"(*rEDX)\n"<br>
       "    : \"a\"(value));");<br>
+  EXPECT_EQ(<br>
+      "void NS_InvokeByIndex(void *that, unsigned int methodIndex) {\n"<br>
+      "    __asm {\n"<br>
+      "        mov     edx,[that] // vtable in edx\n"<br>
+      "        mov     eax,methodIndex\n"<br>
+      "        call    [edx][eax*4] // stdcall\n"<br>
+      "    }\n"<br>
+      "}",<br>
+      format("void NS_InvokeByIndex(void *that,   unsigned int methodIndex) {\n"<br>
+             "    __asm {\n"<br>
+             "        mov     edx,[that] // vtable in edx\n"<br>
+             "        mov     eax,methodIndex\n"<br>
+             "        call    [edx][eax*4] // stdcall\n"<br>
+             "    }\n"<br>
+             "}"));<br>
 }<br>
<br>
 TEST_F(FormatTest, FormatTryCatch) {<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div></div></div><br></div></div>
</blockquote></div><br></div>