Improve wiring for redefinition errors to JDWP and Instrumentation

Use a checked exception up to the point where redefinition is used by
either JDWP or java agents. Translate those to either JDWP error codes
or exceptions.
Make sure that parser exceptions are translated correctly to JDWP error
codes.
Make sure unsupported cases are also translated to JDWP error codes.

Author: gilles-duboscq

espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/ErrorCodes.java

@@ -37,6 +37,7 @@ public final class ErrorCodes {
     public static final int INVALID_SLOT = 35;
     public static final int INVALID_MODULE = 42;
     public static final int INVALID_CLASS_FORMAT = 60;
+    public static final int CIRCULAR_CLASS_DEFINITION = 61;
     public static final int FAILS_VERIFICATION = 62;
     public static final int ADD_METHOD_NOT_IMPLEMENTED = 63;
     public static final int SCHEMA_CHANGE_NOT_IMPLEMENTED = 64;
@@ -46,6 +47,7 @@ public final class ErrorCodes {
     public static final int NAMES_DONT_MATCH = 69;
     public static final int CLASS_MODIFIERS_CHANGE_NOT_IMPLEMENTED = 70;
     public static final int METHOD_MODIFIERS_CHANGE_NOT_IMPLEMENTED = 71;
+    public static final int CLASS_ATTRIBUTE_CHANGE_NOT_IMPLEMENTED = 72;
     public static final int NOT_IMPLEMENTED = 99;
     public static final int ABSENT_INFORMATION = 101;
     public static final int INVALID_EVENT_TYPE = 102;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/preinit/ParserKlassProvider.java

@@ -47,39 +47,49 @@ default int getCachedParserKlassCount() {
         return 0;
     }
 
-    static ParserKlass parseKlass(ClassRegistry.ClassDefinitionInfo info, ClassLoadingEnv env, StaticObject loader, Symbol<Type> typeOrNull, byte[] bytes) {
+    /**
+     * Like {@link #parseKlass} but throws host exceptions that must be caught an handled by the
+     * called.
+     * 
+     * @throws ValidationException a descriptor validation caused a class format error.
+     * @throws ParserException various exceptions, see subclasses.
+     */
+    static ParserKlass parseKlassWithHostErrors(ClassRegistry.ClassDefinitionInfo info, ClassLoadingEnv env, StaticObject loader, Symbol<Type> typeOrNull, byte[] bytes) throws ValidationException {
         boolean verifiable = EspressoVerifier.needsVerify(env.getLanguage(), loader);
         boolean loaderIsBootOrPlatform = env.loaderIsBootOrPlatform(loader);
-        Meta meta = env.getMeta();
-        try {
-            // Classes from trusted class loaders can create strongly referenced symbols directly
-            // during parsing.
-            boolean ensureStrongSymbols = env.loaderIsBootOrPlatform(loader) || env.loaderIsAppLoader(loader);
-            ParsingContext parsingContext = ClassLoadingEnv.createParsingContext(env, ensureStrongSymbols);
+        // Classes from trusted class loaders can create strongly referenced symbols directly
+        // during parsing.
+        boolean ensureStrongSymbols = env.loaderIsBootOrPlatform(loader) || env.loaderIsAppLoader(loader);
+        ParsingContext parsingContext = ClassLoadingEnv.createParsingContext(env, ensureStrongSymbols);
 
-            // Trusted classes do not need validation/verification.
-            boolean validate = verifiable;
-            ParserKlass parserKlass = ClassfileParser.parse(parsingContext, new ClassfileStream(bytes, null), verifiable, loaderIsBootOrPlatform, typeOrNull, info.isHidden,
-                            info.forceAllowVMAnnotations, validate);
-            if (info.isHidden) {
-                Symbol<Type> requestedClassType = typeOrNull;
-                assert requestedClassType != null;
-                long hiddenKlassId = env.getNewKlassId();
-                Symbol<Name> thisKlassName = parsingContext.getOrCreateName(TypeSymbols.hiddenClassName(requestedClassType, hiddenKlassId));
-                Symbol<Type> thisKlassType = parsingContext.getOrCreateTypeFromName(thisKlassName);
-                var pool = parserKlass.getConstantPool().patchForHiddenClass(parserKlass.getThisKlassIndex(), thisKlassName);
-                var classFlags = parserKlass.getFlags() | Constants.ACC_IS_HIDDEN_CLASS;
-                return new ParserKlass(pool, classFlags, thisKlassName, thisKlassType,
-                                parserKlass.getSuperKlass(), parserKlass.getSuperInterfaces(),
-                                parserKlass.getMethods(), parserKlass.getFields(),
-                                parserKlass.getAttributes(),
-                                parserKlass.getThisKlassIndex(),
-                                parserKlass.getMajorVersion(), parserKlass.getMinorVersion(),
-                                parserKlass.getHiddenKlassId());
-            }
+        // Trusted classes do not need validation/verification.
+        boolean validate = verifiable;
+        ParserKlass parserKlass = ClassfileParser.parse(parsingContext, new ClassfileStream(bytes, null), verifiable, loaderIsBootOrPlatform, typeOrNull, info.isHidden,
+                        info.forceAllowVMAnnotations, validate);
+        if (info.isHidden) {
+            Symbol<Type> requestedClassType = typeOrNull;
+            assert requestedClassType != null;
+            long hiddenKlassId = env.getNewKlassId();
+            Symbol<Name> thisKlassName = parsingContext.getOrCreateName(TypeSymbols.hiddenClassName(requestedClassType, hiddenKlassId));
+            Symbol<Type> thisKlassType = parsingContext.getOrCreateTypeFromName(thisKlassName);
+            var pool = parserKlass.getConstantPool().patchForHiddenClass(parserKlass.getThisKlassIndex(), thisKlassName);
+            var classFlags = parserKlass.getFlags() | Constants.ACC_IS_HIDDEN_CLASS;
+            return new ParserKlass(pool, classFlags, thisKlassName, thisKlassType,
+                            parserKlass.getSuperKlass(), parserKlass.getSuperInterfaces(),
+                            parserKlass.getMethods(), parserKlass.getFields(),
+                            parserKlass.getAttributes(),
+                            parserKlass.getThisKlassIndex(),
+                            parserKlass.getMajorVersion(), parserKlass.getMinorVersion(),
+                            parserKlass.getHiddenKlassId());
+        }
 
-            return parserKlass;
+        return parserKlass;
+    }
 
+    static ParserKlass parseKlass(ClassRegistry.ClassDefinitionInfo info, ClassLoadingEnv env, StaticObject loader, Symbol<Type> typeOrNull, byte[] bytes) {
+        Meta meta = env.getMeta();
+        try {
+            return parseKlassWithHostErrors(info, env, loader, typeOrNull, bytes);
         } catch (ValidationException | ParserException.ClassFormatError validationOrBadFormat) {
             throw meta.throwExceptionWithMessage(meta.java_lang_ClassFormatError, validationOrBadFormat.getMessage());
         } catch (ParserException.UnsupportedClassVersionError unsupportedClassVersionError) {