Clean up diagnostic wording for disallowed casts in C++11 constant expressions.
llvm-svn: 146395
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index 62d70dd..3a897ab 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -2226,8 +2226,13 @@
// Bitcasts to cv void* are static_casts, not reinterpret_casts, so are
// permitted in constant expressions in C++11. Bitcasts from cv void* are
// also static_casts, but we disallow them as a resolution to DR1312.
- if (!E->getType()->isVoidPointerType())
- CCEDiag(E, diag::note_constexpr_invalid_cast) << 2;
+ if (!E->getType()->isVoidPointerType()) {
+ if (SubExpr->getType()->isVoidPointerType())
+ CCEDiag(E, diag::note_constexpr_invalid_cast)
+ << 3 << SubExpr->getType();
+ else
+ CCEDiag(E, diag::note_constexpr_invalid_cast) << 2;
+ }
if (!Visit(SubExpr))
return false;
Result.Designator.setInvalid();