src/hotspot/os/solaris/dtrace/jhelper.d

@@ -109,11 +109,11 @@
   copyin_offset(OFFSET_ConstantPool_pool_holder);
 
   copyin_offset(OFFSET_HeapBlockHeader_used);
   copyin_offset(OFFSET_oopDesc_metadata);
 
-  copyin_offset(OFFSET_Symbol_length);
+  copyin_offset(OFFSET_Symbol_length_and_refcount);
   copyin_offset(OFFSET_Symbol_body);
 
   copyin_offset(OFFSET_Method_constMethod);
   copyin_offset(OFFSET_ConstMethod_constants);
   copyin_offset(OFFSET_ConstMethod_name_index);

@@ -462,27 +462,27 @@
       this->nameIndex * sizeof (pointer) + SIZE_ConstantPool);
   /* The symbol is a CPSlot and has lower bit set to indicate metadata */
   this->nameSymbol &= (~1); /* remove metadata lsb */
 
   this->nameSymbolLength = copyin_uint16(this->nameSymbol +
-      OFFSET_Symbol_length);
+      OFFSET_Symbol_length_and_refcount);
 
   this->signatureSymbol = copyin_ptr(this->constantPool +
       this->signatureIndex * sizeof (pointer) + SIZE_ConstantPool);
   this->signatureSymbol &= (~1); /* remove metadata lsb */
 
   this->signatureSymbolLength = copyin_uint16(this->signatureSymbol +
-      OFFSET_Symbol_length);
+      OFFSET_Symbol_length_and_refcount);
 
   this->klassPtr = copyin_ptr(this->constantPool +
       OFFSET_ConstantPool_pool_holder);
 
   this->klassSymbol = copyin_ptr(this->klassPtr +
       OFFSET_Klass_name);
 
   this->klassSymbolLength = copyin_uint16(this->klassSymbol +
-      OFFSET_Symbol_length);
+      OFFSET_Symbol_length_and_refcount);
 
   /*
    * Enough for three strings, plus the '.', plus the trailing '\0'.
    */
   this->result = (char *) alloca(this->klassSymbolLength +