*FromFields() operations should use CalendarResolveFields(), not PrepareTemporalFields().

Author: iamstolis

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/temporal/TemporalCalendarDateFromFieldsNode.java

@@ -50,7 +50,7 @@
 import com.oracle.truffle.js.runtime.builtins.temporal.ISODateRecord;
 import com.oracle.truffle.js.runtime.builtins.temporal.JSTemporalPlainDate;
 import com.oracle.truffle.js.runtime.builtins.temporal.JSTemporalPlainDateObject;
-import com.oracle.truffle.js.runtime.objects.JSObject;
+import com.oracle.truffle.js.runtime.objects.JSDynamicObject;
 import com.oracle.truffle.js.runtime.util.TemporalUtil;
 
 /**
@@ -61,15 +61,14 @@ public abstract class TemporalCalendarDateFromFieldsNode extends JavaScriptBaseN
     protected TemporalCalendarDateFromFieldsNode() {
     }
 
-    public abstract JSTemporalPlainDateObject execute(TruffleString calendar, Object fields, TemporalUtil.Overflow overflow);
+    public abstract JSTemporalPlainDateObject execute(TruffleString calendar, JSDynamicObject fields, TemporalUtil.Overflow overflow);
 
     @Specialization
-    public JSTemporalPlainDateObject calendarDateFromFields(TruffleString calendar, Object fieldsParam, TemporalUtil.Overflow overflow,
+    public JSTemporalPlainDateObject calendarDateFromFields(TruffleString calendar, JSDynamicObject fields, TemporalUtil.Overflow overflow,
                     @Cached JSToIntegerOrInfinityNode toIntegerOrInfinity,
                     @Cached InlinedBranchProfile errorBranch) {
         JSContext context = getJSContext();
-        JSObject fields = TemporalUtil.prepareTemporalFields(context, fieldsParam, TemporalUtil.listDMMCY, TemporalUtil.listYD);
-        TemporalUtil.isoResolveMonth(context, fields, toIntegerOrInfinity);
+        TemporalUtil.calendarResolveFields(context, calendar, fields, TemporalUtil.CalendarResolveFieldsType.DATE, toIntegerOrInfinity);
         ISODateRecord result = TemporalUtil.isoDateFromFields(fields, overflow);
 
         return JSTemporalPlainDate.create(context, getRealm(), result.year(), result.month(), result.day(), calendar, this, errorBranch);

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/temporal/TemporalMonthDayFromFieldsNode.java

@@ -64,12 +64,11 @@ protected TemporalMonthDayFromFieldsNode() {
     public abstract JSTemporalPlainMonthDayObject execute(TruffleString calendar, JSDynamicObject fields, TemporalUtil.Overflow overflow);
 
     @Specialization
-    protected JSTemporalPlainMonthDayObject monthDayFromFields(TruffleString calendar, JSDynamicObject fieldsParam, TemporalUtil.Overflow overflow,
+    protected JSTemporalPlainMonthDayObject monthDayFromFields(TruffleString calendar, JSDynamicObject fields, TemporalUtil.Overflow overflow,
                     @Cached JSToIntegerOrInfinityNode toIntOrInfinityNode,
                     @Cached InlinedBranchProfile errorBranch) {
         JSContext context = getJSContext();
-        JSDynamicObject fields = TemporalUtil.prepareTemporalFields(context, fieldsParam, TemporalUtil.listDMMCY, TemporalUtil.listD);
-        TemporalUtil.isoResolveMonth(context, fields, toIntOrInfinityNode);
+        TemporalUtil.calendarResolveFields(context, calendar, fields, TemporalUtil.CalendarResolveFieldsType.MONTH_DAY, toIntOrInfinityNode);
         ISODateRecord result = TemporalUtil.isoMonthDayFromFields(fields, overflow);
         return JSTemporalPlainMonthDay.create(context, getRealm(),
                         result.month(), result.day(), calendar, result.year(), this, errorBranch);

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/temporal/TemporalYearMonthFromFieldsNode.java

@@ -64,12 +64,11 @@ protected TemporalYearMonthFromFieldsNode() {
     public abstract JSTemporalPlainYearMonthObject execute(TruffleString calendar, JSDynamicObject fields, TemporalUtil.Overflow overflow);
 
     @Specialization
-    protected JSTemporalPlainYearMonthObject yearMonthFromFields(TruffleString calendar, JSDynamicObject fieldsParam, TemporalUtil.Overflow overflow,
+    protected JSTemporalPlainYearMonthObject yearMonthFromFields(TruffleString calendar, JSDynamicObject fields, TemporalUtil.Overflow overflow,
                     @Cached JSToIntegerOrInfinityNode toIntegerOrInfinity,
                     @Cached InlinedBranchProfile errorBranch) {
         JSContext context = getJSContext();
-        JSDynamicObject fields = TemporalUtil.prepareTemporalFields(context, fieldsParam, TemporalUtil.listMMCY, TemporalUtil.listY);
-        TemporalUtil.isoResolveMonth(context, fields, toIntegerOrInfinity);
+        TemporalUtil.calendarResolveFields(context, calendar, fields, TemporalUtil.CalendarResolveFieldsType.YEAR_MONTH, toIntegerOrInfinity);
         ISODateRecord result = TemporalUtil.isoYearMonthFromFields(fields, overflow);
         return JSTemporalPlainYearMonth.create(getJSContext(), getRealm(),
                         result.year(), result.month(), calendar, result.day(), this, errorBranch);

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/util/TemporalUtil.java

@@ -1277,7 +1277,7 @@ private static Overflow toOverflow(TruffleString result) {
         throw Errors.shouldNotReachHereUnexpectedValue(result);
     }
 
-    public static JSTemporalDateTimeRecord interpretTemporalDateTimeFields(TruffleString calendar, Object fields, Overflow overflow,
+    public static JSTemporalDateTimeRecord interpretTemporalDateTimeFields(TruffleString calendar, JSDynamicObject fields, Overflow overflow,
                     TemporalCalendarDateFromFieldsNode dateFromFieldsNode) {
         JSTemporalDateTimeRecord timeResult = toTemporalTimeRecord(fields);
         JSTemporalPlainDateObject date = dateFromFieldsNode.execute(calendar, fields, overflow);
@@ -3262,9 +3262,27 @@ public static boolean isoYearMonthWithinLimits(int year, int month) {
         return true;
     }
 
+    public enum CalendarResolveFieldsType {
+        DATE,
+        YEAR_MONTH,
+        MONTH_DAY
+    }
+
     // 12.1.38
     @TruffleBoundary
-    public static void isoResolveMonth(JSContext ctx, JSDynamicObject fields, JSToIntegerOrInfinityNode toIntegerOrInfinity) {
+    public static void calendarResolveFields(JSContext ctx, TruffleString calendar, JSDynamicObject fields, CalendarResolveFieldsType type, JSToIntegerOrInfinityNode toIntegerOrInfinity) {
+        if (type != CalendarResolveFieldsType.MONTH_DAY) {
+            Object year = JSObject.get(fields, YEAR);
+            if (year == Undefined.instance) {
+                throw Errors.createTypeError("No year present.");
+            }
+        }
+        if (type != CalendarResolveFieldsType.YEAR_MONTH) {
+            Object day = JSObject.get(fields, DAY);
+            if (day == Undefined.instance) {
+                throw Errors.createTypeError("No day present.");
+            }
+        }
         Object month = JSObject.get(fields, MONTH);
         Object monthCode = JSObject.get(fields, MONTH_CODE);
         if (monthCode == Undefined.instance) {