re PR c++/53826 ([alpha]: ICE in fold_convert_loc, at fold-const.c:2008)

	PR c++/53826
	* tree.c (build_zero_cst): Handle NULLPTR_TYPE.

From-SVN: r189238

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4bf7fa081d50a795dec6222f91ae2ffb9595b190..9fcf3ca1dbe4decafa619ac89f7b2eda40be8602 100644 (file)
--- 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 5aa5399d7d1450b3c78a2f4c53084d8e5e82d176..f9942fb04874ac670027b087e38f10227f99de38 100644 (file)
--- 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: