
This patch adds two macros to declare per-type allocators: - JS_DECLARE_ALLOCATOR(TypeName) - JS_DEFINE_ALLOCATOR(TypeName) When used, they add a type-specific CellAllocator that the Heap will delegate allocation requests to. The result of this is that GC objects of the same type always end up within the same HeapBlock, drastically reducing the ability to perform type confusion attacks. It also improves HeapBlock utilization, since each block now has cells sized exactly to the type used within that block. (Previously we only had a handful of block sizes available, and most GC allocations ended up with a large amount of slack in their tails.) There is a small performance hit from this, but I'm sure we can make up for it elsewhere. Note that the old size-based allocators still exist, and we fall back to them for any type that doesn't have its own CellAllocator.
161 lines
8.1 KiB
C++
161 lines
8.1 KiB
C++
/*
|
|
* Copyright (c) 2022, Idan Horowitz <idan.horowitz@serenityos.org>
|
|
* Copyright (c) 2022-2023, Tim Flynn <trflynn89@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include <LibJS/Runtime/AbstractOperations.h>
|
|
#include <LibJS/Runtime/Array.h>
|
|
#include <LibJS/Runtime/GlobalObject.h>
|
|
#include <LibJS/Runtime/Intl/AbstractOperations.h>
|
|
#include <LibJS/Runtime/Intl/DurationFormat.h>
|
|
#include <LibJS/Runtime/Intl/DurationFormatConstructor.h>
|
|
|
|
namespace JS::Intl {
|
|
|
|
JS_DEFINE_ALLOCATOR(DurationFormatConstructor);
|
|
|
|
// 1.2 The Intl.DurationFormat Constructor, https://tc39.es/proposal-intl-duration-format/#sec-intl-durationformat-constructor
|
|
DurationFormatConstructor::DurationFormatConstructor(Realm& realm)
|
|
: NativeFunction(realm.vm().names.DurationFormat.as_string(), realm.intrinsics().function_prototype())
|
|
{
|
|
}
|
|
|
|
void DurationFormatConstructor::initialize(Realm& realm)
|
|
{
|
|
Base::initialize(realm);
|
|
|
|
auto& vm = this->vm();
|
|
|
|
// 1.3.1 Intl.DurationFormat.prototype, https://tc39.es/proposal-intl-duration-format/#sec-Intl.DurationFormat.prototype
|
|
define_direct_property(vm.names.prototype, realm.intrinsics().intl_duration_format_prototype(), 0);
|
|
define_direct_property(vm.names.length, Value(0), Attribute::Configurable);
|
|
|
|
u8 attr = Attribute::Writable | Attribute::Configurable;
|
|
define_native_function(realm, vm.names.supportedLocalesOf, supported_locales_of, 1, attr);
|
|
}
|
|
|
|
// 1.2.1 Intl.DurationFormat ( [ locales [ , options ] ] ), https://tc39.es/proposal-intl-duration-format/#sec-Intl.DurationFormat
|
|
ThrowCompletionOr<Value> DurationFormatConstructor::call()
|
|
{
|
|
// 1. If NewTarget is undefined, throw a TypeError exception.
|
|
return vm().throw_completion<TypeError>(ErrorType::ConstructorWithoutNew, "Intl.DurationFormat");
|
|
}
|
|
|
|
// 1.2.1 Intl.DurationFormat ( [ locales [ , options ] ] ), https://tc39.es/proposal-intl-duration-format/#sec-Intl.DurationFormat
|
|
ThrowCompletionOr<NonnullGCPtr<Object>> DurationFormatConstructor::construct(FunctionObject& new_target)
|
|
{
|
|
auto& vm = this->vm();
|
|
|
|
auto locales = vm.argument(0);
|
|
auto options_value = vm.argument(1);
|
|
|
|
// 2. Let durationFormat be ? OrdinaryCreateFromConstructor(NewTarget, "%DurationFormatPrototype%", « [[InitializedDurationFormat]], [[Locale]], [[DataLocale]], [[NumberingSystem]], [[Style]], [[YearsStyle]], [[YearsDisplay]], [[MonthsStyle]], [[MonthsDisplay]] , [[WeeksStyle]], [[WeeksDisplay]] , [[DaysStyle]], [[DaysDisplay]] , [[HoursStyle]], [[HoursDisplay]] , [[MinutesStyle]], [[MinutesDisplay]] , [[SecondsStyle]], [[SecondsDisplay]] , [[MillisecondsStyle]], [[MillisecondsDisplay]] , [[MicrosecondsStyle]], [[MicrosecondsDisplay]] , [[NanosecondsStyle]], [[NanosecondsDisplay]], [[FractionalDigits]] »).
|
|
auto duration_format = TRY(ordinary_create_from_constructor<DurationFormat>(vm, new_target, &Intrinsics::intl_duration_format_prototype));
|
|
|
|
// 3. Let requestedLocales be ? CanonicalizeLocaleList(locales).
|
|
auto requested_locales = TRY(canonicalize_locale_list(vm, locales));
|
|
|
|
// 4. Let options be ? GetOptionsObject(options).
|
|
auto* options = TRY(Temporal::get_options_object(vm, options_value));
|
|
|
|
// 5. Let matcher be ? GetOption(options, "localeMatcher", string, « "lookup", "best fit" », "best fit").
|
|
auto matcher = TRY(get_option(vm, *options, vm.names.localeMatcher, OptionType::String, { "lookup"sv, "best fit"sv }, "best fit"sv));
|
|
|
|
// 6. Let numberingSystem be ? GetOption(options, "numberingSystem", string, empty, undefined).
|
|
auto numbering_system = TRY(get_option(vm, *options, vm.names.numberingSystem, OptionType::String, {}, Empty {}));
|
|
|
|
// 7. If numberingSystem is not undefined, then
|
|
if (!numbering_system.is_undefined()) {
|
|
// a. If numberingSystem does not match the Unicode Locale Identifier type nonterminal, throw a RangeError exception.
|
|
if (!::Locale::is_type_identifier(numbering_system.as_string().utf8_string_view()))
|
|
return vm.throw_completion<RangeError>(ErrorType::OptionIsNotValidValue, numbering_system, "numberingSystem"sv);
|
|
}
|
|
|
|
// 8. Let opt be the Record { [[localeMatcher]]: matcher, [[nu]]: numberingSystem }.
|
|
LocaleOptions opt {};
|
|
opt.locale_matcher = matcher;
|
|
opt.nu = numbering_system.is_undefined() ? Optional<String>() : numbering_system.as_string().utf8_string();
|
|
|
|
// 9. Let r be ResolveLocale(%DurationFormat%.[[AvailableLocales]], requestedLocales, opt, %DurationFormat%.[[RelevantExtensionKeys]], %DurationFormat%.[[LocaleData]]).
|
|
auto result = resolve_locale(requested_locales, opt, DurationFormat::relevant_extension_keys());
|
|
|
|
// 10. Let locale be r.[[locale]].
|
|
auto locale = move(result.locale);
|
|
|
|
// 11. Set durationFormat.[[Locale]] to locale.
|
|
duration_format->set_locale(move(locale));
|
|
|
|
// 12. Set durationFormat.[[NumberingSystem]] to r.[[nu]].
|
|
if (result.nu.has_value())
|
|
duration_format->set_numbering_system(result.nu.release_value());
|
|
|
|
// 13. Let style be ? GetOption(options, "style", string, « "long", "short", "narrow", "digital" », "short").
|
|
auto style = TRY(get_option(vm, *options, vm.names.style, OptionType::String, { "long"sv, "short"sv, "narrow"sv, "digital"sv }, "short"sv));
|
|
|
|
// 14. Set durationFormat.[[Style]] to style.
|
|
duration_format->set_style(style.as_string().utf8_string_view());
|
|
|
|
// 15. Set durationFormat.[[DataLocale]] to r.[[dataLocale]].
|
|
duration_format->set_data_locale(move(result.data_locale));
|
|
|
|
// 16. Let prevStyle be the empty String.
|
|
String previous_style {};
|
|
|
|
// 17. For each row of Table 1, except the header row, in table order, do
|
|
for (auto const& duration_instances_component : duration_instances_components) {
|
|
// a. Let styleSlot be the Style Slot value of the current row.
|
|
auto style_slot = duration_instances_component.set_style_slot;
|
|
|
|
// b. Let displaySlot be the Display Slot value of the current row.
|
|
auto display_slot = duration_instances_component.set_display_slot;
|
|
|
|
// c. Let unit be the Unit value.
|
|
auto unit = MUST(String::from_utf8(duration_instances_component.unit));
|
|
|
|
// d. Let valueList be the Values value.
|
|
auto value_list = duration_instances_component.values;
|
|
|
|
// e. Let digitalBase be the Digital Default value.
|
|
auto digital_base = duration_instances_component.digital_default;
|
|
|
|
// f. Let unitOptions be ? GetDurationUnitOptions(unit, options, style, valueList, digitalBase, prevStyle).
|
|
auto unit_options = TRY(get_duration_unit_options(vm, unit, *options, style.as_string().utf8_string_view(), value_list, digital_base, previous_style));
|
|
|
|
// g. Set the value of the styleSlot slot of durationFormat to unitOptions.[[Style]].
|
|
(duration_format->*style_slot)(unit_options.style);
|
|
|
|
// h. Set the value of the displaySlot slot of durationFormat to unitOptions.[[Display]].
|
|
(duration_format->*display_slot)(unit_options.display);
|
|
|
|
// i. If unit is one of "hours", "minutes", "seconds", "milliseconds", or "microseconds", then
|
|
if (unit.is_one_of("hours"sv, "minutes"sv, "seconds"sv, "milliseconds"sv, "microseconds"sv)) {
|
|
// i. Set prevStyle to unitOptions.[[Style]].
|
|
previous_style = unit_options.style;
|
|
}
|
|
}
|
|
|
|
// 18. Set durationFormat.[[FractionalDigits]] to ? GetNumberOption(options, "fractionalDigits", 0, 9, 0).
|
|
duration_format->set_fractional_digits(Optional<u8>(TRY(get_number_option(vm, *options, vm.names.fractionalDigits, 0, 9, 0))));
|
|
|
|
// 19. Return durationFormat.
|
|
return duration_format;
|
|
}
|
|
|
|
// 1.3.2 Intl.DurationFormat.supportedLocalesOf ( locales [ , options ] ), https://tc39.es/proposal-intl-duration-format/#sec-Intl.DurationFormat.supportedLocalesOf
|
|
JS_DEFINE_NATIVE_FUNCTION(DurationFormatConstructor::supported_locales_of)
|
|
{
|
|
auto locales = vm.argument(0);
|
|
auto options = vm.argument(1);
|
|
|
|
// 1. Let availableLocales be %DurationFormat%.[[AvailableLocales]].
|
|
|
|
// 2. Let requestedLocales be ? CanonicalizeLocaleList(locales).
|
|
auto requested_locales = TRY(canonicalize_locale_list(vm, locales));
|
|
|
|
// 3. Return ? SupportedLocales(availableLocales, requestedLocales, options).
|
|
return TRY(supported_locales(vm, requested_locales, options));
|
|
}
|
|
|
|
}
|