Skip to content

V
V8
Commit e7e77bb2 authored by Daniel Clifford's avatar Daniel Clifford Committed by Commit Bot
Browse files
Options

Port SloppyArgumentsElements to Torque 

Change-Id: I092c0d70bf517b4c714f5958b188d54030dd9774
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1932838
Commit-Queue: Daniel Clifford <danno@chromium.org>
Reviewed-by: 's avatarTobias Tebbi <tebbi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#67954}
parent f34771f7
Show whitespace changes
Inline Side-by-side
Showing with 467 additions and 482 deletions
src/builtins/array-slice.tq
View file @ e7e77bb2
...@@ -36,21 +36,18 @@ macro HandleFastAliasedSloppyArgumentsSlice( ...@@ -36,21 +36,18 @@ macro HandleFastAliasedSloppyArgumentsSlice(
const sloppyElements: SloppyArgumentsElements = const sloppyElements: SloppyArgumentsElements =
Cast<SloppyArgumentsElements>(args.elements) otherwise Bailout; Cast<SloppyArgumentsElements>(args.elements) otherwise Bailout;
const sloppyElementsLength: Smi = sloppyElements.length; const parameterMapLength: Smi = sloppyElements.length;
const parameterMapLength: Smi =
sloppyElementsLength - kSloppyArgumentsParameterMapStart;
// Check to make sure that the extraction will not access outside the // Check to make sure that the extraction will not access outside the
// defined arguments // defined arguments
const end: Smi = start + count; const end: Smi = start + count;
const unmappedElements: FixedArray = const unmappedElements: FixedArray =
Cast<FixedArray>(sloppyElements.objects[kSloppyArgumentsArgumentsIndex]) Cast<FixedArray>(sloppyElements.arguments)
otherwise Bailout; otherwise Bailout;
const unmappedElementsLength: Smi = unmappedElements.length; const unmappedElementsLength: Smi = unmappedElements.length;
if (SmiAbove(end, unmappedElementsLength)) goto Bailout; if (SmiAbove(end, unmappedElementsLength)) goto Bailout;
const argumentsContext: Context = const argumentsContext: Context = sloppyElements.context;
UnsafeCast<Context>(sloppyElements.objects[kSloppyArgumentsContextIndex]);
const arrayMap: Map = const arrayMap: Map =
LoadJSArrayElementsMap(ElementsKind::HOLEY_ELEMENTS, context); LoadJSArrayElementsMap(ElementsKind::HOLEY_ELEMENTS, context);
...@@ -63,8 +60,7 @@ macro HandleFastAliasedSloppyArgumentsSlice( ...@@ -63,8 +60,7 @@ macro HandleFastAliasedSloppyArgumentsSlice(
// Fill in the part of the result that map to context-mapped parameters. // Fill in the part of the result that map to context-mapped parameters.
for (let current: Smi = start; current < to; ++current) { for (let current: Smi = start; current < to; ++current) {
const e: Object = const e: Object = sloppyElements.mapped_entries[current];
sloppyElements.objects[current + kSloppyArgumentsParameterMapStart];
const newElement = UnsafeCast<(JSAny | TheHole)>( const newElement = UnsafeCast<(JSAny | TheHole)>(
e != TheHole ? argumentsContext[UnsafeCast<Smi>(e)] : e != TheHole ? argumentsContext[UnsafeCast<Smi>(e)] :
unmappedElements.objects[current]); unmappedElements.objects[current]);
......
src/builtins/base.tq
View file @ e7e77bb2
...@@ -365,12 +365,6 @@ const kMaxRegularHeapObjectSize: constexpr int31 ...@@ -365,12 +365,6 @@ const kMaxRegularHeapObjectSize: constexpr int31
const kMaxNewSpaceFixedArrayElements: constexpr int31 const kMaxNewSpaceFixedArrayElements: constexpr int31
generates 'FixedArray::kMaxRegularLength'; generates 'FixedArray::kMaxRegularLength';
const kSloppyArgumentsArgumentsIndex: constexpr int31
generates 'SloppyArgumentsElements::kArgumentsIndex';
const kSloppyArgumentsContextIndex: constexpr int31
generates 'SloppyArgumentsElements::kContextIndex';
const kSloppyArgumentsParameterMapStart: constexpr int31
generates 'SloppyArgumentsElements::kParameterMapStart';
extern enum PrimitiveType { kString, kBoolean, kSymbol, kNumber } extern enum PrimitiveType { kString, kBoolean, kSymbol, kNumber }
...@@ -999,7 +993,6 @@ extern macro EmptyFixedArrayConstant(): EmptyFixedArray; ...@@ -999,7 +993,6 @@ extern macro EmptyFixedArrayConstant(): EmptyFixedArray;
extern macro PromiseCapabilityMapConstant(): Map; extern macro PromiseCapabilityMapConstant(): Map;
extern macro OneByteStringMapConstant(): Map; extern macro OneByteStringMapConstant(): Map;
extern macro StringMapConstant(): Map; extern macro StringMapConstant(): Map;
extern macro SloppyArgumentsElementsMapConstant(): Map;
const kFixedArrayMap: Map = FixedArrayMapConstant(); const kFixedArrayMap: Map = FixedArrayMapConstant();
const kFixedDoubleArrayMap: Map = FixedDoubleArrayMapConstant(); const kFixedDoubleArrayMap: Map = FixedDoubleArrayMapConstant();
...@@ -1011,7 +1004,6 @@ const kPromiseCapabilityMap: Map = PromiseCapabilityMapConstant(); ...@@ -1011,7 +1004,6 @@ const kPromiseCapabilityMap: Map = PromiseCapabilityMapConstant();
const kOneByteStringMap: Map = OneByteStringMapConstant(); const kOneByteStringMap: Map = OneByteStringMapConstant();
// The map of a non-internalized internal SeqTwoByteString. // The map of a non-internalized internal SeqTwoByteString.
const kStringMap: Map = StringMapConstant(); const kStringMap: Map = StringMapConstant();
const kSloppyArgumentsElementsMap: Map = SloppyArgumentsElementsMapConstant();
extern macro IsPrototypeInitialArrayPrototype(implicit context: Context)(Map): extern macro IsPrototypeInitialArrayPrototype(implicit context: Context)(Map):
bool; bool;
......
src/builtins/builtins-handler-gen.cc
View file @ e7e77bb2
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "src/ic/ic.h" #include "src/ic/ic.h"
#include "src/ic/keyed-store-generic.h" #include "src/ic/keyed-store-generic.h"
#include "src/objects/objects-inl.h" #include "src/objects/objects-inl.h"
#include "torque-generated/exported-macros-assembler-tq.h"
namespace v8 { namespace v8 {
namespace internal { namespace internal {
...@@ -78,37 +79,11 @@ TNode<Object> HandlerBuiltinsAssembler::EmitKeyedSloppyArguments( ...@@ -78,37 +79,11 @@ TNode<Object> HandlerBuiltinsAssembler::EmitKeyedSloppyArguments(
TNode<JSObject> receiver, TNode<Object> tagged_key, TNode<JSObject> receiver, TNode<Object> tagged_key,
base::Optional<TNode<Object>> value, Label* bailout, base::Optional<TNode<Object>> value, Label* bailout,
ArgumentsAccessMode access_mode) { ArgumentsAccessMode access_mode) {
// Mapped arguments are actual arguments. Unmapped arguments are values added
// to the arguments object after it was created for the call. Mapped arguments
// are stored in the context at indexes given by elements[key + 2]. Unmapped
// arguments are stored as regular indexed properties in the arguments array,
// held at elements[1]. See NewSloppyArguments() in runtime.cc for a detailed
// look at argument object construction.
//
// The sloppy arguments elements array has a special format:
//
// 0: context
// 1: unmapped arguments array
// 2: mapped_index0,
// 3: mapped_index1,
// ...
//
// length is 2 + min(number_of_actual_arguments, number_of_formal_arguments).
// If key + 2 >= elements.length then attempt to look in the unmapped
// arguments array (given by elements[1]) and return the value at key, missing
// to the runtime if the unmapped arguments array is not a fixed array or if
// key >= unmapped_arguments_array.length.
//
// Otherwise, t = elements[key + 2]. If t is the hole, then look up the value
// in the unmapped arguments array, as described above. Otherwise, t is a Smi
// index into the context array given at elements[0]. Return the value at
// context[t].
GotoIfNot(TaggedIsSmi(tagged_key), bailout); GotoIfNot(TaggedIsSmi(tagged_key), bailout);
TNode<IntPtrT> key = SmiUntag(CAST(tagged_key)); TNode<IntPtrT> key = SmiUntag(CAST(tagged_key));
GotoIf(IntPtrLessThan(key, IntPtrConstant(0)), bailout); GotoIf(IntPtrLessThan(key, IntPtrConstant(0)), bailout);
TNode<FixedArray> elements = CAST(LoadElements(receiver)); TNode<SloppyArgumentsElements> elements = CAST(LoadElements(receiver));
TNode<IntPtrT> elements_length = LoadAndUntagFixedArrayBaseLength(elements); TNode<IntPtrT> elements_length = LoadAndUntagFixedArrayBaseLength(elements);
TVARIABLE(Object, var_result); TVARIABLE(Object, var_result);
...@@ -119,20 +94,18 @@ TNode<Object> HandlerBuiltinsAssembler::EmitKeyedSloppyArguments( ...@@ -119,20 +94,18 @@ TNode<Object> HandlerBuiltinsAssembler::EmitKeyedSloppyArguments(
access_mode == ArgumentsAccessMode::kHas); access_mode == ArgumentsAccessMode::kHas);
} }
Label if_mapped(this), if_unmapped(this), end(this, &var_result); Label if_mapped(this), if_unmapped(this), end(this, &var_result);
TNode<IntPtrT> intptr_two = IntPtrConstant(2);
TNode<IntPtrT> adjusted_length = IntPtrSub(elements_length, intptr_two);
GotoIf(UintPtrGreaterThanOrEqual(key, adjusted_length), &if_unmapped); GotoIf(UintPtrGreaterThanOrEqual(key, elements_length), &if_unmapped);
TNode<Object> mapped_index = TNode<Object> mapped_index =
LoadFixedArrayElement(elements, IntPtrAdd(key, intptr_two)); LoadSloppyArgumentsElementsMappedEntries(elements, key);
Branch(TaggedEqual(mapped_index, TheHoleConstant()), &if_unmapped, Branch(TaggedEqual(mapped_index, TheHoleConstant()), &if_unmapped,
&if_mapped); &if_mapped);
BIND(&if_mapped); BIND(&if_mapped);
{ {
TNode<IntPtrT> mapped_index_intptr = SmiUntag(CAST(mapped_index)); TNode<IntPtrT> mapped_index_intptr = SmiUntag(CAST(mapped_index));
TNode<Context> the_context = CAST(LoadFixedArrayElement(elements, 0)); TNode<Context> the_context = LoadSloppyArgumentsElementsContext(elements);
if (access_mode == ArgumentsAccessMode::kLoad) { if (access_mode == ArgumentsAccessMode::kLoad) {
TNode<Object> result = TNode<Object> result =
LoadContextElement(the_context, mapped_index_intptr); LoadContextElement(the_context, mapped_index_intptr);
...@@ -151,7 +124,7 @@ TNode<Object> HandlerBuiltinsAssembler::EmitKeyedSloppyArguments( ...@@ -151,7 +124,7 @@ TNode<Object> HandlerBuiltinsAssembler::EmitKeyedSloppyArguments(
BIND(&if_unmapped); BIND(&if_unmapped);
{ {
TNode<HeapObject> backing_store_ho = TNode<HeapObject> backing_store_ho =
CAST(LoadFixedArrayElement(elements, 1)); LoadSloppyArgumentsElementsArguments(elements);
GotoIf(TaggedNotEqual(LoadMap(backing_store_ho), FixedArrayMapConstant()), GotoIf(TaggedNotEqual(LoadMap(backing_store_ho), FixedArrayMapConstant()),
bailout); bailout);
TNode<FixedArray> backing_store = CAST(backing_store_ho); TNode<FixedArray> backing_store = CAST(backing_store_ho);
......
src/codegen/code-stub-assembler.h
View file @ e7e77bb2
...@@ -195,8 +195,6 @@ enum class PrimitiveType { kBoolean, kNumber, kString, kSymbol }; ...@@ -195,8 +195,6 @@ enum class PrimitiveType { kBoolean, kNumber, kString, kSymbol };
V(resolve_string, resolve_string, ResolveString) \ V(resolve_string, resolve_string, ResolveString) \
V(return_string, return_string, ReturnString) \ V(return_string, return_string, ReturnString) \
V(SharedFunctionInfoMap, shared_function_info_map, SharedFunctionInfoMap) \ V(SharedFunctionInfoMap, shared_function_info_map, SharedFunctionInfoMap) \
V(SloppyArgumentsElementsMap, sloppy_arguments_elements_map, \
SloppyArgumentsElementsMap) \
V(SmallOrderedHashSetMap, small_ordered_hash_set_map, \ V(SmallOrderedHashSetMap, small_ordered_hash_set_map, \
SmallOrderedHashSetMap) \ SmallOrderedHashSetMap) \
V(SmallOrderedHashMapMap, small_ordered_hash_map_map, \ V(SmallOrderedHashMapMap, small_ordered_hash_map_map, \
......
src/compiler/access-builder.cc
View file @ e7e77bb2
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "src/objects/objects-inl.h" #include "src/objects/objects-inl.h"
#include "src/objects/ordered-hash-table.h" #include "src/objects/ordered-hash-table.h"
#include "src/objects/source-text-module.h" #include "src/objects/source-text-module.h"
#include "torque-generated/exported-class-definitions-tq.h"
namespace v8 { namespace v8 {
namespace internal { namespace internal {
...@@ -529,6 +530,26 @@ FieldAccess AccessBuilder::ForFixedArrayLength() { ...@@ -529,6 +530,26 @@ FieldAccess AccessBuilder::ForFixedArrayLength() {
return access; return access;
} }
// static
FieldAccess AccessBuilder::ForSloppyArgumentsElementsContext() {
FieldAccess access = {
kTaggedBase, SloppyArgumentsElements::kContextOffset,
MaybeHandle<Name>(), MaybeHandle<Map>(),
Type::Any(), MachineType::TaggedPointer(),
kPointerWriteBarrier};
return access;
}
// static
FieldAccess AccessBuilder::ForSloppyArgumentsElementsArguments() {
FieldAccess access = {
kTaggedBase, SloppyArgumentsElements::kArgumentsOffset,
MaybeHandle<Name>(), MaybeHandle<Map>(),
Type::Any(), MachineType::TaggedPointer(),
kPointerWriteBarrier};
return access;
}
// static // static
FieldAccess AccessBuilder::ForPropertyArrayLengthAndHash() { FieldAccess AccessBuilder::ForPropertyArrayLengthAndHash() {
FieldAccess access = { FieldAccess access = {
...@@ -867,6 +888,14 @@ ElementAccess AccessBuilder::ForFixedArrayElement() { ...@@ -867,6 +888,14 @@ ElementAccess AccessBuilder::ForFixedArrayElement() {
} }
// static // static
ElementAccess AccessBuilder::ForSloppyArgumentsElementsMappedEntry() {
ElementAccess access = {
kTaggedBase, SloppyArgumentsElements::kMappedEntriesOffset, Type::Any(),
MachineType::AnyTagged(), kFullWriteBarrier};
return access;
}
// statics
ElementAccess AccessBuilder::ForFixedArrayElement( ElementAccess AccessBuilder::ForFixedArrayElement(
ElementsKind kind, LoadSensitivity load_sensitivity) { ElementsKind kind, LoadSensitivity load_sensitivity) {
ElementAccess access = {kTaggedBase, FixedArray::kHeaderSize, ElementAccess access = {kTaggedBase, FixedArray::kHeaderSize,
......
src/compiler/access-builder.h
View file @ e7e77bb2
...@@ -179,6 +179,12 @@ class V8_EXPORT_PRIVATE AccessBuilder final ...@@ -179,6 +179,12 @@ class V8_EXPORT_PRIVATE AccessBuilder final
// Provides access to FixedArray::length() field. // Provides access to FixedArray::length() field.
static FieldAccess ForFixedArrayLength(); static FieldAccess ForFixedArrayLength();
// Provides access to SloppyArgumentsElements::context() field.
static FieldAccess ForSloppyArgumentsElementsContext();
// Provides access to SloppyArgumentsElements::arguments() field.
static FieldAccess ForSloppyArgumentsElementsArguments();
// Provides access to PropertyArray::length() field. // Provides access to PropertyArray::length() field.
static FieldAccess ForPropertyArrayLengthAndHash(); static FieldAccess ForPropertyArrayLengthAndHash();
...@@ -283,6 +289,9 @@ class V8_EXPORT_PRIVATE AccessBuilder final ...@@ -283,6 +289,9 @@ class V8_EXPORT_PRIVATE AccessBuilder final
ElementsKind kind, ElementsKind kind,
LoadSensitivity load_sensitivity = LoadSensitivity::kUnsafe); LoadSensitivity load_sensitivity = LoadSensitivity::kUnsafe);
// Provides access to SloppyArgumentsElements elements.
static ElementAccess ForSloppyArgumentsElementsMappedEntry();
// Provides access to stack arguments // Provides access to stack arguments
static ElementAccess ForStackArgument(); static ElementAccess ForStackArgument();
......
src/compiler/allocation-builder-inl.h
View file @ e7e77bb2
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
#ifndef V8_COMPILER_ALLOCATION_BUILDER_INL_H_ #ifndef V8_COMPILER_ALLOCATION_BUILDER_INL_H_
#define V8_COMPILER_ALLOCATION_BUILDER_INL_H_ #define V8_COMPILER_ALLOCATION_BUILDER_INL_H_
#include "src/compiler/allocation-builder.h"
#include "src/compiler/access-builder.h" #include "src/compiler/access-builder.h"
#include "src/compiler/allocation-builder.h"
#include "src/objects/map-inl.h" #include "src/objects/map-inl.h"
#include "torque-generated/exported-class-definitions-tq-inl.h"
#include "torque-generated/exported-class-definitions-tq.h"
namespace v8 { namespace v8 {
namespace internal { namespace internal {
...@@ -40,6 +41,14 @@ void AllocationBuilder::AllocateArray(int length, MapRef map, ...@@ -40,6 +41,14 @@ void AllocationBuilder::AllocateArray(int length, MapRef map,
Store(AccessBuilder::ForFixedArrayLength(), jsgraph()->Constant(length)); Store(AccessBuilder::ForFixedArrayLength(), jsgraph()->Constant(length));
} }
void AllocationBuilder::AllocateSloppyArgumentElements(
int length, MapRef map, AllocationType allocation) {
int size = SloppyArgumentsElements::SizeFor(length);
Allocate(size, allocation, Type::OtherInternal());
Store(AccessBuilder::ForMap(), map);
Store(AccessBuilder::ForFixedArrayLength(), jsgraph()->Constant(length));
}
} // namespace compiler } // namespace compiler
} // namespace internal } // namespace internal
} // namespace v8 } // namespace v8
......
src/compiler/allocation-builder.h
View file @ e7e77bb2
...@@ -55,6 +55,11 @@ class AllocationBuilder final { ...@@ -55,6 +55,11 @@ class AllocationBuilder final {
inline void AllocateArray(int length, MapRef map, inline void AllocateArray(int length, MapRef map,
AllocationType allocation = AllocationType::kYoung); AllocationType allocation = AllocationType::kYoung);
// Compound allocation of a SloppyArgumentsElements
inline void AllocateSloppyArgumentElements(
int length, MapRef map,
AllocationType allocation = AllocationType::kYoung);
// Compound store of a constant into a field. // Compound store of a constant into a field.
void Store(const FieldAccess& access, const ObjectRef& value) { void Store(const FieldAccess& access, const ObjectRef& value) {
Store(access, jsgraph()->Constant(value)); Store(access, jsgraph()->Constant(value));
......
src/compiler/js-create-lowering.cc
View file @ e7e77bb2
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "src/objects/js-regexp-inl.h" #include "src/objects/js-regexp-inl.h"
#include "src/objects/objects-inl.h" #include "src/objects/objects-inl.h"
#include "src/objects/template-objects.h" #include "src/objects/template-objects.h"
#include "torque-generated/exported-class-definitions-tq.h"
namespace v8 { namespace v8 {
namespace internal { namespace internal {
...@@ -1507,16 +1508,15 @@ Node* JSCreateLowering::AllocateAliasedArguments( ...@@ -1507,16 +1508,15 @@ Node* JSCreateLowering::AllocateAliasedArguments(
// Actually allocate the backing store. // Actually allocate the backing store.
AllocationBuilder a(jsgraph(), arguments, control); AllocationBuilder a(jsgraph(), arguments, control);
a.AllocateArray(mapped_count + 2, a.AllocateSloppyArgumentElements(
mapped_count,
MapRef(broker(), factory()->sloppy_arguments_elements_map())); MapRef(broker(), factory()->sloppy_arguments_elements_map()));
a.Store(AccessBuilder::ForFixedArrayElement(), jsgraph()->Constant(0), a.Store(AccessBuilder::ForSloppyArgumentsElementsContext(), context);
context); a.Store(AccessBuilder::ForSloppyArgumentsElementsArguments(), arguments);
a.Store(AccessBuilder::ForFixedArrayElement(), jsgraph()->Constant(1),
arguments);
for (int i = 0; i < mapped_count; ++i) { for (int i = 0; i < mapped_count; ++i) {
int idx = shared.context_header_size() + parameter_count - 1 - i; int idx = shared.context_header_size() + parameter_count - 1 - i;
a.Store(AccessBuilder::ForFixedArrayElement(), jsgraph()->Constant(i + 2), a.Store(AccessBuilder::ForSloppyArgumentsElementsMappedEntry(),
jsgraph()->Constant(idx)); jsgraph()->Constant(i), jsgraph()->Constant(idx));
} }
return a.Finish(); return a.Finish();
} }
...@@ -1553,12 +1553,11 @@ Node* JSCreateLowering::AllocateAliasedArguments( ...@@ -1553,12 +1553,11 @@ Node* JSCreateLowering::AllocateAliasedArguments(
// Actually allocate the backing store. // Actually allocate the backing store.
AllocationBuilder a(jsgraph(), effect, control); AllocationBuilder a(jsgraph(), effect, control);
a.AllocateArray(mapped_count + 2, a.AllocateSloppyArgumentElements(
mapped_count,
MapRef(broker(), factory()->sloppy_arguments_elements_map())); MapRef(broker(), factory()->sloppy_arguments_elements_map()));
a.Store(AccessBuilder::ForFixedArrayElement(), jsgraph()->Constant(0), a.Store(AccessBuilder::ForSloppyArgumentsElementsContext(), context);
context); a.Store(AccessBuilder::ForSloppyArgumentsElementsArguments(), arguments);
a.Store(AccessBuilder::ForFixedArrayElement(), jsgraph()->Constant(1),
arguments);
for (int i = 0; i < mapped_count; ++i) { for (int i = 0; i < mapped_count; ++i) {
int idx = shared.context_header_size() + parameter_count - 1 - i; int idx = shared.context_header_size() + parameter_count - 1 - i;
Node* value = graph()->NewNode( Node* value = graph()->NewNode(
...@@ -1566,8 +1565,8 @@ Node* JSCreateLowering::AllocateAliasedArguments( ...@@ -1566,8 +1565,8 @@ Node* JSCreateLowering::AllocateAliasedArguments(
graph()->NewNode(simplified()->NumberLessThan(), jsgraph()->Constant(i), graph()->NewNode(simplified()->NumberLessThan(), jsgraph()->Constant(i),
arguments_length), arguments_length),
jsgraph()->Constant(idx), jsgraph()->TheHoleConstant()); jsgraph()->Constant(idx), jsgraph()->TheHoleConstant());
a.Store(AccessBuilder::ForFixedArrayElement(), jsgraph()->Constant(i + 2), a.Store(AccessBuilder::ForSloppyArgumentsElementsMappedEntry(),
value); jsgraph()->Constant(i), value);
} }
return a.Finish(); return a.Finish();
} }
......
src/deoptimizer/deoptimizer.cc
View file @ e7e77bb2
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include "src/objects/heap-number-inl.h" #include "src/objects/heap-number-inl.h"
#include "src/objects/smi.h" #include "src/objects/smi.h"
#include "src/tracing/trace-event.h" #include "src/tracing/trace-event.h"
#include "torque-generated/exported-class-definitions-tq.h"
// Has to be the last include (doesn't have include guards) // Has to be the last include (doesn't have include guards)
#include "src/objects/object-macros.h" #include "src/objects/object-macros.h"
...@@ -3473,6 +3474,7 @@ void TranslatedState::InitializeCapturedObjectAt( ...@@ -3473,6 +3474,7 @@ void TranslatedState::InitializeCapturedObjectAt(
case STRING_TABLE_TYPE: case STRING_TABLE_TYPE:
case PROPERTY_ARRAY_TYPE: case PROPERTY_ARRAY_TYPE:
case SCRIPT_CONTEXT_TABLE_TYPE: case SCRIPT_CONTEXT_TABLE_TYPE:
case SLOPPY_ARGUMENTS_ELEMENTS_TYPE:
InitializeObjectWithTaggedFieldsAt(frame, &value_index, slot, map, InitializeObjectWithTaggedFieldsAt(frame, &value_index, slot, map,
no_allocation); no_allocation);
break; break;
...@@ -3633,6 +3635,19 @@ void TranslatedState::EnsureCapturedObjectAllocatedAt( ...@@ -3633,6 +3635,19 @@ void TranslatedState::EnsureCapturedObjectAllocatedAt(
&value_index, worklist); &value_index, worklist);
} }
case SLOPPY_ARGUMENTS_ELEMENTS_TYPE: {
// Verify that the arguments size is correct.
Smi args_length = Smi::cast(frame->values_[value_index].GetRawValue());
int args_size = SloppyArgumentsElements::SizeFor(args_length.value());
CHECK_EQ(args_size, slot->GetChildrenCount() * kTaggedSize);
slot->set_storage(AllocateStorageFor(slot));
// Make sure all the remaining children (after the map) are allocated.
return EnsureChildrenAllocated(slot->GetChildrenCount() - 1, frame,
&value_index, worklist);
}
case PROPERTY_ARRAY_TYPE: { case PROPERTY_ARRAY_TYPE: {
// Check we have the right size. // Check we have the right size.
int length_or_hash = int length_or_hash =
......
src/diagnostics/objects-debug.cc
View file @ e7e77bb2
...@@ -326,6 +326,11 @@ void VerifyJSObjectElements(Isolate* isolate, JSObject object) { ...@@ -326,6 +326,11 @@ void VerifyJSObjectElements(Isolate* isolate, JSObject object) {
return; return;
} }
if (object.HasSloppyArgumentsElements()) {
CHECK(object.elements().IsSloppyArgumentsElements());
return;
}
FixedArray elements = FixedArray::cast(object.elements()); FixedArray elements = FixedArray::cast(object.elements());
if (object.HasSmiElements()) { if (object.HasSmiElements()) {
// We might have a partially initialized backing store, in which case we // We might have a partially initialized backing store, in which case we
...@@ -626,39 +631,15 @@ void TransitionArray::TransitionArrayVerify(Isolate* isolate) { ...@@ -626,39 +631,15 @@ void TransitionArray::TransitionArrayVerify(Isolate* isolate) {
CHECK_LE(LengthFor(number_of_transitions()), length()); CHECK_LE(LengthFor(number_of_transitions()), length());
} }
void JSArgumentsObject::JSArgumentsObjectVerify(Isolate* isolate) { namespace {
TorqueGeneratedClassVerifiers::JSArgumentsObjectVerify(*this, isolate); void SloppyArgumentsElementsVerify(Isolate* isolate,
if (IsSloppyArgumentsElementsKind(GetElementsKind())) { SloppyArgumentsElements elements,
SloppyArgumentsElements::cast(elements())
.SloppyArgumentsElementsVerify(isolate, *this);
}
if (isolate->IsInAnyContext(map(), Context::SLOPPY_ARGUMENTS_MAP_INDEX) ||
isolate->IsInAnyContext(map(),
Context::SLOW_ALIASED_ARGUMENTS_MAP_INDEX) ||
isolate->IsInAnyContext(map(),
Context::FAST_ALIASED_ARGUMENTS_MAP_INDEX)) {
VerifyObjectField(isolate, JSSloppyArgumentsObject::kLengthOffset);
VerifyObjectField(isolate, JSSloppyArgumentsObject::kCalleeOffset);
} else if (isolate->IsInAnyContext(map(),
Context::STRICT_ARGUMENTS_MAP_INDEX)) {
VerifyObjectField(isolate, JSStrictArgumentsObject::kLengthOffset);
}
}
void SloppyArgumentsElements::SloppyArgumentsElementsVerify(Isolate* isolate,
JSObject holder) { JSObject holder) {
FixedArrayVerify(isolate); elements.SloppyArgumentsElementsVerify(isolate);
// Abort verification if only partially initialized (can't use arguments()
// getter because it does FixedArray::cast()).
if (get(kArgumentsIndex).IsUndefined(isolate)) return;
ElementsKind kind = holder.GetElementsKind(); ElementsKind kind = holder.GetElementsKind();
bool is_fast = kind == FAST_SLOPPY_ARGUMENTS_ELEMENTS; bool is_fast = kind == FAST_SLOPPY_ARGUMENTS_ELEMENTS;
CHECK(IsFixedArray()); Context context_object = elements.context();
CHECK_GE(length(), 2); FixedArray arg_elements = elements.arguments();
CHECK_EQ(map(), ReadOnlyRoots(isolate).sloppy_arguments_elements_map());
Context context_object = context();
FixedArray arg_elements = FixedArray::cast(arguments());
if (arg_elements.length() == 0) { if (arg_elements.length() == 0) {
CHECK(arg_elements == ReadOnlyRoots(isolate).empty_fixed_array()); CHECK(arg_elements == ReadOnlyRoots(isolate).empty_fixed_array());
return; return;
...@@ -674,7 +655,7 @@ void SloppyArgumentsElements::SloppyArgumentsElementsVerify(Isolate* isolate, ...@@ -674,7 +655,7 @@ void SloppyArgumentsElements::SloppyArgumentsElementsVerify(Isolate* isolate,
for (int i = 0; i < nofMappedParameters; i++) { for (int i = 0; i < nofMappedParameters; i++) {
// Verify that each context-mapped argument is either the hole or a valid // Verify that each context-mapped argument is either the hole or a valid
// Smi within context length range. // Smi within context length range.
Object mapped = get_mapped_entry(i); Object mapped = elements.mapped_entries(i);
if (mapped.IsTheHole(isolate)) { if (mapped.IsTheHole(isolate)) {
// Slow sloppy arguments can be holey. // Slow sloppy arguments can be holey.
if (!is_fast) continue; if (!is_fast) continue;
...@@ -698,6 +679,26 @@ void SloppyArgumentsElements::SloppyArgumentsElementsVerify(Isolate* isolate, ...@@ -698,6 +679,26 @@ void SloppyArgumentsElements::SloppyArgumentsElementsVerify(Isolate* isolate,
CHECK_LE(maxMappedIndex, context_object.length()); CHECK_LE(maxMappedIndex, context_object.length());
CHECK_LE(maxMappedIndex, arg_elements.length()); CHECK_LE(maxMappedIndex, arg_elements.length());
} }
} // namespace
void JSArgumentsObject::JSArgumentsObjectVerify(Isolate* isolate) {
TorqueGeneratedClassVerifiers::JSArgumentsObjectVerify(*this, isolate);
if (IsSloppyArgumentsElementsKind(GetElementsKind())) {
SloppyArgumentsElementsVerify(
isolate, SloppyArgumentsElements::cast(elements()), *this);
}
if (isolate->IsInAnyContext(map(), Context::SLOPPY_ARGUMENTS_MAP_INDEX) ||
isolate->IsInAnyContext(map(),
Context::SLOW_ALIASED_ARGUMENTS_MAP_INDEX) ||
isolate->IsInAnyContext(map(),
Context::FAST_ALIASED_ARGUMENTS_MAP_INDEX)) {
VerifyObjectField(isolate, JSSloppyArgumentsObject::kLengthOffset);
VerifyObjectField(isolate, JSSloppyArgumentsObject::kCalleeOffset);
} else if (isolate->IsInAnyContext(map(),
Context::STRICT_ARGUMENTS_MAP_INDEX)) {
VerifyObjectField(isolate, JSStrictArgumentsObject::kLengthOffset);
}
}
void JSAsyncFunctionObject::JSAsyncFunctionObjectVerify(Isolate* isolate) { void JSAsyncFunctionObject::JSAsyncFunctionObjectVerify(Isolate* isolate) {
TorqueGeneratedClassVerifiers::JSAsyncFunctionObjectVerify(*this, isolate); TorqueGeneratedClassVerifiers::JSAsyncFunctionObjectVerify(*this, isolate);
......
src/diagnostics/objects-printer.cc
View file @ e7e77bb2
...@@ -436,11 +436,9 @@ void PrintSloppyArgumentElements(std::ostream& os, ElementsKind kind, ...@@ -436,11 +436,9 @@ void PrintSloppyArgumentElements(std::ostream& os, ElementsKind kind,
os << "\n 0: context: " << Brief(elements.context()) os << "\n 0: context: " << Brief(elements.context())
<< "\n 1: arguments_store: " << Brief(arguments_store) << "\n 1: arguments_store: " << Brief(arguments_store)
<< "\n parameter to context slot map:"; << "\n parameter to context slot map:";
for (uint32_t i = 0; i < elements.parameter_map_length(); i++) { for (int i = 0; i < elements.length(); i++) {
uint32_t raw_index = i + SloppyArgumentsElements::kParameterMapStart; Object mapped_entry = elements.mapped_entries(i);
Object mapped_entry = elements.get_mapped_entry(i); os << "\n " << i << ": param(" << i << "): " << Brief(mapped_entry);
os << "\n " << raw_index << ": param(" << i
<< "): " << Brief(mapped_entry);
if (mapped_entry.IsTheHole()) { if (mapped_entry.IsTheHole()) {
os << " in the arguments_store[" << i << "]"; os << " in the arguments_store[" << i << "]";
} else { } else {
......
src/heap/object-stats.cc
View file @ e7e77bb2
...@@ -839,7 +839,6 @@ void ObjectStatsCollectorImpl::RecordObjectStats(HeapObject obj, ...@@ -839,7 +839,6 @@ void ObjectStatsCollectorImpl::RecordObjectStats(HeapObject obj,
bool ObjectStatsCollectorImpl::CanRecordFixedArray(FixedArrayBase array) { bool ObjectStatsCollectorImpl::CanRecordFixedArray(FixedArrayBase array) {
ReadOnlyRoots roots(heap_); ReadOnlyRoots roots(heap_);
return array != roots.empty_fixed_array() && return array != roots.empty_fixed_array() &&
array != roots.empty_sloppy_arguments_elements() &&
array != roots.empty_slow_element_dictionary() && array != roots.empty_slow_element_dictionary() &&
array != roots.empty_property_dictionary(); array != roots.empty_property_dictionary();
} }
......
src/heap/setup-heap-internal.cc
View file @ e7e77bb2
...@@ -429,8 +429,6 @@ bool Heap::CreateInitialMaps() { ...@@ -429,8 +429,6 @@ bool Heap::CreateInitialMaps() {
TORQUE_INTERNAL_VARSIZE_INSTANCE_TYPE_LIST(TORQUE_ALLOCATE_VARSIZE_MAP); TORQUE_INTERNAL_VARSIZE_INSTANCE_TYPE_LIST(TORQUE_ALLOCATE_VARSIZE_MAP);
#undef TORQUE_ALLOCATE_VARSIZE_MAP #undef TORQUE_ALLOCATE_VARSIZE_MAP
ALLOCATE_VARSIZE_MAP(FIXED_ARRAY_TYPE, sloppy_arguments_elements)
ALLOCATE_VARSIZE_MAP(CODE_TYPE, code) ALLOCATE_VARSIZE_MAP(CODE_TYPE, code)
ALLOCATE_MAP(CELL_TYPE, Cell::kSize, cell); ALLOCATE_MAP(CELL_TYPE, Cell::kSize, cell);
...@@ -784,14 +782,6 @@ void Heap::CreateInitialObjects() { ...@@ -784,14 +782,6 @@ void Heap::CreateInitialObjects() {
factory->NewManyClosuresCell(factory->undefined_value()); factory->NewManyClosuresCell(factory->undefined_value());
set_many_closures_cell(*many_closures_cell); set_many_closures_cell(*many_closures_cell);
{
Handle<FixedArray> empty_sloppy_arguments_elements =
factory->NewFixedArray(2, AllocationType::kReadOnly);
empty_sloppy_arguments_elements->set_map_after_allocation(
roots.sloppy_arguments_elements_map(), SKIP_WRITE_BARRIER);
set_empty_sloppy_arguments_elements(*empty_sloppy_arguments_elements);
}
set_detached_contexts(roots.empty_weak_array_list()); set_detached_contexts(roots.empty_weak_array_list());
set_retaining_path_targets(roots.empty_weak_array_list()); set_retaining_path_targets(roots.empty_weak_array_list());
......
src/objects/arguments-inl.h
View file @ e7e77bb2
...@@ -5,9 +5,8 @@ ...@@ -5,9 +5,8 @@
#ifndef V8_OBJECTS_ARGUMENTS_INL_H_ #ifndef V8_OBJECTS_ARGUMENTS_INL_H_
#define V8_OBJECTS_ARGUMENTS_INL_H_ #define V8_OBJECTS_ARGUMENTS_INL_H_
#include "src/objects/arguments.h"
#include "src/execution/isolate-inl.h" #include "src/execution/isolate-inl.h"
#include "src/objects/arguments.h"
#include "src/objects/contexts-inl.h" #include "src/objects/contexts-inl.h"
#include "src/objects/fixed-array-inl.h" #include "src/objects/fixed-array-inl.h"
#include "src/objects/objects-inl.h" #include "src/objects/objects-inl.h"
...@@ -18,38 +17,9 @@ ...@@ -18,38 +17,9 @@
namespace v8 { namespace v8 {
namespace internal { namespace internal {
OBJECT_CONSTRUCTORS_IMPL(SloppyArgumentsElements, FixedArray)
TQ_OBJECT_CONSTRUCTORS_IMPL(JSArgumentsObject) TQ_OBJECT_CONSTRUCTORS_IMPL(JSArgumentsObject)
TQ_OBJECT_CONSTRUCTORS_IMPL(AliasedArgumentsEntry) TQ_OBJECT_CONSTRUCTORS_IMPL(AliasedArgumentsEntry)
CAST_ACCESSOR(SloppyArgumentsElements)
DEF_GETTER(SloppyArgumentsElements, context, Context) {
return TaggedField<Context>::load(isolate, *this,
OffsetOfElementAt(kContextIndex));
}
DEF_GETTER(SloppyArgumentsElements, arguments, FixedArray) {
return TaggedField<FixedArray>::load(isolate, *this,
OffsetOfElementAt(kArgumentsIndex));
}
void SloppyArgumentsElements::set_arguments(FixedArray arguments) {
set(kArgumentsIndex, arguments);
}
uint32_t SloppyArgumentsElements::parameter_map_length() {
return length() - kParameterMapStart;
}
Object SloppyArgumentsElements::get_mapped_entry(uint32_t entry) {
return get(entry + kParameterMapStart);
}
void SloppyArgumentsElements::set_mapped_entry(uint32_t entry, Object object) {
set(entry + kParameterMapStart, object);
}
} // namespace internal } // namespace internal
} // namespace v8 } // namespace v8
......
src/objects/arguments.h
View file @ e7e77bb2
...@@ -58,49 +58,6 @@ class JSStrictArgumentsObject : public JSArgumentsObject { ...@@ -58,49 +58,6 @@ class JSStrictArgumentsObject : public JSArgumentsObject {
DISALLOW_IMPLICIT_CONSTRUCTORS(JSStrictArgumentsObject); DISALLOW_IMPLICIT_CONSTRUCTORS(JSStrictArgumentsObject);
}; };
// Helper class to access FAST_ and SLOW_SLOPPY_ARGUMENTS_ELEMENTS
//
// +---+-----------------------+
// | 0 | Context context |
// +---------------------------+
// | 1 | FixedArray arguments +----+ HOLEY_ELEMENTS
// +---------------------------+ v-----+-----------+
// | 2 | Object param_1_map | | 0 | the_hole |
// |...| ... | | ... | ... |
// |n+1| Object param_n_map | | n-1 | the_hole |
// +---------------------------+ | n | element_1 |
// | ... | ... |
// |n+m-1| element_m |
// +-----------------+
//
// Parameter maps give the index into the provided context. If a map entry is
// the_hole it means that the given entry has been deleted from the arguments
// object.
// The arguments backing store kind depends on the ElementsKind of the outer
// JSArgumentsObject:
// - FAST_SLOPPY_ARGUMENTS_ELEMENTS: HOLEY_ELEMENTS
// - SLOW_SLOPPY_ARGUMENTS_ELEMENTS: DICTIONARY_ELEMENTS
class SloppyArgumentsElements : public FixedArray {
public:
static const int kContextIndex = 0;
static const int kArgumentsIndex = 1;
static const uint32_t kParameterMapStart = 2;
DECL_GETTER(context, Context)
DECL_GETTER(arguments, FixedArray)
inline void set_arguments(FixedArray arguments);
inline uint32_t parameter_map_length();
inline Object get_mapped_entry(uint32_t entry);
inline void set_mapped_entry(uint32_t entry, Object object);
DECL_CAST(SloppyArgumentsElements)
#ifdef VERIFY_HEAP
void SloppyArgumentsElementsVerify(Isolate* isolate, JSObject holder);
#endif
OBJECT_CONSTRUCTORS(SloppyArgumentsElements, FixedArray);
};
// Representation of a slow alias as part of a sloppy arguments objects. // Representation of a slow alias as part of a sloppy arguments objects.
// For fast aliases (if HasSloppyArgumentsElements()): // For fast aliases (if HasSloppyArgumentsElements()):
// - the parameter map contains an index into the context // - the parameter map contains an index into the context
......
src/objects/arguments.tq
View file @ e7e77bb2
...@@ -26,7 +26,69 @@ extern shape JSStrictArgumentsObject extends JSArgumentsObject { ...@@ -26,7 +26,69 @@ extern shape JSStrictArgumentsObject extends JSArgumentsObject {
length: JSAny; length: JSAny;
} }
type SloppyArgumentsElements extends FixedArray; // Helper class to access FAST_ and SLOW_SLOPPY_ARGUMENTS_ELEMENTS, dividing
// arguments into two types for a given SloppyArgumentsElements object:
// mapped and unmapped.
//
// For clarity SloppyArgumentsElements fields are qualified with "elements."
// below.
//
// Mapped arguments are actual arguments. Unmapped arguments are values added
// to the arguments object after it was created for the call. Mapped arguments
// are stored in the context at indexes given by elements.mapped_entries[key].
// Unmapped arguments are stored as regular indexed properties in the arguments
// array which can be accessed from elements.arguments.
//
// elements.length is min(number_of_actual_arguments,
// number_of_formal_arguments) for a concrete call to a function.
//
// Once a SloppyArgumentsElements is generated, lookup of an argument with index
// |key| in |elements| works as follows:
//
// If key >= elements.length then attempt to look in the unmapped arguments
// array and return the value at key, missing to the runtime if the unmapped
// arguments array is not a fixed array or if key >= elements.arguments.length.
//
// Otherwise, t = elements.mapped_entries[key]. If t is the hole, then the
// entry has been deleted fron the arguments object, and value is looked up in
// the unmapped arguments array, as described above. Otherwise, t is a Smi
// index into the context array specified at elements.context, and the return
// value is elements.context[t].
//
// A graphic representation of a SloppyArgumentsElements object and a
// corresponding unmapped arguments FixedArray:
//
// SloppyArgumentsElements
// +---+-----------------------+
// | Context context |
// +---------------------------+
// | FixedArray arguments +----+ HOLEY_ELEMENTS
// +---------------------------+ v-----+-----------+
// | 0 | Object mapped_entries | | 0 | the_hole |
// |...| ... | | ... | ... |
// |n-1| Object mapped_entries | | n-1 | the_hole |
// +---------------------------+ | n | element_1 |
// | ... | ... |
// |n+m-1| element_m |
// +-----------------+
//
// The elements.arguments backing store kind depends on the ElementsKind of
// the outer JSArgumentsObject:
// - FAST_SLOPPY_ARGUMENTS_ELEMENTS: HOLEY_ELEMENTS
// - SLOW_SLOPPY_ARGUMENTS_ELEMENTS: DICTIONARY_ELEMENTS
@export
class SloppyArgumentsElements extends FixedArrayBase {
context: Context;
arguments: FixedArray;
mapped_entries[length]: Smi|TheHole;
}
macro NewSloppyArgumentsElements<Iterator: type>(
length: Smi, context: Context, arguments: FixedArray,
it: Iterator): SloppyArgumentsElements {
return new
SloppyArgumentsElements{length, context, arguments, mapped_entries: ...it};
}
@generateCppClass @generateCppClass
@generatePrint @generatePrint
...@@ -49,7 +111,7 @@ macro NewJSStrictArgumentsObject(implicit context: Context)( ...@@ -49,7 +111,7 @@ macro NewJSStrictArgumentsObject(implicit context: Context)(
} }
macro NewJSSloppyArgumentsObject(implicit context: Context)( macro NewJSSloppyArgumentsObject(implicit context: Context)(
elements: FixedArray, callee: JSFunction): JSSloppyArgumentsObject { elements: FixedArrayBase, callee: JSFunction): JSSloppyArgumentsObject {
const map = GetSloppyArgumentsMap(); const map = GetSloppyArgumentsMap();
return new JSSloppyArgumentsObject{ return new JSSloppyArgumentsObject{
map, map,
...@@ -61,7 +123,7 @@ macro NewJSSloppyArgumentsObject(implicit context: Context)( ...@@ -61,7 +123,7 @@ macro NewJSSloppyArgumentsObject(implicit context: Context)(
} }
macro NewJSFastAliasedArgumentsObject(implicit context: Context)( macro NewJSFastAliasedArgumentsObject(implicit context: Context)(
elements: FixedArray, length: Smi, elements: FixedArrayBase, length: Smi,
callee: JSFunction): JSSloppyArgumentsObject { callee: JSFunction): JSSloppyArgumentsObject {
// TODO(danno): FastAliasedArguments should really be a type for itself // TODO(danno): FastAliasedArguments should really be a type for itself
const map = GetFastAliasedArgumentsMap(); const map = GetFastAliasedArgumentsMap();
...@@ -75,28 +137,17 @@ macro NewJSFastAliasedArgumentsObject(implicit context: Context)( ...@@ -75,28 +137,17 @@ macro NewJSFastAliasedArgumentsObject(implicit context: Context)(
} }
struct ParameterMapIterator { struct ParameterMapIterator {
macro Next(): Object labels NoMore { macro Next(): Smi labels NoMore {
const currentMapSlotCopy = this.currentMapSlot++;
if (currentMapSlotCopy > 1) {
if (this.currentIndex == this.endInterationIndex) goto NoMore; if (this.currentIndex == this.endInterationIndex) goto NoMore;
this.currentIndex--; this.currentIndex--;
return Convert<Smi>(this.currentIndex); return Convert<Smi>(this.currentIndex);
} else if (currentMapSlotCopy == 0) {
return this.context;
} else {
assert(currentMapSlotCopy == 1);
return this.elements;
} }
}
const context: Context;
const elements: FixedArray;
currentIndex: intptr; currentIndex: intptr;
const endInterationIndex: intptr; const endInterationIndex: intptr;
currentMapSlot: intptr;
} }
macro NewParameterMapIterator( macro NewParameterMapIterator(
context: Context, elements: FixedArray, formalParameterCount: intptr, context: Context, formalParameterCount: intptr,
mappedCount: intptr): ParameterMapIterator { mappedCount: intptr): ParameterMapIterator {
const flags = context.scope_info.flags; const flags = context.scope_info.flags;
let contextHeaderSize: intptr = MIN_CONTEXT_SLOTS; let contextHeaderSize: intptr = MIN_CONTEXT_SLOTS;
...@@ -112,11 +163,8 @@ macro NewParameterMapIterator( ...@@ -112,11 +163,8 @@ macro NewParameterMapIterator(
const afterLastContextIndex = contextHeaderSize + formalParameterCount; const afterLastContextIndex = contextHeaderSize + formalParameterCount;
const firstContextIndex = afterLastContextIndex - mappedCount; const firstContextIndex = afterLastContextIndex - mappedCount;
return ParameterMapIterator{ return ParameterMapIterator{
context,
elements,
currentIndex: afterLastContextIndex, currentIndex: afterLastContextIndex,
endInterationIndex: firstContextIndex, endInterationIndex: firstContextIndex
currentMapSlot: 0
}; };
} }
...@@ -188,17 +236,16 @@ macro NewSloppyArguments(implicit context: Context)( ...@@ -188,17 +236,16 @@ macro NewSloppyArguments(implicit context: Context)(
const mappedCount = IntPtrMin(formalParameterCount, argumentCount); const mappedCount = IntPtrMin(formalParameterCount, argumentCount);
const it = NewParameterValueIterator(mappedCount, arguments); const it = NewParameterValueIterator(mappedCount, arguments);
const parameterValues = NewFixedArray(argumentCount, it); const parameterValues = NewFixedArray(argumentCount, it);
let paramIter = NewParameterMapIterator( let paramIter =
context, parameterValues, formalParameterCount, mappedCount); NewParameterMapIterator(context, formalParameterCount, mappedCount);
const elementsLength = const elementsLength = Convert<Smi>(mappedCount);
Convert<Smi>(mappedCount + kSloppyArgumentsParameterMapStart); const elements = NewSloppyArgumentsElements(
const map = kSloppyArgumentsElementsMap; elementsLength, context, parameterValues, paramIter);
const elements = new
FixedArray{map, length: elementsLength, objects: ...paramIter};
const length = Convert<Smi>(argumentCount); const length = Convert<Smi>(argumentCount);
return NewJSFastAliasedArgumentsObject(elements, length, callee); return NewJSFastAliasedArgumentsObject(elements, length, callee);
} }
}
} // namespace arguments
@export @export
macro EmitFastNewAllArguments(implicit context: Context)( macro EmitFastNewAllArguments(implicit context: Context)(
......
src/objects/elements.cc
View file @ e7e77bb2
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
#include "src/objects/slots-atomic-inl.h" #include "src/objects/slots-atomic-inl.h"
#include "src/objects/slots.h" #include "src/objects/slots.h"
#include "src/utils/utils.h" #include "src/utils/utils.h"
#include "torque-generated/exported-class-definitions-tq-inl.h"
#include "torque-generated/exported-class-definitions-tq.h"
// Each concrete ElementsAccessor can handle exactly one ElementsKind, // Each concrete ElementsAccessor can handle exactly one ElementsKind,
// several abstract ElementsAccessor classes are used to allow sharing // several abstract ElementsAccessor classes are used to allow sharing
...@@ -3882,11 +3884,11 @@ class SloppyArgumentsElementsAccessor ...@@ -3882,11 +3884,11 @@ class SloppyArgumentsElementsAccessor
InternalIndex entry) { InternalIndex entry) {
Handle<SloppyArgumentsElements> elements( Handle<SloppyArgumentsElements> elements(
SloppyArgumentsElements::cast(parameters), isolate); SloppyArgumentsElements::cast(parameters), isolate);
uint32_t length = elements->parameter_map_length(); uint32_t length = elements->length();
if (entry.as_uint32() < length) { if (entry.as_uint32() < length) {
// Read context mapped entry. // Read context mapped entry.
DisallowHeapAllocation no_gc; DisallowHeapAllocation no_gc;
Object probe = elements->get_mapped_entry(entry.as_uint32()); Object probe = elements->mapped_entries(entry.as_uint32());
DCHECK(!probe.IsTheHole(isolate)); DCHECK(!probe.IsTheHole(isolate));
Context context = elements->context(); Context context = elements->context();
int context_entry = Smi::ToInt(probe); int context_entry = Smi::ToInt(probe);
...@@ -3918,13 +3920,13 @@ class SloppyArgumentsElementsAccessor ...@@ -3918,13 +3920,13 @@ class SloppyArgumentsElementsAccessor
static inline void SetImpl(FixedArrayBase store, InternalIndex entry, static inline void SetImpl(FixedArrayBase store, InternalIndex entry,
Object value) { Object value) {
SloppyArgumentsElements elements = SloppyArgumentsElements::cast(store); SloppyArgumentsElements elements = SloppyArgumentsElements::cast(store);
uint32_t length = elements.parameter_map_length(); uint32_t length = elements.length();
if (entry.as_uint32() < length) { if (entry.as_uint32() < length) {
// Store context mapped entry. // Store context mapped entry.
DisallowHeapAllocation no_gc; DisallowHeapAllocation no_gc;
Object probe = elements.get_mapped_entry(entry.as_uint32()); Object probe = elements.mapped_entries(entry.as_uint32());
DCHECK(!probe.IsTheHole()); DCHECK(!probe.IsTheHole());
Context context = elements.context(); Context context = Context::cast(elements.context());
int context_entry = Smi::ToInt(probe); int context_entry = Smi::ToInt(probe);
DCHECK(!context.get(context_entry).IsTheHole()); DCHECK(!context.get(context_entry).IsTheHole());
context.set(context_entry, value); context.set(context_entry, value);
...@@ -3935,7 +3937,7 @@ class SloppyArgumentsElementsAccessor ...@@ -3935,7 +3937,7 @@ class SloppyArgumentsElementsAccessor
ArgumentsAccessor::GetRaw(arguments, entry.adjust_down(length)); ArgumentsAccessor::GetRaw(arguments, entry.adjust_down(length));
if (current.IsAliasedArgumentsEntry()) { if (current.IsAliasedArgumentsEntry()) {
AliasedArgumentsEntry alias = AliasedArgumentsEntry::cast(current); AliasedArgumentsEntry alias = AliasedArgumentsEntry::cast(current);
Context context = elements.context(); Context context = Context::cast(elements.context());
int context_entry = alias.aliased_context_slot(); int context_entry = alias.aliased_context_slot();
DCHECK(!context.get(context_entry).IsTheHole()); DCHECK(!context.get(context_entry).IsTheHole());
context.set(context_entry, value); context.set(context_entry, value);
...@@ -3955,7 +3957,7 @@ class SloppyArgumentsElementsAccessor ...@@ -3955,7 +3957,7 @@ class SloppyArgumentsElementsAccessor
static uint32_t GetCapacityImpl(JSObject holder, FixedArrayBase store) { static uint32_t GetCapacityImpl(JSObject holder, FixedArrayBase store) {
SloppyArgumentsElements elements = SloppyArgumentsElements::cast(store); SloppyArgumentsElements elements = SloppyArgumentsElements::cast(store);
FixedArray arguments = elements.arguments(); FixedArray arguments = elements.arguments();
return elements.parameter_map_length() + return elements.length() +
ArgumentsAccessor::GetCapacityImpl(holder, arguments); ArgumentsAccessor::GetCapacityImpl(holder, arguments);
} }
...@@ -3967,7 +3969,7 @@ class SloppyArgumentsElementsAccessor ...@@ -3967,7 +3969,7 @@ class SloppyArgumentsElementsAccessor
size_t max_entries = size_t max_entries =
ArgumentsAccessor::GetMaxNumberOfEntries(holder, arguments); ArgumentsAccessor::GetMaxNumberOfEntries(holder, arguments);
DCHECK_LE(max_entries, std::numeric_limits<uint32_t>::max()); DCHECK_LE(max_entries, std::numeric_limits<uint32_t>::max());
return elements.parameter_map_length() + static_cast<uint32_t>(max_entries); return elements.length() + static_cast<uint32_t>(max_entries);
} }
static uint32_t NumberOfElementsImpl(JSObject receiver, static uint32_t NumberOfElementsImpl(JSObject receiver,
...@@ -3977,7 +3979,7 @@ class SloppyArgumentsElementsAccessor ...@@ -3977,7 +3979,7 @@ class SloppyArgumentsElementsAccessor
SloppyArgumentsElements::cast(backing_store); SloppyArgumentsElements::cast(backing_store);
FixedArrayBase arguments = elements.arguments(); FixedArrayBase arguments = elements.arguments();
uint32_t nof_elements = 0; uint32_t nof_elements = 0;
uint32_t length = elements.parameter_map_length(); uint32_t length = elements.length();
for (uint32_t index = 0; index < length; index++) { for (uint32_t index = 0; index < length; index++) {
if (HasParameterMapArg(isolate, elements, index)) nof_elements++; if (HasParameterMapArg(isolate, elements, index)) nof_elements++;
} }
...@@ -4004,7 +4006,7 @@ class SloppyArgumentsElementsAccessor ...@@ -4004,7 +4006,7 @@ class SloppyArgumentsElementsAccessor
InternalIndex entry) { InternalIndex entry) {
SloppyArgumentsElements elements = SloppyArgumentsElements elements =
SloppyArgumentsElements::cast(parameters); SloppyArgumentsElements::cast(parameters);
uint32_t length = elements.parameter_map_length(); uint32_t length = elements.length();
if (entry.raw_value() < length) { if (entry.raw_value() < length) {
return HasParameterMapArg(isolate, elements, entry.raw_value()); return HasParameterMapArg(isolate, elements, entry.raw_value());
} }
...@@ -4035,13 +4037,13 @@ class SloppyArgumentsElementsAccessor ...@@ -4035,13 +4037,13 @@ class SloppyArgumentsElementsAccessor
if (entry.is_not_found()) return entry; if (entry.is_not_found()) return entry;
// Arguments entries could overlap with the dictionary entries, hence offset // Arguments entries could overlap with the dictionary entries, hence offset
// them by the number of context mapped entries. // them by the number of context mapped entries.
return entry.adjust_up(elements.parameter_map_length()); return entry.adjust_up(elements.length());
} }
static PropertyDetails GetDetailsImpl(JSObject holder, InternalIndex entry) { static PropertyDetails GetDetailsImpl(JSObject holder, InternalIndex entry) {
SloppyArgumentsElements elements = SloppyArgumentsElements elements =
SloppyArgumentsElements::cast(holder.elements()); SloppyArgumentsElements::cast(holder.elements());
uint32_t length = elements.parameter_map_length(); uint32_t length = elements.length();
if (entry.as_uint32() < length) { if (entry.as_uint32() < length) {
return PropertyDetails(kData, NONE, PropertyCellType::kNoCell); return PropertyDetails(kData, NONE, PropertyCellType::kNoCell);
} }
...@@ -4053,16 +4055,16 @@ class SloppyArgumentsElementsAccessor ...@@ -4053,16 +4055,16 @@ class SloppyArgumentsElementsAccessor
static bool HasParameterMapArg(Isolate* isolate, static bool HasParameterMapArg(Isolate* isolate,
SloppyArgumentsElements elements, SloppyArgumentsElements elements,
size_t index) { size_t index) {
uint32_t length = elements.parameter_map_length(); uint32_t length = elements.length();
if (index >= length) return false; if (index >= length) return false;
return !elements.get_mapped_entry(static_cast<uint32_t>(index)) return !elements.mapped_entries(static_cast<uint32_t>(index))
.IsTheHole(isolate); .IsTheHole(isolate);
} }
static void DeleteImpl(Handle<JSObject> obj, InternalIndex entry) { static void DeleteImpl(Handle<JSObject> obj, InternalIndex entry) {
Handle<SloppyArgumentsElements> elements( Handle<SloppyArgumentsElements> elements(
SloppyArgumentsElements::cast(obj->elements()), obj->GetIsolate()); SloppyArgumentsElements::cast(obj->elements()), obj->GetIsolate());
uint32_t length = elements->parameter_map_length(); uint32_t length = elements->length();
InternalIndex delete_or_entry = entry; InternalIndex delete_or_entry = entry;
if (entry.as_uint32() < length) { if (entry.as_uint32() < length) {
delete_or_entry = InternalIndex::NotFound(); delete_or_entry = InternalIndex::NotFound();
...@@ -4071,7 +4073,7 @@ class SloppyArgumentsElementsAccessor ...@@ -4071,7 +4073,7 @@ class SloppyArgumentsElementsAccessor
// SloppyDeleteImpl allocates a new dictionary elements store. For making // SloppyDeleteImpl allocates a new dictionary elements store. For making
// heap verification happy we postpone clearing out the mapped entry. // heap verification happy we postpone clearing out the mapped entry.
if (entry.as_uint32() < length) { if (entry.as_uint32() < length) {
elements->set_mapped_entry(entry.as_uint32(), elements->set_mapped_entries(entry.as_uint32(),
obj->GetReadOnlyRoots().the_hole_value()); obj->GetReadOnlyRoots().the_hole_value());
} }
} }
...@@ -4107,10 +4109,10 @@ class SloppyArgumentsElementsAccessor ...@@ -4107,10 +4109,10 @@ class SloppyArgumentsElementsAccessor
uint32_t insertion_index = 0) { uint32_t insertion_index = 0) {
Handle<SloppyArgumentsElements> elements = Handle<SloppyArgumentsElements> elements =
Handle<SloppyArgumentsElements>::cast(backing_store); Handle<SloppyArgumentsElements>::cast(backing_store);
uint32_t length = elements->parameter_map_length(); uint32_t length = elements->length();
for (uint32_t i = 0; i < length; ++i) { for (uint32_t i = 0; i < length; ++i) {
if (elements->get_mapped_entry(i).IsTheHole(isolate)) continue; if (elements->mapped_entries(i).IsTheHole(isolate)) continue;
if (convert == GetKeysConversion::kConvertToString) { if (convert == GetKeysConversion::kConvertToString) {
Handle<String> index_string = isolate->factory()->Uint32ToString(i); Handle<String> index_string = isolate->factory()->Uint32ToString(i);
list->set(insertion_index, *index_string); list->set(insertion_index, *index_string);
...@@ -4238,7 +4240,7 @@ class SlowSloppyArgumentsElementsAccessor ...@@ -4238,7 +4240,7 @@ class SlowSloppyArgumentsElementsAccessor
Isolate* isolate = obj->GetIsolate(); Isolate* isolate = obj->GetIsolate();
Handle<NumberDictionary> dict(NumberDictionary::cast(elements->arguments()), Handle<NumberDictionary> dict(NumberDictionary::cast(elements->arguments()),
isolate); isolate);
uint32_t length = elements->parameter_map_length(); uint32_t length = elements->length();
dict = dict =
NumberDictionary::DeleteEntry(isolate, dict, entry.adjust_down(length)); NumberDictionary::DeleteEntry(isolate, dict, entry.adjust_down(length));
elements->set_arguments(*dict); elements->set_arguments(*dict);
...@@ -4271,9 +4273,9 @@ class SlowSloppyArgumentsElementsAccessor ...@@ -4271,9 +4273,9 @@ class SlowSloppyArgumentsElementsAccessor
Isolate* isolate = object->GetIsolate(); Isolate* isolate = object->GetIsolate();
Handle<SloppyArgumentsElements> elements = Handle<SloppyArgumentsElements> elements =
Handle<SloppyArgumentsElements>::cast(store); Handle<SloppyArgumentsElements>::cast(store);
uint32_t length = elements->parameter_map_length(); uint32_t length = elements->length();
if (entry.as_uint32() < length) { if (entry.as_uint32() < length) {
Object probe = elements->get_mapped_entry(entry.as_uint32()); Object probe = elements->mapped_entries(entry.as_uint32());
DCHECK(!probe.IsTheHole(isolate)); DCHECK(!probe.IsTheHole(isolate));
Context context = elements->context(); Context context = elements->context();
int context_entry = Smi::ToInt(probe); int context_entry = Smi::ToInt(probe);
...@@ -4281,7 +4283,7 @@ class SlowSloppyArgumentsElementsAccessor ...@@ -4281,7 +4283,7 @@ class SlowSloppyArgumentsElementsAccessor
context.set(context_entry, *value); context.set(context_entry, *value);
// Redefining attributes of an aliased element destroys fast aliasing. // Redefining attributes of an aliased element destroys fast aliasing.
elements->set_mapped_entry(entry.as_uint32(), elements->set_mapped_entries(entry.as_uint32(),
ReadOnlyRoots(isolate).the_hole_value()); ReadOnlyRoots(isolate).the_hole_value());
// For elements that are still writable we re-establish slow aliasing. // For elements that are still writable we re-establish slow aliasing.
if ((attributes & READ_ONLY) == 0) { if ((attributes & READ_ONLY) == 0) {
...@@ -4339,7 +4341,7 @@ class FastSloppyArgumentsElementsAccessor ...@@ -4339,7 +4341,7 @@ class FastSloppyArgumentsElementsAccessor
// kMaxUInt32 indicates that a context mapped element got deleted. In this // kMaxUInt32 indicates that a context mapped element got deleted. In this
// case we only normalize the elements (aka. migrate to SLOW_SLOPPY). // case we only normalize the elements (aka. migrate to SLOW_SLOPPY).
if (entry->is_not_found()) return dictionary; if (entry->is_not_found()) return dictionary;
uint32_t length = elements->parameter_map_length(); uint32_t length = elements->length();
if (entry->as_uint32() >= length) { if (entry->as_uint32() >= length) {
*entry = *entry =
dictionary dictionary
......
src/objects/js-objects-inl.h
View file @ e7e77bb2
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
#ifndef V8_OBJECTS_JS_OBJECTS_INL_H_ #ifndef V8_OBJECTS_JS_OBJECTS_INL_H_
#define V8_OBJECTS_JS_OBJECTS_INL_H_ #define V8_OBJECTS_JS_OBJECTS_INL_H_
#include "src/objects/js-objects.h"
#include "src/diagnostics/code-tracer.h" #include "src/diagnostics/code-tracer.h"
#include "src/heap/heap-write-barrier.h" #include "src/heap/heap-write-barrier.h"
#include "src/objects/elements.h" #include "src/objects/elements.h"
...@@ -16,6 +14,7 @@ ...@@ -16,6 +14,7 @@
#include "src/objects/field-index-inl.h" #include "src/objects/field-index-inl.h"
#include "src/objects/hash-table-inl.h" #include "src/objects/hash-table-inl.h"
#include "src/objects/heap-number-inl.h" #include "src/objects/heap-number-inl.h"
#include "src/objects/js-objects.h"
#include "src/objects/keys.h" #include "src/objects/keys.h"
#include "src/objects/lookup-inl.h" #include "src/objects/lookup-inl.h"
#include "src/objects/property-array-inl.h" #include "src/objects/property-array-inl.h"
...@@ -775,9 +774,8 @@ DEF_GETTER(JSObject, GetElementsKind, ElementsKind) { ...@@ -775,9 +774,8 @@ DEF_GETTER(JSObject, GetElementsKind, ElementsKind) {
DCHECK(kind > DICTIONARY_ELEMENTS || DCHECK(kind > DICTIONARY_ELEMENTS ||
IsAnyNonextensibleElementsKind(kind)); IsAnyNonextensibleElementsKind(kind));
} }
DCHECK( DCHECK(!IsSloppyArgumentsElementsKind(kind) ||
!IsSloppyArgumentsElementsKind(kind) || elements(isolate).IsSloppyArgumentsElements());
(elements(isolate).IsFixedArray() && elements(isolate).length() >= 2));
} }
#endif #endif
return kind; return kind;
......
src/objects/js-objects.cc
View file @ e7e77bb2
...@@ -72,6 +72,8 @@ ...@@ -72,6 +72,8 @@
#include "src/strings/string-stream.h" #include "src/strings/string-stream.h"
#include "src/utils/ostreams.h" #include "src/utils/ostreams.h"
#include "src/wasm/wasm-objects.h" #include "src/wasm/wasm-objects.h"
#include "torque-generated/exported-class-definitions-tq-inl.h"
#include "torque-generated/exported-class-definitions-tq.h"
namespace v8 { namespace v8 {
namespace internal { namespace internal {
......
src/objects/lookup.cc
View file @ e7e77bb2
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
#include "src/objects/hash-table-inl.h" #include "src/objects/hash-table-inl.h"
#include "src/objects/heap-number-inl.h" #include "src/objects/heap-number-inl.h"
#include "src/objects/struct-inl.h" #include "src/objects/struct-inl.h"
#include "torque-generated/exported-class-definitions-tq-inl.h"
#include "torque-generated/exported-class-definitions-tq.h"
namespace v8 { namespace v8 {
namespace internal { namespace internal {
...@@ -763,13 +765,14 @@ void LookupIterator::TransitionToAccessorPair(Handle<Object> pair, ...@@ -763,13 +765,14 @@ void LookupIterator::TransitionToAccessorPair(Handle<Object> pair,
receiver->RequireSlowElements(*dictionary); receiver->RequireSlowElements(*dictionary);
if (receiver->HasSlowArgumentsElements(isolate_)) { if (receiver->HasSlowArgumentsElements(isolate_)) {
FixedArray parameter_map = FixedArray::cast(receiver->elements(isolate_)); SloppyArgumentsElements parameter_map =
uint32_t length = parameter_map.length() - 2; SloppyArgumentsElements::cast(receiver->elements(isolate_));
uint32_t length = parameter_map.length();
if (number_.is_found() && number_.as_uint32() < length) { if (number_.is_found() && number_.as_uint32() < length) {
parameter_map.set(number_.as_int() + 2, parameter_map.set_mapped_entries(
ReadOnlyRoots(isolate_).the_hole_value()); number_.as_int(), ReadOnlyRoots(isolate_).the_hole_value());
} }
FixedArray::cast(receiver->elements(isolate_)).set(1, *dictionary); parameter_map.set_arguments(*dictionary);
} else { } else {
receiver->set_elements(*dictionary); receiver->set_elements(*dictionary);
} }
......
src/objects/map-inl.h
View file @ e7e77bb2
...@@ -227,8 +227,6 @@ FixedArrayBase Map::GetInitialElements() const { ...@@ -227,8 +227,6 @@ FixedArrayBase Map::GetInitialElements() const {
if (has_fast_elements() || has_fast_string_wrapper_elements() || if (has_fast_elements() || has_fast_string_wrapper_elements() ||
has_any_nonextensible_elements()) { has_any_nonextensible_elements()) {
result = GetReadOnlyRoots().empty_fixed_array(); result = GetReadOnlyRoots().empty_fixed_array();
} else if (has_fast_sloppy_arguments_elements()) {
result = GetReadOnlyRoots().empty_sloppy_arguments_elements();
} else if (has_typed_array_elements()) { } else if (has_typed_array_elements()) {
result = GetReadOnlyRoots().empty_byte_array(); result = GetReadOnlyRoots().empty_byte_array();
} else if (has_dictionary_elements()) { } else if (has_dictionary_elements()) {
......
src/objects/object-list-macros.h
View file @ e7e77bb2
...@@ -202,7 +202,6 @@ class ZoneForwardList; ...@@ -202,7 +202,6 @@ class ZoneForwardList;
V(SharedFunctionInfo) \ V(SharedFunctionInfo) \
V(SimpleNumberDictionary) \ V(SimpleNumberDictionary) \
V(SlicedString) \ V(SlicedString) \
V(SloppyArgumentsElements) \
V(SmallOrderedHashMap) \ V(SmallOrderedHashMap) \
V(SmallOrderedHashSet) \ V(SmallOrderedHashSet) \
V(SmallOrderedNameDictionary) \ V(SmallOrderedNameDictionary) \
......
src/objects/objects-inl.h
View file @ e7e77bb2
...@@ -67,10 +67,6 @@ int PropertyDetails::field_width_in_words() const { ...@@ -67,10 +67,6 @@ int PropertyDetails::field_width_in_words() const {
return representation().IsDouble() ? kDoubleSize / kTaggedSize : 1; return representation().IsDouble() ? kDoubleSize / kTaggedSize : 1;
} }
DEF_GETTER(HeapObject, IsSloppyArgumentsElements, bool) {
return IsFixedArrayExact(isolate);
}
DEF_GETTER(HeapObject, IsClassBoilerplate, bool) { DEF_GETTER(HeapObject, IsClassBoilerplate, bool) {
return IsFixedArrayExact(isolate); return IsFixedArrayExact(isolate);
} }
......
src/roots/roots.h
View file @ e7e77bb2
...@@ -108,7 +108,6 @@ class Symbol; ...@@ -108,7 +108,6 @@ class Symbol;
V(Map, next_call_side_effect_free_call_handler_info_map, \ V(Map, next_call_side_effect_free_call_handler_info_map, \
NextCallSideEffectFreeCallHandlerInfoMap) \ NextCallSideEffectFreeCallHandlerInfoMap) \
V(Map, simple_number_dictionary_map, SimpleNumberDictionaryMap) \ V(Map, simple_number_dictionary_map, SimpleNumberDictionaryMap) \
V(Map, sloppy_arguments_elements_map, SloppyArgumentsElementsMap) \
V(Map, small_ordered_hash_map_map, SmallOrderedHashMapMap) \ V(Map, small_ordered_hash_map_map, SmallOrderedHashMapMap) \
V(Map, small_ordered_hash_set_map, SmallOrderedHashSetMap) \ V(Map, small_ordered_hash_set_map, SmallOrderedHashSetMap) \
V(Map, small_ordered_name_dictionary_map, SmallOrderedNameDictionaryMap) \ V(Map, small_ordered_name_dictionary_map, SmallOrderedNameDictionaryMap) \
...@@ -167,7 +166,6 @@ class Symbol; ...@@ -167,7 +166,6 @@ class Symbol;
EmptyArrayBoilerplateDescription) \ EmptyArrayBoilerplateDescription) \
V(ClosureFeedbackCellArray, empty_closure_feedback_cell_array, \ V(ClosureFeedbackCellArray, empty_closure_feedback_cell_array, \
EmptyClosureFeedbackCellArray) \ EmptyClosureFeedbackCellArray) \
V(FixedArray, empty_sloppy_arguments_elements, EmptySloppyArgumentsElements) \
V(NumberDictionary, empty_slow_element_dictionary, \ V(NumberDictionary, empty_slow_element_dictionary, \
EmptySlowElementDictionary) \ EmptySlowElementDictionary) \
V(FixedArray, empty_ordered_hash_map, EmptyOrderedHashMap) \ V(FixedArray, empty_ordered_hash_map, EmptyOrderedHashMap) \
......
src/runtime/runtime-scopes.cc
View file @ e7e77bb2
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
#include "src/objects/module-inl.h" #include "src/objects/module-inl.h"
#include "src/objects/smi.h" #include "src/objects/smi.h"
#include "src/runtime/runtime-utils.h" #include "src/runtime/runtime-utils.h"
#include "torque-generated/exported-class-definitions-tq-inl.h"
#include "torque-generated/exported-class-definitions-tq.h"
namespace v8 { namespace v8 {
namespace internal { namespace internal {
...@@ -408,20 +410,19 @@ Handle<JSObject> NewSloppyArguments(Isolate* isolate, Handle<JSFunction> callee, ...@@ -408,20 +410,19 @@ Handle<JSObject> NewSloppyArguments(Isolate* isolate, Handle<JSFunction> callee,
if (argument_count > 0) { if (argument_count > 0) {
if (parameter_count > 0) { if (parameter_count > 0) {
int mapped_count = Min(argument_count, parameter_count); int mapped_count = Min(argument_count, parameter_count);
Handle<FixedArray> parameter_map = isolate->factory()->NewFixedArray(
mapped_count + 2, AllocationType::kYoung);
parameter_map->set_map(
ReadOnlyRoots(isolate).sloppy_arguments_elements_map());
result->set_map(isolate->native_context()->fast_aliased_arguments_map());
result->set_elements(*parameter_map);
// Store the context and the arguments array at the beginning of the // Store the context and the arguments array at the beginning of the
// parameter map. // parameter map.
Handle<Context> context(isolate->context(), isolate); Handle<Context> context(isolate->context(), isolate);
Handle<FixedArray> arguments = isolate->factory()->NewFixedArray( Handle<FixedArray> arguments = isolate->factory()->NewFixedArray(
argument_count, AllocationType::kYoung); argument_count, AllocationType::kYoung);
parameter_map->set(0, *context);
parameter_map->set(1, *arguments); Handle<SloppyArgumentsElements> parameter_map =
isolate->factory()->NewSloppyArgumentsElements(
mapped_count, context, arguments, AllocationType::kYoung);
result->set_map(isolate->native_context()->fast_aliased_arguments_map());
result->set_elements(*parameter_map);
// Loop over the actual parameters backwards. // Loop over the actual parameters backwards.
int index = argument_count - 1; int index = argument_count - 1;
...@@ -438,7 +439,8 @@ Handle<JSObject> NewSloppyArguments(Isolate* isolate, Handle<JSFunction> callee, ...@@ -438,7 +439,8 @@ Handle<JSObject> NewSloppyArguments(Isolate* isolate, Handle<JSFunction> callee,
// arguments object. // arguments object.
for (int i = 0; i < mapped_count; i++) { for (int i = 0; i < mapped_count; i++) {
arguments->set(i, parameters[i]); arguments->set(i, parameters[i]);
parameter_map->set_the_hole(i + 2); parameter_map->set_mapped_entries(
i, *isolate->factory()->the_hole_value());
} }
// Walk all context slots to find context allocated parameters. Mark each // Walk all context slots to find context allocated parameters. Mark each
...@@ -449,7 +451,7 @@ Handle<JSObject> NewSloppyArguments(Isolate* isolate, Handle<JSFunction> callee, ...@@ -449,7 +451,7 @@ Handle<JSObject> NewSloppyArguments(Isolate* isolate, Handle<JSFunction> callee,
if (parameter >= mapped_count) continue; if (parameter >= mapped_count) continue;
arguments->set_the_hole(parameter); arguments->set_the_hole(parameter);
Smi slot = Smi::FromInt(scope_info->ContextHeaderLength() + i); Smi slot = Smi::FromInt(scope_info->ContextHeaderLength() + i);
parameter_map->set(parameter + 2, slot); parameter_map->set_mapped_entries(parameter, slot);
} }
} else { } else {
// If there is no aliasing, the arguments object elements are not // If there is no aliasing, the arguments object elements are not
......
tools/v8heapconst.py
View file @ e7e77bb2
...@@ -97,57 +97,58 @@ INSTANCE_TYPES = { ...@@ -97,57 +97,58 @@ INSTANCE_TYPES = {
133: "BYTECODE_ARRAY_TYPE", 133: "BYTECODE_ARRAY_TYPE",
134: "FIXED_DOUBLE_ARRAY_TYPE", 134: "FIXED_DOUBLE_ARRAY_TYPE",
135: "INTERNAL_CLASS_WITH_SMI_ELEMENTS_TYPE", 135: "INTERNAL_CLASS_WITH_SMI_ELEMENTS_TYPE",
136: "AWAIT_CONTEXT_TYPE", 136: "SLOPPY_ARGUMENTS_ELEMENTS_TYPE",
137: "BLOCK_CONTEXT_TYPE", 137: "AWAIT_CONTEXT_TYPE",
138: "CATCH_CONTEXT_TYPE", 138: "BLOCK_CONTEXT_TYPE",
139: "DEBUG_EVALUATE_CONTEXT_TYPE", 139: "CATCH_CONTEXT_TYPE",
140: "EVAL_CONTEXT_TYPE", 140: "DEBUG_EVALUATE_CONTEXT_TYPE",
141: "FUNCTION_CONTEXT_TYPE", 141: "EVAL_CONTEXT_TYPE",
142: "MODULE_CONTEXT_TYPE", 142: "FUNCTION_CONTEXT_TYPE",
143: "NATIVE_CONTEXT_TYPE", 143: "MODULE_CONTEXT_TYPE",
144: "SCRIPT_CONTEXT_TYPE", 144: "NATIVE_CONTEXT_TYPE",
145: "WITH_CONTEXT_TYPE", 145: "SCRIPT_CONTEXT_TYPE",
146: "SMALL_ORDERED_HASH_MAP_TYPE", 146: "WITH_CONTEXT_TYPE",
147: "SMALL_ORDERED_HASH_SET_TYPE", 147: "SMALL_ORDERED_HASH_MAP_TYPE",
148: "SMALL_ORDERED_NAME_DICTIONARY_TYPE", 148: "SMALL_ORDERED_HASH_SET_TYPE",
149: "EXPORTED_SUB_CLASS_BASE_TYPE", 149: "SMALL_ORDERED_NAME_DICTIONARY_TYPE",
150: "EXPORTED_SUB_CLASS_TYPE", 150: "EXPORTED_SUB_CLASS_BASE_TYPE",
151: "SOURCE_TEXT_MODULE_TYPE", 151: "EXPORTED_SUB_CLASS_TYPE",
152: "SYNTHETIC_MODULE_TYPE", 152: "SOURCE_TEXT_MODULE_TYPE",
153: "UNCOMPILED_DATA_WITH_PREPARSE_DATA_TYPE", 153: "SYNTHETIC_MODULE_TYPE",
154: "UNCOMPILED_DATA_WITHOUT_PREPARSE_DATA_TYPE", 154: "UNCOMPILED_DATA_WITH_PREPARSE_DATA_TYPE",
155: "WEAK_FIXED_ARRAY_TYPE", 155: "UNCOMPILED_DATA_WITHOUT_PREPARSE_DATA_TYPE",
156: "TRANSITION_ARRAY_TYPE", 156: "WEAK_FIXED_ARRAY_TYPE",
157: "CELL_TYPE", 157: "TRANSITION_ARRAY_TYPE",
158: "CODE_TYPE", 158: "CELL_TYPE",
159: "CODE_DATA_CONTAINER_TYPE", 159: "CODE_TYPE",
160: "COVERAGE_INFO_TYPE", 160: "CODE_DATA_CONTAINER_TYPE",
161: "DESCRIPTOR_ARRAY_TYPE", 161: "COVERAGE_INFO_TYPE",
162: "EMBEDDER_DATA_ARRAY_TYPE", 162: "DESCRIPTOR_ARRAY_TYPE",
163: "FEEDBACK_METADATA_TYPE", 163: "EMBEDDER_DATA_ARRAY_TYPE",
164: "FEEDBACK_VECTOR_TYPE", 164: "FEEDBACK_METADATA_TYPE",
165: "FILLER_TYPE", 165: "FEEDBACK_VECTOR_TYPE",
166: "FREE_SPACE_TYPE", 166: "FILLER_TYPE",
167: "INTERNAL_CLASS_TYPE", 167: "FREE_SPACE_TYPE",
168: "INTERNAL_CLASS_WITH_STRUCT_ELEMENTS_TYPE", 168: "INTERNAL_CLASS_TYPE",
169: "MAP_TYPE", 169: "INTERNAL_CLASS_WITH_STRUCT_ELEMENTS_TYPE",
170: "ON_HEAP_BASIC_BLOCK_PROFILER_DATA_TYPE", 170: "MAP_TYPE",
171: "PREPARSE_DATA_TYPE", 171: "ON_HEAP_BASIC_BLOCK_PROFILER_DATA_TYPE",
172: "PROPERTY_ARRAY_TYPE", 172: "PREPARSE_DATA_TYPE",
173: "PROPERTY_CELL_TYPE", 173: "PROPERTY_ARRAY_TYPE",
174: "SHARED_FUNCTION_INFO_TYPE", 174: "PROPERTY_CELL_TYPE",
175: "SMI_BOX_TYPE", 175: "SHARED_FUNCTION_INFO_TYPE",
176: "SMI_PAIR_TYPE", 176: "SMI_BOX_TYPE",
177: "SORT_STATE_TYPE", 177: "SMI_PAIR_TYPE",
178: "WASM_ARRAY_TYPE", 178: "SORT_STATE_TYPE",
179: "WASM_STRUCT_TYPE", 179: "WASM_ARRAY_TYPE",
180: "WEAK_ARRAY_LIST_TYPE", 180: "WASM_STRUCT_TYPE",
181: "WEAK_CELL_TYPE", 181: "WEAK_ARRAY_LIST_TYPE",
182: "JS_PROXY_TYPE", 182: "WEAK_CELL_TYPE",
183: "JS_PROXY_TYPE",
1057: "JS_OBJECT_TYPE", 1057: "JS_OBJECT_TYPE",
183: "JS_GLOBAL_OBJECT_TYPE", 184: "JS_GLOBAL_OBJECT_TYPE",
184: "JS_GLOBAL_PROXY_TYPE", 185: "JS_GLOBAL_PROXY_TYPE",
185: "JS_MODULE_NAMESPACE_TYPE", 186: "JS_MODULE_NAMESPACE_TYPE",
1040: "JS_SPECIAL_API_OBJECT_TYPE", 1040: "JS_SPECIAL_API_OBJECT_TYPE",
1041: "JS_PRIMITIVE_WRAPPER_TYPE", 1041: "JS_PRIMITIVE_WRAPPER_TYPE",
1042: "JS_MAP_KEY_ITERATOR_TYPE", 1042: "JS_MAP_KEY_ITERATOR_TYPE",
...@@ -204,13 +205,13 @@ INSTANCE_TYPES = { ...@@ -204,13 +205,13 @@ INSTANCE_TYPES = {
# List of known V8 maps. # List of known V8 maps.
KNOWN_MAPS = { KNOWN_MAPS = {
("read_only_space", 0x00121): (166, "FreeSpaceMap"), ("read_only_space", 0x00121): (167, "FreeSpaceMap"),
("read_only_space", 0x00149): (169, "MetaMap"), ("read_only_space", 0x00149): (170, "MetaMap"),
("read_only_space", 0x0018d): (67, "NullMap"), ("read_only_space", 0x0018d): (67, "NullMap"),
("read_only_space", 0x001c5): (161, "DescriptorArrayMap"), ("read_only_space", 0x001c5): (162, "DescriptorArrayMap"),
("read_only_space", 0x001f5): (155, "WeakFixedArrayMap"), ("read_only_space", 0x001f5): (156, "WeakFixedArrayMap"),
("read_only_space", 0x0021d): (165, "OnePointerFillerMap"), ("read_only_space", 0x0021d): (166, "OnePointerFillerMap"),
("read_only_space", 0x00245): (165, "TwoPointerFillerMap"), ("read_only_space", 0x00245): (166, "TwoPointerFillerMap"),
("read_only_space", 0x00289): (67, "UninitializedMap"), ("read_only_space", 0x00289): (67, "UninitializedMap"),
("read_only_space", 0x002cd): (8, "OneByteInternalizedStringMap"), ("read_only_space", 0x002cd): (8, "OneByteInternalizedStringMap"),
("read_only_space", 0x00329): (67, "UndefinedMap"), ("read_only_space", 0x00329): (67, "UndefinedMap"),
...@@ -224,14 +225,14 @@ KNOWN_MAPS = { ...@@ -224,14 +225,14 @@ KNOWN_MAPS = {
("read_only_space", 0x00529): (64, "SymbolMap"), ("read_only_space", 0x00529): (64, "SymbolMap"),
("read_only_space", 0x00551): (40, "OneByteStringMap"), ("read_only_space", 0x00551): (40, "OneByteStringMap"),
("read_only_space", 0x00579): (130, "ScopeInfoMap"), ("read_only_space", 0x00579): (130, "ScopeInfoMap"),
("read_only_space", 0x005a1): (174, "SharedFunctionInfoMap"), ("read_only_space", 0x005a1): (175, "SharedFunctionInfoMap"),
("read_only_space", 0x005c9): (158, "CodeMap"), ("read_only_space", 0x005c9): (159, "CodeMap"),
("read_only_space", 0x005f1): (157, "CellMap"), ("read_only_space", 0x005f1): (158, "CellMap"),
("read_only_space", 0x00619): (173, "GlobalPropertyCellMap"), ("read_only_space", 0x00619): (174, "GlobalPropertyCellMap"),
("read_only_space", 0x00641): (70, "ForeignMap"), ("read_only_space", 0x00641): (70, "ForeignMap"),
("read_only_space", 0x00669): (156, "TransitionArrayMap"), ("read_only_space", 0x00669): (157, "TransitionArrayMap"),
("read_only_space", 0x00691): (45, "ThinOneByteStringMap"), ("read_only_space", 0x00691): (45, "ThinOneByteStringMap"),
("read_only_space", 0x006b9): (164, "FeedbackVectorMap"), ("read_only_space", 0x006b9): (165, "FeedbackVectorMap"),
("read_only_space", 0x0070d): (67, "ArgumentsMarkerMap"), ("read_only_space", 0x0070d): (67, "ArgumentsMarkerMap"),
("read_only_space", 0x0076d): (67, "ExceptionMap"), ("read_only_space", 0x0076d): (67, "ExceptionMap"),
("read_only_space", 0x007c9): (67, "TerminationExceptionMap"), ("read_only_space", 0x007c9): (67, "TerminationExceptionMap"),
...@@ -239,13 +240,13 @@ KNOWN_MAPS = { ...@@ -239,13 +240,13 @@ KNOWN_MAPS = {
("read_only_space", 0x00891): (67, "StaleRegisterMap"), ("read_only_space", 0x00891): (67, "StaleRegisterMap"),
("read_only_space", 0x008d5): (131, "ScriptContextTableMap"), ("read_only_space", 0x008d5): (131, "ScriptContextTableMap"),
("read_only_space", 0x008fd): (128, "ClosureFeedbackCellArrayMap"), ("read_only_space", 0x008fd): (128, "ClosureFeedbackCellArrayMap"),
("read_only_space", 0x00925): (163, "FeedbackMetadataArrayMap"), ("read_only_space", 0x00925): (164, "FeedbackMetadataArrayMap"),
("read_only_space", 0x0094d): (117, "ArrayListMap"), ("read_only_space", 0x0094d): (117, "ArrayListMap"),
("read_only_space", 0x00975): (65, "BigIntMap"), ("read_only_space", 0x00975): (65, "BigIntMap"),
("read_only_space", 0x0099d): (129, "ObjectBoilerplateDescriptionMap"), ("read_only_space", 0x0099d): (129, "ObjectBoilerplateDescriptionMap"),
("read_only_space", 0x009c5): (133, "BytecodeArrayMap"), ("read_only_space", 0x009c5): (133, "BytecodeArrayMap"),
("read_only_space", 0x009ed): (159, "CodeDataContainerMap"), ("read_only_space", 0x009ed): (160, "CodeDataContainerMap"),
("read_only_space", 0x00a15): (160, "CoverageInfoMap"), ("read_only_space", 0x00a15): (161, "CoverageInfoMap"),
("read_only_space", 0x00a3d): (134, "FixedDoubleArrayMap"), ("read_only_space", 0x00a3d): (134, "FixedDoubleArrayMap"),
("read_only_space", 0x00a65): (120, "GlobalDictionaryMap"), ("read_only_space", 0x00a65): (120, "GlobalDictionaryMap"),
("read_only_space", 0x00a8d): (96, "ManyClosuresCellMap"), ("read_only_space", 0x00a8d): (96, "ManyClosuresCellMap"),
...@@ -257,103 +258,103 @@ KNOWN_MAPS = { ...@@ -257,103 +258,103 @@ KNOWN_MAPS = {
("read_only_space", 0x00b7d): (123, "OrderedHashMapMap"), ("read_only_space", 0x00b7d): (123, "OrderedHashMapMap"),
("read_only_space", 0x00ba5): (124, "OrderedHashSetMap"), ("read_only_space", 0x00ba5): (124, "OrderedHashSetMap"),
("read_only_space", 0x00bcd): (125, "OrderedNameDictionaryMap"), ("read_only_space", 0x00bcd): (125, "OrderedNameDictionaryMap"),
("read_only_space", 0x00bf5): (171, "PreparseDataMap"), ("read_only_space", 0x00bf5): (172, "PreparseDataMap"),
("read_only_space", 0x00c1d): (172, "PropertyArrayMap"), ("read_only_space", 0x00c1d): (173, "PropertyArrayMap"),
("read_only_space", 0x00c45): (92, "SideEffectCallHandlerInfoMap"), ("read_only_space", 0x00c45): (92, "SideEffectCallHandlerInfoMap"),
("read_only_space", 0x00c6d): (92, "SideEffectFreeCallHandlerInfoMap"), ("read_only_space", 0x00c6d): (92, "SideEffectFreeCallHandlerInfoMap"),
("read_only_space", 0x00c95): (92, "NextCallSideEffectFreeCallHandlerInfoMap"), ("read_only_space", 0x00c95): (92, "NextCallSideEffectFreeCallHandlerInfoMap"),
("read_only_space", 0x00cbd): (126, "SimpleNumberDictionaryMap"), ("read_only_space", 0x00cbd): (126, "SimpleNumberDictionaryMap"),
("read_only_space", 0x00ce5): (117, "SloppyArgumentsElementsMap"), ("read_only_space", 0x00ce5): (147, "SmallOrderedHashMapMap"),
("read_only_space", 0x00d0d): (146, "SmallOrderedHashMapMap"), ("read_only_space", 0x00d0d): (148, "SmallOrderedHashSetMap"),
("read_only_space", 0x00d35): (147, "SmallOrderedHashSetMap"), ("read_only_space", 0x00d35): (149, "SmallOrderedNameDictionaryMap"),
("read_only_space", 0x00d5d): (148, "SmallOrderedNameDictionaryMap"), ("read_only_space", 0x00d5d): (152, "SourceTextModuleMap"),
("read_only_space", 0x00d85): (151, "SourceTextModuleMap"), ("read_only_space", 0x00d85): (127, "StringTableMap"),
("read_only_space", 0x00dad): (127, "StringTableMap"), ("read_only_space", 0x00dad): (153, "SyntheticModuleMap"),
("read_only_space", 0x00dd5): (152, "SyntheticModuleMap"), ("read_only_space", 0x00dd5): (155, "UncompiledDataWithoutPreparseDataMap"),
("read_only_space", 0x00dfd): (154, "UncompiledDataWithoutPreparseDataMap"), ("read_only_space", 0x00dfd): (154, "UncompiledDataWithPreparseDataMap"),
("read_only_space", 0x00e25): (153, "UncompiledDataWithPreparseDataMap"), ("read_only_space", 0x00e25): (181, "WeakArrayListMap"),
("read_only_space", 0x00e4d): (180, "WeakArrayListMap"), ("read_only_space", 0x00e4d): (119, "EphemeronHashTableMap"),
("read_only_space", 0x00e75): (119, "EphemeronHashTableMap"), ("read_only_space", 0x00e75): (163, "EmbedderDataArrayMap"),
("read_only_space", 0x00e9d): (162, "EmbedderDataArrayMap"), ("read_only_space", 0x00e9d): (182, "WeakCellMap"),
("read_only_space", 0x00ec5): (181, "WeakCellMap"), ("read_only_space", 0x00ec5): (32, "StringMap"),
("read_only_space", 0x00eed): (32, "StringMap"), ("read_only_space", 0x00eed): (41, "ConsOneByteStringMap"),
("read_only_space", 0x00f15): (41, "ConsOneByteStringMap"), ("read_only_space", 0x00f15): (33, "ConsStringMap"),
("read_only_space", 0x00f3d): (33, "ConsStringMap"), ("read_only_space", 0x00f3d): (37, "ThinStringMap"),
("read_only_space", 0x00f65): (37, "ThinStringMap"), ("read_only_space", 0x00f65): (35, "SlicedStringMap"),
("read_only_space", 0x00f8d): (35, "SlicedStringMap"), ("read_only_space", 0x00f8d): (43, "SlicedOneByteStringMap"),
("read_only_space", 0x00fb5): (43, "SlicedOneByteStringMap"), ("read_only_space", 0x00fb5): (34, "ExternalStringMap"),
("read_only_space", 0x00fdd): (34, "ExternalStringMap"), ("read_only_space", 0x00fdd): (42, "ExternalOneByteStringMap"),
("read_only_space", 0x01005): (42, "ExternalOneByteStringMap"), ("read_only_space", 0x01005): (50, "UncachedExternalStringMap"),
("read_only_space", 0x0102d): (50, "UncachedExternalStringMap"), ("read_only_space", 0x0102d): (0, "InternalizedStringMap"),
("read_only_space", 0x01055): (0, "InternalizedStringMap"), ("read_only_space", 0x01055): (2, "ExternalInternalizedStringMap"),
("read_only_space", 0x0107d): (2, "ExternalInternalizedStringMap"), ("read_only_space", 0x0107d): (10, "ExternalOneByteInternalizedStringMap"),
("read_only_space", 0x010a5): (10, "ExternalOneByteInternalizedStringMap"), ("read_only_space", 0x010a5): (18, "UncachedExternalInternalizedStringMap"),
("read_only_space", 0x010cd): (18, "UncachedExternalInternalizedStringMap"), ("read_only_space", 0x010cd): (26, "UncachedExternalOneByteInternalizedStringMap"),
("read_only_space", 0x010f5): (26, "UncachedExternalOneByteInternalizedStringMap"), ("read_only_space", 0x010f5): (58, "UncachedExternalOneByteStringMap"),
("read_only_space", 0x0111d): (58, "UncachedExternalOneByteStringMap"), ("read_only_space", 0x0111d): (67, "SelfReferenceMarkerMap"),
("read_only_space", 0x01145): (67, "SelfReferenceMarkerMap"), ("read_only_space", 0x01145): (67, "BasicBlockCountersMarkerMap"),
("read_only_space", 0x0116d): (67, "BasicBlockCountersMarkerMap"), ("read_only_space", 0x01179): (95, "EnumCacheMap"),
("read_only_space", 0x011a1): (95, "EnumCacheMap"), ("read_only_space", 0x011c9): (86, "ArrayBoilerplateDescriptionMap"),
("read_only_space", 0x011f1): (86, "ArrayBoilerplateDescriptionMap"), ("read_only_space", 0x012b5): (98, "InterceptorInfoMap"),
("read_only_space", 0x012ed): (98, "InterceptorInfoMap"), ("read_only_space", 0x03369): (71, "PromiseFulfillReactionJobTaskMap"),
("read_only_space", 0x033a1): (71, "PromiseFulfillReactionJobTaskMap"), ("read_only_space", 0x03391): (72, "PromiseRejectReactionJobTaskMap"),
("read_only_space", 0x033c9): (72, "PromiseRejectReactionJobTaskMap"), ("read_only_space", 0x033b9): (73, "CallableTaskMap"),
("read_only_space", 0x033f1): (73, "CallableTaskMap"), ("read_only_space", 0x033e1): (74, "CallbackTaskMap"),
("read_only_space", 0x03419): (74, "CallbackTaskMap"), ("read_only_space", 0x03409): (75, "PromiseResolveThenableJobTaskMap"),
("read_only_space", 0x03441): (75, "PromiseResolveThenableJobTaskMap"), ("read_only_space", 0x03431): (78, "FunctionTemplateInfoMap"),
("read_only_space", 0x03469): (78, "FunctionTemplateInfoMap"), ("read_only_space", 0x03459): (79, "ObjectTemplateInfoMap"),
("read_only_space", 0x03491): (79, "ObjectTemplateInfoMap"), ("read_only_space", 0x03481): (80, "AccessCheckInfoMap"),
("read_only_space", 0x034b9): (80, "AccessCheckInfoMap"), ("read_only_space", 0x034a9): (81, "AccessorInfoMap"),
("read_only_space", 0x034e1): (81, "AccessorInfoMap"), ("read_only_space", 0x034d1): (82, "AccessorPairMap"),
("read_only_space", 0x03509): (82, "AccessorPairMap"), ("read_only_space", 0x034f9): (83, "AliasedArgumentsEntryMap"),
("read_only_space", 0x03531): (83, "AliasedArgumentsEntryMap"), ("read_only_space", 0x03521): (84, "AllocationMementoMap"),
("read_only_space", 0x03559): (84, "AllocationMementoMap"), ("read_only_space", 0x03549): (87, "AsmWasmDataMap"),
("read_only_space", 0x03581): (87, "AsmWasmDataMap"), ("read_only_space", 0x03571): (88, "AsyncGeneratorRequestMap"),
("read_only_space", 0x035a9): (88, "AsyncGeneratorRequestMap"), ("read_only_space", 0x03599): (89, "BreakPointMap"),
("read_only_space", 0x035d1): (89, "BreakPointMap"), ("read_only_space", 0x035c1): (90, "BreakPointInfoMap"),
("read_only_space", 0x035f9): (90, "BreakPointInfoMap"), ("read_only_space", 0x035e9): (91, "CachedTemplateObjectMap"),
("read_only_space", 0x03621): (91, "CachedTemplateObjectMap"), ("read_only_space", 0x03611): (93, "ClassPositionsMap"),
("read_only_space", 0x03649): (93, "ClassPositionsMap"), ("read_only_space", 0x03639): (94, "DebugInfoMap"),
("read_only_space", 0x03671): (94, "DebugInfoMap"), ("read_only_space", 0x03661): (97, "FunctionTemplateRareDataMap"),
("read_only_space", 0x03699): (97, "FunctionTemplateRareDataMap"), ("read_only_space", 0x03689): (99, "InterpreterDataMap"),
("read_only_space", 0x036c1): (99, "InterpreterDataMap"), ("read_only_space", 0x036b1): (100, "PromiseCapabilityMap"),
("read_only_space", 0x036e9): (100, "PromiseCapabilityMap"), ("read_only_space", 0x036d9): (101, "PromiseReactionMap"),
("read_only_space", 0x03711): (101, "PromiseReactionMap"), ("read_only_space", 0x03701): (102, "PropertyDescriptorObjectMap"),
("read_only_space", 0x03739): (102, "PropertyDescriptorObjectMap"), ("read_only_space", 0x03729): (103, "PrototypeInfoMap"),
("read_only_space", 0x03761): (103, "PrototypeInfoMap"), ("read_only_space", 0x03751): (104, "ScriptMap"),
("read_only_space", 0x03789): (104, "ScriptMap"), ("read_only_space", 0x03779): (105, "SourceTextModuleInfoEntryMap"),
("read_only_space", 0x037b1): (105, "SourceTextModuleInfoEntryMap"), ("read_only_space", 0x037a1): (106, "StackFrameInfoMap"),
("read_only_space", 0x037d9): (106, "StackFrameInfoMap"), ("read_only_space", 0x037c9): (107, "StackTraceFrameMap"),
("read_only_space", 0x03801): (107, "StackTraceFrameMap"), ("read_only_space", 0x037f1): (108, "TemplateObjectDescriptionMap"),
("read_only_space", 0x03829): (108, "TemplateObjectDescriptionMap"), ("read_only_space", 0x03819): (109, "Tuple2Map"),
("read_only_space", 0x03851): (109, "Tuple2Map"), ("read_only_space", 0x03841): (110, "WasmCapiFunctionDataMap"),
("read_only_space", 0x03879): (110, "WasmCapiFunctionDataMap"), ("read_only_space", 0x03869): (111, "WasmDebugInfoMap"),
("read_only_space", 0x038a1): (111, "WasmDebugInfoMap"), ("read_only_space", 0x03891): (112, "WasmExceptionTagMap"),
("read_only_space", 0x038c9): (112, "WasmExceptionTagMap"), ("read_only_space", 0x038b9): (113, "WasmExportedFunctionDataMap"),
("read_only_space", 0x038f1): (113, "WasmExportedFunctionDataMap"), ("read_only_space", 0x038e1): (114, "WasmIndirectFunctionTableMap"),
("read_only_space", 0x03919): (114, "WasmIndirectFunctionTableMap"), ("read_only_space", 0x03909): (115, "WasmJSFunctionDataMap"),
("read_only_space", 0x03941): (115, "WasmJSFunctionDataMap"), ("read_only_space", 0x03931): (116, "WasmValueMap"),
("read_only_space", 0x03969): (116, "WasmValueMap"), ("read_only_space", 0x03959): (136, "SloppyArgumentsElementsMap"),
("read_only_space", 0x03991): (170, "OnHeapBasicBlockProfilerDataMap"), ("read_only_space", 0x03981): (171, "OnHeapBasicBlockProfilerDataMap"),
("read_only_space", 0x039b9): (167, "InternalClassMap"), ("read_only_space", 0x039a9): (168, "InternalClassMap"),
("read_only_space", 0x039e1): (176, "SmiPairMap"), ("read_only_space", 0x039d1): (177, "SmiPairMap"),
("read_only_space", 0x03a09): (175, "SmiBoxMap"), ("read_only_space", 0x039f9): (176, "SmiBoxMap"),
("read_only_space", 0x03a31): (149, "ExportedSubClassBaseMap"), ("read_only_space", 0x03a21): (150, "ExportedSubClassBaseMap"),
("read_only_space", 0x03a59): (150, "ExportedSubClassMap"), ("read_only_space", 0x03a49): (151, "ExportedSubClassMap"),
("read_only_space", 0x03a81): (68, "AbstractInternalClassSubclass1Map"), ("read_only_space", 0x03a71): (68, "AbstractInternalClassSubclass1Map"),
("read_only_space", 0x03aa9): (69, "AbstractInternalClassSubclass2Map"), ("read_only_space", 0x03a99): (69, "AbstractInternalClassSubclass2Map"),
("read_only_space", 0x03ad1): (135, "InternalClassWithSmiElementsMap"), ("read_only_space", 0x03ac1): (135, "InternalClassWithSmiElementsMap"),
("read_only_space", 0x03af9): (168, "InternalClassWithStructElementsMap"), ("read_only_space", 0x03ae9): (169, "InternalClassWithStructElementsMap"),
("read_only_space", 0x03b21): (177, "SortStateMap"), ("read_only_space", 0x03b11): (178, "SortStateMap"),
("read_only_space", 0x03b49): (85, "AllocationSiteWithWeakNextMap"), ("read_only_space", 0x03b39): (85, "AllocationSiteWithWeakNextMap"),
("read_only_space", 0x03b71): (85, "AllocationSiteWithoutWeakNextMap"), ("read_only_space", 0x03b61): (85, "AllocationSiteWithoutWeakNextMap"),
("read_only_space", 0x03b99): (76, "LoadHandler1Map"), ("read_only_space", 0x03b89): (76, "LoadHandler1Map"),
("read_only_space", 0x03bc1): (76, "LoadHandler2Map"), ("read_only_space", 0x03bb1): (76, "LoadHandler2Map"),
("read_only_space", 0x03be9): (76, "LoadHandler3Map"), ("read_only_space", 0x03bd9): (76, "LoadHandler3Map"),
("read_only_space", 0x03c11): (77, "StoreHandler0Map"), ("read_only_space", 0x03c01): (77, "StoreHandler0Map"),
("read_only_space", 0x03c39): (77, "StoreHandler1Map"), ("read_only_space", 0x03c29): (77, "StoreHandler1Map"),
("read_only_space", 0x03c61): (77, "StoreHandler2Map"), ("read_only_space", 0x03c51): (77, "StoreHandler2Map"),
("read_only_space", 0x03c89): (77, "StoreHandler3Map"), ("read_only_space", 0x03c79): (77, "StoreHandler3Map"),
("map_space", 0x00121): (1057, "ExternalMap"), ("map_space", 0x00121): (1057, "ExternalMap"),
("map_space", 0x00149): (1073, "JSMessageObjectMap"), ("map_space", 0x00149): (1073, "JSMessageObjectMap"),
} }
...@@ -378,33 +379,32 @@ KNOWN_OBJECTS = { ...@@ -378,33 +379,32 @@ KNOWN_OBJECTS = {
("read_only_space", 0x007ad): "TerminationException", ("read_only_space", 0x007ad): "TerminationException",
("read_only_space", 0x00815): "OptimizedOut", ("read_only_space", 0x00815): "OptimizedOut",
("read_only_space", 0x00875): "StaleRegister", ("read_only_space", 0x00875): "StaleRegister",
("read_only_space", 0x01195): "EmptyEnumCache", ("read_only_space", 0x0116d): "EmptyEnumCache",
("read_only_space", 0x011c9): "EmptyPropertyArray", ("read_only_space", 0x011a1): "EmptyPropertyArray",
("read_only_space", 0x011d1): "EmptyByteArray", ("read_only_space", 0x011a9): "EmptyByteArray",
("read_only_space", 0x011d9): "EmptyObjectBoilerplateDescription", ("read_only_space", 0x011b1): "EmptyObjectBoilerplateDescription",
("read_only_space", 0x011e5): "EmptyArrayBoilerplateDescription", ("read_only_space", 0x011bd): "EmptyArrayBoilerplateDescription",
("read_only_space", 0x01219): "EmptyClosureFeedbackCellArray", ("read_only_space", 0x011f1): "EmptyClosureFeedbackCellArray",
("read_only_space", 0x01221): "EmptySloppyArgumentsElements", ("read_only_space", 0x011f9): "EmptySlowElementDictionary",
("read_only_space", 0x01231): "EmptySlowElementDictionary", ("read_only_space", 0x0121d): "EmptyOrderedHashMap",
("read_only_space", 0x01255): "EmptyOrderedHashMap", ("read_only_space", 0x01231): "EmptyOrderedHashSet",
("read_only_space", 0x01269): "EmptyOrderedHashSet", ("read_only_space", 0x01245): "EmptyFeedbackMetadata",
("read_only_space", 0x0127d): "EmptyFeedbackMetadata", ("read_only_space", 0x01251): "EmptyPropertyCell",
("read_only_space", 0x01289): "EmptyPropertyCell", ("read_only_space", 0x01265): "EmptyPropertyDictionary",
("read_only_space", 0x0129d): "EmptyPropertyDictionary", ("read_only_space", 0x0128d): "NoOpInterceptorInfo",
("read_only_space", 0x012c5): "NoOpInterceptorInfo", ("read_only_space", 0x012dd): "EmptyWeakArrayList",
("read_only_space", 0x01315): "EmptyWeakArrayList", ("read_only_space", 0x012e9): "InfinityValue",
("read_only_space", 0x01321): "InfinityValue", ("read_only_space", 0x012f5): "MinusZeroValue",
("read_only_space", 0x0132d): "MinusZeroValue", ("read_only_space", 0x01301): "MinusInfinityValue",
("read_only_space", 0x01339): "MinusInfinityValue", ("read_only_space", 0x0130d): "SelfReferenceMarker",
("read_only_space", 0x01345): "SelfReferenceMarker", ("read_only_space", 0x0134d): "BasicBlockCountersMarker",
("read_only_space", 0x01385): "BasicBlockCountersMarker", ("read_only_space", 0x01391): "OffHeapTrampolineRelocationInfo",
("read_only_space", 0x013c9): "OffHeapTrampolineRelocationInfo", ("read_only_space", 0x0139d): "TrampolineTrivialCodeDataContainer",
("read_only_space", 0x013d5): "TrampolineTrivialCodeDataContainer", ("read_only_space", 0x013a9): "TrampolinePromiseRejectionCodeDataContainer",
("read_only_space", 0x013e1): "TrampolinePromiseRejectionCodeDataContainer", ("read_only_space", 0x013b5): "GlobalThisBindingScopeInfo",
("read_only_space", 0x013ed): "GlobalThisBindingScopeInfo", ("read_only_space", 0x013ed): "EmptyFunctionScopeInfo",
("read_only_space", 0x01425): "EmptyFunctionScopeInfo", ("read_only_space", 0x01415): "NativeScopeInfo",
("read_only_space", 0x0144d): "NativeScopeInfo", ("read_only_space", 0x01431): "HashSeed",
("read_only_space", 0x01469): "HashSeed",
("old_space", 0x00121): "ArgumentsIteratorAccessor", ("old_space", 0x00121): "ArgumentsIteratorAccessor",
("old_space", 0x00165): "ArrayLengthAccessor", ("old_space", 0x00165): "ArrayLengthAccessor",
("old_space", 0x001a9): "BoundFunctionLengthAccessor", ("old_space", 0x001a9): "BoundFunctionLengthAccessor",
...@@ -440,27 +440,27 @@ KNOWN_OBJECTS = { ...@@ -440,27 +440,27 @@ KNOWN_OBJECTS = {
("old_space", 0x009ed): "StringSplitCache", ("old_space", 0x009ed): "StringSplitCache",
("old_space", 0x00df5): "RegExpMultipleCache", ("old_space", 0x00df5): "RegExpMultipleCache",
("old_space", 0x011fd): "BuiltinsConstantsTable", ("old_space", 0x011fd): "BuiltinsConstantsTable",
("old_space", 0x015a1): "AsyncFunctionAwaitRejectSharedFun", ("old_space", 0x015a5): "AsyncFunctionAwaitRejectSharedFun",
("old_space", 0x015c9): "AsyncFunctionAwaitResolveSharedFun", ("old_space", 0x015cd): "AsyncFunctionAwaitResolveSharedFun",
("old_space", 0x015f1): "AsyncGeneratorAwaitRejectSharedFun", ("old_space", 0x015f5): "AsyncGeneratorAwaitRejectSharedFun",
("old_space", 0x01619): "AsyncGeneratorAwaitResolveSharedFun", ("old_space", 0x0161d): "AsyncGeneratorAwaitResolveSharedFun",
("old_space", 0x01641): "AsyncGeneratorYieldResolveSharedFun", ("old_space", 0x01645): "AsyncGeneratorYieldResolveSharedFun",
("old_space", 0x01669): "AsyncGeneratorReturnResolveSharedFun", ("old_space", 0x0166d): "AsyncGeneratorReturnResolveSharedFun",
("old_space", 0x01691): "AsyncGeneratorReturnClosedRejectSharedFun", ("old_space", 0x01695): "AsyncGeneratorReturnClosedRejectSharedFun",
("old_space", 0x016b9): "AsyncGeneratorReturnClosedResolveSharedFun", ("old_space", 0x016bd): "AsyncGeneratorReturnClosedResolveSharedFun",
("old_space", 0x016e1): "AsyncIteratorValueUnwrapSharedFun", ("old_space", 0x016e5): "AsyncIteratorValueUnwrapSharedFun",
("old_space", 0x01709): "PromiseAllResolveElementSharedFun", ("old_space", 0x0170d): "PromiseAllResolveElementSharedFun",
("old_space", 0x01731): "PromiseAllSettledResolveElementSharedFun", ("old_space", 0x01735): "PromiseAllSettledResolveElementSharedFun",
("old_space", 0x01759): "PromiseAllSettledRejectElementSharedFun", ("old_space", 0x0175d): "PromiseAllSettledRejectElementSharedFun",
("old_space", 0x01781): "PromiseAnyRejectElementSharedFun", ("old_space", 0x01785): "PromiseAnyRejectElementSharedFun",
("old_space", 0x017a9): "PromiseCapabilityDefaultRejectSharedFun", ("old_space", 0x017ad): "PromiseCapabilityDefaultRejectSharedFun",
("old_space", 0x017d1): "PromiseCapabilityDefaultResolveSharedFun", ("old_space", 0x017d5): "PromiseCapabilityDefaultResolveSharedFun",
("old_space", 0x017f9): "PromiseCatchFinallySharedFun", ("old_space", 0x017fd): "PromiseCatchFinallySharedFun",
("old_space", 0x01821): "PromiseGetCapabilitiesExecutorSharedFun", ("old_space", 0x01825): "PromiseGetCapabilitiesExecutorSharedFun",
("old_space", 0x01849): "PromiseThenFinallySharedFun", ("old_space", 0x0184d): "PromiseThenFinallySharedFun",
("old_space", 0x01871): "PromiseThrowerFinallySharedFun", ("old_space", 0x01875): "PromiseThrowerFinallySharedFun",
("old_space", 0x01899): "PromiseValueThunkFinallySharedFun", ("old_space", 0x0189d): "PromiseValueThunkFinallySharedFun",
("old_space", 0x018c1): "ProxyRevokeSharedFun", ("old_space", 0x018c5): "ProxyRevokeSharedFun",
} }
# Lower 32 bits of first page addresses for various heap spaces. # Lower 32 bits of first page addresses for various heap spaces.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment