2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4bf7fa0..9fcf3ca 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-03  Jason Merrill  <jason@redhat.com>
+
+	PR c++/53826
+	* tree.c (build_zero_cst): Handle NULLPTR_TYPE.
+
 2012-07-03  Nick Clifton  <nickc@redhat.com>
 
 	* config/mep/mep.c (mep_reorg_regmove): Use
diff --git a/gcc/tree.c b/gcc/tree.c
index 5aa5399..f9942fb 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -1640,7 +1640,7 @@ build_zero_cst (tree type)
     {
     case INTEGER_TYPE: case ENUMERAL_TYPE: case BOOLEAN_TYPE:
     case POINTER_TYPE: case REFERENCE_TYPE:
-    case OFFSET_TYPE:
+    case OFFSET_TYPE: case NULLPTR_TYPE:
       return build_int_cst (type, 0);
 
     case REAL_TYPE: