[GR-43819] [GR-48463] [GR-48534] [GR-48537] [GR-48544] Batch backport to 23.1.

PullRequest: js/2923

Author: woess

graal-js/mx.graal-js/suite.py

@@ -254,7 +254,7 @@
       "subDir" : "src",
       "sourceDirs" : ["src"],
       "dependencies" : [
-        "sdk:GRAAL_SDK",
+        "sdk:POLYGLOT",
         "mx:JUNIT",
         "GRAALJS",
         "com.oracle.truffle.js.snapshot",
@@ -275,7 +275,7 @@
       "subDir" : "src",
       "sourceDirs" : ["src"],
       "dependencies" : [
-        "sdk:GRAAL_SDK",
+        "sdk:POLYGLOT",
         "mx:JUNIT",
         "GRAALJS",
         "TRUFFLE_JS_TESTS",
@@ -310,7 +310,7 @@
       "sourceDirs" : ["src"],
       "dependencies" : [
         "mx:JUNIT",
-        "sdk:GRAAL_SDK",
+        "sdk:POLYGLOT",
       ],
       "annotationProcessors" : ["truffle:TRUFFLE_DSL_PROCESSOR"],
       "checkstyle" : "com.oracle.truffle.js",
@@ -325,7 +325,7 @@
       "sourceDirs" : ["src"],
       "dependencies" : [
         "mx:JUNIT",
-        "sdk:GRAAL_SDK",
+        "sdk:POLYGLOT",
         "com.oracle.truffle.js.test",
       ],
       "requires" : [
@@ -343,7 +343,7 @@
       "subDir" : "src",
       "sourceDirs" : ["src"],
       "dependencies" : [
-        "sdk:GRAAL_SDK",
+        "sdk:POLYGLOT",
       ],
       "requires" : [
         "java.scripting",
@@ -360,7 +360,7 @@
       "sourceDirs" : ["src"],
       "dependencies" : [
         "com.oracle.truffle.js.scriptengine",
-        "sdk:GRAAL_SDK",
+        "sdk:POLYGLOT",
         "mx:JUNIT",
         "GRAALJS",
       ],
@@ -379,7 +379,7 @@
       "subDir" : "src",
       "sourceDirs" : ["src"],
       "dependencies" : [
-        "sdk:GRAAL_SDK",
+        "sdk:POLYGLOT",
         "GRAALJS",
         "mx:JMH_1_21"
       ],
@@ -471,7 +471,7 @@
       "distDependencies" : [
         "regex:TREGEX",
         "truffle:TRUFFLE_API",
-        "sdk:GRAAL_SDK",
+        "sdk:POLYGLOT",
         "truffle:TRUFFLE_ICU4J",
       ],
       "exclude" : [
@@ -540,7 +540,7 @@
       "subDir" : "src",
       "dependencies" : ["com.oracle.truffle.js.scriptengine"],
       "distDependencies" : [
-        "sdk:GRAAL_SDK"
+        "sdk:POLYGLOT"
       ],
       "description" : "Graal JavaScript ScriptEngine",
       "maven" : {
@@ -555,7 +555,7 @@
       "dependencies" : ["com.oracle.truffle.js.factory.processor"],
       "distDependencies" : [
         "truffle:TRUFFLE_API",
-        "sdk:GRAAL_SDK"
+        "sdk:POLYGLOT"
       ],
       "maven" : False,
       "overlaps" : ["GRAALJS"],
@@ -594,7 +594,7 @@
       "dependencies" : ["com.oracle.truffle.js.scriptengine.test"],
       "distDependencies" : [
         "mx:JUNIT",
-        "sdk:GRAAL_SDK",
+        "sdk:POLYGLOT",
         "GRAALJS",
         "GRAALJS_SCRIPTENGINE",
       ],
@@ -700,7 +700,7 @@
         "mx:JUNIT"
       ],
       "distDependencies" : [
-        "sdk:GRAAL_SDK",
+        "sdk:POLYGLOT",
         "GRAALJS"
       ],
       "maven" : False,

graal-js/src/com.oracle.truffle.js.test/js/GR-48463.js

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+ */
+
+/**
+ * @option debug-builtin
+ */
+
+load("assert.js");
+
+var array = new Uint8Array(8);
+Debug.typedArrayDetachBuffer(array.buffer);
+
+assertThrows(function() {
+    Object.getOwnPropertyDescriptor(SharedArrayBuffer.prototype, 'byteLength').get.call(array);
+}, TypeError);
+
+assertSameContent([], Object.getOwnPropertyNames(array));

graal-js/src/com.oracle.truffle.js.test/js/GR-48534.js

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+ */
+
+load("assert.js");
+
+var array = [1,2,4];
+delete array[1];
+array.splice(2,0,3);
+array[2] = '3';
+assertSameContent([1,,'3',4], array);
+
+var array = new Array(10);
+array[0] = 0;
+array[2] = 2;
+array.splice(1,0,1);
+array[1] = '1';
+assertSameContent([0,'1',,2,,,,,,,,], array);

graal-js/src/com.oracle.truffle.js.test/js/GR-48544.js

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2023, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+ */
+
+load("assert.js");
+
+var array = new Array(8);
+array[0] = '1';
+array[2] = 3;
+array.splice(3,0,4,5);
+assertSameContent(['1',,3,4,5,,,,,,], array);

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/array/dyn/AbstractWritableArray.java

@@ -680,8 +680,12 @@ ScriptArray addRangeImplContiguous(JSDynamicObject object, long offset, int size
                 int copySize = (lastIndex - effectiveOffset);
                 if (copySize > 0) {
                     System.arraycopy(array, effectiveOffset, array, (effectiveOffset + size), copySize);
+                    fillWithHoles(array, effectiveOffset, effectiveOffset + size);
+                    if (isHolesType()) {
+                        arraySetHoleCount(object, arrayGetHoleCount(object) + size);
+                    }
+                    arraySetUsedLength(object, usedLength + size);
                 }
-                arraySetUsedLength(object, usedLength + size);
                 return this;
             } else {
                 return addRangeGrow(object, array, arrayLength, usedLength, lengthInt(object), (int) (offset - indexOffset), size, arrayOffset, indexOffset);
@@ -703,6 +707,7 @@ private ScriptArray addRangeGrow(JSDynamicObject object, Object array, int array
             arraySetArray(object, newArray);
             arraySetUsedLength(object, usedLength + size);
             if (isHolesType()) {
+                fillWithHoles(newArray, offset, offset + size);
                 arraySetHoleCount(object, arrayGetHoleCount(object) + size);
             }
             return this;

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/builtins/JSArrayBufferView.java

@@ -441,8 +441,11 @@ public List<Object> getOwnPropertyKeys(JSDynamicObject thisObj, boolean strings,
         if (!strings) {
             return super.getOwnPropertyKeys(thisObj, strings, symbols);
         }
-        List<Object> indices = typedArrayGetArrayType(thisObj).ownPropertyKeys(thisObj);
         List<Object> keys = ordinaryOwnPropertyKeys(thisObj, strings, symbols);
+        if (hasDetachedBuffer(thisObj)) {
+            return keys;
+        }
+        List<Object> indices = typedArrayGetArrayType(thisObj).ownPropertyKeys(thisObj);
         return IteratorUtil.concatLists(indices, keys);
     }
 

graal-js/test/maven-demo/pom.xml

@@ -165,8 +165,8 @@
                                             <overWrite>true</overWrite>
                                         </artifactItem>
                                         <artifactItem>
-                                            <groupId>org.graalvm.sdk</groupId>
-                                            <artifactId>graal-sdk</artifactId>
+                                            <groupId>org.graalvm.polyglot</groupId>
+                                            <artifactId>polyglot</artifactId>
                                             <version>${graalvm.version}</version>
                                             <type>jar</type>
                                             <overWrite>true</overWrite>

graal-js/test/maven-demo/src/main/java/module-info.java

@@ -39,7 +39,7 @@
  * SOFTWARE.
  */
 module com.mycompany.app {
-    requires org.graalvm.sdk;
+    requires org.graalvm.polyglot;
     requires java.scripting;
 
     exports com.mycompany.app;

graal-nodejs/mx.graal-nodejs/mx_graal_nodejs.py

@@ -601,7 +601,7 @@ def mx_post_parse_cmd_line(args):
     mx_graal_nodejs_benchmark.register_nodejs_vms()
 
 def _is_wasm_available():
-    return ('wasm', True) in mx.get_dynamic_imports()
+    return any(wasm_suite in mx.get_dynamic_imports() for wasm_suite in [('wasm', True), ('wasm-enterprise', True)])
 
 mx_sdk.register_graalvm_component(mx_sdk.GraalVmLanguage(
     suite=_suite,
@@ -648,7 +648,7 @@ def _is_wasm_available():
     standalone_dependencies={
         'GraalVM license files': ('', ['GRAALVM-README.md']),
         'Graal.nodejs license files': ('', []),
-        **({'GraalWasm' : ('', ['LICENSE_WASM.txt'])} if _is_wasm_available() else {}),
+        **({'GraalWasm' : ('', ['LICENSE_WASM.txt', 'bin/<exe:wasm>', 'lib/<lib:wasmvm>'])} if _is_wasm_available() else {}),
     },
     standalone_dependencies_enterprise={
         'GraalVM enterprise license files': ('', ['GRAALVM-README.md']),