commit 4051ff765087b456d6cd91f9311b8ffe3309b980
author Richard Smith <richard-llvm@metafoo.co.uk> Sun Apr 08 08:02:07 2012 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Sun Apr 08 08:02:07 2012 +0000
tree 51244ff7ccc469f4f823adf1221d1e925d32d648
parent d73a53f1581266882672f0bc82aeac5831cbefae

Don't forget to evaluate the subexpression in a null pointer cast. If we're
converting from std::nullptr_t, the subexpression might have side-effects.

llvm-svn: 154278

clang/lib/AST/ExprConstant.cpp

diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index 4ef169d..435d94c1 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -3178,6 +3178,7 @@
     return HandleBaseToDerivedCast(Info, E, Result);
 
   case CK_NullToPointer:
+    VisitIgnoredValue(E->getSubExpr());
     return ZeroInitialization(E);
 
   case CK_IntegralToPointer: {
@@ -3276,6 +3277,7 @@
     return ExprEvaluatorBaseTy::VisitCastExpr(E);
 
   case CK_NullToMemberPointer:
+    VisitIgnoredValue(E->getSubExpr());
     return ZeroInitialization(E);
 
   case CK_BaseToDerivedMemberPointer: {