1.1 --- a/src/share/vm/ci/ciInstanceKlass.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/ci/ciInstanceKlass.hpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -27,14 +27,13 @@
1.4
1.5 #include "ci/ciConstantPoolCache.hpp"
1.6 #include "ci/ciFlags.hpp"
1.7 -#include "ci/ciInstanceKlassKlass.hpp"
1.8 #include "ci/ciKlass.hpp"
1.9 #include "ci/ciSymbol.hpp"
1.10
1.11 // ciInstanceKlass
1.12 //
1.13 -// This class represents a klassOop in the HotSpot virtual machine
1.14 -// whose Klass part is an instanceKlass. It may or may not
1.15 +// This class represents a Klass* in the HotSpot virtual machine
1.16 +// whose Klass part is an InstanceKlass. It may or may not
1.17 // be loaded.
1.18 class ciInstanceKlass : public ciKlass {
1.19 CI_PACKAGE_ACCESS
1.20 @@ -48,7 +47,7 @@
1.21 jobject _loader;
1.22 jobject _protection_domain;
1.23
1.24 - instanceKlass::ClassState _init_state; // state of class
1.25 + InstanceKlass::ClassState _init_state; // state of class
1.26 bool _is_shared;
1.27 bool _has_finalizer;
1.28 bool _has_subklass;
1.29 @@ -77,8 +76,8 @@
1.30 ciInstanceKlass(KlassHandle h_k);
1.31 ciInstanceKlass(ciSymbol* name, jobject loader, jobject protection_domain);
1.32
1.33 - instanceKlass* get_instanceKlass() const {
1.34 - return (instanceKlass*)get_Klass();
1.35 + InstanceKlass* get_instanceKlass() const {
1.36 + return (InstanceKlass*)get_Klass();
1.37 }
1.38
1.39 oop loader();
1.40 @@ -103,7 +102,7 @@
1.41 GrowableArray<ciField*>* compute_nonstatic_fields_impl(GrowableArray<ciField*>* super_fields);
1.42
1.43 // Update the init_state for shared klasses
1.44 - void update_if_shared(instanceKlass::ClassState expected) {
1.45 + void update_if_shared(InstanceKlass::ClassState expected) {
1.46 if (_is_shared && _init_state != expected) {
1.47 if (is_loaded()) compute_shared_init_state();
1.48 }
1.49 @@ -112,18 +111,18 @@
1.50 public:
1.51 // Has this klass been initialized?
1.52 bool is_initialized() {
1.53 - update_if_shared(instanceKlass::fully_initialized);
1.54 - return _init_state == instanceKlass::fully_initialized;
1.55 + update_if_shared(InstanceKlass::fully_initialized);
1.56 + return _init_state == InstanceKlass::fully_initialized;
1.57 }
1.58 // Is this klass being initialized?
1.59 bool is_being_initialized() {
1.60 - update_if_shared(instanceKlass::being_initialized);
1.61 - return _init_state == instanceKlass::being_initialized;
1.62 + update_if_shared(InstanceKlass::being_initialized);
1.63 + return _init_state == InstanceKlass::being_initialized;
1.64 }
1.65 // Has this klass been linked?
1.66 bool is_linked() {
1.67 - update_if_shared(instanceKlass::linked);
1.68 - return _init_state >= instanceKlass::linked;
1.69 + update_if_shared(InstanceKlass::linked);
1.70 + return _init_state >= InstanceKlass::linked;
1.71 }
1.72
1.73 // General klass information.
1.74 @@ -220,7 +219,7 @@
1.75 // Is the defining class loader of this class the default loader?
1.76 bool uses_default_loader();
1.77
1.78 - bool is_java_lang_Object();
1.79 + bool is_java_lang_Object() const;
1.80
1.81 // Is this klass in the given package?
1.82 bool is_in_package(const char* packagename) {
1.83 @@ -229,8 +228,8 @@
1.84 bool is_in_package(const char* packagename, int len);
1.85
1.86 // What kind of ciObject is this?
1.87 - bool is_instance_klass() { return true; }
1.88 - bool is_java_klass() { return true; }
1.89 + bool is_instance_klass() const { return true; }
1.90 + bool is_java_klass() const { return true; }
1.91 };
1.92
1.93 #endif // SHARE_VM_CI_CIINSTANCEKLASS_HPP
