From c950bc92e69910b667d7a3dea24e4afc8abdc7e5 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Wed, 3 Oct 2012 06:57:02 +0000 Subject: [PATCH] While I'm here, resync a %select with the enum definition it selects on. * nullptr used to be mapped to ERROR, now mapped to nullptr * integral was missing * expressions now have their own error message, so they won't reach this. Map them to ERROR. Note that clang usually crashes before emitting this diagnostic anyway (see PR13984), so this change alone doesn't have an observable effect. It makes the code more correct though. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165095 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/AST/MicrosoftMangle.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/AST/MicrosoftMangle.cpp b/lib/AST/MicrosoftMangle.cpp index 19ceca5fb2..072ad06999 100644 --- a/lib/AST/MicrosoftMangle.cpp +++ b/lib/AST/MicrosoftMangle.cpp @@ -830,8 +830,8 @@ MicrosoftCXXNameMangler::mangleTemplateArgs( // Issue a diagnostic. DiagnosticsEngine &Diags = Context.getDiags(); unsigned DiagID = Diags.getCustomDiagID(DiagnosticsEngine::Error, - "cannot mangle this %select{ERROR|ERROR|pointer/reference|ERROR|" - "template|template pack expansion|expression|parameter pack}0 " + "cannot mangle this %select{ERROR|ERROR|pointer/reference|nullptr|" + "integral|template|template pack expansion|ERROR|parameter pack}0 " "template argument yet"); Diags.Report(TAL.getLocation(), DiagID) << TA.getKind() -- 2.40.0