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

*** 24,33 ****
--- 24,34 ----
  
  import static java.util.Objects.requireNonNull;
  import static jdk.vm.ci.hotspot.CompilerToVM.compilerToVM;
  import static jdk.vm.ci.hotspot.HotSpotConstantPool.isSignaturePolymorphicHolder;
  import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
+ import static jdk.vm.ci.hotspot.HotSpotModifiers.jvmClassModifiers;
  import static jdk.vm.ci.hotspot.HotSpotVMConfig.config;
  import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
  
  import java.lang.annotation.Annotation;
  import java.lang.reflect.Array;
*** 47,57 ****
  import jdk.vm.ci.meta.Assumptions.NoFinalizableSubclass;
  import jdk.vm.ci.meta.Constant;
  import jdk.vm.ci.meta.JavaConstant;
  import jdk.vm.ci.meta.JavaKind;
  import jdk.vm.ci.meta.JavaType;
- import jdk.vm.ci.meta.ModifiersProvider;
  import jdk.vm.ci.meta.ResolvedJavaField;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  import jdk.vm.ci.meta.ResolvedJavaType;
  
  /**
--- 48,57 ----
*** 150,160 ****
      @Override
      public int getModifiers() {
          if (isArray()) {
              return (getElementalType().getModifiers() & (Modifier.PUBLIC | Modifier.PRIVATE | Modifier.PROTECTED)) | Modifier.FINAL | Modifier.ABSTRACT;
          } else {
!             return getAccessFlags() & ModifiersProvider.jvmClassModifiers();
          }
      }
  
      public int getAccessFlags() {
          HotSpotVMConfig config = config();
--- 150,160 ----
      @Override
      public int getModifiers() {
          if (isArray()) {
              return (getElementalType().getModifiers() & (Modifier.PUBLIC | Modifier.PRIVATE | Modifier.PROTECTED)) | Modifier.FINAL | Modifier.ABSTRACT;
          } else {
!             return getAccessFlags() & jvmClassModifiers();
          }
      }
  
      public int getAccessFlags() {
          HotSpotVMConfig config = config();
*** 505,515 ****
      }
  
      synchronized HotSpotResolvedJavaField createField(String fieldName, JavaType type, long offset, int rawFlags) {
          HotSpotResolvedJavaField result = null;
  
!         final int flags = rawFlags & ModifiersProvider.jvmFieldModifiers();
  
          final long id = offset + ((long) flags << 32);
  
          // Must cache the fields, because the local load elimination only works if the
          // objects from two field lookups are identical.
--- 505,515 ----
      }
  
      synchronized HotSpotResolvedJavaField createField(String fieldName, JavaType type, long offset, int rawFlags) {
          HotSpotResolvedJavaField result = null;
  
!         final int flags = rawFlags & HotSpotModifiers.jvmFieldModifiers();
  
          final long id = offset + ((long) flags << 32);
  
          // Must cache the fields, because the local load elimination only works if the
          // objects from two field lookups are identical.