[GR-39184] Avoid recursive inlining in allocation path.

PullRequest: graal/11985

Author: gilles-duboscq

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

@@ -982,13 +982,18 @@ public void safeInitialize() {
             StaticObject cause = e.getGuestException();
             Meta meta = getMeta();
             if (!InterpreterToVM.instanceOf(cause, meta.java_lang_Error)) {
-                throw meta.throwExceptionWithCause(meta.java_lang_ExceptionInInitializerError, cause);
+                throw throwExceptionInInitializerError(meta, cause);
             } else {
                 throw e;
             }
         }
     }
 
+    @TruffleBoundary
+    private static EspressoException throwExceptionInInitializerError(Meta meta, StaticObject cause) {
+        throw meta.throwExceptionWithCause(meta.java_lang_ExceptionInInitializerError, cause);
+    }
+
     public final Klass getSupertype() {
         if (isPrimitive()) {
             return null;

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

@@ -364,11 +364,16 @@ boolean isErroneous() {
 
     private void checkErroneousInitialization() {
         if (isErroneous()) {
-            Meta meta = getMeta();
-            throw meta.throwExceptionWithMessage(meta.java_lang_NoClassDefFoundError, EspressoError.cat("Erroneous class: ", getName()));
+            throw throwNoClassDefFoundError();
         }
     }
 
+    @TruffleBoundary
+    private EspressoException throwNoClassDefFoundError() {
+        Meta meta = getMeta();
+        throw meta.throwExceptionWithMessage(meta.java_lang_NoClassDefFoundError, "Erroneous class: " + getName());
+    }
+
     @ExplodeLoop
     private void actualInit() {
         checkErroneousInitialization();

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/meta/ExceptionDispatch.java

@@ -27,11 +27,12 @@
 import com.oracle.truffle.espresso.descriptors.Symbol;
 import com.oracle.truffle.espresso.impl.ContextAccessImpl;
 import com.oracle.truffle.espresso.impl.ObjectKlass;
+import com.oracle.truffle.espresso.runtime.EspressoContext;
 import com.oracle.truffle.espresso.runtime.StaticObject;
 import com.oracle.truffle.espresso.vm.InterpreterToVM;
 
 /**
- * Allows fast-path runtime guest exception creation.
+ * Allows fast-path creation of well-known guest runtime exceptions .
  */
 public final class ExceptionDispatch extends ContextAccessImpl {
     private final Meta meta;
@@ -57,8 +58,7 @@ StaticObject initEx(ObjectKlass klass, StaticObject message, StaticObject cause)
     }
 
     private StaticObject fastPath(ObjectKlass klass, StaticObject message, StaticObject cause) {
-        StaticObject ex = klass.allocateInstance(getContext());
-
+        StaticObject ex = allocateException(klass);
         // TODO: Remove this when truffle exceptions are reworked.
         InterpreterToVM.fillInStackTrace(ex, false, meta);
 
@@ -71,12 +71,20 @@ private StaticObject fastPath(ObjectKlass klass, StaticObject message, StaticObj
         return ex;
     }
 
+    private StaticObject allocateException(ObjectKlass klass) {
+        EspressoContext ctx = getContext();
+        // avoid PE recursion in the checks in klass.allocateInstance
+        // the exception types allocated here should be well-known and well-behaved
+        assert !klass.isAbstract() && !klass.isInterface();
+        return ctx.getAllocator().createNew(klass);
+    }
+
     private StaticObject slowPath(ObjectKlass klass, StaticObject message, StaticObject cause) {
         assert meta.java_lang_Throwable.isAssignableFrom(klass);
         StaticObject ex;
         // if klass was a compilation constant, the constantness of the klass field in ex should
         // propagate even through the boundary.
-        ex = klass.allocateInstance(getContext());
+        ex = allocateException(klass);
         slowInitEx(ex, klass, message, cause);
         return ex;
     }