* init.c (build_new_1): Deal with an OVERLOAD set when

	looking up for _Jv_AllocObject.
	* except.c (build_throw): Likewise for _Jv_Throw.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74474 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4b3b74a..7f23f0f 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-09  Giovanni Bajo  <giovannibajo@gcc.gnu.org>\r
+\r
+       * init.c (build_new_1): Deal with an OVERLOAD set when\r
+       looking up for _Jv_AllocObject.\r
+       * except.c (build_throw): Likewise for _Jv_Throw.\r
+
 2003-12-08  Jason Merrill  <jason@redhat.com>
 
        PR c++/11971

diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index 1d4e766..b684efb 100644 (file)
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -645,6 +645,11 @@ build_throw (tree exp)
          tmp = build_function_type (ptr_type_node, tmp);
          fn = push_throw_library_fn (fn, tmp);
        }
+      else if (really_overloaded_fn (fn))
+       {\r
+         error ("`%D' should never be overloaded", fn);
+         return error_mark_node;\r
+       }
       fn = OVL_CURRENT (fn);
       exp = build_function_call (fn, tree_cons (NULL_TREE, exp, NULL_TREE));
     }

diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 21b0032..19642d6 100644 (file)
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -2005,11 +2005,18 @@ build_new_1 (tree exp)
       tree class_size = size_in_bytes (true_type);
       static const char alloc_name[] = "_Jv_AllocObject";
       use_java_new = 1;
-      alloc_decl = IDENTIFIER_GLOBAL_VALUE (get_identifier (alloc_name));
-      if (alloc_decl == NULL_TREE)
-      fatal_error ("call to Java constructor with `%s' undefined",
-                   alloc_name);
-
+      if (!get_global_value_if_present (get_identifier (alloc_name), 
+                                       &alloc_decl))
+       {\r
+         error ("call to Java constructor with `%s' undefined", alloc_name);
+         return error_mark_node;
+       }
+      else if (really_overloaded_fn (alloc_decl))
+       {\r
+         error ("`%D' should never be overloaded", alloc_decl);
+         return error_mark_node;
+       }
+      alloc_decl = OVL_CURRENT (alloc_decl);
       class_addr = build1 (ADDR_EXPR, jclass_node, class_decl);
       alloc_call = (build_function_call
                    (alloc_decl,