src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java

rev 12604 : 8173912: [JVMCI] fix memory overhead of JVMCI

*** 83,93 ****
      final int klassLayoutHelperOffset = getFieldOffset("Klass::_layout_helper", Integer.class, "jint");
  
      final int klassLayoutHelperNeutralValue = getConstant("Klass::_lh_neutral_value", Integer.class);
      final int klassLayoutHelperInstanceSlowPathBit = getConstant("Klass::_lh_instance_slow_path_bit", Integer.class);
  
!     final int vtableEntrySize = getTypeSize("vtableEntry");
      final int vtableEntryMethodOffset = getFieldOffset("vtableEntry::_method", Integer.class, "Method*");
  
      final int instanceKlassSourceFileNameIndexOffset = getFieldOffset("InstanceKlass::_source_file_name_index", Integer.class, "u2");
      final int instanceKlassInitStateOffset = getFieldOffset("InstanceKlass::_init_state", Integer.class, "u1");
      final int instanceKlassConstantsOffset = getFieldOffset("InstanceKlass::_constants", Integer.class, "ConstantPool*");
--- 83,93 ----
      final int klassLayoutHelperOffset = getFieldOffset("Klass::_layout_helper", Integer.class, "jint");
  
      final int klassLayoutHelperNeutralValue = getConstant("Klass::_lh_neutral_value", Integer.class);
      final int klassLayoutHelperInstanceSlowPathBit = getConstant("Klass::_lh_instance_slow_path_bit", Integer.class);
  
!     final int vtableEntrySize = getFieldValue("CompilerToVM::Data::sizeof_vtableEntry", Integer.class, "int");
      final int vtableEntryMethodOffset = getFieldOffset("vtableEntry::_method", Integer.class, "Method*");
  
      final int instanceKlassSourceFileNameIndexOffset = getFieldOffset("InstanceKlass::_source_file_name_index", Integer.class, "u2");
      final int instanceKlassInitStateOffset = getFieldOffset("InstanceKlass::_init_state", Integer.class, "u1");
      final int instanceKlassConstantsOffset = getFieldOffset("InstanceKlass::_constants", Integer.class, "ConstantPool*");
*** 190,213 ****
  
      final int constMethodHasLineNumberTable = getConstant("ConstMethod::_has_linenumber_table", Integer.class);
      final int constMethodHasLocalVariableTable = getConstant("ConstMethod::_has_localvariable_table", Integer.class);
      final int constMethodHasExceptionTable = getConstant("ConstMethod::_has_exception_table", Integer.class);
  
!     final int exceptionTableElementSize = getTypeSize("ExceptionTableElement");
      final int exceptionTableElementStartPcOffset = getFieldOffset("ExceptionTableElement::start_pc", Integer.class, "u2");
      final int exceptionTableElementEndPcOffset = getFieldOffset("ExceptionTableElement::end_pc", Integer.class, "u2");
      final int exceptionTableElementHandlerPcOffset = getFieldOffset("ExceptionTableElement::handler_pc", Integer.class, "u2");
      final int exceptionTableElementCatchTypeIndexOffset = getFieldOffset("ExceptionTableElement::catch_type_index", Integer.class, "u2");
  
!     final int localVariableTableElementSize = getTypeSize("LocalVariableTableElement");
      final int localVariableTableElementStartBciOffset = getFieldOffset("LocalVariableTableElement::start_bci", Integer.class, "u2");
      final int localVariableTableElementLengthOffset = getFieldOffset("LocalVariableTableElement::length", Integer.class, "u2");
      final int localVariableTableElementNameCpIndexOffset = getFieldOffset("LocalVariableTableElement::name_cp_index", Integer.class, "u2");
      final int localVariableTableElementDescriptorCpIndexOffset = getFieldOffset("LocalVariableTableElement::descriptor_cp_index", Integer.class, "u2");
      final int localVariableTableElementSlotOffset = getFieldOffset("LocalVariableTableElement::slot", Integer.class, "u2");
  
!     final int constantPoolSize = getTypeSize("ConstantPool");
      final int constantPoolTagsOffset = getFieldOffset("ConstantPool::_tags", Integer.class, "Array<u1>*");
      final int constantPoolHolderOffset = getFieldOffset("ConstantPool::_pool_holder", Integer.class, "InstanceKlass*");
      final int constantPoolLengthOffset = getFieldOffset("ConstantPool::_length", Integer.class, "int");
  
      final int constantPoolCpCacheIndexTag = getConstant("ConstantPool::CPCACHE_INDEX_TAG", Integer.class);
--- 190,213 ----
  
      final int constMethodHasLineNumberTable = getConstant("ConstMethod::_has_linenumber_table", Integer.class);
      final int constMethodHasLocalVariableTable = getConstant("ConstMethod::_has_localvariable_table", Integer.class);
      final int constMethodHasExceptionTable = getConstant("ConstMethod::_has_exception_table", Integer.class);
  
!     final int exceptionTableElementSize = getFieldValue("CompilerToVM::Data::sizeof_ExceptionTableElement", Integer.class, "int");
      final int exceptionTableElementStartPcOffset = getFieldOffset("ExceptionTableElement::start_pc", Integer.class, "u2");
      final int exceptionTableElementEndPcOffset = getFieldOffset("ExceptionTableElement::end_pc", Integer.class, "u2");
      final int exceptionTableElementHandlerPcOffset = getFieldOffset("ExceptionTableElement::handler_pc", Integer.class, "u2");
      final int exceptionTableElementCatchTypeIndexOffset = getFieldOffset("ExceptionTableElement::catch_type_index", Integer.class, "u2");
  
!     final int localVariableTableElementSize = getFieldValue("CompilerToVM::Data::sizeof_LocalVariableTableElement", Integer.class, "int");
      final int localVariableTableElementStartBciOffset = getFieldOffset("LocalVariableTableElement::start_bci", Integer.class, "u2");
      final int localVariableTableElementLengthOffset = getFieldOffset("LocalVariableTableElement::length", Integer.class, "u2");
      final int localVariableTableElementNameCpIndexOffset = getFieldOffset("LocalVariableTableElement::name_cp_index", Integer.class, "u2");
      final int localVariableTableElementDescriptorCpIndexOffset = getFieldOffset("LocalVariableTableElement::descriptor_cp_index", Integer.class, "u2");
      final int localVariableTableElementSlotOffset = getFieldOffset("LocalVariableTableElement::slot", Integer.class, "u2");
  
!     final int constantPoolSize = getFieldValue("CompilerToVM::Data::sizeof_ConstantPool", Integer.class, "int");
      final int constantPoolTagsOffset = getFieldOffset("ConstantPool::_tags", Integer.class, "Array<u1>*");
      final int constantPoolHolderOffset = getFieldOffset("ConstantPool::_pool_holder", Integer.class, "InstanceKlass*");
      final int constantPoolLengthOffset = getFieldOffset("ConstantPool::_length", Integer.class, "int");
  
      final int constantPoolCpCacheIndexTag = getConstant("ConstantPool::CPCACHE_INDEX_TAG", Integer.class);
*** 235,250 ****
      final int jvmConstantInternalMin = getConstant("JVM_CONSTANT_InternalMin", Integer.class);
      final int jvmConstantInternalMax = getConstant("JVM_CONSTANT_InternalMax", Integer.class);
  
      final int heapWordSize = getConstant("HeapWordSize", Integer.class);
  
!     final int symbolPointerSize = getTypeSize("Symbol*");
  
      final long vmSymbolsSymbols = getFieldAddress("vmSymbols::_symbols[0]", "Symbol*");
      final int vmSymbolsFirstSID = getConstant("vmSymbols::FIRST_SID", Integer.class);
      final int vmSymbolsSIDLimit = getConstant("vmSymbols::SID_LIMIT", Integer.class);
  
      /**
       * Returns the symbol in the {@code vmSymbols} table at position {@code index} as a
       * {@link String}.
       *
       * @param index position in the symbol table
--- 235,253 ----
      final int jvmConstantInternalMin = getConstant("JVM_CONSTANT_InternalMin", Integer.class);
      final int jvmConstantInternalMax = getConstant("JVM_CONSTANT_InternalMax", Integer.class);
  
      final int heapWordSize = getConstant("HeapWordSize", Integer.class);
  
!     final int symbolPointerSize = getFieldValue("CompilerToVM::Data::sizeof_SymbolPointer", Integer.class, "int");
  
      final long vmSymbolsSymbols = getFieldAddress("vmSymbols::_symbols[0]", "Symbol*");
      final int vmSymbolsFirstSID = getConstant("vmSymbols::FIRST_SID", Integer.class);
      final int vmSymbolsSIDLimit = getConstant("vmSymbols::SID_LIMIT", Integer.class);
  
+     final long symbolInit = getFieldValue("CompilerToVM::Data::symbol_init", Long.class);
+     final long symbolClinit = getFieldValue("CompilerToVM::Data::symbol_clinit", Long.class);
+ 
      /**
       * Returns the symbol in the {@code vmSymbols} table at position {@code index} as a
       * {@link String}.
       *
       * @param index position in the symbol table