Type resolution failures from the verifier shouldn't stick

Author: gilles-duboscq

espresso-shared/src/com.oracle.truffle.espresso.shared/src/com/oracle/truffle/espresso/shared/meta/TypeAccess.java

@@ -202,7 +202,8 @@ default boolean isJavaLangObject() {
 
     /**
      * Resolves a class in the runtime constant pool of this type, then returns it. Further calls to
-     * this method with the same cpi should not trigger class loading.
+     * this method with the same cpi should not trigger class loading. Resolution errors should not
+     * be saved in the constant pool.
      *
      * @param cpi The constant pool index in which to find the class constant
      * @throws IllegalArgumentException If there is no

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/constantpool/RuntimeConstantPool.java

@@ -112,13 +112,20 @@ private ResolvedConstant outOfLockResolvedAt(ObjectKlass accessingKlass, int ind
      * Returns the resolved, non-primitive, constant pool entry.
      */
     public ResolvedConstant resolvedAt(ObjectKlass accessingKlass, int index) {
+        return resolvedAt(accessingKlass, index, true);
+    }
+
+    public ResolvedConstant resolvedAt(ObjectKlass accessingKlass, int index, boolean allowStickyFailures) {
         ResolvedConstant c = resolvedConstants[index];
         if (c == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
             synchronized (this) {
                 c = resolvedConstants[index];
                 if (c == null) {
-                    resolvedConstants[index] = c = resolve(index, accessingKlass);
+                    c = resolve(index, accessingKlass);
+                    if (allowStickyFailures || c.isSuccess()) {
+                        resolvedConstants[index] = c;
+                    }
                 }
             }
         }
@@ -136,7 +143,11 @@ private ResolvedConstant resolvedAtNoCache(ObjectKlass accessingKlass, int index
     }
 
     public Klass resolvedKlassAt(ObjectKlass accessingKlass, int index) {
-        ResolvedClassConstant resolved = (ResolvedClassConstant) resolvedAt(accessingKlass, index);
+        return resolvedKlassAt(accessingKlass, index, true);
+    }
+
+    public Klass resolvedKlassAt(ObjectKlass accessingKlass, int index, boolean allowStickyFailures) {
+        ResolvedClassConstant resolved = (ResolvedClassConstant) resolvedAt(accessingKlass, index, allowStickyFailures);
         return (Klass) resolved.value();
     }
 

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Klass.java

@@ -1925,7 +1925,7 @@ public final boolean isMagicAccessor() {
     public final Klass resolveClassConstantInPool(int cpi) {
         if (this instanceof ObjectKlass objectKlass) {
             try {
-                return objectKlass.getConstantPool().resolvedKlassAt(objectKlass, cpi);
+                return objectKlass.getConstantPool().resolvedKlassAt(objectKlass, cpi, false);
             } catch (ClassCastException | IndexOutOfBoundsException e) {
                 throw new IllegalArgumentException("No ClassConstant at constant pool index " + cpi);
             }