src/share/vm/classfile/javaClasses.cpp

rev 11747 : [mq]: per.hotspot.patch

*** 3013,3057 ****
    case T_DOUBLE:    st->print("%lf", value->d);                     break;
    default:          st->print("type %d?", type);                    break;
    }
  }
  
- 
- // Support for java_lang_ref_Reference
- HeapWord *java_lang_ref_Reference::pending_list_lock_addr() {
-   InstanceKlass* ik = SystemDictionary::Reference_klass();
-   address addr = ik->static_field_addr(static_lock_offset);
-   return (HeapWord*) addr;
- }
- 
- oop java_lang_ref_Reference::pending_list_lock() {
-   InstanceKlass* ik = SystemDictionary::Reference_klass();
-   address addr = ik->static_field_addr(static_lock_offset);
-   if (UseCompressedOops) {
-     return oopDesc::load_decode_heap_oop((narrowOop *)addr);
-   } else {
-     return oopDesc::load_decode_heap_oop((oop*)addr);
-   }
- }
- 
- HeapWord *java_lang_ref_Reference::pending_list_addr() {
-   InstanceKlass* ik = SystemDictionary::Reference_klass();
-   address addr = ik->static_field_addr(static_pending_offset);
-   // XXX This might not be HeapWord aligned, almost rather be char *.
-   return (HeapWord*)addr;
- }
- 
- oop java_lang_ref_Reference::pending_list() {
-   char *addr = (char *)pending_list_addr();
-   if (UseCompressedOops) {
-     return oopDesc::load_decode_heap_oop((narrowOop *)addr);
-   } else {
-     return oopDesc::load_decode_heap_oop((oop*)addr);
-   }
- }
- 
- 
  // Support for java_lang_ref_SoftReference
  
  jlong java_lang_ref_SoftReference::timestamp(oop ref) {
    return ref->long_field(timestamp_offset);
  }
--- 3013,3022 ----
*** 3623,3634 ****
  int java_lang_boxing_object::long_value_offset;
  int java_lang_ref_Reference::referent_offset;
  int java_lang_ref_Reference::queue_offset;
  int java_lang_ref_Reference::next_offset;
  int java_lang_ref_Reference::discovered_offset;
- int java_lang_ref_Reference::static_lock_offset;
- int java_lang_ref_Reference::static_pending_offset;
  int java_lang_ref_Reference::number_of_fake_oop_fields;
  int java_lang_ref_SoftReference::timestamp_offset;
  int java_lang_ref_SoftReference::static_clock_offset;
  int java_lang_ClassLoader::parent_offset;
  int java_lang_System::static_in_offset;
--- 3588,3597 ----
*** 3779,3790 ****
    // java_lang_ref_Reference:
    java_lang_ref_Reference::referent_offset = java_lang_ref_Reference::hc_referent_offset * x + header;
    java_lang_ref_Reference::queue_offset = java_lang_ref_Reference::hc_queue_offset * x + header;
    java_lang_ref_Reference::next_offset  = java_lang_ref_Reference::hc_next_offset * x + header;
    java_lang_ref_Reference::discovered_offset  = java_lang_ref_Reference::hc_discovered_offset * x + header;
-   java_lang_ref_Reference::static_lock_offset = java_lang_ref_Reference::hc_static_lock_offset *  x;
-   java_lang_ref_Reference::static_pending_offset = java_lang_ref_Reference::hc_static_pending_offset * x;
    // Artificial fields for java_lang_ref_Reference
    // The first field is for the discovered field added in 1.4
    java_lang_ref_Reference::number_of_fake_oop_fields = 1;
  
    // java_lang_ref_SoftReference Class
--- 3742,3751 ----
*** 4013,4024 ****
    CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, referent, "Ljava/lang/Object;");
    CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, queue, "Ljava/lang/ref/ReferenceQueue;");
    CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, next, "Ljava/lang/ref/Reference;");
    // Fake field
    //CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, discovered, "Ljava/lang/ref/Reference;");
-   CHECK_STATIC_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, lock, "Ljava/lang/ref/Reference$Lock;");
-   CHECK_STATIC_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, pending, "Ljava/lang/ref/Reference;");
  
    // java.lang.ref.SoftReference
  
    CHECK_OFFSET("java/lang/ref/SoftReference", java_lang_ref_SoftReference, timestamp, "J");
    CHECK_STATIC_OFFSET("java/lang/ref/SoftReference", java_lang_ref_SoftReference, clock, "J");
--- 3974,3983 ----