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

interpret.cc (_Jv_InterpMethod::run): Update _Jv_AllocObject arguments to match new signature. 

2004-04-16  Bryce McKinlay  <mckinlay@redhat.com>

	* interpret.cc (_Jv_InterpMethod::run): Update _Jv_AllocObject
	arguments to match new signature. Remove FIXME comments.

From-SVN: r80766
This commit is contained in:
Bryce McKinlay 2004-04-16 20:38:27 +01:00
parent 390e4c0dbe
commit bf7ad40253
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2004-04-16 Bryce McKinlay <mckinlay@redhat.com>
* interpret.cc (_Jv_InterpMethod::run): Update _Jv_AllocObject
arguments to match new signature. Remove FIXME comments.
2004-04-09 Thomas Fitzsimmons <fitzsim@redhat.com> 2004-04-09 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkPanelPeer.java (connectSignals): * gnu/java/awt/peer/gtk/GtkPanelPeer.java (connectSignals):
@ -259,6 +264,7 @@
* java/applet/Applet.java (getPreferredSize): New method. * java/applet/Applet.java (getPreferredSize): New method.
(getMinimumSize): New method. (getMinimumSize): New method.
>>>>>>> 1.2732
2004-04-15 Bryce McKinlay <mckinlay@redhat.com> 2004-04-15 Bryce McKinlay <mckinlay@redhat.com>
* prims.cc (_Jv_AllocObject): Remove `size' argument. * prims.cc (_Jv_AllocObject): Remove `size' argument.

8
libjava/interpret.cc
View File

@ -2917,11 +2917,7 @@ _Jv_InterpMethod::run (void *retp, ffi_raw *args)
{ {
int index = GET2U (); int index = GET2U ();
jclass klass = (_Jv_ResolvePoolEntry (defining_class, index)).clazz; jclass klass = (_Jv_ResolvePoolEntry (defining_class, index)).clazz;
// We initialize here because otherwise `size_in_bytes' may jobject res = _Jv_AllocObject (klass);
// not be set correctly, leading us to pass `0' as the size.
// FIXME: fix in the allocator? There is a PR for this.
_Jv_InitClass (klass);
jobject res = _Jv_AllocObject (klass, klass->size_in_bytes);
PUSHA (res); PUSHA (res);
#ifdef DIRECT_THREADED #ifdef DIRECT_THREADED
@ -2935,7 +2931,7 @@ _Jv_InterpMethod::run (void *retp, ffi_raw *args)
new_resolved: new_resolved:
{ {
jclass klass = (jclass) AVAL (); jclass klass = (jclass) AVAL ();
jobject res = _Jv_AllocObject (klass, klass->size_in_bytes); jobject res = _Jv_AllocObject (klass);
PUSHA (res); PUSHA (res);
} }
NEXT_INSN; NEXT_INSN;