* typeck.c (convert): Don't use flag_emit_class_files.

	* lang.c (java_post_options): Don't use flag_emit_class_files.
	(java_handle_option): Don't use flag_extraneous_semicolon or
	flag_redundant.
	* jcf-parse.c (HANDLE_CONSTANTVALUE): Don't use
	flag_emit_class_files.
	(load_class): Likewise.
	* java-tree.h (flag_emit_class_files): Don't declare.
	(STATIC_CLASS_INIT_OPT_P): Don't use flag_emit_class_files.
	(flag_extraneous_semicolon): Don't declare.
	(flag_not_overriding): Likewise.
	(flag_static_local_jdk1_1): Likewise.
	(flag_redundant): Likewise.
	* expr.c (build_newarray): Don't use flag_emit_class_files.
	* class.c (DEFAULT_ENABLE_ASSERT): Don't use
	flag_emit_class_files.
	(build_class_ref): Likewise.
	* builtins.c (check_for_builtin): Don't use
	flag_emit_class_files.

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

1 files changed, 1 insertions, 35 deletions

diff --git a/gcc/java/class.c b/gcc/java/class.c
index e9d8174e43d..a22a9368bb2 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -209,7 +209,7 @@ add_assume_compiled (const char *ident, int excludep)
 
 /* The default value returned by enable_assertions. */
 
-#define DEFAULT_ENABLE_ASSERT (flag_emit_class_files || optimize == 0)
+#define DEFAULT_ENABLE_ASSERT (optimize == 0)
 
 /* Enter IDENT (a class or package name) into the enable-assertions table.
    VALUE is true to enable and false to disable. */
@@ -1059,40 +1059,6 @@ build_class_ref (tree type)
 	  const char *name;
 	  tree decl_name;
 	  char buffer[25];
-	  if (flag_emit_class_files)
-	    {
-	      const char *prim_class_name;
-	      tree prim_class;
-	      if (type == char_type_node)
-		prim_class_name = "java.lang.Character";
-	      else if (type == boolean_type_node)
-		prim_class_name = "java.lang.Boolean";
-	      else if (type == byte_type_node)
-		prim_class_name = "java.lang.Byte";
-	      else if (type == short_type_node)
-		prim_class_name = "java.lang.Short";
-	      else if (type == int_type_node)
-		prim_class_name = "java.lang.Integer";
-	      else if (type == long_type_node)
-		prim_class_name = "java.lang.Long";
-	      else if (type == float_type_node)
-                prim_class_name = "java.lang.Float";
-	      else if (type == double_type_node)
-                prim_class_name = "java.lang.Double";
-	      else if (type == void_type_node)
-                prim_class_name = "java.lang.Void";
-	      else
-		gcc_unreachable ();
-
-	      prim_class = lookup_class (get_identifier (prim_class_name));
-	      /* We wrap the class in a NOP_EXPR, because it is a
-	         type.  We can't hold it in the COMPONENT_REF itself,
-	         as that type must remain NULL.  */
-	      prim_class = build1 (NOP_EXPR, prim_class, NULL_TREE);
-	      
-	      return build3 (COMPONENT_REF, NULL_TREE,
-			     prim_class, TYPE_identifier_node, NULL_TREE);
-	    }
 	  decl_name = TYPE_NAME (type);
 	  if (TREE_CODE (decl_name) == TYPE_DECL)
 	    decl_name = DECL_NAME (decl_name);