add intermediate prototype for foreign objects

Author: wirthi

CHANGELOG.md

@@ -8,11 +8,13 @@ See [version roadmap](https://www.graalvm.org/release-notes/version-roadmap/) fo
 ## Version 22.2.0
 * GraalVM JavaScript is now an installable component of GraalVM. It can be installed with `gu install js`.
 * Enabled option `js.foreign-object-prototype` by default. Polyglot Interop objects now get a fitting JavaScript prototype assigned unless explicitly turned off using this flag.
+* Added intermediate prototype for foreign objects to simplify adapting functionality.
 * Removed deprecated experimental option `experimental-foreign-object-prototype`.
 * Removed experimental option `commonjs-global-properties`. The same functionality can be achieved in user code with a direct call to `require()` after context creation.
 * Added an experimental option `--js.zone-rules-based-time-zones` that allows to use timezone-related data from `ZoneRulesProvider` (instead of ICU4J data files).
 * Temporal objects can be converted to compatible Java objects when possible, using the `Value` API's methods like `asDate()`.
 
+
 ## Version 22.1.0
 * Updated Node.js to version 16.14.2.
 * Graal.js now requires Java 11+ and no longer supports Java 8.

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/interop/ForeignObjectPrototypeNode.java

@@ -64,23 +64,23 @@ public JSDynamicObject doTruffleObject(Object truffleObject,
                     @CachedLibrary("truffleObject") InteropLibrary interop) {
         JSRealm realm = getRealm();
         if (interop.hasArrayElements(truffleObject)) {
-            return realm.getArrayPrototype();
+            return realm.getForeignArrayPrototype();
         } else if (interop.isInstant(truffleObject)) {
-            return realm.getDatePrototype();
+            return realm.getForeignDatePrototype();
         } else if (interop.hasHashEntries(truffleObject)) {
-            return realm.getMapPrototype();
+            return realm.getForeignMapPrototype();
         } else if (interop.hasIterator(truffleObject)) {
             return realm.getForeignIterablePrototype();
         } else if (interop.isString(truffleObject)) {
-            return realm.getStringPrototype();
+            return realm.getForeignStringPrototype();
         } else if (interop.isNumber(truffleObject)) {
-            return realm.getNumberPrototype();
+            return realm.getForeignNumberPrototype();
         } else if (interop.isBoolean(truffleObject)) {
-            return realm.getBooleanPrototype();
+            return realm.getForeignBooleanPrototype();
         } else if (interop.isExecutable(truffleObject) || interop.isInstantiable(truffleObject)) {
-            return realm.getFunctionPrototype();
+            return realm.getForeignFunctionPrototype();
         } else {
-            return realm.getObjectPrototype();
+            return realm.getForeignObjectPrototype();
         }
     }
 

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/JSContext.java

@@ -1498,6 +1498,10 @@ public boolean isOptionAsyncStackTraces() {
         return contextOptions.isAsyncStackTraces();
     }
 
+    public boolean isOptionForeignObjectPrototype () {
+        return contextOptions.hasForeignObjectPrototype();
+    }
+
     public long getTimerResolution() {
         assert !(getInitialEnvironment() != null && getInitialEnvironment().isPreInitialization()) : "Patchable option timer-resolution accessed during context pre-initialization.";
         return contextOptions.getTimerResolution();

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/JSRealm.java

@@ -57,6 +57,7 @@
 import java.util.SplittableRandom;
 import java.util.WeakHashMap;
 
+import com.oracle.truffle.js.runtime.objects.Null;
 import org.graalvm.collections.Pair;
 import org.graalvm.home.HomeFinder;
 import org.graalvm.options.OptionValues;
@@ -274,6 +275,15 @@ public class JSRealm {
     private final JSFunctionObject callSiteConstructor;
     private final JSDynamicObject callSitePrototype;
 
+    private final JSDynamicObject foreignArrayPrototype;
+    private final JSDynamicObject foreignDatePrototype;
+    private final JSDynamicObject foreignMapPrototype;
+    private final JSDynamicObject foreignStringPrototype;
+    private final JSDynamicObject foreignNumberPrototype;
+    private final JSDynamicObject foreignBooleanPrototype;
+    private final JSDynamicObject foreignFunctionPrototype;
+    private final JSDynamicObject foreignObjectPrototype;
+
     private final Shape initialRegExpPrototypeShape;
     private final JSObjectFactory.RealmData objectFactories;
 
@@ -974,6 +984,18 @@ protected JSRealm(JSContext context, TruffleLanguage.Env env, JSRealm parentReal
             this.temporalZonedDateTimeConstructor = null;
             this.temporalZonedDateTimePrototype = null;
         }
+
+        // always create, regardless of context.isOptionForeignObjectPrototype()
+        // we use them in some scenarios even when option is turned off
+        this.foreignArrayPrototype = JSOrdinary.createInit(this, this.arrayPrototype);
+        this.foreignDatePrototype = JSOrdinary.createInit(this, this.datePrototype);
+        // mapPrototype can be null in ES5 mode
+        this.foreignMapPrototype = JSOrdinary.createInit(this, this.mapPrototype == null ? Null.instance : this.mapPrototype);
+        this.foreignStringPrototype = JSOrdinary.createInit(this, this.stringPrototype);
+        this.foreignNumberPrototype = JSOrdinary.createInit(this, this.numberPrototype);
+        this.foreignBooleanPrototype = JSOrdinary.createInit(this, this.booleanPrototype);
+        this.foreignFunctionPrototype = JSOrdinary.createInit(this, this.functionPrototype);
+        this.foreignObjectPrototype = JSOrdinary.createInit(this, this.objectPrototype);
     }
 
     private void initializeTypedArrayConstructors() {
@@ -1492,6 +1514,38 @@ public JSDynamicObject getTemporalZonedDateTimePrototype() {
         return temporalZonedDateTimePrototype;
     }
 
+    public final JSDynamicObject getForeignArrayPrototype() {
+        return foreignArrayPrototype;
+    }
+
+    public final JSDynamicObject getForeignDatePrototype() {
+        return foreignDatePrototype;
+    }
+
+    public JSDynamicObject getForeignMapPrototype() {
+        return foreignMapPrototype;
+    }
+
+    public JSDynamicObject getForeignStringPrototype() {
+        return foreignStringPrototype;
+    }
+
+    public JSDynamicObject getForeignNumberPrototype() {
+        return foreignNumberPrototype;
+    }
+
+    public JSDynamicObject getForeignBooleanPrototype() {
+        return foreignBooleanPrototype;
+    }
+
+    public JSDynamicObject getForeignFunctionPrototype() {
+        return foreignFunctionPrototype;
+    }
+
+    public JSDynamicObject getForeignObjectPrototype() {
+        return foreignObjectPrototype;
+    }
+
     public final Map<Object, JSDynamicObject> getTemplateRegistry() {
         if (templateRegistry == null) {
             createTemplateRegistry();