Bug 1920955 - Part 48: Simplify ToTemporalDuration. r=sfink

<tc39/proposal-temporal#2943> should address the fixme note.

Differential Revision: https://phabricator.services.mozilla.com/D223554

Author: anba

js/src/builtin/temporal/Duration.cpp

@@ -1154,38 +1154,12 @@ bool js::temporal::ToTemporalDurationRecord(JSContext* cx,
 /**
  * ToTemporalDuration ( item )
  */
-Wrapped<DurationObject*> js::temporal::ToTemporalDuration(JSContext* cx,
-                                                          Handle<Value> item) {
-  // Step 1.
-  if (item.isObject()) {
-    JSObject* itemObj = &item.toObject();
-    if (itemObj->canUnwrapAs<DurationObject>()) {
-      return itemObj;
-    }
-  }
-
-  // Step 2.
-  Duration result;
-  if (!ToTemporalDurationRecord(cx, item, &result)) {
-    return nullptr;
-  }
-
-  // Step 3.
-  return CreateTemporalDuration(cx, result);
-}
-
-/**
- * ToTemporalDuration ( item )
- */
-bool js::temporal::ToTemporalDuration(JSContext* cx, Handle<Value> item,
-                                      Duration* result) {
-  auto obj = ToTemporalDuration(cx, item);
-  if (!obj) {
-    return false;
-  }
+static bool ToTemporalDuration(JSContext* cx, Handle<Value> item,
+                               Duration* result) {
+  // FIXME: spec issue - Merge with ToTemporalDurationRecord.
 
-  *result = ToDuration(&obj.unwrap());
-  return true;
+  // Steps 1-3.
+  return ToTemporalDurationRecord(cx, item, result);
 }
 
 /**
@@ -3366,28 +3340,18 @@ static bool DurationConstructor(JSContext* cx, unsigned argc, Value* vp) {
 static bool Duration_from(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
 
-  Handle<Value> item = args.get(0);
-
-  // Step 1.
-  if (item.isObject()) {
-    if (auto* duration = item.toObject().maybeUnwrapIf<DurationObject>()) {
-      auto* result = CreateTemporalDuration(cx, ToDuration(duration));
-      if (!result) {
-        return false;
-      }
-
-      args.rval().setObject(*result);
-      return true;
-    }
+  // Steps 1-2.
+  Duration result;
+  if (!ToTemporalDuration(cx, args.get(0), &result)) {
+    return false;
   }
 
-  // Step 2.
-  auto result = ToTemporalDuration(cx, item);
-  if (!result) {
+  auto* obj = CreateTemporalDuration(cx, result);
+  if (!obj) {
     return false;
   }
 
-  args.rval().setObject(*result);
+  args.rval().setObject(*obj);
   return true;
 }
 

js/src/builtin/temporal/Duration.h

@@ -261,18 +261,6 @@ NormalizedTimeDuration NormalizedTimeDurationFromEpochNanosecondsDifference(
  */
 DurationObject* CreateTemporalDuration(JSContext* cx, const Duration& duration);
 
-/**
- * ToTemporalDuration ( item )
- */
-Wrapped<DurationObject*> ToTemporalDuration(JSContext* cx,
-                                            JS::Handle<JS::Value> item);
-
-/**
- * ToTemporalDuration ( item )
- */
-bool ToTemporalDuration(JSContext* cx, JS::Handle<JS::Value> item,
-                        Duration* result);
-
 /**
  * ToTemporalDurationRecord ( temporalDurationLike )
  */