<div dir="ltr">Could you update the demangler too?</div><br><div class="gmail_quote"><div dir="ltr">On Thu, Oct 25, 2018 at 6:53 PM Richard Smith via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rsmith<br>
Date: Thu Oct 25 15:51:16 2018<br>
New Revision: 345330<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=345330&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=345330&view=rev</a><br>
Log:<br>
Add MS ABI mangling for operator<=>.<br>
<br>
Thanks to Cameron DaCamara at Microsoft for letting us know what their<br>
chosen mangling is here!<br>
<br>
Added:<br>
    cfe/trunk/test/CodeGenCXX/mangle-ms-cxx2a.cpp<br>
Modified:<br>
    cfe/trunk/lib/AST/MicrosoftMangle.cpp<br>
    cfe/trunk/test/CodeGenCXX/cxx2a-three-way-comparison.cpp<br>
<br>
Modified: cfe/trunk/lib/AST/MicrosoftMangle.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/MicrosoftMangle.cpp?rev=345330&r1=345329&r2=345330&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/MicrosoftMangle.cpp?rev=345330&r1=345329&r2=345330&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/AST/MicrosoftMangle.cpp (original)<br>
+++ cfe/trunk/lib/AST/MicrosoftMangle.cpp Thu Oct 25 15:51:16 2018<br>
@@ -1240,15 +1240,8 @@ void MicrosoftCXXNameMangler::mangleOper<br>
   case OO_Array_Delete: Out << "?_V"; break;<br>
   // <operator-name> ::= ?__L # co_await<br>
   case OO_Coawait: Out << "?__L"; break;<br>
-<br>
-  case OO_Spaceship: {<br>
-    // FIXME: Once MS picks a mangling, use it.<br>
-    DiagnosticsEngine &Diags = Context.getDiags();<br>
-    unsigned DiagID = Diags.getCustomDiagID(DiagnosticsEngine::Error,<br>
-      "cannot mangle this three-way comparison operator yet");<br>
-    Diags.Report(Loc, DiagID);<br>
-    break;<br>
-  }<br>
+  // <operator-name> ::= ?__M # <=><br>
+  case OO_Spaceship: Out << "?__M"; break;<br>
<br>
   case OO_Conditional: {<br>
     DiagnosticsEngine &Diags = Context.getDiags();<br>
<br>
Modified: cfe/trunk/test/CodeGenCXX/cxx2a-three-way-comparison.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/cxx2a-three-way-comparison.cpp?rev=345330&r1=345329&r2=345330&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/cxx2a-three-way-comparison.cpp?rev=345330&r1=345329&r2=345330&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenCXX/cxx2a-three-way-comparison.cpp (original)<br>
+++ cfe/trunk/test/CodeGenCXX/cxx2a-three-way-comparison.cpp Thu Oct 25 15:51:16 2018<br>
@@ -1,24 +1,28 @@<br>
-// RUN: %clang_cc1 -std=c++2a -emit-llvm %s -o - -triple %itanium_abi_triple | FileCheck %s --check-prefix=ITANIUM<br>
-// RUN: not %clang_cc1 -std=c++2a -emit-llvm %s -o - -triple %ms_abi_triple 2>&1 | FileCheck %s --check-prefix=MSABI<br>
+// RUN: %clang_cc1 -std=c++2a -emit-llvm %s -o - -triple %itanium_abi_triple | FileCheck %s --check-prefixes=CHECK,ITANIUM<br>
+// RUN: %clang_cc1 -std=c++2a -emit-llvm %s -o - -triple %ms_abi_triple | FileCheck %s --check-prefixes=CHECK,MSABI<br>
 // RUN: not %clang_cc1 -std=c++2a -emit-llvm %s -o - -triple %itanium_abi_triple -DBUILTIN 2>&1 | FileCheck %s --check-prefix=BUILTIN<br>
-// MSABI: cannot mangle this three-way comparison operator yet<br>
+// RUN: not %clang_cc1 -std=c++2a -emit-llvm %s -o - -triple %ms_abi_triple -DBUILTIN 2>&1 | FileCheck %s --check-prefix=BUILTIN<br>
<br>
 struct A {<br>
   void operator<=>(int);<br>
 };<br>
<br>
 // ITANIUM: define {{.*}}@_ZN1AssEi(<br>
+// MSABI: define {{.*}}@"??__MA@@QEAAXH@Z"(<br>
 void A::operator<=>(int) {}<br>
<br>
 // ITANIUM: define {{.*}}@_Zssi1A(<br>
+// MSABI: define {{.*}}@"??__M@YAXHUA@@@Z"(<br>
 void operator<=>(int, A) {}<br>
<br>
 int operator<=>(A, A);<br>
<br>
 // ITANIUM: define {{.*}}_Z1f1A(<br>
+// MSABI: define {{.*}}"?f@@YAHUA@@@Z"(<br>
 int f(A a) {<br>
   // ITANIUM: %[[RET:.*]] = call {{.*}}_Zss1AS_(<br>
-  // ITANIUM: ret i32 %[[RET]]<br>
+  // MSABI: %[[RET:.*]] = call {{.*}}"??__M@YAHUA@@0@Z"(<br>
+  // CHECK: ret i32 %[[RET]]<br>
   return a <=> a;<br>
 }<br>
<br>
<br>
Added: cfe/trunk/test/CodeGenCXX/mangle-ms-cxx2a.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-ms-cxx2a.cpp?rev=345330&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-ms-cxx2a.cpp?rev=345330&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenCXX/mangle-ms-cxx2a.cpp (added)<br>
+++ cfe/trunk/test/CodeGenCXX/mangle-ms-cxx2a.cpp Thu Oct 25 15:51:16 2018<br>
@@ -0,0 +1,6 @@<br>
+// RUN: %clang_cc1 -std=c++2a -fms-extensions -emit-llvm %s -o - -triple=i386-pc-win32 -fms-compatibility-version=19.00 | FileCheck %s<br>
+<br>
+struct A {};<br>
+<br>
+// CHECK-DAG: define {{.*}} @"??__M@YAXUA@@0@Z"<br>
+void operator<=>(A, A) {}<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">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/mailman/listinfo/cfe-commits</a><br>
</blockquote></div>