mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-11 02:04:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

parse.y (patch_method_invocation): Pick the correct enclosing context when creating inner class instances.

Browse Source 
2000-12-04  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* parse.y (patch_method_invocation): Pick the correct enclosing
	context when creating inner class instances.
	Fixes gcj/332.

(http://gcc.gnu.org/ml/gcc-patches/2000-12/msg00217.html)

From-SVN: r38026
This commit is contained in:
Alexandre Petit-Bianco 2000-12-05 07:08:56 +00:00 committed by Alexandre Petit-Bianco
parent fad3e66e8e
commit f8b93ea75d
2 changed files with 33 additions and 1 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 @@
2000-12-04 Alexandre Petit-Bianco <apbianco@cygnus.com>
* parse.y (patch_method_invocation): Pick the correct enclosing
context when creating inner class instances.
Fixes gcj/332.
2000-11-26 Joseph S. Myers <jsm28@cam.ac.uk>
* gjavah.c (version), jcf-dump.c (version), jv-scan.c (version):

28
gcc/java/parse.y
View File

@ -9997,7 +9997,33 @@ patch_method_invocation (patch, primary, where, is_static, ret_decl)
/* Secretly pass the current_this/primary as a second argument */
if (primary || current_this)
args = tree_cons (NULL_TREE, (primary ? primary : current_this), args);
{
tree extra_arg;
tree this_type = (current_this ?
TREE_TYPE (TREE_TYPE (current_this)) : NULL_TREE);
/* Method's (list) enclosing context */
tree mec = DECL_CONTEXT (TYPE_NAME (DECL_CONTEXT (list)));
/* If we have a primary, use it. */
if (primary)
extra_arg = primary;
/* The current `this' is an inner class but isn't a direct
enclosing context for the inner class we're trying to
create. Build an access to the proper enclosing context
and use it. */
else if (current_this && PURE_INNER_CLASS_TYPE_P (this_type)
&& this_type != TREE_TYPE (mec))
{
extra_arg = build_access_to_thisn (current_class,
TREE_TYPE (mec), 0);
extra_arg = java_complete_tree (extra_arg);
}
/* Otherwise, just use the current `this' as an enclosing
context. */
else
extra_arg = current_this;
args = tree_cons (NULL_TREE, extra_arg, args);
}
else
args = tree_cons (NULL_TREE, integer_zero_node, args);
}