jdk-sandbox: comparison hotspot/src/share/vm/oops/instanceMirrorKlass.cpp

equal deleted inserted replaced

-:aa8c9eb6d900
+:d67be49a5beb
 #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
 #include "oops/oop.pcgc.inline.hpp"
 #endif
-int instanceMirrorKlass::_offset_of_static_fields = 0;
+int InstanceMirrorKlass::_offset_of_static_fields = 0;
 #ifdef ASSERT
 template <class T> void assert_is_in(T *p) {
 T heap_oop = oopDesc::load_heap_oop(p);
 if (!oopDesc::is_null(heap_oop)) {
 do_oop, assert_fn)                                                   \
 }                                                                        \
 }
-void instanceMirrorKlass::oop_follow_contents(oop obj) {
+void InstanceMirrorKlass::oop_follow_contents(oop obj) {
 InstanceKlass::oop_follow_contents(obj);
 // Follow the klass field in the mirror.
 Klass* klass = java_lang_Class::as_Klass(obj);
 if (klass != NULL) {
 MarkSweep::mark_and_push(p),                                                      \
 assert_is_in_closed_subset)
 }
 #ifndef SERIALGC
-void instanceMirrorKlass::oop_follow_contents(ParCompactionManager* cm,
+void InstanceMirrorKlass::oop_follow_contents(ParCompactionManager* cm,
 oop obj) {
 InstanceKlass::oop_follow_contents(cm, obj);
 // Follow the klass field in the mirror.
 Klass* klass = java_lang_Class::as_Klass(obj);
 PSParallelCompact::mark_and_push(cm, p),                                          \
 assert_is_in)
 }
 #endif // SERIALGC
-int instanceMirrorKlass::oop_adjust_pointers(oop obj) {
+int InstanceMirrorKlass::oop_adjust_pointers(oop obj) {
 int size = oop_size(obj);
 InstanceKlass::oop_adjust_pointers(obj);
 // Follow the klass field in the mirror.
 Klass* klass = java_lang_Class::as_Klass(obj);
 /* Make sure the non-virtual and the virtual versions match. */     \
 assert(closure->do_metadata##nv_suffix() == closure->do_metadata(), \
 "Inconsistency in do_metadata");                                \
 if (closure->do_metadata##nv_suffix())
-// Macro to define instanceMirrorKlass::oop_oop_iterate for virtual/nonvirtual for
+// Macro to define InstanceMirrorKlass::oop_oop_iterate for virtual/nonvirtual for
 // all closures.  Macros calling macros above for each oop size.
 #define InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN(OopClosureType, nv_suffix)           \
 \
-int instanceMirrorKlass::                                                             \
+int InstanceMirrorKlass::                                                             \
 oop_oop_iterate##nv_suffix(oop obj, OopClosureType* closure) {                        \
 /* Get size before changing pointers */                                             \
 SpecializationStats::record_iterate_call##nv_suffix(SpecializationStats::irk);      \
 \
 InstanceKlass::oop_oop_iterate##nv_suffix(obj, closure);                            \
 }
 #ifndef SERIALGC
 #define InstanceMirrorKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN(OopClosureType, nv_suffix) \
 \
-int instanceMirrorKlass::                                                             \
+int InstanceMirrorKlass::                                                             \
 oop_oop_iterate_backwards##nv_suffix(oop obj, OopClosureType* closure) {              \
 /* Get size before changing pointers */                                             \
 SpecializationStats::record_iterate_call##nv_suffix(SpecializationStats::irk);      \
 \
 InstanceKlass::oop_oop_iterate_backwards##nv_suffix(obj, closure);                  \
 #endif // !SERIALGC
 #define InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN_m(OopClosureType, nv_suffix)         \
 \
-int instanceMirrorKlass::                                                             \
+int InstanceMirrorKlass::                                                             \
 oop_oop_iterate##nv_suffix##_m(oop obj,                                               \
 OopClosureType* closure,                               \
 MemRegion mr) {                                        \
 SpecializationStats::record_iterate_call##nv_suffix(SpecializationStats::irk);      \
 \
 #endif // SERIALGC
 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN_m)
 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN_m)
 #ifndef SERIALGC
-void instanceMirrorKlass::oop_push_contents(PSPromotionManager* pm, oop obj) {
+void InstanceMirrorKlass::oop_push_contents(PSPromotionManager* pm, oop obj) {
 // Note that we don't have to follow the mirror -> klass pointer, since all
 // klasses that are dirty will be scavenged when we iterate over the
 // ClassLoaderData objects.
 InstanceKlass::oop_push_contents(pm, obj);
 pm->claim_or_forward_depth(p);                                          \
 },                                                                        \
 assert_nothing )
 }
-int instanceMirrorKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) {
+int InstanceMirrorKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) {
 int size = oop_size(obj);
 InstanceKlass::oop_update_pointers(cm, obj);
 // Follow the klass field in the mirror.
 Klass* klass = java_lang_Class::as_Klass(obj);
 assert_nothing)
 return size;
 }
 #endif // SERIALGC
-int instanceMirrorKlass::instance_size(KlassHandle k) {
+int InstanceMirrorKlass::instance_size(KlassHandle k) {
 if (k() != NULL && k->oop_is_instance()) {
 return align_object_size(size_helper() + InstanceKlass::cast(k())->static_field_size());
 }
 return size_helper();
 }
-instanceOop instanceMirrorKlass::allocate_instance(KlassHandle k, TRAPS) {
+instanceOop InstanceMirrorKlass::allocate_instance(KlassHandle k, TRAPS) {
 // Query before forming handle.
 int size = instance_size(k);
 KlassHandle h_k(THREAD, this);
 instanceOop i = (instanceOop) CollectedHeap::Class_obj_allocate(h_k, size, k, CHECK_NULL);
 return i;
 }
-int instanceMirrorKlass::oop_size(oop obj) const {
+int InstanceMirrorKlass::oop_size(oop obj) const {
 return java_lang_Class::oop_size(obj);
 }
-int instanceMirrorKlass::compute_static_oop_field_count(oop obj) {
+int InstanceMirrorKlass::compute_static_oop_field_count(oop obj) {
 Klass* k = java_lang_Class::as_Klass(obj);
 if (k != NULL && k->oop_is_instance()) {
 return InstanceKlass::cast(k)->static_oop_field_count();
 }
 return 0;

changeset 13738	d67be49a5beb
parent 13728	882756847a04
child 15482	470d0b0c09f1