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

parse.y (maybe_yank_clinit): Also keep <clinit> if its body contains something else than MODIFY_EXPR. 

2000-09-29  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* parse.y (maybe_yank_clinit): Also keep <clinit> if its body
	contains something else than MODIFY_EXPR.

(http://gcc.gnu.org/ml/gcc-patches/2000-09/msg01141.html)

From-SVN: r36670
This commit is contained in:
Alexandre Petit-Bianco 2000-09-29 20:14:53 +00:00 committed by Alexandre Petit-Bianco
parent a1c63101c4
commit 99eaf8d457
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/java/ChangeLog
View File

@ -1,3 +1,8 @@
2000-09-29 Alexandre Petit-Bianco <apbianco@cygnus.com>
* parse.y (maybe_yank_clinit): Also keep <clinit> if its body
contains something else than MODIFY_EXPR.
2000-09-23 Mark Mitchell <mark@codesourcery.com>
* Make-lang.in (JAVA_SRCS): Include java-tree.h.

31
gcc/java/parse.y
View File

@ -7599,6 +7599,7 @@ maybe_yank_clinit (mdecl)
{
tree type, current;
tree fbody, bbody;
int found = 0;
if (!DECL_CLINIT_P (mdecl))
return 0;
@ -7646,7 +7647,35 @@ maybe_yank_clinit (mdecl)
break;
}
if (current)
/* Now we analyze the method body and look for something that
isn't a MODIFY_EXPR */
if (bbody == empty_stmt_node)
bbody = NULL_TREE;
while (bbody)
switch (TREE_CODE (bbody))
{
case BLOCK:
bbody = BLOCK_EXPR_BODY (bbody);
break;
case EXPR_WITH_FILE_LOCATION:
bbody = EXPR_WFL_NODE (bbody);
break;
case COMPOUND_EXPR:
bbody = TREE_OPERAND (bbody, 0);
break;
case MODIFY_EXPR:
bbody = NULL_TREE;
break;
default:
bbody = NULL_TREE;
found = 1;
}
if (current || found)
return 0;
/* Get rid of <clinit> in the class' list of methods */