src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp

*** 59,79 ****
  
  bool       CompilerToVM::Data::_supports_inline_contig_alloc;
  HeapWord** CompilerToVM::Data::_heap_end_addr;
  HeapWord* volatile* CompilerToVM::Data::_heap_top_addr;
  int CompilerToVM::Data::_max_oop_map_stack_offset;
  
  jbyte* CompilerToVM::Data::cardtable_start_address;
  int CompilerToVM::Data::cardtable_shift;
  
  int CompilerToVM::Data::vm_page_size;
  
  int CompilerToVM::Data::sizeof_vtableEntry = sizeof(vtableEntry);
  int CompilerToVM::Data::sizeof_ExceptionTableElement = sizeof(ExceptionTableElement);
  int CompilerToVM::Data::sizeof_LocalVariableTableElement = sizeof(LocalVariableTableElement);
  int CompilerToVM::Data::sizeof_ConstantPool = sizeof(ConstantPool);
- int CompilerToVM::Data::sizeof_SymbolPointer = sizeof(Symbol*);
  int CompilerToVM::Data::sizeof_narrowKlass = sizeof(narrowKlass);
  int CompilerToVM::Data::sizeof_arrayOopDesc = sizeof(arrayOopDesc);
  int CompilerToVM::Data::sizeof_BasicLock = sizeof(BasicLock);
  
  address CompilerToVM::Data::dsin;
--- 59,79 ----
  
  bool       CompilerToVM::Data::_supports_inline_contig_alloc;
  HeapWord** CompilerToVM::Data::_heap_end_addr;
  HeapWord* volatile* CompilerToVM::Data::_heap_top_addr;
  int CompilerToVM::Data::_max_oop_map_stack_offset;
+ int CompilerToVM::Data::_fields_annotations_base_offset;
  
  jbyte* CompilerToVM::Data::cardtable_start_address;
  int CompilerToVM::Data::cardtable_shift;
  
  int CompilerToVM::Data::vm_page_size;
  
  int CompilerToVM::Data::sizeof_vtableEntry = sizeof(vtableEntry);
  int CompilerToVM::Data::sizeof_ExceptionTableElement = sizeof(ExceptionTableElement);
  int CompilerToVM::Data::sizeof_LocalVariableTableElement = sizeof(LocalVariableTableElement);
  int CompilerToVM::Data::sizeof_ConstantPool = sizeof(ConstantPool);
  int CompilerToVM::Data::sizeof_narrowKlass = sizeof(narrowKlass);
  int CompilerToVM::Data::sizeof_arrayOopDesc = sizeof(arrayOopDesc);
  int CompilerToVM::Data::sizeof_BasicLock = sizeof(BasicLock);
  
  address CompilerToVM::Data::dsin;
*** 120,129 ****
--- 120,131 ----
    assert(!OopMapValue::legal_vm_reg_name(VMRegImpl::stack2reg(max_oop_map_stack_index + 1)), "should be invalid");
  
    symbol_init = (address) vmSymbols::object_initializer_name();
    symbol_clinit = (address) vmSymbols::class_initializer_name();
  
+   _fields_annotations_base_offset = Array<AnnotationArray*>::base_offset_in_bytes();
+ 
    BarrierSet* bs = BarrierSet::barrier_set();
    if (bs->is_a(BarrierSet::CardTableBarrierSet)) {
      jbyte* base = ci_card_table_address();
      assert(base != NULL, "unexpected byte_map_base");
      cardtable_start_address = base;