Author: hans
Date: Fri Oct 26 06:05:45 2018
New Revision: 345380
URL: http://llvm.org/viewvc/llvm-project?rev=345380&view=rev
Log:
Revert r345330 "Add MS ABI mangling for operator<=>."
The generated MS manglings differ between 32- and 64-bit, and the test only
expects the latter. See also the commit email thread.
> Thanks to Cameron DaCamara at Microsoft for letting us know what their
> chosen mangling is here!
Removed:
cfe/trunk/test/CodeGenCXX/mangle-ms-cxx2a.cpp
Modified:
cfe/trunk/lib/AST/MicrosoftMangle.cpp
cfe/trunk/test/CodeGenCXX/cxx2a-three-way-comparison.cpp
Modified: cfe/trunk/lib/AST/MicrosoftMangle.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/MicrosoftMangle.cpp?rev=345380&r1=345379&r2=345380&view=diff
==============================================================================
--- cfe/trunk/lib/AST/MicrosoftMangle.cpp (original)
+++ cfe/trunk/lib/AST/MicrosoftMangle.cpp Fri Oct 26 06:05:45 2018
@@ -1240,8 +1240,15 @@ void MicrosoftCXXNameMangler::mangleOper
case OO_Array_Delete: Out << "?_V"; break;
// <operator-name> ::= ?__L # co_await
case OO_Coawait: Out << "?__L"; break;
- // <operator-name> ::= ?__M # <=>
- case OO_Spaceship: Out << "?__M"; break;
+
+ case OO_Spaceship: {
+ // FIXME: Once MS picks a mangling, use it.
+ DiagnosticsEngine &Diags = Context.getDiags();
+ unsigned DiagID = Diags.getCustomDiagID(DiagnosticsEngine::Error,
+ "cannot mangle this three-way comparison operator yet");
+ Diags.Report(Loc, DiagID);
+ break;
+ }
case OO_Conditional: {
DiagnosticsEngine &Diags = Context.getDiags();
Modified: cfe/trunk/test/CodeGenCXX/cxx2a-three-way-comparison.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/cxx2a-three-way-comparison.cpp?rev=345380&r1=345379&r2=345380&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCXX/cxx2a-three-way-comparison.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/cxx2a-three-way-comparison.cpp Fri Oct 26
06:05:45 2018
@@ -1,28 +1,24 @@
-// RUN: %clang_cc1 -std=c++2a -emit-llvm %s -o - -triple %itanium_abi_triple |
FileCheck %s --check-prefixes=CHECK,ITANIUM
-// RUN: %clang_cc1 -std=c++2a -emit-llvm %s -o - -triple %ms_abi_triple |
FileCheck %s --check-prefixes=CHECK,MSABI
+// RUN: %clang_cc1 -std=c++2a -emit-llvm %s -o - -triple %itanium_abi_triple |
FileCheck %s --check-prefix=ITANIUM
+// RUN: not %clang_cc1 -std=c++2a -emit-llvm %s -o - -triple %ms_abi_triple
2>&1 | FileCheck %s --check-prefix=MSABI
// RUN: not %clang_cc1 -std=c++2a -emit-llvm %s -o - -triple
%itanium_abi_triple -DBUILTIN 2>&1 | FileCheck %s --check-prefix=BUILTIN
-// RUN: not %clang_cc1 -std=c++2a -emit-llvm %s -o - -triple %ms_abi_triple
-DBUILTIN 2>&1 | FileCheck %s --check-prefix=BUILTIN
+// MSABI: cannot mangle this three-way comparison operator yet
struct A {
void operator<=>(int);
};
// ITANIUM: define {{.*}}@_ZN1AssEi(
-// MSABI: define {{.*}}@"??__MA@@QEAAXH@Z"(
void A::operator<=>(int) {}
// ITANIUM: define {{.*}}@_Zssi1A(
-// MSABI: define {{.*}}@"??__M@YAXHUA@@@Z"(
void operator<=>(int, A) {}
int operator<=>(A, A);
// ITANIUM: define {{.*}}_Z1f1A(
-// MSABI: define {{.*}}"?f@@YAHUA@@@Z"(
int f(A a) {
// ITANIUM: %[[RET:.*]] = call {{.*}}_Zss1AS_(
- // MSABI: %[[RET:.*]] = call {{.*}}"??__M@YAHUA@@0@Z"(
- // CHECK: ret i32 %[[RET]]
+ // ITANIUM: ret i32 %[[RET]]
return a <=> a;
}
Removed: cfe/trunk/test/CodeGenCXX/mangle-ms-cxx2a.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-ms-cxx2a.cpp?rev=345379&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenCXX/mangle-ms-cxx2a.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/mangle-ms-cxx2a.cpp (removed)
@@ -1,6 +0,0 @@
-// RUN: %clang_cc1 -std=c++2a -fms-extensions -emit-llvm %s -o -
-triple=i386-pc-win32 -fms-compatibility-version=19.00 | FileCheck %s
-
-struct A {};
-
-// CHECK-DAG: define {{.*}} @"??__M@YAXUA@@0@Z"
-void operator<=>(A, A) {}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
