MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

check-init.c (check_init): Removed code accepting to see things falling through default:, when doing xrefs.

Browse Source 
Thu May 13 13:23:38 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
	* check-init.c (check_init): Removed code accepting to see things
	falling through default:, when doing xrefs.
	* java-tree.h (do_not_fold): New global variable, declared.
	* parse.y (do_not_fold): New global variable, defined.
	(java_complete_expand_method): Set `do_not_fold' to the value of
 	`flag_emit_xref'. When doing xrefs: copy the thrown exceptions,
 	and reinstall them after them have been purged; do not check for
 	initializations; do not issue missing return errors.
	(java_complete_lhs): Do not attempt to patch INSTANCEOF_EXPR nodes
 	when doing xrefs.
	(patch_binop): Skip the fold part when doing xrefs.
	(build_string_concatenation): Skip the concatenation part when
 	doing xrefs.
	(patch_synchronized_statement): Do not generate a try-finally when
 	doing xrefs.
	(patch_throw_statement): When doing xrefs, do not call BUILD_THROW
 	and keep the location where the throw was seen.
	* typeck.c (convert): When `do_not_fold' is set, do not attempt
 	any treatment on the converted node an simply return a NOP_EXPR of
 	the targeted type.
	* xref.c (xref_get_data): New function, defined.
	* xref.h (xref_get_data): New function, declared.
	(XREF_GET_DATA): Use xref_get_data.

From-SVN: r26926
This commit is contained in:
Alexandre Petit-Bianco 1999-05-13 14:33:37 +00:00 committed by Alexandre Petit-Bianco
parent 19ba816140
commit ce6e914727
8 changed files with 617 additions and 504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gcc/java/ChangeLog
View File

@ -1,3 +1,29 @@
Thu May 13 13:23:38 1999 Alexandre Petit-Bianco <apbianco@cygnus.com>
* check-init.c (check_init): Removed code accepting to see things
falling through default:, when doing xrefs.
* java-tree.h (do_not_fold): New global variable, declared.
* parse.y (do_not_fold): New global variable, defined.
(java_complete_expand_method): Set `do_not_fold' to the value of
`flag_emit_xref'. When doing xrefs: copy the thrown exceptions,
and reinstall them after them have been purged; do not check for
initializations; do not issue missing return errors.
(java_complete_lhs): Do not attempt to patch INSTANCEOF_EXPR nodes
when doing xrefs.
(patch_binop): Skip the fold part when doing xrefs.
(build_string_concatenation): Skip the concatenation part when
doing xrefs.
(patch_synchronized_statement): Do not generate a try-finally when
doing xrefs.
(patch_throw_statement): When doing xrefs, do not call BUILD_THROW
and keep the location where the throw was seen.
* typeck.c (convert): When `do_not_fold' is set, do not attempt
any treatment on the converted node an simply return a NOP_EXPR of
the targeted type.
* xref.c (xref_get_data): New function, defined.
* xref.h (xref_get_data): New function, declared.
(XREF_GET_DATA): Use xref_get_data.
1999-05-13 Kaveh R. Ghazi <ghazi@snafu.rutgers.edu>
* gjavah.c (print_include): Cast the result of `strlen' to int
@ -123,7 +149,7 @@ Fri Apr 30 17:54:40 1999 Alexandre Petit-Bianco <apbianco@cygnus.com>
(resolve_qualified_expression_name): Check for illegal use of
static fields in a non static context. Call static_ref_err to
report error in various places.
(java_complete_tree): To not fold initialized static fields when
(java_complete_tree): Do not fold initialized static fields when
doing xrefs.
(java_complete_lhs): Likewise.

3
gcc/java/check-init.c
View File

@ -700,9 +700,6 @@ check_init (exp, before)
break;
default:
/* It's OK to see that when doing xrefs. */
if (TREE_CODE (exp) == TYPE_DECL && flag_emit_xref)
break;
fatal ("internal error in check-init: tree code not implemented: %s",
tree_code_name [(int) TREE_CODE (exp)]);
}

3
gcc/java/java-tree.h
View File

@ -132,6 +132,9 @@ extern int flag_emit_class_files;
extern int flag_emit_xref;
/* When doing xrefs, tell when not to fold. */
extern int do_not_fold;
/* Turned to 1 if -Wall was encountered. See lang.c for their meanings. */
extern int flag_wall;
extern int flag_redundant;

1026
gcc/java/parse.c
View File

File diff suppressed because it is too large Load Diff

48
gcc/java/parse.y
View File

@ -247,6 +247,8 @@ static void static_ref_err PROTO ((tree, tree, tree));
int java_error_count;
/* Number of warning found so far. */
int java_warning_count;
/* Tell when not to fold, when doing xrefs */
int do_not_fold;
/* The current parser context */
struct parser_ctxt *ctxp;
@ -5706,6 +5708,8 @@ void
java_complete_expand_methods ()
{
tree current;
do_not_fold = flag_emit_xref;
for (current = ctxp->class_list; current; current = TREE_CHAIN (current))
{
@ -5819,6 +5823,7 @@ java_complete_expand_method (mdecl)
{
tree fbody = DECL_FUNCTION_BODY (mdecl);
tree block_body = BLOCK_EXPR_BODY (fbody);
tree exception_copy;
expand_start_java_method (mdecl);
build_result_decl (mdecl);
@ -5826,7 +5831,12 @@ java_complete_expand_method (mdecl)
= (!METHOD_STATIC (mdecl) ?
BLOCK_EXPR_DECLS (DECL_FUNCTION_BODY (mdecl)) : NULL_TREE);
/* Purge the `throws' list of unchecked exceptions */
/* Purge the `throws' list of unchecked exceptions. If we're
doing xref, save a copy of the list and re-install it
later. */
if (flag_emit_xref)
exception_copy = copy_list (DECL_FUNCTION_THROWS (mdecl));
purge_unchecked_exceptions (mdecl);
/* Install exceptions thrown with `throws' */
@ -5835,13 +5845,15 @@ java_complete_expand_method (mdecl)
if (block_body != NULL_TREE)
{
block_body = java_complete_tree (block_body);
check_for_initialization (block_body);
if (!flag_emit_xref)
check_for_initialization (block_body);
ctxp->explicit_constructor_p = 0;
}
BLOCK_EXPR_BODY (fbody) = block_body;
if ((block_body == NULL_TREE || CAN_COMPLETE_NORMALLY (block_body))
&& TREE_CODE (TREE_TYPE (TREE_TYPE (mdecl))) != VOID_TYPE)
&& TREE_CODE (TREE_TYPE (TREE_TYPE (mdecl))) != VOID_TYPE
&& !flag_emit_xref)
missing_return_error (current_function_decl);
complete_start_java_method (mdecl);
@ -5860,6 +5872,9 @@ java_complete_expand_method (mdecl)
POP_EXCEPTIONS();
if (currently_caught_type_list)
fatal ("Exception list non empty - java_complete_expand_method");
if (flag_emit_xref)
DECL_FUNCTION_THROWS (mdecl) = exception_copy;
}
}
@ -7871,7 +7886,7 @@ java_complete_lhs (node)
/* First, the case expression must be constant */
cn = fold (cn);
if (!TREE_CONSTANT (cn))
if (!TREE_CONSTANT (cn) && !flag_emit_xref)
{
EXPR_WFL_LINECOL (wfl_operator) = EXPR_WFL_LINECOL (node);
parse_error_context (node, "Constant expression required");
@ -8229,6 +8244,11 @@ java_complete_lhs (node)
case INSTANCEOF_EXPR:
wfl_op1 = TREE_OPERAND (node, 0);
COMPLETE_CHECK_OP_0 (node);
if (flag_emit_xref)
{
TREE_TYPE (node) = boolean_type_node;
return node;
}
return patch_binop (node, wfl_op1, TREE_OPERAND (node, 1));
case UNARY_PLUS_EXPR:
@ -9508,6 +9528,9 @@ patch_binop (node, wfl_op1, wfl_op2)
TREE_TYPE (node) = prom_type;
TREE_SIDE_EFFECTS (node) = TREE_SIDE_EFFECTS (op1) | TREE_SIDE_EFFECTS (op2);
if (flag_emit_xref)
return node;
/* fold does not respect side-effect order as required for Java but not C.
* Also, it sometimes create SAVE_EXPRs which are bad when emitting
* bytecode.
@ -9635,6 +9658,9 @@ build_string_concatenation (op1, op2)
{
tree result;
int side_effects = TREE_SIDE_EFFECTS (op1) | TREE_SIDE_EFFECTS (op2);
if (flag_emit_xref)
return build (PLUS_EXPR, string_type_node, op1, op2);
/* Try to do some static optimization */
if ((result = string_constant_concatenation (op1, op2)))
@ -11121,6 +11147,14 @@ patch_synchronized_statement (node, wfl_op1)
return error_mark_node;
}
if (flag_emit_xref)
{
TREE_OPERAND (node, 0) = expr;
TREE_OPERAND (node, 1) = java_complete_tree (block);
CAN_COMPLETE_NORMALLY (node) = 1;
return node;
}
/* Generate a try-finally for the synchronized statement, except
that the handler that catches all throw exception calls
_Jv_MonitorExit and then rethrow the exception.
@ -11234,8 +11268,12 @@ patch_throw_statement (node, wfl_op1)
return error_mark_node;
}
if (! flag_emit_class_files)
if (! flag_emit_class_files && ! flag_emit_xref)
BUILD_THROW (node, expr);
/* If doing xrefs, keep the location where the `throw' was seen. */
if (flag_emit_xref)
EXPR_WFL_LINECOL (node) = EXPR_WFL_LINECOL (wfl_op1);
return node;
}

3
gcc/java/typeck.c
View File

@ -86,6 +86,9 @@ convert (type, expr)
{
register enum tree_code code = TREE_CODE (type);
if (do_not_fold)
return build1 (NOP_EXPR, type, expr);
if (type == TREE_TYPE (expr)
|| TREE_CODE (expr) == ERROR_MARK)
return expr;

7
gcc/java/xref.c
View File

@ -59,6 +59,13 @@ xref_set_data (flag, data)
xref_table [flag-1].data = data;
}
void *
xref_get_data (flag)
int flag;
{
return xref_table [flag-1].data;
}
/* Branch to the right xref "back-end". */
void

3
gcc/java/xref.h
View File

@ -27,6 +27,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
int xref_flag_value PROTO ((char *));
void expand_xref PROTO ((tree));
void xref_set_data PROTO ((int, void *));
void *xref_get_data PROTO ((int));
/* flag_emit_xref range of possible values. */
@ -43,4 +44,4 @@ typedef struct {
void *data; /* Placeholder for additional data */
} xref_flag_table;
#define XREF_GET_DATA(FLAG, T) ((T)xref_table [(FLAG)-1].data)
#define XREF_GET_DATA(FLAG, T) ((T)xref_get_data (FLAG))