corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1960027 - Part 3: Replace JS_HAS_TEMPORAL_API with JS_HAS_INTL_API. r=spidermonkey-reviewers,dminor

Browse Source 
When JS_HAS_INTL_API is defined, then ICU4C and ICU4X are available, which are
both required to build Temporal.

Differential Revision: https://phabricator.services.mozilla.com/D245278
This commit is contained in:
André Bargull
2025-04-15 13:12:19 +00:00
parent ad8ba97d84
commit 33c427964a
9 changed files with 118 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

217
js/public/ProtoKey.h
View File

@@ -41,12 +41,6 @@
# define IF_INTL(REAL, IMAGINARY) IMAGINARY
#endif
#ifdef JS_HAS_TEMPORAL_API
# define IF_TEMPORAL(REAL, IMAGINARY) REAL
#else
# define IF_TEMPORAL(REAL, IMAGINARY) IMAGINARY
#endif
#ifdef ENABLE_WASM_TYPE_REFLECTIONS
# define IF_WASM_TYPE(REAL, IMAGINARY) REAL
#else
@@ -65,113 +59,112 @@
# define IF_NIGHTLY(REAL, IMAGINARY) IMAGINARY
#endif
#define JS_FOR_PROTOTYPES_(REAL, IMAGINARY, REAL_IF_INTL, REAL_IF_TEMPORAL, \
REAL_IF_WASM_TYPE, REAL_IF_WASM_JSPI, \
REAL_IF_NIGHTLY) \
IMAGINARY(Null, dummy) \
REAL(Object, OCLASP(Plain)) \
REAL(Function, &FunctionClass) \
IMAGINARY(BoundFunction, OCLASP(BoundFunction)) \
REAL(Array, OCLASP(Array)) \
REAL(Boolean, OCLASP(Boolean)) \
REAL(JSON, CLASP(JSON)) \
REAL(Date, OCLASP(Date)) \
REAL(Math, CLASP(Math)) \
REAL(Number, OCLASP(Number)) \
REAL(String, OCLASP(String)) \
REAL(RegExp, OCLASP(RegExp)) \
REAL(Error, ERROR_CLASP(JSEXN_ERR)) \
REAL(InternalError, ERROR_CLASP(JSEXN_INTERNALERR)) \
REAL(AggregateError, ERROR_CLASP(JSEXN_AGGREGATEERR)) \
REAL(EvalError, ERROR_CLASP(JSEXN_EVALERR)) \
REAL(RangeError, ERROR_CLASP(JSEXN_RANGEERR)) \
REAL(ReferenceError, ERROR_CLASP(JSEXN_REFERENCEERR)) \
IF_EXPLICIT_RESOURCE_MANAGEMENT( \
REAL(SuppressedError, ERROR_CLASP(JSEXN_SUPPRESSEDERR))) \
REAL(SyntaxError, ERROR_CLASP(JSEXN_SYNTAXERR)) \
REAL(TypeError, ERROR_CLASP(JSEXN_TYPEERR)) \
REAL(URIError, ERROR_CLASP(JSEXN_URIERR)) \
REAL(DebuggeeWouldRun, ERROR_CLASP(JSEXN_DEBUGGEEWOULDRUN)) \
REAL(CompileError, ERROR_CLASP(JSEXN_WASMCOMPILEERROR)) \
REAL(LinkError, ERROR_CLASP(JSEXN_WASMLINKERROR)) \
REAL(RuntimeError, ERROR_CLASP(JSEXN_WASMRUNTIMEERROR)) \
REAL_IF_WASM_JSPI(SuspendError, ERROR_CLASP(JSEXN_WASMSUSPENDERROR)) \
REAL(ArrayBuffer, OCLASP(FixedLengthArrayBuffer)) \
REAL(Int8Array, TYPED_ARRAY_CLASP(Int8)) \
REAL(Uint8Array, TYPED_ARRAY_CLASP(Uint8)) \
REAL(Int16Array, TYPED_ARRAY_CLASP(Int16)) \
REAL(Uint16Array, TYPED_ARRAY_CLASP(Uint16)) \
REAL(Int32Array, TYPED_ARRAY_CLASP(Int32)) \
REAL(Uint32Array, TYPED_ARRAY_CLASP(Uint32)) \
REAL(Float32Array, TYPED_ARRAY_CLASP(Float32)) \
REAL(Float64Array, TYPED_ARRAY_CLASP(Float64)) \
REAL(Uint8ClampedArray, TYPED_ARRAY_CLASP(Uint8Clamped)) \
REAL(BigInt64Array, TYPED_ARRAY_CLASP(BigInt64)) \
REAL(BigUint64Array, TYPED_ARRAY_CLASP(BigUint64)) \
REAL(Float16Array, TYPED_ARRAY_CLASP(Float16)) \
REAL(BigInt, OCLASP(BigInt)) \
REAL(Proxy, CLASP(Proxy)) \
REAL(WeakMap, OCLASP(WeakMap)) \
REAL(Map, OCLASP(Map)) \
REAL(Set, OCLASP(Set)) \
REAL(DataView, OCLASP(FixedLengthDataView)) \
REAL(Symbol, OCLASP(Symbol)) \
REAL(ShadowRealm, OCLASP(ShadowRealm)) \
REAL(SharedArrayBuffer, OCLASP(FixedLengthSharedArrayBuffer)) \
REAL_IF_INTL(Intl, CLASP(Intl)) \
REAL_IF_INTL(Collator, OCLASP(Collator)) \
REAL_IF_INTL(DateTimeFormat, OCLASP(DateTimeFormat)) \
REAL_IF_INTL(DisplayNames, OCLASP(DisplayNames)) \
REAL_IF_INTL(DurationFormat, OCLASP(DurationFormat)) \
REAL_IF_INTL(ListFormat, OCLASP(ListFormat)) \
REAL_IF_INTL(Locale, OCLASP(Locale)) \
REAL_IF_INTL(NumberFormat, OCLASP(NumberFormat)) \
REAL_IF_INTL(PluralRules, OCLASP(PluralRules)) \
REAL_IF_INTL(RelativeTimeFormat, OCLASP(RelativeTimeFormat)) \
REAL_IF_INTL(Segmenter, OCLASP(Segmenter)) \
REAL(Reflect, CLASP(Reflect)) \
REAL(WeakSet, OCLASP(WeakSet)) \
REAL(TypedArray, &js::TypedArrayObject::sharedTypedArrayPrototypeClass) \
REAL(Atomics, OCLASP(Atomics)) \
REAL(SavedFrame, &js::SavedFrame::class_) \
REAL(Promise, OCLASP(Promise)) \
REAL(AsyncFunction, CLASP(AsyncFunction)) \
REAL(GeneratorFunction, CLASP(GeneratorFunction)) \
REAL(AsyncGeneratorFunction, CLASP(AsyncGeneratorFunction)) \
REAL(WebAssembly, OCLASP(WasmNamespace)) \
REAL(WasmModule, OCLASP(WasmModule)) \
REAL(WasmInstance, OCLASP(WasmInstance)) \
REAL(WasmMemory, OCLASP(WasmMemory)) \
REAL(WasmTable, OCLASP(WasmTable)) \
REAL(WasmGlobal, OCLASP(WasmGlobal)) \
REAL(WasmTag, OCLASP(WasmTag)) \
REAL_IF_WASM_TYPE(WasmFunction, CLASP(WasmFunction)) \
REAL_IF_WASM_JSPI(WasmSuspending, OCLASP(WasmSuspending)) \
REAL(WasmException, OCLASP(WasmException)) \
REAL(FinalizationRegistry, OCLASP(FinalizationRegistry)) \
REAL(WeakRef, OCLASP(WeakRef)) \
REAL(Iterator, OCLASP(Iterator)) \
REAL(AsyncIterator, OCLASP(AsyncIterator)) \
IF_EXPLICIT_RESOURCE_MANAGEMENT( \
REAL(DisposableStack, OCLASP(DisposableStack))) \
IF_EXPLICIT_RESOURCE_MANAGEMENT( \
REAL(AsyncDisposableStack, OCLASP(AsyncDisposableStack))) \
REAL_IF_TEMPORAL(Temporal, OCLASP(temporal::Temporal)) \
REAL_IF_TEMPORAL(Duration, OCLASP(temporal::Duration)) \
REAL_IF_TEMPORAL(Instant, OCLASP(temporal::Instant)) \
REAL_IF_TEMPORAL(PlainDate, OCLASP(temporal::PlainDate)) \
REAL_IF_TEMPORAL(PlainDateTime, OCLASP(temporal::PlainDateTime)) \
REAL_IF_TEMPORAL(PlainMonthDay, OCLASP(temporal::PlainMonthDay)) \
REAL_IF_TEMPORAL(PlainYearMonth, OCLASP(temporal::PlainYearMonth)) \
REAL_IF_TEMPORAL(PlainTime, OCLASP(temporal::PlainTime)) \
REAL_IF_TEMPORAL(TemporalNow, OCLASP(temporal::TemporalNow)) \
REAL_IF_TEMPORAL(ZonedDateTime, OCLASP(temporal::ZonedDateTime))
#define JS_FOR_PROTOTYPES_(REAL, IMAGINARY, REAL_IF_INTL, REAL_IF_WASM_TYPE, \
REAL_IF_WASM_JSPI, REAL_IF_NIGHTLY) \
IMAGINARY(Null, dummy) \
REAL(Object, OCLASP(Plain)) \
REAL(Function, &FunctionClass) \
IMAGINARY(BoundFunction, OCLASP(BoundFunction)) \
REAL(Array, OCLASP(Array)) \
REAL(Boolean, OCLASP(Boolean)) \
REAL(JSON, CLASP(JSON)) \
REAL(Date, OCLASP(Date)) \
REAL(Math, CLASP(Math)) \
REAL(Number, OCLASP(Number)) \
REAL(String, OCLASP(String)) \
REAL(RegExp, OCLASP(RegExp)) \
REAL(Error, ERROR_CLASP(JSEXN_ERR)) \
REAL(InternalError, ERROR_CLASP(JSEXN_INTERNALERR)) \
REAL(AggregateError, ERROR_CLASP(JSEXN_AGGREGATEERR)) \
REAL(EvalError, ERROR_CLASP(JSEXN_EVALERR)) \
REAL(RangeError, ERROR_CLASP(JSEXN_RANGEERR)) \
REAL(ReferenceError, ERROR_CLASP(JSEXN_REFERENCEERR)) \
IF_EXPLICIT_RESOURCE_MANAGEMENT( \
REAL(SuppressedError, ERROR_CLASP(JSEXN_SUPPRESSEDERR))) \
REAL(SyntaxError, ERROR_CLASP(JSEXN_SYNTAXERR)) \
REAL(TypeError, ERROR_CLASP(JSEXN_TYPEERR)) \
REAL(URIError, ERROR_CLASP(JSEXN_URIERR)) \
REAL(DebuggeeWouldRun, ERROR_CLASP(JSEXN_DEBUGGEEWOULDRUN)) \
REAL(CompileError, ERROR_CLASP(JSEXN_WASMCOMPILEERROR)) \
REAL(LinkError, ERROR_CLASP(JSEXN_WASMLINKERROR)) \
REAL(RuntimeError, ERROR_CLASP(JSEXN_WASMRUNTIMEERROR)) \
REAL_IF_WASM_JSPI(SuspendError, ERROR_CLASP(JSEXN_WASMSUSPENDERROR)) \
REAL(ArrayBuffer, OCLASP(FixedLengthArrayBuffer)) \
REAL(Int8Array, TYPED_ARRAY_CLASP(Int8)) \
REAL(Uint8Array, TYPED_ARRAY_CLASP(Uint8)) \
REAL(Int16Array, TYPED_ARRAY_CLASP(Int16)) \
REAL(Uint16Array, TYPED_ARRAY_CLASP(Uint16)) \
REAL(Int32Array, TYPED_ARRAY_CLASP(Int32)) \
REAL(Uint32Array, TYPED_ARRAY_CLASP(Uint32)) \
REAL(Float32Array, TYPED_ARRAY_CLASP(Float32)) \
REAL(Float64Array, TYPED_ARRAY_CLASP(Float64)) \
REAL(Uint8ClampedArray, TYPED_ARRAY_CLASP(Uint8Clamped)) \
REAL(BigInt64Array, TYPED_ARRAY_CLASP(BigInt64)) \
REAL(BigUint64Array, TYPED_ARRAY_CLASP(BigUint64)) \
REAL(Float16Array, TYPED_ARRAY_CLASP(Float16)) \
REAL(BigInt, OCLASP(BigInt)) \
REAL(Proxy, CLASP(Proxy)) \
REAL(WeakMap, OCLASP(WeakMap)) \
REAL(Map, OCLASP(Map)) \
REAL(Set, OCLASP(Set)) \
REAL(DataView, OCLASP(FixedLengthDataView)) \
REAL(Symbol, OCLASP(Symbol)) \
REAL(ShadowRealm, OCLASP(ShadowRealm)) \
REAL(SharedArrayBuffer, OCLASP(FixedLengthSharedArrayBuffer)) \
REAL_IF_INTL(Intl, CLASP(Intl)) \
REAL_IF_INTL(Collator, OCLASP(Collator)) \
REAL_IF_INTL(DateTimeFormat, OCLASP(DateTimeFormat)) \
REAL_IF_INTL(DisplayNames, OCLASP(DisplayNames)) \
REAL_IF_INTL(DurationFormat, OCLASP(DurationFormat)) \
REAL_IF_INTL(ListFormat, OCLASP(ListFormat)) \
REAL_IF_INTL(Locale, OCLASP(Locale)) \
REAL_IF_INTL(NumberFormat, OCLASP(NumberFormat)) \
REAL_IF_INTL(PluralRules, OCLASP(PluralRules)) \
REAL_IF_INTL(RelativeTimeFormat, OCLASP(RelativeTimeFormat)) \
REAL_IF_INTL(Segmenter, OCLASP(Segmenter)) \
REAL(Reflect, CLASP(Reflect)) \
REAL(WeakSet, OCLASP(WeakSet)) \
REAL(TypedArray, &js::TypedArrayObject::sharedTypedArrayPrototypeClass) \
REAL(Atomics, OCLASP(Atomics)) \
REAL(SavedFrame, &js::SavedFrame::class_) \
REAL(Promise, OCLASP(Promise)) \
REAL(AsyncFunction, CLASP(AsyncFunction)) \
REAL(GeneratorFunction, CLASP(GeneratorFunction)) \
REAL(AsyncGeneratorFunction, CLASP(AsyncGeneratorFunction)) \
REAL(WebAssembly, OCLASP(WasmNamespace)) \
REAL(WasmModule, OCLASP(WasmModule)) \
REAL(WasmInstance, OCLASP(WasmInstance)) \
REAL(WasmMemory, OCLASP(WasmMemory)) \
REAL(WasmTable, OCLASP(WasmTable)) \
REAL(WasmGlobal, OCLASP(WasmGlobal)) \
REAL(WasmTag, OCLASP(WasmTag)) \
REAL_IF_WASM_TYPE(WasmFunction, CLASP(WasmFunction)) \
REAL_IF_WASM_JSPI(WasmSuspending, OCLASP(WasmSuspending)) \
REAL(WasmException, OCLASP(WasmException)) \
REAL(FinalizationRegistry, OCLASP(FinalizationRegistry)) \
REAL(WeakRef, OCLASP(WeakRef)) \
REAL(Iterator, OCLASP(Iterator)) \
REAL(AsyncIterator, OCLASP(AsyncIterator)) \
IF_EXPLICIT_RESOURCE_MANAGEMENT( \
REAL(DisposableStack, OCLASP(DisposableStack))) \
IF_EXPLICIT_RESOURCE_MANAGEMENT( \
REAL(AsyncDisposableStack, OCLASP(AsyncDisposableStack))) \
REAL_IF_INTL(Temporal, OCLASP(temporal::Temporal)) \
REAL_IF_INTL(Duration, OCLASP(temporal::Duration)) \
REAL_IF_INTL(Instant, OCLASP(temporal::Instant)) \
REAL_IF_INTL(PlainDate, OCLASP(temporal::PlainDate)) \
REAL_IF_INTL(PlainDateTime, OCLASP(temporal::PlainDateTime)) \
REAL_IF_INTL(PlainMonthDay, OCLASP(temporal::PlainMonthDay)) \
REAL_IF_INTL(PlainYearMonth, OCLASP(temporal::PlainYearMonth)) \
REAL_IF_INTL(PlainTime, OCLASP(temporal::PlainTime)) \
REAL_IF_INTL(TemporalNow, OCLASP(temporal::TemporalNow)) \
REAL_IF_INTL(ZonedDateTime, OCLASP(temporal::ZonedDateTime))
#define JS_FOR_PROTOTYPES(REAL, IMAGINARY) \
JS_FOR_PROTOTYPES_( \
REAL, IMAGINARY, IF_INTL(REAL, IMAGINARY), IF_TEMPORAL(REAL, IMAGINARY), \
IF_WASM_TYPE(REAL, IMAGINARY), IF_WASM_JSPI(REAL, IMAGINARY), \
IF_NIGHTLY(REAL, IMAGINARY))
#define JS_FOR_PROTOTYPES(REAL, IMAGINARY) \
JS_FOR_PROTOTYPES_(REAL, IMAGINARY, IF_INTL(REAL, IMAGINARY), \
IF_WASM_TYPE(REAL, IMAGINARY), \
IF_WASM_JSPI(REAL, IMAGINARY), \
IF_NIGHTLY(REAL, IMAGINARY))
#define JS_FOR_EACH_PROTOTYPE(MACRO) JS_FOR_PROTOTYPES(MACRO, MACRO)

2
js/src/jsapi-tests/testFractionToDouble.cpp
View File

@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifdef JS_HAS_TEMPORAL_API
#ifdef JS_HAS_INTL_API
# include <cmath>
# include <stdint.h>

2
js/src/jsapi-tests/testInt128.cpp
View File

@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifdef JS_HAS_TEMPORAL_API
#ifdef JS_HAS_INTL_API
# include "mozilla/Compiler.h"
# include "mozilla/TextUtils.h"

10
js/src/jsdate.cpp
View File

@@ -34,7 +34,7 @@
#include "jsnum.h"
#include "jstypes.h"
#ifdef JS_HAS_TEMPORAL_API
#ifdef JS_HAS_INTL_API
# include "builtin/temporal/Instant.h"
#endif
#include "jit/InlinableNatives.h"
@@ -4416,7 +4416,7 @@ bool js::date_toPrimitive(JSContext* cx, unsigned argc, Value* vp) {
return OrdinaryToPrimitive(cx, obj, hint, args.rval());
}
#if JS_HAS_TEMPORAL_API
#if JS_HAS_INTL_API
/**
* Date.prototype.toTemporalInstant ( )
*/
@@ -4453,7 +4453,7 @@ static bool date_toTemporalInstant(JSContext* cx, unsigned argc, Value* vp) {
args.rval().setObject(*result);
return true;
}
#endif /* JS_HAS_TEMPORAL_API */
#endif /* JS_HAS_INTL_API */
static const JSFunctionSpec date_static_methods[] = {
JS_FN("UTC", date_UTC, 7, 0),
@@ -4499,10 +4499,8 @@ static const JSFunctionSpec date_methods[] = {
JS_FN("setMilliseconds", date_setMilliseconds, 1, 0),
JS_FN("setUTCMilliseconds", date_setUTCMilliseconds, 1, 0),
JS_FN("toUTCString", date_toUTCString, 0, 0),
#if JS_HAS_TEMPORAL_API
JS_FN("toTemporalInstant", date_toTemporalInstant, 0, 0),
#endif
#if JS_HAS_INTL_API
JS_FN("toTemporalInstant", date_toTemporalInstant, 0, 0),
JS_SELF_HOSTED_FN("toLocaleString", "Date_toLocaleString", 0, 0),
JS_SELF_HOSTED_FN("toLocaleDateString", "Date_toLocaleDateString", 0, 0),
JS_SELF_HOSTED_FN("toLocaleTimeString", "Date_toLocaleTimeString", 0, 0),

2
js/src/moz.build
View File

@@ -556,7 +556,7 @@ DIRS += [
"xsum",
]
if CONFIG["JS_HAS_TEMPORAL_API"]:
if CONFIG["JS_HAS_INTL_API"]:
DIRS += ["builtin/temporal"]
# Bug 1739321 - clang 13+ only emits debuginfo for classes that are actually

2
js/src/shell/js.cpp
View File

@@ -13040,7 +13040,7 @@ bool SetGlobalOptionsPreJSInit(const OptionParser& op) {
JS::Prefs::set_experimental_explicit_resource_management(false);
}
#endif
#ifdef JS_HAS_TEMPORAL_API
#ifdef JS_HAS_INTL_API
if (op.getBoolOption("enable-temporal")) {
JS::Prefs::setAtStartup_experimental_temporal(true);
}

4
js/src/vm/GlobalObject.cpp
View File

@@ -34,7 +34,7 @@
#include "builtin/MapObject.h"
#include "builtin/ShadowRealm.h"
#include "builtin/Symbol.h"
#ifdef JS_HAS_TEMPORAL_API
#ifdef JS_HAS_INTL_API
# include "builtin/temporal/Duration.h"
# include "builtin/temporal/Instant.h"
# include "builtin/temporal/PlainDate.h"
@@ -205,9 +205,7 @@ bool GlobalObject::skipDeselectedConstructor(JSContext* cx, JSProtoKey key) {
case JSProto_RelativeTimeFormat:
case JSProto_Segmenter:
return false;
#endif
#ifdef JS_HAS_TEMPORAL_API
case JSProto_Temporal:
case JSProto_Duration:
case JSProto_Instant:

2
js/src/vm/JSObject.cpp
View File

@@ -2202,7 +2202,7 @@ JS_PUBLIC_API bool js::ShouldIgnorePropertyDefinition(JSContext* cx,
}
}
#ifdef JS_HAS_TEMPORAL_API
#ifdef JS_HAS_INTL_API
if (key == JSProto_Date && !JS::Prefs::experimental_temporal() &&
id == NameToId(cx->names().toTemporalInstant)) {
return true;

6
js/src/vm/SelfHosting.cpp
View File

@@ -46,7 +46,7 @@
#include "builtin/RegExp.h"
#include "builtin/SelfHostingDefines.h"
#include "builtin/String.h"
#ifdef JS_HAS_TEMPORAL_API
#ifdef JS_HAS_INTL_API
# include "builtin/temporal/Duration.h"
#endif
#include "builtin/WeakMapObject.h"
@@ -1890,7 +1890,7 @@ static bool intrinsic_newList(JSContext* cx, unsigned argc, js::Value* vp) {
return true;
}
#ifdef JS_HAS_TEMPORAL_API
#ifdef JS_HAS_INTL_API
static bool intrinsic_ToTemporalDuration(JSContext* cx, unsigned argc,
js::Value* vp) {
CallArgs args = CallArgsFromVp(argc, vp);
@@ -2248,7 +2248,7 @@ static const JSFunctionSpec intrinsic_functions[] = {
JS_INLINABLE_FN("ToObject", intrinsic_ToObject, 1, 0, IntrinsicToObject),
JS_FN("ToPropertyKey", intrinsic_ToPropertyKey, 1, 0),
JS_FN("ToSource", intrinsic_ToSource, 1, 0),
#ifdef JS_HAS_TEMPORAL_API
#ifdef JS_HAS_INTL_API
JS_FN("ToTemporalDuration", intrinsic_ToTemporalDuration, 1, 0),
#endif
JS_FN("TypedArrayBitwiseSlice", intrinsic_TypedArrayBitwiseSlice, 4, 0),