Add EnableAdvancedRedefinition option

`EnableAdvancedRedefinition` controls whether things like method or
field addition/removal and class hierarchy changes are enabled.

It controls the access to such features both for JDWP and java agents.

Author: gilles-duboscq

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoOptions.java

@@ -763,6 +763,12 @@ public enum MemoryAccessOption {
                     usageSyntax = "allow|warn|debug|deny") //
     public static final OptionKey<MemoryAccessOption> SunMiscUnsafeMemoryAccess = new OptionKey<>(MemoryAccessOption.defaultValue);
 
+    @Option(help = "Enable advanced class redefinition.", //
+                    category = OptionCategory.EXPERT, //
+                    stability = OptionStability.EXPERIMENTAL, //
+                    usageSyntax = "false|true") //
+    public static final OptionKey<Boolean> EnableAdvancedRedefinition = new OptionKey<>(false);
+
     /**
      * Property used to force liveness analysis to also be applied by the interpreter. For testing
      * purpose only. Use a host property rather than an option. An option would slow interpreter

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/redefinition/ClassRedefinition.java

@@ -258,11 +258,15 @@ public List<ChangePacket> detectClassChanges(HotSwapClassInfo[] classInfos, bool
     }
 
     @TruffleBoundary
-    public void redefineClasses(RedefineInfo[] redefineInfos, boolean applyTransformers) {
-        redefineClasses(Arrays.asList(redefineInfos), true, applyTransformers);
+    public int redefineClasses(RedefineInfo[] redefineInfos, boolean applyTransformers) {
+        return redefineClasses(Arrays.asList(redefineInfos), applyTransformers);
     }
 
-    public synchronized int redefineClasses(List<RedefineInfo> redefineInfos, boolean jvmtiRestrictions, boolean applyTransformers) {
+    public int redefineClasses(List<RedefineInfo> redefineInfos, boolean applyTransformers) {
+        return redefineClasses(redefineInfos, !context.advancedRedefinitionEnabled(), applyTransformers);
+    }
+
+    private synchronized int redefineClasses(List<RedefineInfo> redefineInfos, boolean jvmtiRestrictions, boolean applyTransformers) {
         List<RedefineInfo> resultingInfos = applyTransformers ? getTransformedInfos(redefineInfos) : redefineInfos;
 
         // make sure the modules of redefined classes can read injected agent classes
@@ -465,7 +469,7 @@ private static ClassChange detectClassChanges(ParserKlass newParserKlass, Object
                 throw meta.throwExceptionWithMessage(meta.java_lang_UnsupportedOperationException, "attempted to redefine record attribute");
             }
             if (attrChanged(oldKlass.getAttribute(PermittedSubclassesAttribute.NAME), newParserKlass.getAttribute(PermittedSubclassesAttribute.NAME), oldConstantPool, newConstantPool)) {
-                throw meta.throwExceptionWithMessage(meta.java_lang_UnsupportedOperationException, "attempted to redefine record attribute");
+                throw meta.throwExceptionWithMessage(meta.java_lang_UnsupportedOperationException, "attempted to redefine permitted subclasses attribute");
             }
         }
 

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java

@@ -896,7 +896,7 @@ public JavaVersion getJavaVersion() {
     }
 
     public boolean advancedRedefinitionEnabled() {
-        return espressoEnv.JDWPOptions != null;
+        return espressoEnv.AdvancedRedefinition;
     }
 
     public TypeSymbols getTypes() {

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoEnv.java

@@ -105,6 +105,7 @@ public final class EspressoEnv {
     private final PolyglotTypeMappings polyglotTypeMappings;
     private final boolean enableGenericTypeHints;
     private final HashMap<String, EspressoForeignProxyGenerator.GeneratedProxyBytes> proxyCache;
+    public final boolean AdvancedRedefinition;
 
     // Debug option
     public final com.oracle.truffle.espresso.jdwp.api.JDWPOptions JDWPOptions;
@@ -168,6 +169,7 @@ public EspressoEnv(EspressoContext context, TruffleLanguage.Env env) {
         this.enableGenericTypeHints = env.getOptions().get(EspressoOptions.EnableGenericTypeHints);
         this.proxyCache = polyglotTypeMappings.hasMappings() ? new HashMap<>() : null;
         this.UseBindingsLoader = env.getOptions().get(EspressoOptions.UseBindingsLoader);
+        this.AdvancedRedefinition = env.getOptions().get(EspressoOptions.EnableAdvancedRedefinition);
 
         EspressoOptions.JImageMode requestedJImageMode = env.getOptions().get(EspressoOptions.JImage);
         if (!NativeAccessAllowed && requestedJImageMode == EspressoOptions.JImageMode.NATIVE) {

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JDWPContextImpl.java

@@ -828,7 +828,7 @@ public ModuleRef[] getAllModulesRefs() {
     }
 
     public synchronized int redefineClasses(List<RedefineInfo> redefineInfos) {
-        return context.getClassRedefinition().redefineClasses(redefineInfos, false, true);
+        return context.getClassRedefinition().redefineClasses(redefineInfos, true);
     }
 
     @Override