From 5851266d212cbfd46b424c1b2e135a503f2003c2 Mon Sep 17 00:00:00 2001 From: bryce Date: Fri, 16 Apr 2004 19:38:27 +0000 Subject: [PATCH] 2004-04-16 Bryce McKinlay * interpret.cc (_Jv_InterpMethod::run): Update _Jv_AllocObject arguments to match new signature. Remove FIXME comments. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@80766 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 6 ++++++ libjava/interpret.cc | 8 ++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b375daa..d425a4b 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-04-16 Bryce McKinlay + + * interpret.cc (_Jv_InterpMethod::run): Update _Jv_AllocObject + arguments to match new signature. Remove FIXME comments. + 2004-04-09 Thomas Fitzsimmons * 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 * prims.cc (_Jv_AllocObject): Remove `size' argument. diff --git a/libjava/interpret.cc b/libjava/interpret.cc index 5fd2c2b..61ff9fb 100644 --- a/libjava/interpret.cc +++ b/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; -- 2.7.4