Rename list containing active jvmti envs. Pass cause to shouldNotReachHere in NativeMemberOffsetGetter.

Author: rakachan

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/jvmti/JVMTI.java

@@ -57,7 +57,7 @@ public final class JVMTI {
     @CompilationFinal //
     private volatile Structs structs;
 
-    private final ArrayList<JVMTIEnv> created = new ArrayList<>();
+    private final ArrayList<JVMTIEnv> activeEnvironments = new ArrayList<>();
 
     private JvmtiPhase phase;
 
@@ -128,23 +128,23 @@ public synchronized TruffleObject create(int version) {
             return null;
         }
         JVMTIEnv jvmtiEnv = new JVMTIEnv(context, initializeJvmtiContext, version);
-        created.add(jvmtiEnv);
+        activeEnvironments.add(jvmtiEnv);
         return jvmtiEnv.getEnv();
     }
 
     public synchronized void dispose() {
-        for (JVMTIEnv jvmtiEnv : created) {
+        for (JVMTIEnv jvmtiEnv : activeEnvironments) {
             jvmtiEnv.dispose(disposeJvmtiContext);
         }
-        created.clear();
+        activeEnvironments.clear();
     }
 
     @TruffleBoundary
     synchronized void dispose(JVMTIEnv env) {
         CompilerAsserts.neverPartOfCompilation();
-        if (created.contains(env)) {
+        if (activeEnvironments.contains(env)) {
             env.dispose(disposeJvmtiContext);
-            created.remove(env);
+            activeEnvironments.remove(env);
         }
     }
 

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/jvmti/structs/NativeMemberOffsetGetter.java

@@ -55,7 +55,7 @@ private long lookupInfo(String str) {
         try (RawBuffer memberBuffer = RawBuffer.getNativeString(str)) {
             return (long) library.execute(lookupMemberOffset, memberInfoPtr, memberBuffer.pointer());
         } catch (UnsupportedTypeException | ArityException | UnsupportedMessageException e) {
-            throw EspressoError.shouldNotReachHere();
+            throw EspressoError.shouldNotReachHere(e);
         }
     }
 }