<p dir="ltr"><br>
</p>
<p dir="ltr"></p>
<p dir="ltr">On Wed, Aug 27, 2014, 01:27 Daniel Jasper <<a href="mailto:djasper@google.com">djasper@google.com</a>> wrote:</p>
<blockquote><p dir="ltr">Author: djasper<br>
Date: Tue Aug 26 18:15:12 2014<br>
New Revision: 216501</p>
<p dir="ltr">URL: <a href="http://llvm.org/viewvc/llvm-project?rev=216501&view=rev">http://llvm.org/viewvc/llvm-project?rev=216501&view=rev</a><br>
Log:<br>
clang-format: Don't butcher __asm blocks.</p>
<p dir="ltr">Instead completely cop out of formatting them for now.</p>
<p dir="ltr">This fixes <a href="http://llvm.org/PR20618">llvm.org/PR20618</a>.</p>
<p dir="ltr">Modified:<br>
    cfe/trunk/lib/Format/UnwrappedLineParser.cpp<br>
    cfe/trunk/unittests/Format/FormatTest.cpp</p>
<p dir="ltr">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">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;</p>
</blockquote>
<blockquote><p dir="ltr"></p>
<p dir="ltr">Line can be removed? <br>
</p>
</blockquote>
<blockquote><p dir="ltr"><br>
+      while (FormatTok) {<br>
+        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;</p>
<p dir="ltr">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">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>
 }</p>
<p dir="ltr"> TEST_F(FormatTest, FormatTryCatch) {<br></p>
<p dir="ltr">_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</p>
</blockquote>
<p dir="ltr"><br>
</p>