<div dir="ltr">On Tue, Feb 6, 2018 at 5:55 PM, Saleem Abdulrasool via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: compnerd<br>
Date: Tue Feb  6 17:55:08 2018<br>
New Revision: 324439<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=324439&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=324439&view=rev</a><br>
Log:<br>
AST: support SwiftCC on MS ABI<br>
<br>
Microsoft has reserved the identifier 'S' as the swift calling<br>
convention.  Decorate the symbols appropriately.  This enables swift on<br>
Windows.<br></blockquote><div><br></div><div>Hans, thoughts on getting this into 6.0?  This is needed to enable swift on Windows.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Added:<br>
    cfe/trunk/test/CodeGenCXX/<wbr>msabi-swiftcall-cc.cpp<br>
Modified:<br>
    cfe/trunk/lib/AST/<wbr>MicrosoftMangle.cpp<br>
<br>
Modified: cfe/trunk/lib/AST/<wbr>MicrosoftMangle.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/MicrosoftMangle.cpp?rev=324439&r1=324438&r2=324439&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/AST/<wbr>MicrosoftMangle.cpp?rev=<wbr>324439&r1=324438&r2=324439&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/AST/<wbr>MicrosoftMangle.cpp (original)<br>
+++ cfe/trunk/lib/AST/<wbr>MicrosoftMangle.cpp Tue Feb  6 17:55:08 2018<br>
@@ -950,11 +950,10 @@ void MicrosoftCXXNameMangler::<wbr>mangleUnqu<br>
   }<br>
 }<br>
<br>
+// <postfix> ::= <unqualified-name> [<postfix>]<br>
+//           ::= <substitution> [<postfix>]<br>
 void MicrosoftCXXNameMangler::<wbr>mangleNestedName(const NamedDecl *ND) {<br>
-  // <postfix> ::= <unqualified-name> [<postfix>]<br>
-  //           ::= <substitution> [<postfix>]<br>
   const DeclContext *DC = getEffectiveDeclContext(ND);<br>
-<br>
   while (!DC->isTranslationUnit()) {<br>
     if (isa<TagDecl>(ND) || isa<VarDecl>(ND)) {<br>
       unsigned Disc;<br>
@@ -2136,6 +2135,7 @@ void MicrosoftCXXNameMangler::<wbr>mangleCall<br>
     case CC_X86StdCall: Out << 'G'; break;<br>
     case CC_X86FastCall: Out << 'I'; break;<br>
     case CC_X86VectorCall: Out << 'Q'; break;<br>
+    case CC_Swift: Out << 'S'; break;<br>
     case CC_X86RegCall: Out << 'w'; break;<br>
   }<br>
 }<br>
<br>
Added: cfe/trunk/test/CodeGenCXX/<wbr>msabi-swiftcall-cc.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/msabi-swiftcall-cc.cpp?rev=324439&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>CodeGenCXX/msabi-swiftcall-cc.<wbr>cpp?rev=324439&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/CodeGenCXX/<wbr>msabi-swiftcall-cc.cpp (added)<br>
+++ cfe/trunk/test/CodeGenCXX/<wbr>msabi-swiftcall-cc.cpp Tue Feb  6 17:55:08 2018<br>
@@ -0,0 +1,28 @@<br>
+// RUN: %clang_cc1 -triple i686-unknown-windows-msvc -fdeclspec -emit-llvm %s -o - | FileCheck %s<br>
+<br>
+void __attribute__((__swiftcall__)) f() {}<br>
+// CHECK-DAG: @"\01?f@@YSXXZ"<br>
+<br>
+void (__attribute__((__swiftcall__)<wbr>) *p)();<br>
+// CHECK-DAG: @"\01?p@@3P6SXXZA"<br>
+<br>
+namespace {<br>
+void __attribute__((__swiftcall__)) __attribute__((__used__)) f() { }<br>
+// CHECK-DAG: "\01?f@?A@@YSXXZ"<br>
+}<br>
+<br>
+namespace n {<br>
+void __attribute__((__swiftcall__)) f() {}<br>
+// CHECK-DAG: "\01?f@n@@YSXXZ"<br>
+}<br>
+<br>
+struct __declspec(dllexport) S {<br>
+  S(const S &) = delete;<br>
+  S & operator=(const S &) = delete;<br>
+  void __attribute__((__swiftcall__)) m() { }<br>
+  // CHECK-DAG: "\01?m@S@@QASXXZ"<br>
+};<br>
+<br>
+void f(void (__attribute__((__swiftcall__)<wbr>)())) {}<br>
+// CHECK-DAG: "\01?f@@YAXP6SXXZ@Z"<br>
+<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature">Saleem Abdulrasool<br>compnerd (at) compnerd (dot) org</div>
</div></div>