diff options
| -rw-r--r-- | lib/AST/ExprConstant.cpp | 2 | ||||
| -rw-r--r-- | test/CodeGenCXX/const-init-cxx11.cpp | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp index 4ef169d189..435d94c1d4 100644 --- a/lib/AST/ExprConstant.cpp +++ b/lib/AST/ExprConstant.cpp @@ -3178,6 +3178,7 @@ bool PointerExprEvaluator::VisitCastExpr(const CastExpr* E) { return HandleBaseToDerivedCast(Info, E, Result); case CK_NullToPointer: + VisitIgnoredValue(E->getSubExpr()); return ZeroInitialization(E); case CK_IntegralToPointer: { @@ -3276,6 +3277,7 @@ bool MemberPointerExprEvaluator::VisitCastExpr(const CastExpr *E) { return ExprEvaluatorBaseTy::VisitCastExpr(E); case CK_NullToMemberPointer: + VisitIgnoredValue(E->getSubExpr()); return ZeroInitialization(E); case CK_BaseToDerivedMemberPointer: { diff --git a/test/CodeGenCXX/const-init-cxx11.cpp b/test/CodeGenCXX/const-init-cxx11.cpp index c6250c6d96..c745deebf0 100644 --- a/test/CodeGenCXX/const-init-cxx11.cpp +++ b/test/CodeGenCXX/const-init-cxx11.cpp @@ -414,3 +414,12 @@ namespace InitFromConst { consume(a); } } + +namespace Null { + decltype(nullptr) null(); + // CHECK: call {{.*}} @_ZN4Null4nullEv( + int *p = null(); + struct S {}; + // CHECK: call {{.*}} @_ZN4Null4nullEv( + int S::*q = null(); +} |