Skip to content

V
V8
Commit 0eb4b90f authored by Mythri A's avatar Mythri A Committed by Commit Bot
Browse files
Options

[cleanup][CSA] TNodify ic-accessor-assembler.cc 

TNodifies most of ic-accessor-assember. Most of the remaining Node* are
because of the Parameters.

Bug: v8:6949, v8:9396
Change-Id: Ife9fd96c5e46dee02fdc60e5825562d7ae89f8f9
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1803634Reviewed-by: 's avatarIgor Sheludko <ishell@chromium.org>
Commit-Queue: Mythri Alle <mythria@chromium.org>
Cr-Commit-Position: refs/heads/master@{#63830}
parent 982412d9
Show whitespace changes
Inline Side-by-side
Showing with 139 additions and 131 deletions
src/codegen/code-stub-assembler.cc
View file @ 0eb4b90f
...@@ -3266,7 +3266,7 @@ Node* CodeStubAssembler::AllocateCellWithValue(Node* value, ...@@ -3266,7 +3266,7 @@ Node* CodeStubAssembler::AllocateCellWithValue(Node* value,
return result; return result;
} }
Node* CodeStubAssembler::LoadCellValue(Node* cell) { TNode<Object> CodeStubAssembler::LoadCellValue(Node* cell) {
CSA_SLOW_ASSERT(this, HasInstanceType(cell, CELL_TYPE)); CSA_SLOW_ASSERT(this, HasInstanceType(cell, CELL_TYPE));
return LoadObjectField(cell, Cell::kValueOffset); return LoadObjectField(cell, Cell::kValueOffset);
} }
......
src/codegen/code-stub-assembler.h
View file @ 0eb4b90f
...@@ -1691,7 +1691,7 @@ class V8_EXPORT_PRIVATE CodeStubAssembler ...@@ -1691,7 +1691,7 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
return AllocateCellWithValue(SmiConstant(value), SKIP_WRITE_BARRIER); return AllocateCellWithValue(SmiConstant(value), SKIP_WRITE_BARRIER);
} }
Node* LoadCellValue(Node* cell); TNode<Object> LoadCellValue(Node* cell);
void StoreCellValue(Node* cell, Node* value, void StoreCellValue(Node* cell, Node* value,
WriteBarrierMode mode = UPDATE_WRITE_BARRIER); WriteBarrierMode mode = UPDATE_WRITE_BARRIER);
......
src/ic/accessor-assembler.cc
View file @ 0eb4b90f
...@@ -64,14 +64,13 @@ TNode<MaybeObject> AccessorAssembler::LoadHandlerDataField( ...@@ -64,14 +64,13 @@ TNode<MaybeObject> AccessorAssembler::LoadHandlerDataField(
} }
TNode<MaybeObject> AccessorAssembler::TryMonomorphicCase( TNode<MaybeObject> AccessorAssembler::TryMonomorphicCase(
TNode<Smi> slot, Node* vector, TNode<Map> receiver_map, Label* if_handler, TNode<Smi> slot, TNode<FeedbackVector> vector, TNode<Map> receiver_map,
TVariable<MaybeObject>* var_handler, Label* if_miss) { Label* if_handler, TVariable<MaybeObject>* var_handler, Label* if_miss) {
Comment("TryMonomorphicCase"); Comment("TryMonomorphicCase");
DCHECK_EQ(MachineRepresentation::kTagged, var_handler->rep()); DCHECK_EQ(MachineRepresentation::kTagged, var_handler->rep());
// TODO(ishell): add helper class that hides offset computations for a series // TODO(ishell): add helper class that hides offset computations for a series
// of loads. // of loads.
CSA_ASSERT(this, IsFeedbackVector(vector), vector);
int32_t header_size = FeedbackVector::kFeedbackSlotsOffset - kHeapObjectTag; int32_t header_size = FeedbackVector::kFeedbackSlotsOffset - kHeapObjectTag;
// Adding |header_size| with a separate IntPtrAdd rather than passing it // Adding |header_size| with a separate IntPtrAdd rather than passing it
// into ElementOffsetFromIndex() allows it to be folded into a single // into ElementOffsetFromIndex() allows it to be folded into a single
...@@ -95,7 +94,7 @@ TNode<MaybeObject> AccessorAssembler::TryMonomorphicCase( ...@@ -95,7 +94,7 @@ TNode<MaybeObject> AccessorAssembler::TryMonomorphicCase(
} }
void AccessorAssembler::HandlePolymorphicCase( void AccessorAssembler::HandlePolymorphicCase(
Node* receiver_map, TNode<WeakFixedArray> feedback, Label* if_handler, TNode<Map> receiver_map, TNode<WeakFixedArray> feedback, Label* if_handler,
TVariable<MaybeObject>* var_handler, Label* if_miss) { TVariable<MaybeObject>* var_handler, Label* if_miss) {
Comment("HandlePolymorphicCase"); Comment("HandlePolymorphicCase");
DCHECK_EQ(MachineRepresentation::kTagged, var_handler->rep()); DCHECK_EQ(MachineRepresentation::kTagged, var_handler->rep());
...@@ -118,8 +117,7 @@ void AccessorAssembler::HandlePolymorphicCase( ...@@ -118,8 +117,7 @@ void AccessorAssembler::HandlePolymorphicCase(
TNode<MaybeObject> maybe_cached_map = TNode<MaybeObject> maybe_cached_map =
LoadWeakFixedArrayElement(feedback, var_index.value()); LoadWeakFixedArrayElement(feedback, var_index.value());
CSA_ASSERT(this, IsWeakOrCleared(maybe_cached_map)); CSA_ASSERT(this, IsWeakOrCleared(maybe_cached_map));
GotoIf(IsNotWeakReferenceTo(maybe_cached_map, CAST(receiver_map)), GotoIf(IsNotWeakReferenceTo(maybe_cached_map, receiver_map), &loop_next);
&loop_next);
// Found, now call handler. // Found, now call handler.
TNode<MaybeObject> handler = TNode<MaybeObject> handler =
...@@ -154,7 +152,7 @@ void AccessorAssembler::HandleLoadICHandlerCase( ...@@ -154,7 +152,7 @@ void AccessorAssembler::HandleLoadICHandlerCase(
BIND(&try_proto_handler); BIND(&try_proto_handler);
{ {
GotoIf(IsCodeMap(LoadMap(CAST(handler))), &call_handler); GotoIf(IsCodeMap(LoadMap(CAST(handler))), &call_handler);
HandleLoadICProtoHandler(p, handler, &var_holder, &var_smi_handler, HandleLoadICProtoHandler(p, CAST(handler), &var_holder, &var_smi_handler,
&if_smi_handler, miss, exit_point, ic_mode, &if_smi_handler, miss, exit_point, ic_mode,
access_mode); access_mode);
} }
...@@ -234,7 +232,8 @@ void AccessorAssembler::HandleLoadAccessor( ...@@ -234,7 +232,8 @@ void AccessorAssembler::HandleLoadAccessor(
api_holder.value(), p->receiver())); api_holder.value(), p->receiver()));
} }
void AccessorAssembler::HandleLoadField(Node* holder, Node* handler_word, void AccessorAssembler::HandleLoadField(SloppyTNode<JSObject> holder,
TNode<WordT> handler_word,
Variable* var_double_value, Variable* var_double_value,
Label* rebox_double, Label* miss, Label* rebox_double, Label* miss,
ExitPoint* exit_point) { ExitPoint* exit_point) {
...@@ -302,10 +301,10 @@ TNode<MaybeObject> AccessorAssembler::LoadDescriptorValueOrFieldType( ...@@ -302,10 +301,10 @@ TNode<MaybeObject> AccessorAssembler::LoadDescriptorValueOrFieldType(
} }
void AccessorAssembler::HandleLoadICSmiHandlerCase( void AccessorAssembler::HandleLoadICSmiHandlerCase(
const LazyLoadICParameters* p, Node* holder, SloppyTNode<Smi> smi_handler, const LazyLoadICParameters* p, SloppyTNode<HeapObject> holder,
SloppyTNode<Object> handler, Label* miss, ExitPoint* exit_point, SloppyTNode<Smi> smi_handler, SloppyTNode<Object> handler, Label* miss,
OnNonExistent on_nonexistent, ElementSupport support_elements, ExitPoint* exit_point, OnNonExistent on_nonexistent,
LoadAccessMode access_mode) { ElementSupport support_elements, LoadAccessMode access_mode) {
VARIABLE(var_double_value, MachineRepresentation::kFloat64); VARIABLE(var_double_value, MachineRepresentation::kFloat64);
Label rebox_double(this, &var_double_value); Label rebox_double(this, &var_double_value);
...@@ -397,10 +396,11 @@ void AccessorAssembler::HandleLoadICSmiHandlerCase( ...@@ -397,10 +396,11 @@ void AccessorAssembler::HandleLoadICSmiHandlerCase(
Label if_oob(this, Label::kDeferred); Label if_oob(this, Label::kDeferred);
Comment("indexed string"); Comment("indexed string");
TNode<String> string_holder = CAST(holder);
TNode<IntPtrT> intptr_index = TryToIntptr(p->name(), miss); TNode<IntPtrT> intptr_index = TryToIntptr(p->name(), miss);
TNode<IntPtrT> length = LoadStringLengthAsWord(holder); TNode<IntPtrT> length = LoadStringLengthAsWord(string_holder);
GotoIf(UintPtrGreaterThanOrEqual(intptr_index, length), &if_oob); GotoIf(UintPtrGreaterThanOrEqual(intptr_index, length), &if_oob);
TNode<Int32T> code = StringCharCodeAt(holder, intptr_index); TNode<Int32T> code = StringCharCodeAt(string_holder, intptr_index);
TNode<String> result = StringFromSingleCharCode(code); TNode<String> result = StringFromSingleCharCode(code);
Return(result); Return(result);
...@@ -428,10 +428,11 @@ void AccessorAssembler::HandleLoadICSmiHandlerCase( ...@@ -428,10 +428,11 @@ void AccessorAssembler::HandleLoadICSmiHandlerCase(
} }
void AccessorAssembler::HandleLoadICSmiHandlerLoadNamedCase( void AccessorAssembler::HandleLoadICSmiHandlerLoadNamedCase(
const LazyLoadICParameters* p, Node* holder, TNode<IntPtrT> handler_kind, const LazyLoadICParameters* p, TNode<HeapObject> holder,
TNode<WordT> handler_word, Label* rebox_double, Variable* var_double_value, TNode<IntPtrT> handler_kind, TNode<WordT> handler_word, Label* rebox_double,
SloppyTNode<Object> handler, Label* miss, ExitPoint* exit_point, Variable* var_double_value, SloppyTNode<Object> handler, Label* miss,
OnNonExistent on_nonexistent, ElementSupport support_elements) { ExitPoint* exit_point, OnNonExistent on_nonexistent,
ElementSupport support_elements) {
Label constant(this), field(this), normal(this, Label::kDeferred), Label constant(this), field(this), normal(this, Label::kDeferred),
interceptor(this, Label::kDeferred), nonexistent(this), interceptor(this, Label::kDeferred), nonexistent(this),
accessor(this, Label::kDeferred), global(this, Label::kDeferred), accessor(this, Label::kDeferred), global(this, Label::kDeferred),
...@@ -474,8 +475,8 @@ void AccessorAssembler::HandleLoadICSmiHandlerLoadNamedCase( ...@@ -474,8 +475,8 @@ void AccessorAssembler::HandleLoadICSmiHandlerLoadNamedCase(
&module_export, &interceptor); &module_export, &interceptor);
BIND(&field); BIND(&field);
HandleLoadField(holder, handler_word, var_double_value, rebox_double, miss, HandleLoadField(CAST(holder), handler_word, var_double_value, rebox_double,
exit_point); miss, exit_point);
BIND(&nonexistent); BIND(&nonexistent);
// This is a handler for a load of a non-existent value. // This is a handler for a load of a non-existent value.
...@@ -496,7 +497,7 @@ void AccessorAssembler::HandleLoadICSmiHandlerLoadNamedCase( ...@@ -496,7 +497,7 @@ void AccessorAssembler::HandleLoadICSmiHandlerLoadNamedCase(
BIND(&normal); BIND(&normal);
{ {
Comment("load_normal"); Comment("load_normal");
TNode<NameDictionary> properties = CAST(LoadSlowProperties(holder)); TNode<NameDictionary> properties = CAST(LoadSlowProperties(CAST(holder)));
TVARIABLE(IntPtrT, var_name_index); TVARIABLE(IntPtrT, var_name_index);
Label found(this, &var_name_index); Label found(this, &var_name_index);
NameDictionaryLookup<NameDictionary>(properties, CAST(p->name()), &found, NameDictionaryLookup<NameDictionary>(properties, CAST(p->name()), &found,
...@@ -601,14 +602,13 @@ void AccessorAssembler::HandleLoadICSmiHandlerLoadNamedCase( ...@@ -601,14 +602,13 @@ void AccessorAssembler::HandleLoadICSmiHandlerLoadNamedCase(
Comment("module export"); Comment("module export");
TNode<UintPtrT> index = TNode<UintPtrT> index =
DecodeWord<LoadHandler::ExportsIndexBits>(handler_word); DecodeWord<LoadHandler::ExportsIndexBits>(handler_word);
Node* module = TNode<Module> module =
LoadObjectField(p->receiver(), JSModuleNamespace::kModuleOffset, CAST(LoadObjectField(p->receiver(), JSModuleNamespace::kModuleOffset));
MachineType::TaggedPointer()); TNode<ObjectHashTable> exports =
TNode<ObjectHashTable> exports = CAST(LoadObjectField( LoadObjectField<ObjectHashTable>(module, Module::kExportsOffset);
module, Module::kExportsOffset, MachineType::TaggedPointer()));
TNode<Cell> cell = CAST(LoadFixedArrayElement(exports, index)); TNode<Cell> cell = CAST(LoadFixedArrayElement(exports, index));
// The handler is only installed for exports that exist. // The handler is only installed for exports that exist.
Node* value = LoadCellValue(cell); TNode<Object> value = LoadCellValue(cell);
Label is_the_hole(this, Label::kDeferred); Label is_the_hole(this, Label::kDeferred);
GotoIf(IsTheHole(value), &is_the_hole); GotoIf(IsTheHole(value), &is_the_hole);
exit_point->Return(value); exit_point->Return(value);
...@@ -626,8 +626,8 @@ void AccessorAssembler::HandleLoadICSmiHandlerLoadNamedCase( ...@@ -626,8 +626,8 @@ void AccessorAssembler::HandleLoadICSmiHandlerLoadNamedCase(
} }
void AccessorAssembler::HandleLoadICSmiHandlerHasNamedCase( void AccessorAssembler::HandleLoadICSmiHandlerHasNamedCase(
const LazyLoadICParameters* p, Node* holder, TNode<IntPtrT> handler_kind, const LazyLoadICParameters* p, TNode<HeapObject> holder,
Label* miss, ExitPoint* exit_point) { TNode<IntPtrT> handler_kind, Label* miss, ExitPoint* exit_point) {
Label return_true(this), return_false(this), return_lookup(this), Label return_true(this), return_false(this), return_lookup(this),
normal(this), global(this); normal(this), global(this);
...@@ -685,7 +685,7 @@ void AccessorAssembler::HandleLoadICSmiHandlerHasNamedCase( ...@@ -685,7 +685,7 @@ void AccessorAssembler::HandleLoadICSmiHandlerHasNamedCase(
BIND(&normal); BIND(&normal);
{ {
Comment("has_normal"); Comment("has_normal");
TNode<NameDictionary> properties = CAST(LoadSlowProperties(holder)); TNode<NameDictionary> properties = CAST(LoadSlowProperties(CAST(holder)));
TVARIABLE(IntPtrT, var_name_index); TVARIABLE(IntPtrT, var_name_index);
Label found(this); Label found(this);
NameDictionaryLookup<NameDictionary>(properties, CAST(p->name()), &found, NameDictionaryLookup<NameDictionary>(properties, CAST(p->name()), &found,
...@@ -724,8 +724,9 @@ void AccessorAssembler::HandleLoadICSmiHandlerHasNamedCase( ...@@ -724,8 +724,9 @@ void AccessorAssembler::HandleLoadICSmiHandlerHasNamedCase(
// TODO(ishell): Remove templatezation once we move common bits from // TODO(ishell): Remove templatezation once we move common bits from
// Load/StoreHandler to the base class. // Load/StoreHandler to the base class.
template <typename ICHandler, typename ICParameters> template <typename ICHandler, typename ICParameters>
Node* AccessorAssembler::HandleProtoHandler( TNode<Object> AccessorAssembler::HandleProtoHandler(
const ICParameters* p, Node* handler, const OnCodeHandler& on_code_handler, const ICParameters* p, TNode<DataHandler> handler,
const OnCodeHandler& on_code_handler,
const OnFoundOnReceiver& on_found_on_receiver, Label* miss, const OnFoundOnReceiver& on_found_on_receiver, Label* miss,
ICMode ic_mode) { ICMode ic_mode) {
// //
...@@ -747,8 +748,7 @@ Node* AccessorAssembler::HandleProtoHandler( ...@@ -747,8 +748,7 @@ Node* AccessorAssembler::HandleProtoHandler(
Label if_smi_handler(this); Label if_smi_handler(this);
GotoIf(TaggedIsSmi(smi_or_code_handler), &if_smi_handler); GotoIf(TaggedIsSmi(smi_or_code_handler), &if_smi_handler);
CSA_ASSERT(this, IsCodeMap(LoadMap(CAST(smi_or_code_handler)))); on_code_handler(CAST(smi_or_code_handler));
on_code_handler(smi_or_code_handler);
BIND(&if_smi_handler); BIND(&if_smi_handler);
} }
...@@ -780,8 +780,8 @@ Node* AccessorAssembler::HandleProtoHandler( ...@@ -780,8 +780,8 @@ Node* AccessorAssembler::HandleProtoHandler(
CSA_ASSERT(this, IsWeakOrCleared(data2)); CSA_ASSERT(this, IsWeakOrCleared(data2));
TNode<Context> expected_native_context = TNode<Context> expected_native_context =
CAST(GetHeapObjectAssumeWeak(data2, miss)); CAST(GetHeapObjectAssumeWeak(data2, miss));
EmitAccessCheck(expected_native_context, p->context(), p->receiver(), EmitAccessCheck(expected_native_context, p->context(),
&done, miss); CAST(p->receiver()), &done, miss);
} }
// Dictionary lookup on receiver is not necessary for Load/StoreGlobalIC // Dictionary lookup on receiver is not necessary for Load/StoreGlobalIC
...@@ -816,18 +816,19 @@ Node* AccessorAssembler::HandleProtoHandler( ...@@ -816,18 +816,19 @@ Node* AccessorAssembler::HandleProtoHandler(
} }
void AccessorAssembler::HandleLoadICProtoHandler( void AccessorAssembler::HandleLoadICProtoHandler(
const LazyLoadICParameters* p, Node* handler, Variable* var_holder, const LazyLoadICParameters* p, TNode<DataHandler> handler,
Variable* var_smi_handler, Label* if_smi_handler, Label* miss, Variable* var_holder, Variable* var_smi_handler, Label* if_smi_handler,
ExitPoint* exit_point, ICMode ic_mode, LoadAccessMode access_mode) { Label* miss, ExitPoint* exit_point, ICMode ic_mode,
LoadAccessMode access_mode) {
DCHECK_EQ(MachineRepresentation::kTagged, var_holder->rep()); DCHECK_EQ(MachineRepresentation::kTagged, var_holder->rep());
DCHECK_EQ(MachineRepresentation::kTagged, var_smi_handler->rep()); DCHECK_EQ(MachineRepresentation::kTagged, var_smi_handler->rep());
Node* smi_handler = HandleProtoHandler<LoadHandler>( TNode<Smi> smi_handler = CAST(HandleProtoHandler<LoadHandler>(
p, handler, p, handler,
// Code sub-handlers are not expected in LoadICs, so no |on_code_handler|. // Code sub-handlers are not expected in LoadICs, so no |on_code_handler|.
nullptr, nullptr,
// on_found_on_receiver // on_found_on_receiver
[=](Node* properties, Node* name_index) { [=](TNode<NameDictionary> properties, TNode<IntPtrT> name_index) {
if (access_mode == LoadAccessMode::kHas) { if (access_mode == LoadAccessMode::kHas) {
exit_point->Return(TrueConstant()); exit_point->Return(TrueConstant());
} else { } else {
...@@ -841,7 +842,7 @@ void AccessorAssembler::HandleLoadICProtoHandler( ...@@ -841,7 +842,7 @@ void AccessorAssembler::HandleLoadICProtoHandler(
exit_point->Return(value); exit_point->Return(value);
} }
}, },
miss, ic_mode); miss, ic_mode));
TNode<MaybeObject> maybe_holder_or_constant = TNode<MaybeObject> maybe_holder_or_constant =
LoadHandlerDataField(handler, 1); LoadHandlerDataField(handler, 1);
...@@ -887,14 +888,15 @@ void AccessorAssembler::HandleLoadICProtoHandler( ...@@ -887,14 +888,15 @@ void AccessorAssembler::HandleLoadICProtoHandler(
} }
void AccessorAssembler::EmitAccessCheck(TNode<Context> expected_native_context, void AccessorAssembler::EmitAccessCheck(TNode<Context> expected_native_context,
TNode<Context> context, Node* receiver, TNode<Context> context,
TNode<Object> receiver,
Label* can_access, Label* miss) { Label* can_access, Label* miss) {
CSA_ASSERT(this, IsNativeContext(expected_native_context)); CSA_ASSERT(this, IsNativeContext(expected_native_context));
TNode<Context> native_context = LoadNativeContext(context); TNode<Context> native_context = LoadNativeContext(context);
GotoIf(TaggedEqual(expected_native_context, native_context), can_access); GotoIf(TaggedEqual(expected_native_context, native_context), can_access);
// If the receiver is not a JSGlobalProxy then we miss. // If the receiver is not a JSGlobalProxy then we miss.
GotoIfNot(IsJSGlobalProxy(receiver), miss); GotoIfNot(IsJSGlobalProxy(CAST(receiver)), miss);
// For JSGlobalProxy receiver try to compare security tokens of current // For JSGlobalProxy receiver try to compare security tokens of current
// and expected native contexts. // and expected native contexts.
TNode<Object> expected_token = LoadContextElement( TNode<Object> expected_token = LoadContextElement(
...@@ -904,8 +906,8 @@ void AccessorAssembler::EmitAccessCheck(TNode<Context> expected_native_context, ...@@ -904,8 +906,8 @@ void AccessorAssembler::EmitAccessCheck(TNode<Context> expected_native_context,
Branch(TaggedEqual(expected_token, current_token), can_access, miss); Branch(TaggedEqual(expected_token, current_token), can_access, miss);
} }
void AccessorAssembler::JumpIfDataProperty(Node* details, Label* writable, void AccessorAssembler::JumpIfDataProperty(TNode<Uint32T> details,
Label* readonly) { Label* writable, Label* readonly) {
if (readonly) { if (readonly) {
// Accessor properties never have the READ_ONLY attribute set. // Accessor properties never have the READ_ONLY attribute set.
GotoIf(IsSetWord32(details, PropertyDetails::kAttributesReadOnlyMask), GotoIf(IsSetWord32(details, PropertyDetails::kAttributesReadOnlyMask),
...@@ -920,7 +922,8 @@ void AccessorAssembler::JumpIfDataProperty(Node* details, Label* writable, ...@@ -920,7 +922,8 @@ void AccessorAssembler::JumpIfDataProperty(Node* details, Label* writable,
} }
void AccessorAssembler::HandleStoreICNativeDataProperty( void AccessorAssembler::HandleStoreICNativeDataProperty(
const StoreICParameters* p, Node* holder, TNode<Word32T> handler_word) { const StoreICParameters* p, SloppyTNode<HeapObject> holder,
TNode<Word32T> handler_word) {
Comment("native_data_property_store"); Comment("native_data_property_store");
TNode<IntPtrT> descriptor = TNode<IntPtrT> descriptor =
Signed(DecodeWordFromWord32<StoreHandler::DescriptorBits>(handler_word)); Signed(DecodeWordFromWord32<StoreHandler::DescriptorBits>(handler_word));
...@@ -1145,7 +1148,7 @@ void AccessorAssembler::HandleStoreICTransitionMapHandlerCase( ...@@ -1145,7 +1148,7 @@ void AccessorAssembler::HandleStoreICTransitionMapHandlerCase(
} }
void AccessorAssembler::CheckFieldType(TNode<DescriptorArray> descriptors, void AccessorAssembler::CheckFieldType(TNode<DescriptorArray> descriptors,
Node* name_index, TNode<IntPtrT> name_index,
TNode<Word32T> representation, TNode<Word32T> representation,
Node* value, Label* bailout) { Node* value, Label* bailout) {
Label r_smi(this), r_double(this), r_heapobject(this), all_fine(this); Label r_smi(this), r_double(this), r_heapobject(this), all_fine(this);
...@@ -1177,8 +1180,8 @@ void AccessorAssembler::CheckFieldType(TNode<DescriptorArray> descriptors, ...@@ -1177,8 +1180,8 @@ void AccessorAssembler::CheckFieldType(TNode<DescriptorArray> descriptors,
BIND(&r_heapobject); BIND(&r_heapobject);
{ {
GotoIf(TaggedIsSmi(value), bailout); GotoIf(TaggedIsSmi(value), bailout);
TNode<MaybeObject> field_type = LoadFieldTypeByKeyIndex( TNode<MaybeObject> field_type =
descriptors, UncheckedCast<IntPtrT>(name_index)); LoadFieldTypeByKeyIndex(descriptors, name_index);
const Address kNoneType = FieldType::None().ptr(); const Address kNoneType = FieldType::None().ptr();
const Address kAnyType = FieldType::Any().ptr(); const Address kAnyType = FieldType::Any().ptr();
DCHECK_NE(static_cast<uint32_t>(kNoneType), kClearedWeakHeapObjectLower32); DCHECK_NE(static_cast<uint32_t>(kNoneType), kClearedWeakHeapObjectLower32);
...@@ -1202,15 +1205,16 @@ void AccessorAssembler::CheckFieldType(TNode<DescriptorArray> descriptors, ...@@ -1202,15 +1205,16 @@ void AccessorAssembler::CheckFieldType(TNode<DescriptorArray> descriptors,
BIND(&all_fine); BIND(&all_fine);
} }
TNode<BoolT> AccessorAssembler::IsPropertyDetailsConst(Node* details) { TNode<BoolT> AccessorAssembler::IsPropertyDetailsConst(TNode<Uint32T> details) {
return Word32Equal(DecodeWord32<PropertyDetails::ConstnessField>(details), return Word32Equal(DecodeWord32<PropertyDetails::ConstnessField>(details),
Int32Constant(static_cast<int32_t>(VariableMode::kConst))); Int32Constant(static_cast<int32_t>(VariableMode::kConst)));
} }
void AccessorAssembler::OverwriteExistingFastDataProperty( void AccessorAssembler::OverwriteExistingFastDataProperty(
Node* object, Node* object_map, Node* descriptors, SloppyTNode<HeapObject> object, TNode<Map> object_map,
Node* descriptor_name_index, Node* details, TNode<Object> value, TNode<DescriptorArray> descriptors, TNode<IntPtrT> descriptor_name_index,
Label* slow, bool do_transitioning_store) { TNode<Uint32T> details, TNode<Object> value, Label* slow,
bool do_transitioning_store) {
Label done(this), if_field(this), if_descriptor(this); Label done(this), if_field(this), if_descriptor(this);
CSA_ASSERT(this, CSA_ASSERT(this,
...@@ -1226,8 +1230,8 @@ void AccessorAssembler::OverwriteExistingFastDataProperty( ...@@ -1226,8 +1230,8 @@ void AccessorAssembler::OverwriteExistingFastDataProperty(
TNode<Uint32T> representation = TNode<Uint32T> representation =
DecodeWord32<PropertyDetails::RepresentationField>(details); DecodeWord32<PropertyDetails::RepresentationField>(details);
CheckFieldType(CAST(descriptors), descriptor_name_index, representation, CheckFieldType(descriptors, descriptor_name_index, representation, value,
value, slow); slow);
TNode<UintPtrT> field_index = TNode<UintPtrT> field_index =
DecodeWordFromWord32<PropertyDetails::FieldIndexField>(details); DecodeWordFromWord32<PropertyDetails::FieldIndexField>(details);
...@@ -1258,7 +1262,7 @@ void AccessorAssembler::OverwriteExistingFastDataProperty( ...@@ -1258,7 +1262,7 @@ void AccessorAssembler::OverwriteExistingFastDataProperty(
Label if_mutable(this); Label if_mutable(this);
GotoIfNot(IsPropertyDetailsConst(details), &if_mutable); GotoIfNot(IsPropertyDetailsConst(details), &if_mutable);
TNode<Float64T> current_value = TNode<Float64T> current_value =
LoadObjectField<Float64T>(CAST(object), field_offset); LoadObjectField<Float64T>(object, field_offset);
BranchIfSameNumberValue(current_value, double_value, &done, slow); BranchIfSameNumberValue(current_value, double_value, &done, slow);
BIND(&if_mutable); BIND(&if_mutable);
} }
...@@ -1291,8 +1295,7 @@ void AccessorAssembler::OverwriteExistingFastDataProperty( ...@@ -1291,8 +1295,7 @@ void AccessorAssembler::OverwriteExistingFastDataProperty(
} else { } else {
Label if_mutable(this); Label if_mutable(this);
GotoIfNot(IsPropertyDetailsConst(details), &if_mutable); GotoIfNot(IsPropertyDetailsConst(details), &if_mutable);
TNode<Object> current_value = TNode<Object> current_value = LoadObjectField(object, field_offset);
LoadObjectField(CAST(object), field_offset);
BranchIfSameValue(current_value, value, &done, slow, BranchIfSameValue(current_value, value, &done, slow,
SameValueMode::kNumbersOnly); SameValueMode::kNumbersOnly);
BIND(&if_mutable); BIND(&if_mutable);
...@@ -1336,7 +1339,8 @@ void AccessorAssembler::OverwriteExistingFastDataProperty( ...@@ -1336,7 +1339,8 @@ void AccessorAssembler::OverwriteExistingFastDataProperty(
} else { } else {
Label tagged_rep(this), double_rep(this); Label tagged_rep(this), double_rep(this);
TNode<PropertyArray> properties = CAST(LoadFastProperties(object)); TNode<PropertyArray> properties =
CAST(LoadFastProperties(CAST(object)));
Branch( Branch(
Word32Equal(representation, Int32Constant(Representation::kDouble)), Word32Equal(representation, Int32Constant(Representation::kDouble)),
&double_rep, &tagged_rep); &double_rep, &tagged_rep);
...@@ -1376,7 +1380,7 @@ void AccessorAssembler::OverwriteExistingFastDataProperty( ...@@ -1376,7 +1380,7 @@ void AccessorAssembler::OverwriteExistingFastDataProperty(
{ {
// Check that constant matches value. // Check that constant matches value.
TNode<Object> constant = LoadValueByKeyIndex( TNode<Object> constant = LoadValueByKeyIndex(
CAST(descriptors), UncheckedCast<IntPtrT>(descriptor_name_index)); descriptors, UncheckedCast<IntPtrT>(descriptor_name_index));
GotoIf(TaggedNotEqual(value, constant), slow); GotoIf(TaggedNotEqual(value, constant), slow);
if (do_transitioning_store) { if (do_transitioning_store) {
...@@ -1404,7 +1408,7 @@ void AccessorAssembler::CheckPrototypeValidityCell( ...@@ -1404,7 +1408,7 @@ void AccessorAssembler::CheckPrototypeValidityCell(
} }
void AccessorAssembler::HandleStoreAccessor(const StoreICParameters* p, void AccessorAssembler::HandleStoreAccessor(const StoreICParameters* p,
Node* holder, SloppyTNode<HeapObject> holder,
TNode<Word32T> handler_word) { TNode<Word32T> handler_word) {
Comment("accessor_store"); Comment("accessor_store");
TNode<IntPtrT> descriptor = TNode<IntPtrT> descriptor =
...@@ -1428,7 +1432,7 @@ void AccessorAssembler::HandleStoreICProtoHandler( ...@@ -1428,7 +1432,7 @@ void AccessorAssembler::HandleStoreICProtoHandler(
OnCodeHandler on_code_handler; OnCodeHandler on_code_handler;
if (support_elements == kSupportElements) { if (support_elements == kSupportElements) {
// Code sub-handlers are expected only in KeyedStoreICs. // Code sub-handlers are expected only in KeyedStoreICs.
on_code_handler = [=](Node* code_handler) { on_code_handler = [=](TNode<Code> code_handler) {
// This is either element store or transitioning element store. // This is either element store or transitioning element store.
Label if_element_store(this), if_transitioning_element_store(this); Label if_element_store(this), if_transitioning_element_store(this);
Branch(IsStoreHandler0Map(LoadMap(handler)), &if_element_store, Branch(IsStoreHandler0Map(LoadMap(handler)), &if_element_store,
...@@ -1456,10 +1460,10 @@ void AccessorAssembler::HandleStoreICProtoHandler( ...@@ -1456,10 +1460,10 @@ void AccessorAssembler::HandleStoreICProtoHandler(
}; };
} }
Node* smi_handler = HandleProtoHandler<StoreHandler>( TNode<Object> smi_handler = HandleProtoHandler<StoreHandler>(
p, handler, on_code_handler, p, handler, on_code_handler,
// on_found_on_receiver // on_found_on_receiver
[=](Node* properties, Node* name_index) { [=](TNode<NameDictionary> properties, TNode<IntPtrT> name_index) {
TNode<Uint32T> details = TNode<Uint32T> details =
LoadDetailsByKeyIndex<NameDictionary>(properties, name_index); LoadDetailsByKeyIndex<NameDictionary>(properties, name_index);
// Check that the property is a writable data property (no accessor). // Check that the property is a writable data property (no accessor).
...@@ -1469,8 +1473,8 @@ void AccessorAssembler::HandleStoreICProtoHandler( ...@@ -1469,8 +1473,8 @@ void AccessorAssembler::HandleStoreICProtoHandler(
STATIC_ASSERT(kData == 0); STATIC_ASSERT(kData == 0);
GotoIf(IsSetWord32(details, kTypeAndReadOnlyMask), miss); GotoIf(IsSetWord32(details, kTypeAndReadOnlyMask), miss);
StoreValueByKeyIndex<NameDictionary>( StoreValueByKeyIndex<NameDictionary>(properties, name_index,
CAST(properties), UncheckedCast<IntPtrT>(name_index), p->value()); p->value());
Return(p->value()); Return(p->value());
}, },
miss, ic_mode); miss, ic_mode);
...@@ -1481,7 +1485,7 @@ void AccessorAssembler::HandleStoreICProtoHandler( ...@@ -1481,7 +1485,7 @@ void AccessorAssembler::HandleStoreICProtoHandler(
if_interceptor(this); if_interceptor(this);
CSA_ASSERT(this, TaggedIsSmi(smi_handler)); CSA_ASSERT(this, TaggedIsSmi(smi_handler));
TNode<Int32T> handler_word = SmiToInt32(smi_handler); TNode<Int32T> handler_word = SmiToInt32(CAST(smi_handler));
TNode<Uint32T> handler_kind = TNode<Uint32T> handler_kind =
DecodeWord32<StoreHandler::KindBits>(handler_word); DecodeWord32<StoreHandler::KindBits>(handler_word);
...@@ -2607,7 +2611,7 @@ void AccessorAssembler::LoadIC_BytecodeHandler(const LazyLoadICParameters* p, ...@@ -2607,7 +2611,7 @@ void AccessorAssembler::LoadIC_BytecodeHandler(const LazyLoadICParameters* p,
Label try_polymorphic(this), if_handler(this, &var_handler); Label try_polymorphic(this), if_handler(this, &var_handler);
TNode<MaybeObject> feedback = TNode<MaybeObject> feedback =
TryMonomorphicCase(p->slot(), p->vector(), recv_map, &if_handler, TryMonomorphicCase(p->slot(), CAST(p->vector()), recv_map, &if_handler,
&var_handler, &try_polymorphic); &var_handler, &try_polymorphic);
BIND(&if_handler); BIND(&if_handler);
...@@ -2669,8 +2673,8 @@ void AccessorAssembler::LoadIC(const LoadICParameters* p) { ...@@ -2669,8 +2673,8 @@ void AccessorAssembler::LoadIC(const LoadICParameters* p) {
// Check monomorphic case. // Check monomorphic case.
TNode<MaybeObject> feedback = TNode<MaybeObject> feedback =
TryMonomorphicCase(p->slot(), p->vector(), receiver_map, &if_handler, TryMonomorphicCase(p->slot(), CAST(p->vector()), receiver_map,
&var_handler, &try_polymorphic); &if_handler, &var_handler, &try_polymorphic);
BIND(&if_handler); BIND(&if_handler);
{ {
LazyLoadICParameters lazy_p(p); LazyLoadICParameters lazy_p(p);
...@@ -2871,8 +2875,8 @@ void AccessorAssembler::KeyedLoadIC(const LoadICParameters* p, ...@@ -2871,8 +2875,8 @@ void AccessorAssembler::KeyedLoadIC(const LoadICParameters* p,
// Check monomorphic case. // Check monomorphic case.
TNode<MaybeObject> feedback = TNode<MaybeObject> feedback =
TryMonomorphicCase(p->slot(), p->vector(), receiver_map, &if_handler, TryMonomorphicCase(p->slot(), CAST(p->vector()), receiver_map,
&var_handler, &try_polymorphic); &if_handler, &var_handler, &try_polymorphic);
BIND(&if_handler); BIND(&if_handler);
{ {
LazyLoadICParameters lazy_p(p); LazyLoadICParameters lazy_p(p);
...@@ -3119,8 +3123,8 @@ void AccessorAssembler::StoreIC(const StoreICParameters* p) { ...@@ -3119,8 +3123,8 @@ void AccessorAssembler::StoreIC(const StoreICParameters* p) {
// Check monomorphic case. // Check monomorphic case.
TNode<MaybeObject> feedback = TNode<MaybeObject> feedback =
TryMonomorphicCase(p->slot(), p->vector(), receiver_map, &if_handler, TryMonomorphicCase(p->slot(), CAST(p->vector()), receiver_map,
&var_handler, &try_polymorphic); &if_handler, &var_handler, &try_polymorphic);
BIND(&if_handler); BIND(&if_handler);
{ {
Comment("StoreIC_if_handler"); Comment("StoreIC_if_handler");
...@@ -3306,8 +3310,8 @@ void AccessorAssembler::KeyedStoreIC(const StoreICParameters* p) { ...@@ -3306,8 +3310,8 @@ void AccessorAssembler::KeyedStoreIC(const StoreICParameters* p) {
// Check monomorphic case. // Check monomorphic case.
TNode<MaybeObject> feedback = TNode<MaybeObject> feedback =
TryMonomorphicCase(p->slot(), p->vector(), receiver_map, &if_handler, TryMonomorphicCase(p->slot(), CAST(p->vector()), receiver_map,
&var_handler, &try_polymorphic); &if_handler, &var_handler, &try_polymorphic);
BIND(&if_handler); BIND(&if_handler);
{ {
Comment("KeyedStoreIC_if_handler"); Comment("KeyedStoreIC_if_handler");
...@@ -3377,7 +3381,7 @@ void AccessorAssembler::StoreInArrayLiteralIC(const StoreICParameters* p) { ...@@ -3377,7 +3381,7 @@ void AccessorAssembler::StoreInArrayLiteralIC(const StoreICParameters* p) {
GotoIf(IsUndefined(p->vector()), &miss); GotoIf(IsUndefined(p->vector()), &miss);
TNode<MaybeObject> feedback = TNode<MaybeObject> feedback =
TryMonomorphicCase(p->slot(), p->vector(), array_map, &if_handler, TryMonomorphicCase(p->slot(), CAST(p->vector()), array_map, &if_handler,
&var_handler, &try_polymorphic); &var_handler, &try_polymorphic);
BIND(&if_handler); BIND(&if_handler);
...@@ -3808,7 +3812,7 @@ void AccessorAssembler::GenerateCloneObjectIC() { ...@@ -3808,7 +3812,7 @@ void AccessorAssembler::GenerateCloneObjectIC() {
TNode<Object> source = CAST(Parameter(Descriptor::kSource)); TNode<Object> source = CAST(Parameter(Descriptor::kSource));
TNode<Smi> flags = CAST(Parameter(Descriptor::kFlags)); TNode<Smi> flags = CAST(Parameter(Descriptor::kFlags));
TNode<Smi> slot = CAST(Parameter(Descriptor::kSlot)); TNode<Smi> slot = CAST(Parameter(Descriptor::kSlot));
TNode<HeapObject> vector = CAST(Parameter(Descriptor::kVector)); TNode<HeapObject> maybe_vector = CAST(Parameter(Descriptor::kVector));
TNode<Context> context = CAST(Parameter(Descriptor::kContext)); TNode<Context> context = CAST(Parameter(Descriptor::kContext));
TVARIABLE(MaybeObject, var_handler); TVARIABLE(MaybeObject, var_handler);
Label if_handler(this, &var_handler), miss(this, Label::kDeferred), Label if_handler(this, &var_handler), miss(this, Label::kDeferred),
...@@ -3818,10 +3822,11 @@ void AccessorAssembler::GenerateCloneObjectIC() { ...@@ -3818,10 +3822,11 @@ void AccessorAssembler::GenerateCloneObjectIC() {
TNode<Map> source_map = LoadReceiverMap(source); TNode<Map> source_map = LoadReceiverMap(source);
GotoIf(IsDeprecatedMap(source_map), &miss); GotoIf(IsDeprecatedMap(source_map), &miss);
GotoIf(IsUndefined(vector), &slow); GotoIf(IsUndefined(maybe_vector), &slow);
TNode<MaybeObject> feedback = TryMonomorphicCase( TNode<MaybeObject> feedback =
slot, vector, source_map, &if_handler, &var_handler, &try_polymorphic); TryMonomorphicCase(slot, CAST(maybe_vector), source_map, &if_handler,
&var_handler, &try_polymorphic);
BIND(&if_handler); BIND(&if_handler);
{ {
...@@ -3949,14 +3954,15 @@ void AccessorAssembler::GenerateCloneObjectIC() { ...@@ -3949,14 +3954,15 @@ void AccessorAssembler::GenerateCloneObjectIC() {
BIND(&slow); BIND(&slow);
{ {
TailCallBuiltin(Builtins::kCloneObjectIC_Slow, context, source, flags, slot, TailCallBuiltin(Builtins::kCloneObjectIC_Slow, context, source, flags, slot,
vector); maybe_vector);
} }
BIND(&miss); BIND(&miss);
{ {
Comment("CloneObjectIC_miss"); Comment("CloneObjectIC_miss");
TNode<HeapObject> map_or_result = CAST(CallRuntime( TNode<HeapObject> map_or_result =
Runtime::kCloneObjectIC_Miss, context, source, flags, slot, vector)); CAST(CallRuntime(Runtime::kCloneObjectIC_Miss, context, source, flags,
slot, maybe_vector));
var_handler = UncheckedCast<MaybeObject>(map_or_result); var_handler = UncheckedCast<MaybeObject>(map_or_result);
GotoIf(IsMap(map_or_result), &if_handler); GotoIf(IsMap(map_or_result), &if_handler);
CSA_ASSERT(this, IsJSObject(map_or_result)); CSA_ASSERT(this, IsJSObject(map_or_result));
......
src/ic/accessor-assembler.h
View file @ 0eb4b90f
...@@ -181,20 +181,22 @@ class V8_EXPORT_PRIVATE AccessorAssembler : public CodeStubAssembler { ...@@ -181,20 +181,22 @@ class V8_EXPORT_PRIVATE AccessorAssembler : public CodeStubAssembler {
Label* miss, Label* miss,
StoreTransitionMapFlags flags); StoreTransitionMapFlags flags);
void JumpIfDataProperty(Node* details, Label* writable, Label* readonly); void JumpIfDataProperty(TNode<Uint32T> details, Label* writable,
Label* readonly);
void InvalidateValidityCellIfPrototype(Node* map, Node* bitfield3 = nullptr); void InvalidateValidityCellIfPrototype(Node* map, Node* bitfield3 = nullptr);
void OverwriteExistingFastDataProperty(Node* object, Node* object_map, void OverwriteExistingFastDataProperty(SloppyTNode<HeapObject> object,
Node* descriptors, TNode<Map> object_map,
Node* descriptor_name_index, TNode<DescriptorArray> descriptors,
Node* details, TNode<Object> value, TNode<IntPtrT> descriptor_name_index,
Label* slow, TNode<Uint32T> details,
TNode<Object> value, Label* slow,
bool do_transitioning_store); bool do_transitioning_store);
void CheckFieldType(TNode<DescriptorArray> descriptors, Node* name_index, void CheckFieldType(TNode<DescriptorArray> descriptors,
TNode<Word32T> representation, Node* value, TNode<IntPtrT> name_index, TNode<Word32T> representation,
Label* bailout); Node* value, Label* bailout);
private: private:
// Stub generation entry points. // Stub generation entry points.
...@@ -228,13 +230,11 @@ class V8_EXPORT_PRIVATE AccessorAssembler : public CodeStubAssembler { ...@@ -228,13 +230,11 @@ class V8_EXPORT_PRIVATE AccessorAssembler : public CodeStubAssembler {
// IC dispatcher behavior. // IC dispatcher behavior.
// Checks monomorphic case. Returns {feedback} entry of the vector. // Checks monomorphic case. Returns {feedback} entry of the vector.
TNode<MaybeObject> TryMonomorphicCase(TNode<Smi> slot, Node* vector, TNode<MaybeObject> TryMonomorphicCase(
TNode<Map> receiver_map, TNode<Smi> slot, TNode<FeedbackVector> vector, TNode<Map> receiver_map,
Label* if_handler, Label* if_handler, TVariable<MaybeObject>* var_handler, Label* if_miss);
TVariable<MaybeObject>* var_handler, void HandlePolymorphicCase(TNode<Map> receiver_map,
Label* if_miss); TNode<WeakFixedArray> feedback, Label* if_handler,
void HandlePolymorphicCase(Node* receiver_map, TNode<WeakFixedArray> feedback,
Label* if_handler,
TVariable<MaybeObject>* var_handler, TVariable<MaybeObject>* var_handler,
Label* if_miss); Label* if_miss);
...@@ -246,15 +246,14 @@ class V8_EXPORT_PRIVATE AccessorAssembler : public CodeStubAssembler { ...@@ -246,15 +246,14 @@ class V8_EXPORT_PRIVATE AccessorAssembler : public CodeStubAssembler {
ElementSupport support_elements = kOnlyProperties, ElementSupport support_elements = kOnlyProperties,
LoadAccessMode access_mode = LoadAccessMode::kLoad); LoadAccessMode access_mode = LoadAccessMode::kLoad);
void HandleLoadICSmiHandlerCase(const LazyLoadICParameters* p, Node* holder, void HandleLoadICSmiHandlerCase(
SloppyTNode<Smi> smi_handler, const LazyLoadICParameters* p, SloppyTNode<HeapObject> holder,
SloppyTNode<Object> handler, Label* miss, SloppyTNode<Smi> smi_handler, SloppyTNode<Object> handler, Label* miss,
ExitPoint* exit_point, ExitPoint* exit_point, OnNonExistent on_nonexistent,
OnNonExistent on_nonexistent, ElementSupport support_elements, LoadAccessMode access_mode);
ElementSupport support_elements,
LoadAccessMode access_mode);
void HandleLoadICProtoHandler(const LazyLoadICParameters* p, Node* handler, void HandleLoadICProtoHandler(const LazyLoadICParameters* p,
TNode<DataHandler> handler,
Variable* var_holder, Variable* var_smi_handler, Variable* var_holder, Variable* var_smi_handler,
Label* if_smi_handler, Label* miss, Label* if_smi_handler, Label* miss,
ExitPoint* exit_point, ICMode ic_mode, ExitPoint* exit_point, ICMode ic_mode,
...@@ -270,23 +269,23 @@ class V8_EXPORT_PRIVATE AccessorAssembler : public CodeStubAssembler { ...@@ -270,23 +269,23 @@ class V8_EXPORT_PRIVATE AccessorAssembler : public CodeStubAssembler {
TNode<WordT> handler_word, TNode<DataHandler> handler, TNode<WordT> handler_word, TNode<DataHandler> handler,
TNode<IntPtrT> handler_kind, ExitPoint* exit_point); TNode<IntPtrT> handler_kind, ExitPoint* exit_point);
void HandleLoadField(Node* holder, Node* handler_word, void HandleLoadField(SloppyTNode<JSObject> holder, TNode<WordT> handler_word,
Variable* var_double_value, Label* rebox_double, Variable* var_double_value, Label* rebox_double,
Label* miss, ExitPoint* exit_point); Label* miss, ExitPoint* exit_point);
void EmitAccessCheck(TNode<Context> expected_native_context, void EmitAccessCheck(TNode<Context> expected_native_context,
TNode<Context> context, Node* receiver, TNode<Context> context, TNode<Object> receiver,
Label* can_access, Label* miss); Label* can_access, Label* miss);
void HandleLoadICSmiHandlerLoadNamedCase( void HandleLoadICSmiHandlerLoadNamedCase(
const LazyLoadICParameters* p, Node* holder, TNode<IntPtrT> handler_kind, const LazyLoadICParameters* p, TNode<HeapObject> holder,
TNode<WordT> handler_word, Label* rebox_double, TNode<IntPtrT> handler_kind, TNode<WordT> handler_word,
Variable* var_double_value, SloppyTNode<Object> handler, Label* miss, Label* rebox_double, Variable* var_double_value,
ExitPoint* exit_point, OnNonExistent on_nonexistent, SloppyTNode<Object> handler, Label* miss, ExitPoint* exit_point,
ElementSupport support_elements); OnNonExistent on_nonexistent, ElementSupport support_elements);
void HandleLoadICSmiHandlerHasNamedCase(const LazyLoadICParameters* p, void HandleLoadICSmiHandlerHasNamedCase(const LazyLoadICParameters* p,
Node* holder, TNode<HeapObject> holder,
TNode<IntPtrT> handler_kind, TNode<IntPtrT> handler_kind,
Label* miss, ExitPoint* exit_point); Label* miss, ExitPoint* exit_point);
...@@ -322,13 +321,15 @@ class V8_EXPORT_PRIVATE AccessorAssembler : public CodeStubAssembler { ...@@ -322,13 +321,15 @@ class V8_EXPORT_PRIVATE AccessorAssembler : public CodeStubAssembler {
void CheckPrototypeValidityCell(TNode<Object> maybe_validity_cell, void CheckPrototypeValidityCell(TNode<Object> maybe_validity_cell,
Label* miss); Label* miss);
void HandleStoreICNativeDataProperty(const StoreICParameters* p, Node* holder, void HandleStoreICNativeDataProperty(const StoreICParameters* p,
SloppyTNode<HeapObject> holder,
TNode<Word32T> handler_word); TNode<Word32T> handler_word);
void HandleStoreToProxy(const StoreICParameters* p, Node* proxy, Label* miss, void HandleStoreToProxy(const StoreICParameters* p, Node* proxy, Label* miss,
ElementSupport support_elements); ElementSupport support_elements);
void HandleStoreAccessor(const StoreICParameters* p, Node* holder, void HandleStoreAccessor(const StoreICParameters* p,
SloppyTNode<HeapObject> holder,
TNode<Word32T> handler_word); TNode<Word32T> handler_word);
// KeyedLoadIC_Generic implementation. // KeyedLoadIC_Generic implementation.
...@@ -345,15 +346,16 @@ class V8_EXPORT_PRIVATE AccessorAssembler : public CodeStubAssembler { ...@@ -345,15 +346,16 @@ class V8_EXPORT_PRIVATE AccessorAssembler : public CodeStubAssembler {
// Low-level helpers. // Low-level helpers.
using OnCodeHandler = std::function<void(Node* code_handler)>; using OnCodeHandler = std::function<void(TNode<Code> code_handler)>;
using OnFoundOnReceiver = using OnFoundOnReceiver = std::function<void(TNode<NameDictionary> properties,
std::function<void(Node* properties, Node* name_index)>; TNode<IntPtrT> name_index)>;
template <typename ICHandler, typename ICParameters> template <typename ICHandler, typename ICParameters>
Node* HandleProtoHandler(const ICParameters* p, Node* handler, TNode<Object> HandleProtoHandler(
const ICParameters* p, TNode<DataHandler> handler,
const OnCodeHandler& on_code_handler, const OnCodeHandler& on_code_handler,
const OnFoundOnReceiver& on_found_on_receiver, const OnFoundOnReceiver& on_found_on_receiver, Label* miss,
Label* miss, ICMode ic_mode); ICMode ic_mode);
void CheckHeapObjectTypeMatchesDescriptor(TNode<Word32T> handler_word, void CheckHeapObjectTypeMatchesDescriptor(TNode<Word32T> handler_word,
TNode<JSObject> holder, TNode<JSObject> holder,
...@@ -381,7 +383,7 @@ class V8_EXPORT_PRIVATE AccessorAssembler : public CodeStubAssembler { ...@@ -381,7 +383,7 @@ class V8_EXPORT_PRIVATE AccessorAssembler : public CodeStubAssembler {
LoadAccessMode access_mode = LoadAccessMode::kLoad); LoadAccessMode access_mode = LoadAccessMode::kLoad);
void NameDictionaryNegativeLookup(Node* object, SloppyTNode<Name> name, void NameDictionaryNegativeLookup(Node* object, SloppyTNode<Name> name,
Label* miss); Label* miss);
TNode<BoolT> IsPropertyDetailsConst(Node* details); TNode<BoolT> IsPropertyDetailsConst(TNode<Uint32T> details);
// Stub cache access helpers. // Stub cache access helpers.
......
src/ic/keyed-store-generic.cc
View file @ 0eb4b90f
...@@ -676,8 +676,8 @@ void KeyedStoreGenericAssembler::LookupPropertyOnPrototypeChain( ...@@ -676,8 +676,8 @@ void KeyedStoreGenericAssembler::LookupPropertyOnPrototypeChain(
TNode<Object> value = TNode<Object> value =
LoadObjectField(property_cell, PropertyCell::kValueOffset); LoadObjectField(property_cell, PropertyCell::kValueOffset);
GotoIf(TaggedEqual(value, TheHoleConstant()), &next_proto); GotoIf(TaggedEqual(value, TheHoleConstant()), &next_proto);
TNode<Int32T> details = LoadAndUntagToWord32ObjectField( TNode<Uint32T> details = Unsigned(LoadAndUntagToWord32ObjectField(
property_cell, PropertyCell::kPropertyDetailsRawOffset); property_cell, PropertyCell::kPropertyDetailsRawOffset));
JumpIfDataProperty(details, &ok_to_write, readonly); JumpIfDataProperty(details, &ok_to_write, readonly);
if (accessor != nullptr) { if (accessor != nullptr) {
......
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