From 71b71b96f05daefae87b3f5b65b7252987fb6eab Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Wed, 6 Nov 2013 20:19:10 +0000 Subject: re PR c++/11006 ([CNI] ICE with use of __java_boolean) /cp 2013-11-06 Paolo Carlini PR c++/11006 * init.c (build_new_1): Don't call build_java_class_ref on non-class types. /testsuite 2013-11-06 Paolo Carlini PR c++/11006 * g++.dg/other/java3.C: New. From-SVN: r204469 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/init.c | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'gcc/cp') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 887ea615..6369f05 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2013-11-06 Paolo Carlini + + PR c++/11006 + * init.c (build_new_1): Don't call build_java_class_ref on non-class + types. + 2013-11-05 Jason Merrill PR c++/58868 diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 85732ff..a4d8280 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -2461,9 +2461,16 @@ build_new_1 (vec **placement, tree type, tree nelts, if (vec_safe_is_empty (*placement) && TYPE_FOR_JAVA (elt_type)) { tree class_addr; - tree class_decl = build_java_class_ref (elt_type); + tree class_decl; static const char alloc_name[] = "_Jv_AllocObject"; + if (!MAYBE_CLASS_TYPE_P (elt_type)) + { + error ("%qT isn%'t a valid Java class type", elt_type); + return error_mark_node; + } + + class_decl = build_java_class_ref (elt_type); if (class_decl == error_mark_node) return error_mark_node; -- cgit v1.1