From 355d89939212294d4b0d1cf9bc3cd806eb6d7a84 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 15 Apr 2003 02:17:12 +0000 Subject: [PATCH] resolve.cc (_Jv_PrepareClass): Round up class size to multiple of alignment. * resolve.cc (_Jv_PrepareClass): Round up class size to multiple of alignment. From-SVN: r65617 --- libjava/ChangeLog | 5 +++++ libjava/resolve.cc | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d4403ef6ad4..8d9944d4c85 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-04-14 Tom Tromey + + * resolve.cc (_Jv_PrepareClass): Round up class size to multiple + of alignment. + 2003-04-10 Tom Tromey * verify.cc (pop64): Removed. diff --git a/libjava/resolve.cc b/libjava/resolve.cc index ea506452d58..fbdc284945f 100644 --- a/libjava/resolve.cc +++ b/libjava/resolve.cc @@ -513,7 +513,10 @@ _Jv_PrepareClass(jclass klass) } } - // set the instance size for the class + // Set the instance size for the class. Note that first we round it + // to the alignment required for Object; this keeps us in sync with + // our current ABI. + instance_size = ROUND (instance_size, __alignof__ (java::lang::Object)); clz->size_in_bytes = instance_size; // allocate static memory