aboutsummaryrefslogtreecommitdiff
path: root/lib/Sema/SemaInit.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2012-03-23 23:55:39 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2012-03-23 23:55:39 +0000
commitf602806965531ee06fd8664b9d7a8912c4af2870 (patch)
tree66b36e40cf4f0571cd120ee1e6e9061677cc60b4 /lib/Sema/SemaInit.cpp
parente78ec3e8f7324e36ac9cf2268d5fe32997762940 (diff)
Teach APValue printer to print boolean 0 and 1 as 'false' and 'true'. Fix up
some calling code to actually pass in a non-null type, to avoid a crash. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@153358 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaInit.cpp')
-rw-r--r--lib/Sema/SemaInit.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp
index 78a9f89d59..570b240332 100644
--- a/lib/Sema/SemaInit.cpp
+++ b/lib/Sema/SemaInit.cpp
@@ -6045,7 +6045,9 @@ static void DiagnoseNarrowingInInitList(Sema &S, InitializationSequence &Seq,
// C++11 [dcl.init.list]p7: Check whether this is a narrowing conversion.
APValue ConstantValue;
- switch (SCS->getNarrowingKind(S.Context, PostInit, ConstantValue)) {
+ QualType ConstantType;
+ switch (SCS->getNarrowingKind(S.Context, PostInit, ConstantValue,
+ ConstantType)) {
case NK_Not_Narrowing:
// No narrowing occurred.
return;
@@ -6074,7 +6076,7 @@ static void DiagnoseNarrowingInInitList(Sema &S, InitializationSequence &Seq,
diag::err_init_list_constant_narrowing_sfinae
: diag::err_init_list_constant_narrowing)
<< PostInit->getSourceRange()
- << ConstantValue.getAsString(S.getASTContext(), EntityType)
+ << ConstantValue.getAsString(S.getASTContext(), ConstantType)
<< EntityType.getLocalUnqualifiedType();
break;