aboutsummaryrefslogtreecommitdiff
path: root/lib/AST/ExprConstant.cpp
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@mac.com>2009-09-15 04:39:46 +0000
committerAnders Carlsson <andersca@mac.com>2009-09-15 04:39:46 +0000
commitc1eb14a66fdd955aff3f957a5843295f27952bdd (patch)
treeab3738d62044635456c762d297cfef49bbce19e1 /lib/AST/ExprConstant.cpp
parentaab7efef16e29797e9a7fe4a8e93ad7f58752991 (diff)
Codegen support for nullptr from C++0x.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@81835 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AST/ExprConstant.cpp')
-rw-r--r--lib/AST/ExprConstant.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index 8f5ff7284b..8df52c9377 100644
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -383,7 +383,8 @@ APValue PointerExprEvaluator::VisitCastExpr(const CastExpr* E) {
// Check for pointer->pointer cast
if (SubExpr->getType()->isPointerType() ||
- SubExpr->getType()->isObjCObjectPointerType()) {
+ SubExpr->getType()->isObjCObjectPointerType() ||
+ SubExpr->getType()->isNullPtrType()) {
APValue Result;
if (EvaluatePointer(SubExpr, Result, Info))
return Result;