aboutsummaryrefslogtreecommitdiff
path: root/gcc/tree.c
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2012-07-09 10:11:01 -0400
committerJason Merrill <jason@gcc.gnu.org>2012-07-09 10:11:01 -0400
commit06e3e32bcd55600300f4a393a77bb582ff68cdf9 (patch)
tree021b701cb646698a039d5ccd1a70274ab3b26324 /gcc/tree.c
parent065dd77587faa7359d6a56dcae25e2c22843f2a3 (diff)
downloadgcc-06e3e32bcd55600300f4a393a77bb582ff68cdf9.zip
gcc-06e3e32bcd55600300f4a393a77bb582ff68cdf9.tar.gz
gcc-06e3e32bcd55600300f4a393a77bb582ff68cdf9.tar.bz2
re PR c++/53882 (ICE in type_contains_placeholder_1, at tree.c:3015)
PR c++/53882 * tree.c (type_contains_placeholder_1): Handle NULLPTR_TYPE. (type_hash_eq): Likewise. From-SVN: r189386
Diffstat (limited to 'gcc/tree.c')
-rw-r--r--gcc/tree.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/gcc/tree.c b/gcc/tree.c
index 9be0c9a..f92f070 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -2980,6 +2980,7 @@ type_contains_placeholder_1 (const_tree type)
case METHOD_TYPE:
case FUNCTION_TYPE:
case VECTOR_TYPE:
+ case NULLPTR_TYPE:
return false;
case INTEGER_TYPE:
@@ -6188,6 +6189,7 @@ type_hash_eq (const void *va, const void *vb)
case COMPLEX_TYPE:
case POINTER_TYPE:
case REFERENCE_TYPE:
+ case NULLPTR_TYPE:
return 1;
case VECTOR_TYPE: