[GR-30290] Backport: ArrayBuffer.prototype.byteLength should handle detached interop array buffer.

PullRequest: js/1944

Author: iamstolis

graal-js/src/com.oracle.truffle.js.test/src/com/oracle/truffle/js/test/interop/InteropByteBufferTest.java

@@ -278,4 +278,19 @@ public void testReadOnlyByteBuffer() {
             assertThrows(() -> jsBuffer.setArrayElement(0, 42), e -> assertTrue(e.getMessage(), e.getMessage().startsWith("TypeError")));
         }
     }
+
+    @Test
+    public void testDetachedInteropArrayBuffer() {
+        HostAccess hostAccess = HostAccess.newBuilder().allowBufferAccess(true).build();
+        try (Context context = JSTest.newContextBuilder().allowHostAccess(hostAccess).allowExperimentalOptions(true).option("js.debug-builtin", "true").option("js.v8-compat", "true").build()) {
+            ByteBuffer buffer = ByteBuffer.wrap(new byte[]{1, 2, 3});
+            context.getBindings("js").putMember("buffer", buffer);
+            Value byteLength = context.eval(ID, "" +
+                            "var arrayBuffer = new ArrayBuffer(buffer);\n" +
+                            "Debug.typedArrayDetachBuffer(arrayBuffer);\n" +
+                            "arrayBuffer.byteLength;");
+            assertEquals(0, byteLength.asInt());
+        }
+    }
+
 }

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/builtins/ArrayBufferPrototypeBuiltins.java

@@ -140,6 +140,9 @@ protected int directArrayBuffer(Object thisObj) {
         protected int interopArrayBuffer(Object thisObj,
                         @CachedLibrary(limit = "InteropLibraryLimit") InteropLibrary interop) {
             Object buffer = JSArrayBuffer.getInteropBuffer(thisObj);
+            if (!getContext().getTypedArrayNotDetachedAssumption().isValid() && buffer == null) {
+                return handleDetachedBuffer();
+            }
             try {
                 long bufferSize = interop.getBufferSize(buffer);
                 // Buffer size was already checked in the ArrayBuffer constructor.

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/builtins/DebugBuiltins.java

@@ -690,7 +690,7 @@ public DebugTypedArrayDetachBufferNode(JSContext context, JSBuiltin builtin) {
         @TruffleBoundary
         @Specialization
         protected static Object detachBuffer(Object obj) {
-            if (!(JSArrayBuffer.isJSHeapArrayBuffer(obj) || JSArrayBuffer.isJSDirectArrayBuffer(obj))) {
+            if (!(JSArrayBuffer.isJSHeapArrayBuffer(obj) || JSArrayBuffer.isJSDirectArrayBuffer(obj) || JSArrayBuffer.isJSInteropArrayBuffer(obj))) {
                 throw Errors.createTypeError("ArrayBuffer expected");
             }
             JSArrayBuffer.detachArrayBuffer((DynamicObject) obj);