- * Note that specifying delegate in the {@code @ExportLibrary} annotation does - * not work. - */ -@ExportLibrary(InteropLibrary.class) -public final class HostObjectDebugWrapper implements TruffleObject { - - private final String stringRepr; - - public HostObjectDebugWrapper(Object hostObject) { - Env env = EnsoContext.get(null).getEnvironment(); - InteropLibrary interop = InteropLibrary.getUncached(); - assert env.isHostObject(hostObject); - StringBuilder sb = new StringBuilder(); - sb.append("HostObject{"); - try { - if (interop.hasMetaObject(hostObject)) { - Object metaObject = interop.getMetaObject(hostObject); - Object metaQualifiedName = interop.getMetaQualifiedName(metaObject); - sb.append(interop.asString(metaQualifiedName)).append(": "); - } - sb.append("'").append(interop.asString(interop.toDisplayString(hostObject))).append("'"); - } catch (UnsupportedMessageException e) { - sb.append("unknown"); - } - sb.append("}"); - this.stringRepr = sb.toString(); - } - - /** - * Wraps given object in {@link HostObjectDebugWrapper} if necessary. The returned - * wrapper is a string from the Truffle perspective. - *
- * Serves as a workaround for https://github.com/oracle/graal/issues/5513.
- *
- * @param object Object to potentialy wrap in {@link HostObjectDebugWrapper}.
- */
- @TruffleBoundary
- public static Object wrapHostValues(Object object, InteropLibrary interop, StructsLibrary structs) {
- if (object instanceof Atom atom) {
- Object[] fields = structs.getFields(atom);
- Object[] wrappedFields = new Object[fields.length];
- for (int i = 0; i < fields.length; i++) {
- wrappedFields[i] = wrapHostValues(fields[i], interop, structs);
- }
- return atom.getConstructor().newInstance(wrappedFields);
- } else if (isHostValue(object, interop)) {
- return new HostObjectDebugWrapper(object);
- } else {
- return object;
- }
- }
-
- private static boolean isHostValue(Object value, InteropLibrary interop) {
- return EnsoContext.get(interop).getEnvironment().isHostObject(value);
- }
-
-
- @ExportMessage
- boolean hasLanguage() {
- return true;
- }
-
- @ExportMessage
- Class> getLanguage() {
- return EnsoLanguage.class;
- }
-
- @ExportMessage
- boolean isString() {
- return true;
- }
-
- @ExportMessage
- String asString() {
- return stringRepr;
- }
-
- @ExportMessage
- String toDisplayString(boolean allowSideEffects) {
- return stringRepr;
- }
-}
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/ExpressionNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/ExpressionNode.java
index d470cf997ca9..623eabffd713 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/ExpressionNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/ExpressionNode.java
@@ -21,11 +21,8 @@
import java.util.UUID;
-import org.enso.interpreter.instrument.HostObjectDebugWrapper;
-import org.enso.interpreter.runtime.EnsoContext;
import org.enso.interpreter.runtime.builtin.Builtins;
import org.enso.interpreter.runtime.callable.atom.AtomConstructor;
-import org.enso.interpreter.runtime.callable.atom.StructsLibrary;
import org.enso.interpreter.runtime.callable.function.Function;
import org.enso.interpreter.runtime.scope.DebugLocalScope;
import org.enso.interpreter.runtime.tag.AvoidIdInstrumentationTag;
@@ -203,26 +200,6 @@ public WrapperNode createWrapper(ProbeNode probe) {
return new ExpressionNodeWrapper(this, probe);
}
- /**
- * Transitively converts the given value to a wrapper that treats the host objects
- * as simple strings. This is a workaround for https://github.com/oracle/graal/issues/5513
- * - there is a bug in chromeinspector which reinterprets host objects in host original
- * language, which causes NullPointerException. Therefore, we have to wrap all the
- * host objects.
- *
- * @param retValue Value returned from this expression node
- * @return Value with all the host objects wrapped.
- */
- @OutgoingConverter
- public Object wrapHostObjects(Object retValue) {
- // Wrap only if chrome inspector is attached.
- if (EnsoContext.get(this).getChromeInspectorNotAttached().isValid()) {
- return retValue;
- } else {
- return HostObjectDebugWrapper.wrapHostValues(retValue, InteropLibrary.getUncached(), StructsLibrary.getUncached());
- }
- }
-
@ExportMessage
boolean hasScope(Frame frame) {
return isInstrumentable();
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/function/StatementNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/function/StatementNode.java
index 6bf607902c00..7ac125605c2e 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/function/StatementNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/function/StatementNode.java
@@ -42,14 +42,6 @@ public boolean isInstrumentable() {
@Override
public Object executeGeneric(VirtualFrame frame) {
- if (CompilerDirectives.inInterpreter()) {
- var ctx = EnsoContext.get(this);
- Assumption chromeInspectorNotAttached = ctx.getChromeInspectorNotAttached();
- if (chromeInspectorNotAttached.isValid()
- && ctx.getEnvironment().getInstruments().containsKey("inspect")) {
- chromeInspectorNotAttached.invalidate("Chrome inspector attached");
- }
- }
return node.executeGeneric(frame);
}
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/EnsoContext.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/EnsoContext.java
index de8608deddfd..ab9c875c30cc 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/EnsoContext.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/EnsoContext.java
@@ -34,9 +34,7 @@
import org.enso.polyglot.RuntimeServerInfo;
import org.graalvm.options.OptionKey;
-import com.oracle.truffle.api.Assumption;
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.api.Truffle;
import com.oracle.truffle.api.TruffleFile;
import com.oracle.truffle.api.TruffleLanguage;
import com.oracle.truffle.api.TruffleLanguage.Env;
@@ -80,9 +78,6 @@ public class EnsoContext {
private final LockManager lockManager;
private final AtomicLong clock = new AtomicLong();
- private final Assumption chromeInspectorNotAttached =
- Truffle.getRuntime().createAssumption("chromeInspectorNotAttached");
-
private final Shape rootStateShape = Shape.newBuilder().layout(State.Container.class).build();
private final IOPermissions rootIOPermissions;
@@ -218,11 +213,6 @@ public final Compiler getCompiler() {
return compiler;
}
- /** Returns an {@link Assumption} that Chrome inspector is not attached to this context. */
- public Assumption getChromeInspectorNotAttached() {
- return chromeInspectorNotAttached;
- }
-
/**
* Returns the {@link Env} instance used by this context.
*
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/scope/DebugLocalScope.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/scope/DebugLocalScope.java
index 2f4784f38f8a..e228c99072ec 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/scope/DebugLocalScope.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/scope/DebugLocalScope.java
@@ -20,7 +20,6 @@
import java.util.stream.Collectors;
import org.enso.interpreter.EnsoLanguage;
-import org.enso.interpreter.instrument.HostObjectDebugWrapper;
import org.enso.interpreter.node.EnsoRootNode;
import org.enso.interpreter.runtime.callable.atom.StructsLibrary;
import org.enso.interpreter.runtime.callable.function.Function;
@@ -183,16 +182,12 @@ boolean isMemberReadable(String memberName) {
}
@ExportMessage
- Object readMember(
- String member,
- @CachedLibrary(limit = "10") InteropLibrary interop,
- @CachedLibrary(limit = "10") StructsLibrary structs) {
+ Object readMember(String member) {
FramePointer framePtr = allBindings.get(member);
if (framePtr == null) {
return null;
} else {
- Object value = getValue(frame, framePtr);
- return HostObjectDebugWrapper.wrapHostValues(value, interop, structs);
+ return getValue(frame, framePtr);
}
}
diff --git a/engine/runtime/src/test/java/org/enso/interpreter/test/DebuggingEnsoTest.java b/engine/runtime/src/test/java/org/enso/interpreter/test/DebuggingEnsoTest.java
index cb821593667a..f36036b2e117 100644
--- a/engine/runtime/src/test/java/org/enso/interpreter/test/DebuggingEnsoTest.java
+++ b/engine/runtime/src/test/java/org/enso/interpreter/test/DebuggingEnsoTest.java
@@ -183,9 +183,6 @@ public void callerVariablesAreVisibleOnPreviousStackFrame() {
}
}
- /**
- * Host values in the stack frame are handled specially, because of https://github.com/oracle/graal/issues/5513
- */
@Test
public void testHostValues() {
Value fooFunc = createEnsoMethod("""
@@ -208,15 +205,12 @@ public void testHostValues() {
assertTrue(pathValue.isReadable());
assertFalse(pathValue.isInternal());
assertFalse(pathValue.hasReadSideEffects());
- assertTrue(pathValue.toDisplayString().startsWith("HostObject"));
DebugValue listValue = scope.getDeclaredValue("list");
- // ArrayList is internally represented as Enso list, but as an object
- // initialized in host context, it suffers from the issue mentioned in
- // https://github.com/oracle/graal/issues/5513. Therefore, we display
- // it just as 'HostObject' in the debugger.
assertNotNull(listValue);
- assertTrue(listValue.toDisplayString().startsWith("HostObject"));
+ assertTrue(listValue.isArray());
+ assertEquals(10, listValue.getArray().get(0).asInt());
+ assertEquals(20, listValue.getArray().get(1).asInt());
}
}
event.getSession().suspendNextExecution();
@@ -537,48 +531,6 @@ public void testSteppingIntoMoreExpressionsOneLine() {
testStepping(src, "foo", new Object[]{0}, steps, expectedLineNumbers);
}
- /**
- * Steps through some stdlib methods, enumerates all the values in frames and checks if all
- * the host values are wrapped.
- *
- * Note that this is essentially a check whether the workaround for https://github.com/oracle/graal/issues/5513 works.
- */
- @Test
- public void testAllHostObjectsAreWrapped() {
- Value fooFunc = createEnsoMethod("""
- from Standard.Base import Vector
- foo x =
- vec = [5, 5, 1, 2, 1]
- vec.distinct
- """, "foo");
- List