Tess Strickland
6672353e0f
Previously, the default type arguments for closure functions were instantiated in the same way as other types of functions, where the instantiator and function type arguments of the call were used. However, the defaults for closure functions should be instantiated with the instantiator and parent function type arguments stored within the closure itself. Since the instantiation of the default type arguments only depends on the instantiator and parent function type arguments, which are shared between partial instantiations of the same generic closure, the VM performs this instantiation once at closure creation and caches it in the closure object, so it can be retrieved when the default type arguments are needed and copied to new partial instantiations of the same closure without need for recalculation. As a side effect, this should speed up dynamic invocation of generic closures, since the invoke field dispatcher that implements them previously performed this instantiation when needed on every invocation, but now it just retrieves the cached version instead. TEST=language/closure/type_arguments vm/dart/regress_54426 Fixes: https://github.com/dart-lang/sdk/issues/54426 Change-Id: I9baad807befa0323f3c5b66196b9664e4d78af0a Cq-Include-Trybots: luci.dart.try:vm-aot-linux-release-x64-try,vm-reload-linux-release-x64-try,vm-reload-rollback-linux-release-x64-try,vm-tsan-linux-release-x64-try,vm-aot-tsan-linux-release-x64-try,vm-aot-msan-linux-release-x64-try,vm-msan-linux-release-x64-try,vm-aot-linux-release-arm64-try,vm-aot-dwarf-linux-product-x64-try,vm-aot-mac-product-arm64-try,vm-aot-obfuscate-linux-release-x64-try Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/344700 Reviewed-by: Daco Harkes <dacoharkes@google.com>
339 lines
22 KiB
C++
339 lines
22 KiB
C++
// Copyright (c) 2018, the Dart project authors. Please see the AUTHORS file
|
|
// for details. All rights reserved. Use of this source code is governed by a
|
|
// BSD-style license that can be found in the LICENSE file.
|
|
|
|
#include <type_traits>
|
|
|
|
#include "vm/raw_object_fields.h"
|
|
|
|
namespace dart {
|
|
|
|
#if defined(DART_PRECOMPILER) || defined(DART_ENABLE_HEAP_SNAPSHOT_WRITER)
|
|
|
|
// The list contains concrete classes and all of their fields (including ones
|
|
// from super hierarchy)
|
|
// If a class is listed here, only the fields in the list will appear in
|
|
// heapsnapshots.
|
|
#define COMMON_CLASSES_AND_FIELDS(F) \
|
|
F(Class, name_) \
|
|
F(Class, functions_) \
|
|
F(Class, functions_hash_table_) \
|
|
F(Class, fields_) \
|
|
F(Class, offset_in_words_to_field_) \
|
|
F(Class, interfaces_) \
|
|
F(Class, script_) \
|
|
F(Class, library_) \
|
|
F(Class, type_parameters_) \
|
|
F(Class, super_type_) \
|
|
F(Class, constants_) \
|
|
F(Class, declaration_type_) \
|
|
F(Class, invocation_dispatcher_cache_) \
|
|
F(PatchClass, wrapped_class_) \
|
|
F(PatchClass, script_) \
|
|
F(Function, name_) \
|
|
F(Function, owner_) \
|
|
F(Function, signature_) \
|
|
F(Function, data_) \
|
|
F(Function, ic_data_array_) \
|
|
F(Function, code_) \
|
|
F(ClosureData, context_scope_) \
|
|
F(ClosureData, parent_function_) \
|
|
F(ClosureData, closure_) \
|
|
F(Field, name_) \
|
|
F(Field, owner_) \
|
|
F(Field, type_) \
|
|
F(Field, initializer_function_) \
|
|
F(Field, host_offset_or_field_id_) \
|
|
F(Field, guarded_list_length_) \
|
|
F(Field, dependent_code_) \
|
|
F(Script, url_) \
|
|
F(Script, resolved_url_) \
|
|
F(Script, line_starts_) \
|
|
F(Script, debug_positions_) \
|
|
F(Script, kernel_program_info_) \
|
|
F(Script, source_) \
|
|
F(Library, name_) \
|
|
F(Library, url_) \
|
|
F(Library, private_key_) \
|
|
F(Library, dictionary_) \
|
|
F(Library, metadata_) \
|
|
F(Library, toplevel_class_) \
|
|
F(Library, used_scripts_) \
|
|
F(Library, loading_unit_) \
|
|
F(Library, imports_) \
|
|
F(Library, exports_) \
|
|
F(Library, dependencies_) \
|
|
F(Library, loaded_scripts_) \
|
|
F(Namespace, target_) \
|
|
F(Namespace, show_names_) \
|
|
F(Namespace, hide_names_) \
|
|
F(Namespace, owner_) \
|
|
F(KernelProgramInfo, kernel_component_) \
|
|
F(KernelProgramInfo, string_offsets_) \
|
|
F(KernelProgramInfo, string_data_) \
|
|
F(KernelProgramInfo, canonical_names_) \
|
|
F(KernelProgramInfo, metadata_payloads_) \
|
|
F(KernelProgramInfo, metadata_mappings_) \
|
|
F(KernelProgramInfo, scripts_) \
|
|
F(KernelProgramInfo, constants_) \
|
|
F(KernelProgramInfo, constants_table_) \
|
|
F(KernelProgramInfo, libraries_cache_) \
|
|
F(KernelProgramInfo, classes_cache_) \
|
|
F(WeakSerializationReference, target_) \
|
|
F(WeakSerializationReference, replacement_) \
|
|
F(WeakArray, length_) \
|
|
F(Code, object_pool_) \
|
|
F(Code, instructions_) \
|
|
F(Code, owner_) \
|
|
F(Code, exception_handlers_) \
|
|
F(Code, pc_descriptors_) \
|
|
F(Code, catch_entry_) \
|
|
F(Code, compressed_stackmaps_) \
|
|
F(Code, inlined_id_to_function_) \
|
|
F(Code, code_source_map_) \
|
|
F(ExceptionHandlers, handled_types_data_) \
|
|
F(Context, parent_) \
|
|
F(SingleTargetCache, target_) \
|
|
F(UnlinkedCall, target_name_) \
|
|
F(UnlinkedCall, args_descriptor_) \
|
|
F(MonomorphicSmiableCall, expected_cid_) \
|
|
F(MonomorphicSmiableCall, entrypoint_) \
|
|
F(CallSiteData, target_name_) \
|
|
F(CallSiteData, args_descriptor_) \
|
|
F(ICData, target_name_) \
|
|
F(ICData, args_descriptor_) \
|
|
F(ICData, entries_) \
|
|
F(ICData, owner_) \
|
|
F(InstructionsTable, code_objects_) \
|
|
F(MegamorphicCache, target_name_) \
|
|
F(MegamorphicCache, args_descriptor_) \
|
|
F(MegamorphicCache, buckets_) \
|
|
F(MegamorphicCache, mask_) \
|
|
F(SubtypeTestCache, cache_) \
|
|
F(LoadingUnit, parent_) \
|
|
F(LoadingUnit, base_objects_) \
|
|
F(ApiError, message_) \
|
|
F(LanguageError, previous_error_) \
|
|
F(LanguageError, script_) \
|
|
F(LanguageError, message_) \
|
|
F(LanguageError, formatted_message_) \
|
|
F(UnhandledException, exception_) \
|
|
F(UnhandledException, stacktrace_) \
|
|
F(UnwindError, message_) \
|
|
F(LibraryPrefix, name_) \
|
|
F(LibraryPrefix, importer_) \
|
|
F(LibraryPrefix, imports_) \
|
|
F(TypeArguments, instantiations_) \
|
|
F(TypeArguments, length_) \
|
|
F(TypeArguments, hash_) \
|
|
F(TypeArguments, nullability_) \
|
|
F(AbstractType, type_test_stub_) \
|
|
F(Type, type_test_stub_) \
|
|
F(Type, arguments_) \
|
|
F(Type, hash_) \
|
|
F(FunctionType, type_test_stub_) \
|
|
F(FunctionType, hash_) \
|
|
F(FunctionType, result_type_) \
|
|
F(FunctionType, parameter_types_) \
|
|
F(FunctionType, named_parameter_names_) \
|
|
F(FunctionType, type_parameters_) \
|
|
F(TypeParameter, type_test_stub_) \
|
|
F(TypeParameter, hash_) \
|
|
F(TypeParameter, owner_) \
|
|
F(TypeParameters, names_) \
|
|
F(TypeParameters, flags_) \
|
|
F(TypeParameters, bounds_) \
|
|
F(TypeParameters, defaults_) \
|
|
F(Closure, instantiator_type_arguments_) \
|
|
F(Closure, function_type_arguments_) \
|
|
F(Closure, delayed_type_arguments_) \
|
|
F(Closure, default_type_arguments_) \
|
|
F(Closure, function_) \
|
|
F(Closure, context_) \
|
|
F(Closure, hash_) \
|
|
F(String, length_) \
|
|
F(Array, type_arguments_) \
|
|
F(Array, length_) \
|
|
F(ImmutableArray, type_arguments_) \
|
|
F(ImmutableArray, length_) \
|
|
F(GrowableObjectArray, type_arguments_) \
|
|
F(GrowableObjectArray, length_) \
|
|
F(GrowableObjectArray, data_) \
|
|
F(Map, type_arguments_) \
|
|
F(Map, index_) \
|
|
F(Map, hash_mask_) \
|
|
F(Map, data_) \
|
|
F(Map, used_data_) \
|
|
F(Map, deleted_keys_) \
|
|
F(ConstMap, type_arguments_) \
|
|
F(ConstMap, index_) \
|
|
F(ConstMap, hash_mask_) \
|
|
F(ConstMap, data_) \
|
|
F(ConstMap, used_data_) \
|
|
F(ConstMap, deleted_keys_) \
|
|
F(Set, type_arguments_) \
|
|
F(Set, index_) \
|
|
F(Set, hash_mask_) \
|
|
F(Set, data_) \
|
|
F(Set, used_data_) \
|
|
F(Set, deleted_keys_) \
|
|
F(ConstSet, type_arguments_) \
|
|
F(ConstSet, index_) \
|
|
F(ConstSet, hash_mask_) \
|
|
F(ConstSet, data_) \
|
|
F(ConstSet, used_data_) \
|
|
F(ConstSet, deleted_keys_) \
|
|
F(TypedData, length_) \
|
|
F(ExternalTypedData, length_) \
|
|
F(ReceivePort, send_port_) \
|
|
F(ReceivePort, handler_) \
|
|
F(ReceivePort, bitfield_) \
|
|
F(StackTrace, async_link_) \
|
|
F(StackTrace, code_array_) \
|
|
F(StackTrace, pc_offset_array_) \
|
|
F(RegExp, num_bracket_expressions_) \
|
|
F(RegExp, capture_name_map_) \
|
|
F(RegExp, pattern_) \
|
|
F(RegExp, one_byte_) \
|
|
F(RegExp, two_byte_) \
|
|
F(RegExp, external_one_byte_) \
|
|
F(RegExp, external_two_byte_) \
|
|
F(RegExp, one_byte_sticky_) \
|
|
F(RegExp, two_byte_sticky_) \
|
|
F(RegExp, external_one_byte_sticky_) \
|
|
F(RegExp, external_two_byte_sticky_) \
|
|
F(SuspendState, function_data_) \
|
|
F(SuspendState, then_callback_) \
|
|
F(SuspendState, error_callback_) \
|
|
F(WeakProperty, key_) \
|
|
F(WeakProperty, value_) \
|
|
F(WeakReference, target_) \
|
|
F(WeakReference, type_arguments_) \
|
|
F(Finalizer, detachments_) \
|
|
F(Finalizer, all_entries_) \
|
|
F(Finalizer, entries_collected_) \
|
|
F(Finalizer, callback_) \
|
|
F(Finalizer, type_arguments_) \
|
|
F(NativeFinalizer, detachments_) \
|
|
F(NativeFinalizer, all_entries_) \
|
|
F(NativeFinalizer, entries_collected_) \
|
|
F(NativeFinalizer, callback_) \
|
|
F(FinalizerEntry, value_) \
|
|
F(FinalizerEntry, detach_) \
|
|
F(FinalizerEntry, token_) \
|
|
F(FinalizerEntry, finalizer_) \
|
|
F(FinalizerEntry, next_) \
|
|
F(MirrorReference, referent_) \
|
|
F(UserTag, label_) \
|
|
F(Pointer, data_) \
|
|
F(Pointer, type_arguments_) \
|
|
F(DynamicLibrary, handle_) \
|
|
F(DynamicLibrary, isClosed_) \
|
|
F(DynamicLibrary, canBeClosed_) \
|
|
F(FfiTrampolineData, c_signature_) \
|
|
F(FfiTrampolineData, callback_target_) \
|
|
F(FfiTrampolineData, callback_exceptional_return_) \
|
|
F(TypedDataView, length_) \
|
|
F(TypedDataView, typed_data_) \
|
|
F(TypedDataView, offset_in_bytes_) \
|
|
F(FutureOr, type_arguments_)
|
|
|
|
#define AOT_CLASSES_AND_FIELDS(F)
|
|
|
|
#define AOT_NON_PRODUCT_CLASSES_AND_FIELDS(F) \
|
|
F(Class, direct_implementors_) \
|
|
F(Class, direct_subclasses_)
|
|
|
|
#define JIT_CLASSES_AND_FIELDS(F) \
|
|
F(Class, allocation_stub_) \
|
|
F(Class, dependent_code_) \
|
|
F(Class, direct_implementors_) \
|
|
F(Class, direct_subclasses_) \
|
|
F(Code, active_instructions_) \
|
|
F(Code, deopt_info_array_) \
|
|
F(Code, static_calls_target_table_) \
|
|
F(ICData, receivers_static_type_) \
|
|
F(Function, positional_parameter_names_) \
|
|
F(Function, unoptimized_code_)
|
|
|
|
#define JIT_NON_PRODUCT_CLASSES_AND_FIELDS(F) \
|
|
F(Script, constant_coverage_)
|
|
|
|
#define NON_PRODUCT_CLASSES_AND_FIELDS(F) \
|
|
F(Class, user_name_) \
|
|
F(Code, return_address_metadata_) \
|
|
F(Code, var_descriptors_) \
|
|
F(Code, comments_) \
|
|
F(ReceivePort, debug_name_) \
|
|
F(ReceivePort, allocation_location_)
|
|
|
|
#define NON_HEADER_HASH_CLASSES_AND_FIELDS(F) F(String, hash_)
|
|
|
|
OffsetsTable::OffsetsTable(Zone* zone) : cached_offsets_(zone) {
|
|
for (const OffsetsTableEntry& entry : OffsetsTable::offsets_table()) {
|
|
cached_offsets_.Insert({{entry.class_id, entry.offset}, entry.field_name});
|
|
}
|
|
}
|
|
|
|
const char* OffsetsTable::FieldNameForOffset(intptr_t class_id,
|
|
intptr_t offset) {
|
|
return cached_offsets_.LookupValue({class_id, offset});
|
|
}
|
|
|
|
static MallocGrowableArray<OffsetsTable::OffsetsTableEntry> field_offsets_table;
|
|
|
|
const MallocGrowableArray<OffsetsTable::OffsetsTableEntry>&
|
|
OffsetsTable::offsets_table() {
|
|
ASSERT(field_offsets_table.length() > 0); // Initialized.
|
|
return field_offsets_table;
|
|
}
|
|
|
|
template <typename T>
|
|
bool is_compressed_pointer() {
|
|
return std::is_base_of<CompressedObjectPtr, T>::value;
|
|
}
|
|
|
|
void OffsetsTable::Init() {
|
|
static const OffsetsTable::OffsetsTableEntry table[] {
|
|
#define DEFINE_OFFSETS_TABLE_ENTRY(class_name, field_name) \
|
|
{class_name::kClassId, #field_name, \
|
|
is_compressed_pointer<decltype(Untagged##class_name::field_name)>(), \
|
|
OFFSET_OF(Untagged##class_name, field_name)},
|
|
|
|
COMMON_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY)
|
|
#if !defined(PRODUCT)
|
|
NON_PRODUCT_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY)
|
|
#endif
|
|
|
|
#if !defined(HASH_IN_OBJECT_HEADER)
|
|
NON_HEADER_HASH_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY)
|
|
#endif
|
|
|
|
#if defined(DART_PRECOMPILED_RUNTIME)
|
|
AOT_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY)
|
|
#if !defined(PRODUCT)
|
|
AOT_NON_PRODUCT_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY)
|
|
#endif
|
|
#else
|
|
JIT_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY)
|
|
#if !defined(PRODUCT)
|
|
JIT_NON_PRODUCT_CLASSES_AND_FIELDS(DEFINE_OFFSETS_TABLE_ENTRY)
|
|
#endif
|
|
#endif
|
|
|
|
#undef DEFINE_OFFSETS_TABLE_ENTRY
|
|
};
|
|
|
|
for (const OffsetsTableEntry& entry : table) {
|
|
field_offsets_table.Add(entry);
|
|
}
|
|
}
|
|
|
|
void OffsetsTable::Cleanup() {
|
|
field_offsets_table.Clear();
|
|
}
|
|
|
|
#endif
|
|
|
|
} // namespace dart
|