Commit 180a937d authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r354633: 

------------------------------------------------------------------------
r354633 | rsmith | 2019-02-21 15:04:35 -0800 (Thu, 21 Feb 2019) | 3 lines

Use _Q as MS ABI mangling for char8_t.

Thanks to Yuriy Solodkyy for letting us know the mangling here.
------------------------------------------------------------------------

llvm-svn: 364487
parent cf7a59f2

clang/lib/AST/MicrosoftMangle.cpp

+5 −2
Original line number Diff line number Diff line
@@ -1937,8 +1937,9 @@ void MicrosoftCXXNameMangler::mangleType(const BuiltinType *T, Qualifiers, 
  //                 ::= _M # unsigned __int128

  //                 ::= _N # bool

  //                     _O # <array in parameter>

  //                 ::= _T # __float80 (Intel)

  //                 ::= _Q # char8_t

  //                 ::= _S # char16_t

  //                 ::= _T # __float80 (Intel)

  //                 ::= _U # char32_t

  //                 ::= _W # wchar_t

  //                 ::= _Z # __float80 (Digital Mars)
@@ -1999,6 +2000,9 @@ void MicrosoftCXXNameMangler::mangleType(const BuiltinType *T, Qualifiers, 
  case BuiltinType::Bool:

    Out << "_N";

    break;

  case BuiltinType::Char8:

    Out << "_Q";

    break;

  case BuiltinType::Char16:

    Out << "_S";

    break;
@@ -2094,7 +2098,6 @@ void MicrosoftCXXNameMangler::mangleType(const BuiltinType *T, Qualifiers, 
  case BuiltinType::SatUShortFract:

  case BuiltinType::SatUFract:

  case BuiltinType::SatULongFract:

  case BuiltinType::Char8:

  case BuiltinType::Float128: {

    DiagnosticsEngine &Diags = Context.getDiags();

    unsigned DiagID = Diags.getCustomDiagID(

clang/test/CodeGenCXX/char8_t.cpp

+7 −5
Original line number Diff line number Diff line 
// RUN: %clang_cc1 -std=c++17 -emit-llvm -fchar8_t -triple x86_64-linux %s -o - | FileCheck %s

// RUN: %clang_cc1 -std=c++17 -emit-llvm -fchar8_t -triple x86_64-windows %s -o - -verify

// RUN: %clang_cc1 -std=c++17 -emit-llvm -fchar8_t -triple x86_64-linux %s -o - | FileCheck %s --check-prefix=ITANIUM

// RUN: %clang_cc1 -std=c++17 -emit-llvm -fchar8_t -triple x86_64-windows %s -o - | FileCheck %s --check-prefix=MSABI



// CHECK: define void @_Z1fDu(

void f(char8_t c) {} // expected-error {{cannot mangle this built-in char8_t type yet}}

// ITANIUM: define void @_Z1fDu(

// MSABI: define {{.*}}void @"?f@@YAX_Q@Z"(

void f(char8_t c) {}



// CHECK: define weak_odr void @_Z1gIiEvDTplplcvT__ELA4_KDuELDu114EE

// ITANIUM: define weak_odr void @_Z1gIiEvDTplplcvT__ELA4_KDuELDu114EE(

// MSABI: define weak_odr {{.*}}void @"??$g@H@@YAXPEB_Q@Z"(

template<typename T> void g(decltype(T() + u8"foo" + u8'r')) {}

template void g<int>(const char8_t*);