OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR java/17265 (Libjava doesn't build) 

PR java/17265
	* class.c (make_local_function_alias): Revert 2004-08-18 change.
	(make_method_value): Likewise.

From-SVN: r89443
This commit is contained in:
Eric Botcazou 2004-10-22 16:30:37 +02:00 committed by Eric Botcazou
parent 8638a0f819
commit e063dbf8f7
2 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/java/ChangeLog
View File

@ -1,3 +1,9 @@
2004-10-22 Eric Botcazou <ebotcazou@libertysurf.fr>
PR java/17265
* class.c (make_local_function_alias): Revert 2004-08-18 change.
(make_method_value): Likewise.
2004-10-21 Andrew Haley <aph@redhat.com>
PR java/18091:

45
gcc/java/class.c
View File

@ -1198,48 +1198,6 @@ get_access_flags_from_decl (tree decl)
abort ();
}
static GTY (()) int alias_labelno = 0;
/* Create a private alias for METHOD. Using this alias instead of the method
decl ensures that ncode entries in the method table point to the real function
at runtime, not a PLT entry. */
static tree
make_local_function_alias (tree method)
{
#ifdef ASM_OUTPUT_DEF
tree alias;
const char *method_name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (method));
char *name = alloca (strlen (method_name) + 2);
char *buf = alloca (strlen (method_name) + 128);
/* Prefix method_name with 'L' for the alias label. */
*name = 'L';
strcpy (name + 1, method_name);
ASM_GENERATE_INTERNAL_LABEL (buf, name, alias_labelno++);
alias = build_decl (FUNCTION_DECL, get_identifier (buf),
TREE_TYPE (method));
DECL_CONTEXT (alias) = NULL;
TREE_READONLY (alias) = TREE_READONLY (method);
TREE_THIS_VOLATILE (alias) = TREE_THIS_VOLATILE (method);
TREE_PUBLIC (alias) = 0;
DECL_EXTERNAL (alias) = 0;
DECL_ARTIFICIAL (alias) = 1;
DECL_INLINE (alias) = 0;
DECL_INITIAL (alias) = error_mark_node;
TREE_ADDRESSABLE (alias) = 1;
TREE_USED (alias) = 1;
SET_DECL_ASSEMBLER_NAME (alias, DECL_NAME (alias));
TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (alias)) = 1;
if (!flag_syntax_only)
assemble_alias (alias, DECL_ASSEMBLER_NAME (method));
return alias;
#else
return method;
#endif
}
/** Make reflection data (_Jv_Field) for field FDECL. */
static tree
@ -1311,8 +1269,7 @@ make_method_value (tree mdecl)
code = null_pointer_node;
if (DECL_RTL_SET_P (mdecl))
code = build1 (ADDR_EXPR, nativecode_ptr_type_node,
make_local_function_alias (mdecl));
code = build1 (ADDR_EXPR, nativecode_ptr_type_node, mdecl);
START_RECORD_CONSTRUCTOR (minit, method_type_node);
PUSH_FIELD_VALUE (minit, "name",
build_utf8_ref (DECL_CONSTRUCTOR_P (mdecl) ?