summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaExprCXX.cpp
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@mac.com>2009-11-23 20:04:44 +0000
committerAnders Carlsson <andersca@mac.com>2009-11-23 20:04:44 +0000
commit7fa434c2b88aa1ea755465cf678a2e3e34a8796f (patch)
tree0b8a49743eb9c6f9ef9aa44f2f14ba3bd3f05f9b /clang/lib/Sema/SemaExprCXX.cpp
parent3f21c159dc274006423602745a3ed8c9db24c6d0 (diff)
downloadbcm5719-llvm-7fa434c2b88aa1ea755465cf678a2e3e34a8796f.tar.gz
bcm5719-llvm-7fa434c2b88aa1ea755465cf678a2e3e34a8796f.zip
Handle converting member pointers to bool.
llvm-svn: 89692
Diffstat (limited to 'clang/lib/Sema/SemaExprCXX.cpp')
-rw-r--r--clang/lib/Sema/SemaExprCXX.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index 24fd6c5eebb..21ab093a1a5 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/lib/Sema/SemaExprCXX.cpp
@@ -1359,9 +1359,14 @@ Sema::PerformImplicitConversion(Expr *&From, QualType ToType,
ImpCastExprToType(From, ToType, Kind);
break;
}
- case ICK_Boolean_Conversion:
- ImpCastExprToType(From, Context.BoolTy, CastExpr::CK_Unknown);
+ case ICK_Boolean_Conversion: {
+ CastExpr::CastKind Kind = CastExpr::CK_Unknown;
+ if (FromType->isMemberPointerType())
+ Kind = CastExpr::CK_MemberPointerToBoolean;
+
+ ImpCastExprToType(From, Context.BoolTy, Kind);
break;
+ }
case ICK_Derived_To_Base:
if (CheckDerivedToBaseConversion(From->getType(),
OpenPOWER on IntegriCloud