diff options
| author | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-05-10 17:17:20 +0000 |
|---|---|---|
| committer | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-05-10 17:17:20 +0000 |
| commit | 150315eee8c9f1df3129b2be82d679fcca4335cd (patch) | |
| tree | 3d05e19771942fcb867ce8da5bf1c3330d200872 /libjava/link.cc | |
| parent | 5f01faf20c12be8f15e34342c50d959acc6c2485 (diff) | |
| download | gcc-150315eee8c9f1df3129b2be82d679fcca4335cd.tar.gz | |
2006-05-09 Andrew Haley <aph@redhat.com>
* prims.cc (_Jv_soleIndirectCompiledEngine): New.
* include/execution.h (Jv_CompiledEngine::do_allocate_static_fields):
Remove body.
(_Jv_CompiledEngine::allocate_field_initializers): New.
(_Jv_CompiledEngine::_Jv_CompiledEngine): Initialize
allocate_field_initializers.
(class _Jv_IndirectCompiledClass): New.
(struct _Jv_IndirectCompiledEngine): New.
* java/lang/Class.h: (IndirectCompiledEngine): New.
* java/lang/natClassLoader.cc (_Jv_NewClassFromInitializer): Set
engine to _Jv_soleIndirectCompiledEngine
* link.cc (ensure_fields_laid_out): Call
engine->allocate_field_initializers().
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113674 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/link.cc')
| -rw-r--r-- | libjava/link.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libjava/link.cc b/libjava/link.cc index 6c281516895..4f01cb54564 100644 --- a/libjava/link.cc +++ b/libjava/link.cc @@ -1527,6 +1527,8 @@ _Jv_Linker::ensure_fields_laid_out (jclass klass) else instance_size = java::lang::Object::class$.size(); + klass->engine->allocate_field_initializers (klass); + for (int i = 0; i < klass->field_count; i++) { int field_size; @@ -1539,7 +1541,6 @@ _Jv_Linker::ensure_fields_laid_out (jclass klass) // It is safe to resolve the field here, since it's a // primitive class, which does not cause loading to happen. resolve_field (field, klass->loader); - field_size = field->type->size (); field_align = get_alignment_from_class (field->type); } |