Add InterpreterUtil.assertion

This helps avoid AssertionError in the interpreter.

Author: gilles-duboscq

substratevm/src/com.oracle.svm.interpreter/src/com/oracle/svm/interpreter/Interpreter.java

@@ -322,7 +322,7 @@ private static void initArguments(InterpreterFrame frame, InterpreterResolvedJav
         int receiverSlot = hasReceiver ? 1 : 0;
         int curSlot = 0;
         if (hasReceiver) {
-            assert arguments[0] != null : "null receiver in init arguments !";
+            InterpreterUtil.assertion(arguments[0] != null, "null receiver in init arguments !");
             Object receiver = arguments[0];
             setLocalObject(frame, curSlot, receiver);
             curSlot += JavaKind.Object.getSlotCount();

substratevm/src/com.oracle.svm.interpreter/src/com/oracle/svm/interpreter/InterpreterStubSection.java

@@ -278,35 +278,35 @@ private static Pointer enterHelper(InterpreterResolvedJavaMethod interpreterMeth
 
         switch (returnType.getJavaKind()) {
             case Boolean:
-                assert retVal instanceof Boolean;
+                InterpreterUtil.assertion(retVal instanceof Boolean, "invalid return type");
                 accessHelper.setGpReturn(enterData, ((Boolean) retVal) ? 1 : 0);
                 break;
             case Byte:
-                assert retVal instanceof Byte;
+                InterpreterUtil.assertion(retVal instanceof Byte, "invalid return type");
                 accessHelper.setGpReturn(enterData, ((Byte) retVal).longValue());
                 break;
             case Short:
-                assert retVal instanceof Short;
+                InterpreterUtil.assertion(retVal instanceof Short, "invalid return type");
                 accessHelper.setGpReturn(enterData, ((Short) retVal).longValue());
                 break;
             case Char:
-                assert retVal instanceof Character;
+                InterpreterUtil.assertion(retVal instanceof Character, "invalid return type");
                 accessHelper.setGpReturn(enterData, ((Character) retVal).charValue());
                 break;
             case Int:
-                assert retVal instanceof Integer;
+                InterpreterUtil.assertion(retVal instanceof Integer, "invalid return type");
                 accessHelper.setGpReturn(enterData, ((Integer) retVal).longValue());
                 break;
             case Long:
-                assert retVal instanceof Long;
+                InterpreterUtil.assertion(retVal instanceof Long, "invalid return type");
                 accessHelper.setGpReturn(enterData, (Long) retVal);
                 break;
             case Float:
-                assert retVal instanceof Float;
+                InterpreterUtil.assertion(retVal instanceof Float, "invalid return type");
                 accessHelper.setFpReturn(enterData, Float.floatToRawIntBits((float) retVal));
                 break;
             case Double:
-                assert retVal instanceof Double;
+                InterpreterUtil.assertion(retVal instanceof Double, "invalid return type");
                 accessHelper.setFpReturn(enterData, Double.doubleToRawLongBits((double) retVal));
                 break;
             case Object:

substratevm/src/com.oracle.svm.interpreter/src/com/oracle/svm/interpreter/InterpreterUtil.java

@@ -24,14 +24,20 @@
  */
 package com.oracle.svm.interpreter;
 
-import com.oracle.svm.core.log.Log;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
+import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.interpreter.metadata.MetadataUtil;
 
 public class InterpreterUtil {
+    private static final boolean assertionsEnabled;
+    static {
+        boolean status = false;
+        assert (status = true) == true;
+        assertionsEnabled = status;
+    }
 
     /**
      * Alternative to {@link VMError#guarantee(boolean, String, Object)} that avoids
@@ -43,6 +49,12 @@ public static void guarantee(boolean condition, String simpleFormat, Object arg1
         }
     }
 
+    public static void assertion(boolean condition, String message) {
+        if (assertionsEnabled && !condition) {
+            VMError.guarantee(condition, message);
+        }
+    }
+
     /**
      * Build time logging.
      */

substratevm/src/com.oracle.svm.interpreter/src/com/oracle/svm/interpreter/SemanticJavaException.java

@@ -46,7 +46,7 @@ public Throwable fillInStackTrace() {
     }
 
     public static RuntimeException raise(Throwable cause) {
-        assert cause != null && !(cause instanceof SemanticJavaException);
+        InterpreterUtil.assertion(cause != null && !(cause instanceof SemanticJavaException), "bad SemanticJavaException nesting");
         throw new SemanticJavaException(cause);
     }
 }