From: Jason Merrill <jason@redhat.com>
Date: Tue, 3 Jul 2012 18:10:39 +0000 (-0400)
Subject: re PR c++/53826 ([alpha]: ICE in fold_convert_loc, at fold-const.c:2008)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f5d306802cc5327d9ee94eeae84765dab89a0104;p=gcc.git

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 4bf7fa081d5..9fcf3ca1dbe 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 5aa5399d7d1..f9942fb0487 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: