output.h (make_function_rtl): Remove prototype.

	* output.h (make_function_rtl): Remove prototype.
	(make_decl_rtl): Likewise.
	* varasm.c (make_function_rtl): Remove.
	(make_decl_rtl): Determine top-levelness from DECL_CONTEXT, rather
	than from a third parameter.
	* tree.h (make_decl_rtl): Remove last parameter.
	* c-decl.c (builtin_function): Remove last argument in call to
	make_decl_rtl; use make_function_rtl instead of make_decl_rtl.
	(start_function): Likewise.
	* except.c (call_get_eh_context): Likewise.
	* expr.c (emit_block_move): Likewise.
	(clear_storage): Likewise.
	* profile.c (output_func_start_profiler): Likewise.
	* toplev.c (rest_of_decl_compilation): Likewise.
	* objc/objc-act.c (create_builtin_decl): Likewise.
	(synth_module_prologue): Likewise.
	(generate_static_reference): Likewise.
	(build_selector_reference_decl): Likewise.
	(build_class_reference_decl): Likewise.
	(build_objc_string_decl): Likewise.
	(build_protocol_reference): Likewise.

	* class.c (finish_struct_1):  Remove last argument in call to
	make_decl_rtl; use make_function_rtl instead of make_decl_rtl.
	* decl.c (builtin_function): Likewise.
	(build_cp_library_fn): Likewise.
	(check_initializer): Likewise.
	(make_rtl_for_nonlocal_decl): Likewise.
	(cp_finish_decl): Likewise.
	(start_function): Likewise.
	* decl2.c (finish_anon_union): Likewise.
	* friend.c (do_friend): Likewise.
	* init.c (build_java_class_ref): Likewise.
	* method.c (make_thunk): Likewise.
	* pt.c (tsubst_friend_function): Likewise.
	* semantics.c (expand_body): Likewise.

	* com.c (ffecom_init_zero_):  Remove last argument in call to
	make_decl_rtl; use make_function_rtl instead of make_decl_rtl.
	(ffecom_lookup_label_): Likewise.
	(builtin_function): Likewise.
	(start_function): Likewise.

	* class.c (build_utf8_ref): Remove last argument in call to
	make_decl_rtl; use make_function_rtl instead of make_decl_rtl.
	(build_class_ref): Likewise.
	(build_static_field_ref): Likewise.
	(get_dispatch_table): Likewise.
	(layout_class_method): Likewise.
	(emit_register_classes): Likewise.
	* constants.c (build_constant_data_ref): Likewise.
	* decl.c (builtin_function): Likewise.
	(create_primitive_vtable): Likewise.
	* expr.c (build_known_method_def): Likewise.
	(build_jni_stub): Likewise.
	(java_lang_expand_expr): Likewise.

From-SVN: r38884

5 files changed, 34 insertions, 18 deletions

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 1688aa6..bf0b323 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,19 @@
+2001-01-10  Mark Mitchell  <mark@codesourcery.com>
+
+	* class.c (build_utf8_ref): Remove last argument in call to
+	make_decl_rtl; use make_function_rtl instead of make_decl_rtl.
+	(build_class_ref): Likewise.
+	(build_static_field_ref): Likewise.
+	(get_dispatch_table): Likewise.
+	(layout_class_method): Likewise.
+	(emit_register_classes): Likewise.
+	* constants.c (build_constant_data_ref): Likewise.
+	* decl.c (builtin_function): Likewise.
+	(create_primitive_vtable): Likewise.
+	* expr.c (build_known_method_def): Likewise.
+	(build_jni_stub): Likewise.
+	(java_lang_expand_expr): Likewise.
+	
 2001-01-10  Tom Tromey  <tromey@redhat.com>
 
 	* jvspec.c (jvgenmain_spec): Omit -fencoding from cc1 invocation.
diff --git a/gcc/java/class.c b/gcc/java/class.c
index ae715f1..dbf3f4e 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -1,5 +1,5 @@
 /* Functions related to building classes and their related objects.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -855,7 +855,7 @@ build_utf8_ref (name)
   pushdecl (decl);
   rest_of_decl_compilation (decl, (char*) 0, global_bindings_p (), 0);
   utf8_decl_list = decl;
-  make_decl_rtl (decl, (char*) 0, 1);
+  make_decl_rtl (decl, (char*) 0);
   ref = build1 (ADDR_EXPR, utf8const_ptr_type, decl);
   IDENTIFIER_UTF8_REF (name) = ref;
   return ref;
@@ -891,7 +891,7 @@ build_class_ref (type)
 	      DECL_IGNORED_P (decl) = 1;
 	      DECL_ARTIFICIAL (decl) = 1;
 	      DECL_ASSEMBLER_NAME (decl) = mangle_class_field (type);
-	      make_decl_rtl (decl, NULL, 1);
+	      make_decl_rtl (decl, NULL);
 	      pushdecl_top_level (decl);
 	      if (is_compiled == 1)
 		DECL_EXTERNAL (decl) = 1;
@@ -943,7 +943,7 @@ build_class_ref (type)
 	      decl = build_decl (VAR_DECL, decl_name, class_type_node);
 	      TREE_STATIC (decl) = 1;
 	      TREE_PUBLIC (decl) = 1;
-	      make_decl_rtl (decl, NULL, 1);
+	      make_decl_rtl (decl, NULL);
 	      pushdecl_top_level (decl);
 	      if (is_compiled == 1)
 		DECL_EXTERNAL (decl) = 1;
@@ -974,7 +974,7 @@ build_static_field_ref (fdecl)
     {
       if (DECL_RTL (fdecl) == 0)
 	{
-	  make_decl_rtl (fdecl, NULL, 1);
+	  make_decl_rtl (fdecl, NULL);
 	  if (is_compiled == 1)
 	    DECL_EXTERNAL (fdecl) = 1;
 	}
@@ -1222,7 +1222,7 @@ get_dispatch_table (type, this_class_addr)
       else
 	{
 	  if (DECL_RTL (method) == 0)
-	    make_decl_rtl (method, NULL, 1);
+	    make_decl_rtl (method, NULL);
 	  method = build1 (ADDR_EXPR, nativecode_ptr_type_node, method);
 	}
       list = tree_cons (NULL_TREE /*DECL_VINDEX (method) + 2*/,
@@ -2122,7 +2122,7 @@ layout_class_method (this_class, super_class, method_decl, dtable_count)
   if (! METHOD_ABSTRACT (method_decl) 
       || (CLASS_INTERFACE (TYPE_NAME (this_class)) 
 	  && (DECL_CLINIT_P (method_decl))))
-    make_function_rtl (method_decl);
+    make_decl_rtl (method_decl, NULL);
   obstack_free (&temporary_obstack, asm_name);
 
   if (ID_INIT_P (method_name))
@@ -2219,7 +2219,7 @@ emit_register_classes ()
   /*  DECL_EXTERNAL (init_decl) = 1;*/
   TREE_PUBLIC (init_decl) = 1;
   pushlevel (0);
-  make_function_rtl (init_decl);
+  make_decl_rtl (init_decl, NULL);
   init_function_start (init_decl, input_filename, 0);
   expand_function_start (init_decl, 0);
 
diff --git a/gcc/java/constants.c b/gcc/java/constants.c
index ad2ed21..aff5bed 100644
--- a/gcc/java/constants.c
+++ b/gcc/java/constants.c
@@ -1,5 +1,5 @@
 /* Handle the constant pool of the Java(TM) Virtual Machine.
-   Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -402,7 +402,7 @@ build_constant_data_ref ()
 			 build_array_type (ptr_type_node,
 					   one_elt_array_domain_type));
       TREE_STATIC (decl) = 1;
-      make_decl_rtl (decl, NULL, 1);
+      make_decl_rtl (decl, NULL);
       TYPE_CPOOL_DATA_REF (current_class) = current_constant_pool_data_ref
 	= build1 (ADDR_EXPR, ptr_type_node, decl);
     }
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index 8d78878..3c5a6cc 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -1,6 +1,6 @@
 /* Process declarations and variables for the GNU compiler for the
    Java(TM) language.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -399,7 +399,7 @@ builtin_function (name, type, function_code, class, library_name)
   TREE_PUBLIC (decl) = 1;
   if (library_name)
     DECL_ASSEMBLER_NAME (decl) = get_identifier (library_name);
-  make_decl_rtl (decl, NULL_PTR, 1);
+  make_decl_rtl (decl, NULL_PTR);
   pushdecl (decl);
   DECL_BUILT_IN_CLASS (decl) = class;
   DECL_FUNCTION_CODE (decl) = function_code;
@@ -417,7 +417,7 @@ create_primitive_vtable (name)
   sprintf (buf, "_Jv_%sVTable", name);
   r = build_decl (VAR_DECL, get_identifier (buf), ptr_type_node);
   DECL_EXTERNAL (r) = 1;
-  make_decl_rtl (r, buf, 1);
+  make_decl_rtl (r, buf);
   return r;
 }
 
diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 95a27fd..4ad903e 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -1,5 +1,5 @@
 /* Process expressions for the GNU compiler for the Java(TM) language.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -1680,7 +1680,7 @@ build_known_method_ref (method, method_type, self_type, method_signature, arg_li
   tree func;
   if (is_compiled_class (self_type))
     {
-      make_decl_rtl (method, NULL, 1);
+      make_decl_rtl (method, NULL);
       func = build1 (ADDR_EXPR, method_ptr_type_node, method);
     }
   else
@@ -2000,7 +2000,7 @@ build_jni_stub (method)
   TREE_STATIC (meth_var) = 1;
   TREE_PUBLIC (meth_var) = 0;
   DECL_EXTERNAL (meth_var) = 0;
-  make_decl_rtl (meth_var, NULL, 0);
+  make_decl_rtl (meth_var, NULL);
   meth_var = pushdecl_top_level (meth_var);
 
   /* One strange way that the front ends are different is that they
@@ -2364,7 +2364,7 @@ java_lang_expand_expr (exp, target, tmode, modifier)
 	    DECL_IGNORED_P (init_decl) = 1;
 	    TREE_READONLY (init_decl) = 1;
 	    TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (init_decl)) = 1;
-	    make_decl_rtl (init_decl, NULL, 1);
+	    make_decl_rtl (init_decl, NULL);
 	    init = build1 (ADDR_EXPR, TREE_TYPE (exp), init_decl);
 	    r = expand_expr (init, target, tmode, modifier);
 	    return r;
@@ -2387,7 +2387,7 @@ java_lang_expand_expr (exp, target, tmode, modifier)
 	    DECL_IGNORED_P (init_decl) = 1;
 	    TREE_READONLY (init_decl) = 1;
 	    TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (init_decl)) = 1;
-	    make_decl_rtl (init_decl, NULL, 1);
+	    make_decl_rtl (init_decl, NULL);
 	    init = init_decl;
 	  }
 	expand_assignment (build (COMPONENT_REF, TREE_TYPE (data_fld),