Fix issues after merge.

Author: christianaistleitner

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

@@ -331,6 +331,7 @@ public enum Constructor implements BuiltinEnum<Constructor> {
         JavaImporter(1),
 
         // Record and Tuple proposal
+        Record(0),
         Tuple(0);
 
         private final int length;
@@ -630,6 +631,8 @@ protected Object createNode(JSContext context, JSBuiltin builtin, boolean constr
                                 ? ConstructWebAssemblyTableNodeGen.create(context, builtin, true, args().newTarget().fixedArgs(1).createArgumentNodes(context))
                                 : ConstructWebAssemblyTableNodeGen.create(context, builtin, false, args().function().fixedArgs(1).createArgumentNodes(context)))
                                 : createCallRequiresNew(context, builtin);
+            case Record:
+                throw new RuntimeException("TODO"); // TODO
             case Tuple:
                 return construct ? ConstructTupleNodeGen.create(context, builtin, args().createArgumentNodes(context))
                         : CallTupleNodeGen.create(context, builtin, args().varArgs().createArgumentNodes(context));

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

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.truffle.js.builtins;
+
+import com.oracle.truffle.js.nodes.function.JSBuiltin;
+import com.oracle.truffle.js.runtime.JSContext;
+import com.oracle.truffle.js.runtime.builtins.BuiltinEnum;
+import com.oracle.truffle.js.runtime.builtins.JSRecord;
+
+/**
+ * Contains builtins for Record function.
+ */
+public final class RecordFunctionBuiltins extends JSBuiltinsContainer.SwitchEnum<RecordFunctionBuiltins.RecordFunction> {
+
+    public static final JSBuiltinsContainer BUILTINS = new RecordFunctionBuiltins();
+
+    protected RecordFunctionBuiltins() {
+        super(JSRecord.CLASS_NAME, RecordFunction.class);
+    }
+
+    public enum RecordFunction implements BuiltinEnum<RecordFunction> {
+        ;
+
+        private final int length;
+
+        RecordFunction(int length) {
+            this.length = length;
+        }
+
+        @Override
+        public int getLength() {
+            return length;
+        }
+    }
+
+    @Override
+    protected Object createNode(JSContext context, JSBuiltin builtin, boolean construct, boolean newTarget, RecordFunction builtinEnum) {
+        switch (builtinEnum) {
+            // TODO
+        }
+        return null;
+    }
+}

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/access/ReadElementNode.java

@@ -1599,6 +1599,11 @@ protected Object executeWithTargetAndIndexUnchecked(Object target, Object index,
 
         @Override
         protected Object executeWithTargetAndIndexUnchecked(Object target, int index, Object receiver, Object defaultValue, ReadElementNode root) {
+            return executeWithTargetAndIndexUnchecked(target, (long)index, receiver, defaultValue, root);
+        }
+
+        @Override
+        protected Object executeWithTargetAndIndexUnchecked(Object target, long index, Object receiver, Object defaultValue, ReadElementNode root) {
             Tuple tuple = (Tuple) target;
             return JSObject.getOrDefault(JSTuple.create(root.context, tuple), index, receiver, defaultValue, jsclassProfile, root);
         }

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/control/DeletePropertyNode.java

@@ -57,6 +57,7 @@
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.NodeInfo;
+import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.object.Property;
 import com.oracle.truffle.api.profiles.ConditionProfile;

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

@@ -55,6 +55,7 @@
 import java.util.SplittableRandom;
 import java.util.WeakHashMap;
 
+import com.oracle.truffle.js.runtime.builtins.JSRecord;
 import org.graalvm.collections.Pair;
 import org.graalvm.home.HomeFinder;
 import org.graalvm.options.OptionValues;
@@ -379,6 +380,8 @@ public class JSRealm {
     private final DynamicObject foreignIterablePrototype;
 
     /** Record and Tuple support. */
+    private final DynamicObject recordConstructor;
+    private final DynamicObject recordPrototype;
     private final DynamicObject tupleConstructor;
     private final DynamicObject tuplePrototype;
 
@@ -763,10 +766,15 @@ public JSRealm(JSContext context, TruffleLanguage.Env env) {
         // TODO: Associate with the correct ECMAScript Version
         boolean es13 = context.getContextOptions().getEcmaScriptVersion() >= JSConfig.ECMAScript2022;
         if (es13) {
+            ctor = JSRecord.createConstructor(this);
+            this.recordConstructor = ctor.getFunctionObject();
+            this.recordPrototype = ctor.getPrototype();
             ctor = JSTuple.createConstructor(this);
             this.tupleConstructor = ctor.getFunctionObject();
             this.tuplePrototype = ctor.getPrototype();
         } else {
+            this.recordConstructor = null;
+            this.recordPrototype = null;
             this.tupleConstructor = null;
             this.tuplePrototype= null;
         }
@@ -2468,6 +2476,14 @@ public DynamicObject getForeignIterablePrototype() {
         return foreignIterablePrototype;
     }
 
+    public DynamicObject getRecordConstructor() {
+        return recordConstructor;
+    }
+
+    public DynamicObject getRecordPrototype() {
+        return recordPrototype;
+    }
+
     public DynamicObject getTupleConstructor() {
         return tupleConstructor;
     }

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

@@ -43,11 +43,14 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.Shape;
+import com.oracle.truffle.js.builtins.RecordFunctionBuiltins;
 import com.oracle.truffle.js.runtime.JSContext;
 import com.oracle.truffle.js.runtime.JSRealm;
 import com.oracle.truffle.js.runtime.JSRuntime;
 import com.oracle.truffle.js.runtime.Record;
 import com.oracle.truffle.js.runtime.Symbol;
+import com.oracle.truffle.js.runtime.objects.JSDynamicObject;
+import com.oracle.truffle.js.runtime.objects.JSObject;
 import com.oracle.truffle.js.runtime.objects.JSObjectUtil;
 import com.oracle.truffle.js.runtime.objects.JSShape;
 import com.oracle.truffle.js.runtime.objects.PropertyDescriptor;
@@ -112,8 +115,11 @@ public DynamicObject createPrototype(JSRealm realm, DynamicObject constructor) {
 
     @Override
     public DynamicObject getIntrinsicDefaultProto(JSRealm realm) {
-        // TODO: return realm.getRecordPrototype();
-        return null;
+        return realm.getRecordPrototype();
+    }
+
+    public static JSConstructor createConstructor(JSRealm realm) {
+        return INSTANCE.createConstructorAndPrototype(realm, RecordFunctionBuiltins.BUILTINS);
     }
 
     /**
@@ -126,9 +132,20 @@ public DynamicObject getIntrinsicDefaultProto(JSRealm realm) {
      */
     @Override
     public Shape makeInitialShape(JSContext context, DynamicObject prototype) {
-        return JSShape.newBuilder(context, INSTANCE, prototype)
+        Shape initialShape = Shape.newBuilder()
+                .layout(JSShape.getLayout(INSTANCE))
+                .dynamicType(INSTANCE)
+                .addConstantProperty(JSObject.HIDDEN_PROTO, prototype, 0)
                 .shapeFlags(JSShape.NOT_EXTENSIBLE_FLAG)
                 .build();
+
+        assert !JSShape.isExtensible(initialShape);
+        return initialShape;
+
+        // TODO: remove commented out code below
+        // return JSShape.newBuilder(context, INSTANCE, prototype)
+        //         .shapeFlags(JSShape.NOT_EXTENSIBLE_FLAG)
+        //         .build();
     }
 
     /**