commit 32ac816fff2fb4137fc9633e459826289ce20481
author Richard Smith <richard-llvm@metafoo.co.uk> Tue May 01 18:50:15 2018 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Tue May 01 18:50:15 2018 +0000
tree 773953b60f76b8fa2827fa015cb977e32969454e
parent 1501af4846791c3b52b812c41ec540081343ba38

Fix bogus MSVC char8_t mangling.

This appears to have been caused by a bad automatic svn merge with r330225
attaching the 'case' label to the wrong block of code. :(

llvm-svn: 331299

clang/lib/AST/MicrosoftMangle.cpp

diff --git a/clang/lib/AST/MicrosoftMangle.cpp b/clang/lib/AST/MicrosoftMangle.cpp
index f39c1a8..7b60c14 100644
--- a/clang/lib/AST/MicrosoftMangle.cpp
+++ b/clang/lib/AST/MicrosoftMangle.cpp
@@ -1918,7 +1918,6 @@
     Out << "$$T";
     break;
 
-  case BuiltinType::Char8:
   case BuiltinType::Float16:
     mangleArtificalTagType(TTK_Struct, "_Float16", {"__clang"});
     break;
@@ -1927,6 +1926,7 @@
     mangleArtificalTagType(TTK_Struct, "_Half", {"__clang"});
     break;
 
+  case BuiltinType::Char8:
   case BuiltinType::Float128: {
     DiagnosticsEngine &Diags = Context.getDiags();
     unsigned DiagID = Diags.getCustomDiagID(