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

libjava/ChangeLog

+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>
 
 	* gnu/java/awt/peer/gtk/GtkPanelPeer.java (connectSignals):
@@ -259,6 +264,7 @@
 	* java/applet/Applet.java (getPreferredSize): New method.
 	(getMinimumSize): New method.
 
+>>>>>>> 1.2732
 2004-04-15  Bryce McKinlay  <mckinlay@redhat.com>
 
 	* prims.cc (_Jv_AllocObject): Remove `size' argument.

libjava/interpret.cc

@@ -2917,11 +2917,7 @@ _Jv_InterpMethod::run (void *retp, ffi_raw *args)
       {
 	int index = GET2U ();
 	jclass klass = (_Jv_ResolvePoolEntry (defining_class, index)).clazz;
-	// We initialize here because otherwise `size_in_bytes' may
-	// 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);
+	jobject res = _Jv_AllocObject (klass);
 	PUSHA (res);
 
 #ifdef DIRECT_THREADED
@@ -2935,7 +2931,7 @@ _Jv_InterpMethod::run (void *retp, ffi_raw *args)
     new_resolved:
       {
 	jclass klass = (jclass) AVAL ();
-	jobject res = _Jv_AllocObject (klass, klass->size_in_bytes);
+	jobject res = _Jv_AllocObject (klass);
 	PUSHA (res);
       }
       NEXT_INSN;