aboutsummaryrefslogtreecommitdiff
path: root/gcc/expr.c
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2011-09-15 10:33:24 -0400
committerJason Merrill <jason@gcc.gnu.org>2011-09-15 10:33:24 -0400
commitf298ca2696ac1db770edd7ebdbb641881d82c4e1 (patch)
tree42bad24db71dafdca90156ba0b9f28f87d9141d3 /gcc/expr.c
parenta61bd0304c6b9b0f68a78dbb5ff4f3aaa7afafe4 (diff)
downloadgcc-f298ca2696ac1db770edd7ebdbb641881d82c4e1.zip
gcc-f298ca2696ac1db770edd7ebdbb641881d82c4e1.tar.gz
gcc-f298ca2696ac1db770edd7ebdbb641881d82c4e1.tar.bz2
re PR c++/50361 ([C++0x] [4.7 Regression] ICE with std::initializer_list and nullptr)
PR c++/50361 * expr.c (count_type_elements): Handle NULLPTR_TYPE. From-SVN: r178882
Diffstat (limited to 'gcc/expr.c')
-rw-r--r--gcc/expr.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/gcc/expr.c b/gcc/expr.c
index e4bb633..29bf68b 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -5296,6 +5296,7 @@ count_type_elements (const_tree type, bool for_ctor_p)
case POINTER_TYPE:
case OFFSET_TYPE:
case REFERENCE_TYPE:
+ case NULLPTR_TYPE:
return 1;
case ERROR_MARK: