git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libgcj/34444 (Class.getEnclosingClass() returns null on enclosed class) 

2008-01-04  Andrew Haley  <aph@redhat.com>

	PR libgcj/34444
	* java/lang/natClass.cc (Class::getEnclosingClass): Call
	getDeclaringClass().

From-SVN: r131326
This commit is contained in:
Andrew Haley 2008-01-04 17:18:56 +00:00 committed by Andrew Haley
parent bdb69beee9
commit d5b7beb930
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2008-01-04 Andrew Haley <aph@redhat.com>
PR libgcj/34444
* java/lang/natClass.cc (Class::getEnclosingClass): Call
getDeclaringClass().
2007-12-22 David Daney <ddaney@avtrex.com> 2007-12-22 David Daney <ddaney@avtrex.com>
* scripts/makemake.tcl (emit_bc_rule): Use $(LIBGCJ_BC_FLAGS) * scripts/makemake.tcl (emit_bc_rule): Use $(LIBGCJ_BC_FLAGS)

3
libjava/java/lang/natClass.cc
View File

@ -1043,7 +1043,8 @@ java::lang::Class::getEnclosingClass()
_Jv_word indexes; _Jv_word indexes;
indexes.i = getEnclosingMethodData(); indexes.i = getEnclosingMethodData();
if (indexes.i == 0) if (indexes.i == 0)
return NULL; // No enclosing method, but perhaps a member or anonymous class
return getDeclaringClass();
_Jv_ushort class_index, method_index; _Jv_ushort class_index, method_index;
_Jv_loadIndexes (&indexes, class_index, method_index); _Jv_loadIndexes (&indexes, class_index, method_index);
return _Jv_Linker::resolve_pool_entry (this, class_index).clazz; return _Jv_Linker::resolve_pool_entry (this, class_index).clazz;