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

*** 845,854 ****
--- 845,863 ----
      }
  
      @Override
      public ResolvedJavaField findInstanceFieldWithOffset(long offset, JavaKind expectedEntryKind) {
          ResolvedJavaField[] declaredFields = getInstanceFields(true);
+         return findFieldWithOffset(offset, expectedEntryKind, declaredFields);
+     }
+ 
+     public ResolvedJavaField findStaticFieldWithOffset(long offset, JavaKind expectedEntryKind) {
+         ResolvedJavaField[] declaredFields = getStaticFields();
+         return findFieldWithOffset(offset, expectedEntryKind, declaredFields);
+     }
+ 
+     private static ResolvedJavaField findFieldWithOffset(long offset, JavaKind expectedEntryKind, ResolvedJavaField[] declaredFields) {
          for (ResolvedJavaField field : declaredFields) {
              HotSpotResolvedJavaField resolvedField = (HotSpotResolvedJavaField) field;
              long resolvedFieldOffset = resolvedField.offset();
              // @formatter:off
              if (ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN  &&