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

*** 1,7 ****
  /*
!  * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 23,32 ****
--- 23,33 ----
  package jdk.vm.ci.hotspot;
  
  import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
  import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
  
+ import jdk.vm.ci.services.Services;
  import jdk.internal.misc.Unsafe;
  
  /**
   * Used to access native configuration details.
   *
*** 50,60 ****
      /**
       * Gets the host architecture name for the purpose of finding the corresponding
       * {@linkplain HotSpotJVMCIBackendFactory backend}.
       */
      String getHostArchitectureName() {
!         String arch = System.getProperty("os.arch");
          switch (arch) {
              case "x86_64":
                  return "amd64";
  
              case "sparcv9":
--- 51,61 ----
      /**
       * Gets the host architecture name for the purpose of finding the corresponding
       * {@linkplain HotSpotJVMCIBackendFactory backend}.
       */
      String getHostArchitectureName() {
!         String arch = Services.getSavedProperty("os.arch");
          switch (arch) {
              case "x86_64":
                  return "amd64";
  
              case "sparcv9":
*** 68,87 ****
  
      final boolean useCompressedOops = getFlag("UseCompressedOops", Boolean.class);
  
      final int objectAlignment = getFlag("ObjectAlignmentInBytes", Integer.class);
  
      final int prototypeMarkWordOffset = getFieldOffset("Klass::_prototype_header", Integer.class, "markOop");
      final int subklassOffset = getFieldOffset("Klass::_subklass", Integer.class, "Klass*");
      final int nextSiblingOffset = getFieldOffset("Klass::_next_sibling", Integer.class, "Klass*");
      final int superCheckOffsetOffset = getFieldOffset("Klass::_super_check_offset", Integer.class, "juint");
      final int secondarySuperCacheOffset = getFieldOffset("Klass::_secondary_super_cache", Integer.class, "Klass*");
  
      /**
       * The offset of the _java_mirror field (of type {@link Class}) in a Klass.
       */
!     final int classMirrorHandleOffset = getFieldOffset("Klass::_java_mirror", Integer.class, "OopHandle");
  
      final int klassAccessFlagsOffset = getFieldOffset("Klass::_access_flags", Integer.class, "AccessFlags");
      final int klassLayoutHelperOffset = getFieldOffset("Klass::_layout_helper", Integer.class, "jint");
  
      final int klassLayoutHelperNeutralValue = getConstant("Klass::_lh_neutral_value", Integer.class);
--- 69,93 ----
  
      final boolean useCompressedOops = getFlag("UseCompressedOops", Boolean.class);
  
      final int objectAlignment = getFlag("ObjectAlignmentInBytes", Integer.class);
  
+     final int hubOffset = getFieldOffset("oopDesc::_metadata._klass", Integer.class, "Klass*");
+ 
      final int prototypeMarkWordOffset = getFieldOffset("Klass::_prototype_header", Integer.class, "markOop");
      final int subklassOffset = getFieldOffset("Klass::_subklass", Integer.class, "Klass*");
+     final int superOffset = getFieldOffset("Klass::_super", Integer.class, "Klass*");
      final int nextSiblingOffset = getFieldOffset("Klass::_next_sibling", Integer.class, "Klass*");
      final int superCheckOffsetOffset = getFieldOffset("Klass::_super_check_offset", Integer.class, "juint");
      final int secondarySuperCacheOffset = getFieldOffset("Klass::_secondary_super_cache", Integer.class, "Klass*");
  
+     final int classLoaderDataOffset = getFieldOffset("Klass::_class_loader_data", Integer.class, "ClassLoaderData*");
+ 
      /**
       * The offset of the _java_mirror field (of type {@link Class}) in a Klass.
       */
!     final int javaMirrorOffset = getFieldOffset("Klass::_java_mirror", Integer.class, "OopHandle");
  
      final int klassAccessFlagsOffset = getFieldOffset("Klass::_access_flags", Integer.class, "AccessFlags");
      final int klassLayoutHelperOffset = getFieldOffset("Klass::_layout_helper", Integer.class, "jint");
  
      final int klassLayoutHelperNeutralValue = getConstant("Klass::_lh_neutral_value", Integer.class);
*** 129,138 ****
--- 135,145 ----
      final int jvmAccSynthetic = getConstant("JVM_ACC_SYNTHETIC", Integer.class);
      final int jvmAccAnnotation = getConstant("JVM_ACC_ANNOTATION", Integer.class);
      final int jvmAccBridge = getConstant("JVM_ACC_BRIDGE", Integer.class);
      final int jvmAccVarargs = getConstant("JVM_ACC_VARARGS", Integer.class);
      final int jvmAccEnum = getConstant("JVM_ACC_ENUM", Integer.class);
+     final int jvmAccInterface = getConstant("JVM_ACC_INTERFACE", Integer.class);
  
      // This is only valid on AMD64.
      final int runtimeCallStackSize = getConstant("frame::arg_reg_save_area_bytes", Integer.class, osArch.equals("amd64") ? null : 0);
  
      private final int markWordNoHashInPlace = getConstant("markOopDesc::no_hash_in_place", Integer.class);