Codegen support for nullptr from C++0x.

llvm-svn: 81835
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index 8f5ff72..8df52c9 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -383,7 +383,8 @@
 
    // 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;