diff options
| author | Andrew Haley <aph@redhat.com> | 2006-05-24 14:27:53 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2006-05-24 14:27:53 +0000 |
| commit | 5eecfc4d3b3dd5577eaf9eb0c074b44b5a7648df (patch) | |
| tree | af84056aeedb99ef8f5fe62d2ba504a922decba0 /gcc | |
| parent | 9e29923752bf42a1053916db98d98d8bbeceaa9c (diff) | |
| download | gcc-5eecfc4d3b3dd5577eaf9eb0c074b44b5a7648df.zip gcc-5eecfc4d3b3dd5577eaf9eb0c074b44b5a7648df.tar.gz gcc-5eecfc4d3b3dd5577eaf9eb0c074b44b5a7648df.tar.bz2 | |
decl.c (java_add_stmt): Use a STATEMENT_LIST rather than a COMPOUND_EXPR.
2006-05-24 Andrew Haley <aph@redhat.com>
* decl.c (java_add_stmt): Use a STATEMENT_LIST rather than a
COMPOUND_EXPR.
From-SVN: r114042
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/decl.c | 33 |
2 files changed, 31 insertions, 7 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index fc6b806..d316cc4 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2006-05-24 Andrew Haley <aph@redhat.com> + + * decl.c (java_add_stmt): Use a STATEMENT_LIST rather than a + COMPOUND_EXPR. + 2006-05-16 H.J. Lu <hongjiu.lu@intel.com> * lang.opt (femit-class-file): Remove VarExists. diff --git a/gcc/java/decl.c b/gcc/java/decl.c index a16c49b..302df65 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -48,6 +48,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "tree-inline.h" #include "target.h" #include "version.h" +#include "tree-iterator.h" #if defined (DEBUG_JAVA_BINDING_LEVELS) extern void indent (void); @@ -2236,18 +2237,36 @@ add_stmt_to_compound (tree existing, tree type, tree stmt) return stmt; } -/* Add a statement to the compound_expr currently being - constructed. */ +/* Add a statement to the statement_list currently being constructed. + If the statement_list is null, we don't create a singleton list. + This is necessary because poplevel() assumes that adding a + statement to a null statement_list returns the statement. */ tree -java_add_stmt (tree stmt) +java_add_stmt (tree new_stmt) { + tree stmts = current_binding_level->stmts; + tree_stmt_iterator i; + if (input_filename) - SET_EXPR_LOCATION (stmt, input_location); + SET_EXPR_LOCATION (new_stmt, input_location); - return current_binding_level->stmts - = add_stmt_to_compound (current_binding_level->stmts, - TREE_TYPE (stmt), stmt); + if (stmts == NULL) + return current_binding_level->stmts = new_stmt; + + /* Force STMTS to be a statement_list. */ + if (TREE_CODE (stmts) != STATEMENT_LIST) + { + tree t = make_node (STATEMENT_LIST); + i = tsi_last (t); + tsi_link_after (&i, stmts, TSI_CONTINUE_LINKING); + stmts = t; + } + + i = tsi_last (stmts); + tsi_link_after (&i, new_stmt, TSI_CONTINUE_LINKING); + + return current_binding_level->stmts = stmts; } /* Add a variable to the current scope. */ |