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

*** 123,133 ****
          // a ClassCastException below
          JavaType currentType = type;
          if (currentType instanceof UnresolvedJavaType) {
              // Don't allow unresolved types to hang around forever
              UnresolvedJavaType unresolvedType = (UnresolvedJavaType) currentType;
!             ResolvedJavaType resolved = unresolvedType.resolve(holder);
              if (resolved != null) {
                  type = resolved;
              }
          }
          return type;
--- 123,133 ----
          // a ClassCastException below
          JavaType currentType = type;
          if (currentType instanceof UnresolvedJavaType) {
              // Don't allow unresolved types to hang around forever
              UnresolvedJavaType unresolvedType = (UnresolvedJavaType) currentType;
!             ResolvedJavaType resolved = holder.lookupType(unresolvedType, false);
              if (resolved != null) {
                  type = resolved;
              }
          }
          return type;