1.1 --- a/src/share/vm/ci/ciInstanceKlass.cpp Thu Jul 08 14:29:44 2010 -0700
1.2 +++ b/src/share/vm/ci/ciInstanceKlass.cpp Mon Jul 12 10:58:25 2010 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -44,9 +44,7 @@
1.11 _flags = ciFlags(access_flags);
1.12 _has_finalizer = access_flags.has_finalizer();
1.13 _has_subklass = ik->subklass() != NULL;
1.14 - _is_initialized = ik->is_initialized();
1.15 - // Next line must follow and use the result of the previous line:
1.16 - _is_linked = _is_initialized || ik->is_linked();
1.17 + _init_state = (instanceKlass::ClassState)ik->get_init_state();
1.18 _nonstatic_field_size = ik->nonstatic_field_size();
1.19 _has_nonstatic_fields = ik->has_nonstatic_fields();
1.20 _nonstatic_fields = NULL; // initialized lazily by compute_nonstatic_fields:
1.21 @@ -91,8 +89,7 @@
1.22 : ciKlass(name, ciInstanceKlassKlass::make())
1.23 {
1.24 assert(name->byte_at(0) != '[', "not an instance klass");
1.25 - _is_initialized = false;
1.26 - _is_linked = false;
1.27 + _init_state = (instanceKlass::ClassState)0;
1.28 _nonstatic_field_size = -1;
1.29 _has_nonstatic_fields = false;
1.30 _nonstatic_fields = NULL;
1.31 @@ -109,21 +106,10 @@
1.32
1.33 // ------------------------------------------------------------------
1.34 // ciInstanceKlass::compute_shared_is_initialized
1.35 -bool ciInstanceKlass::compute_shared_is_initialized() {
1.36 +void ciInstanceKlass::compute_shared_init_state() {
1.37 GUARDED_VM_ENTRY(
1.38 instanceKlass* ik = get_instanceKlass();
1.39 - _is_initialized = ik->is_initialized();
1.40 - return _is_initialized;
1.41 - )
1.42 -}
1.43 -
1.44 -// ------------------------------------------------------------------
1.45 -// ciInstanceKlass::compute_shared_is_linked
1.46 -bool ciInstanceKlass::compute_shared_is_linked() {
1.47 - GUARDED_VM_ENTRY(
1.48 - instanceKlass* ik = get_instanceKlass();
1.49 - _is_linked = ik->is_linked();
1.50 - return _is_linked;
1.51 + _init_state = (instanceKlass::ClassState)ik->get_init_state();
1.52 )
1.53 }
1.54
