@@ -5969,7 +5969,8 @@ void CodeStubAssembler::LoadPropertyFromGlobalDictionary(Node* dictionary,
59695969// Returns either the original value, or the result of the getter call.
59705970Node* CodeStubAssembler::CallGetterIfAccessor(Node* value, Node* details,
59715971 Node* context, Node* receiver,
5972- Label* if_bailout) {
5972+ Label* if_bailout,
5973+ GetOwnPropertyMode mode) {
59735974 VARIABLE(var_value, MachineRepresentation::kTagged, value);
59745975 Label done(this), if_accessor_info(this, Label::kDeferred);
59755976
@@ -5981,23 +5982,26 @@ Node* CodeStubAssembler::CallGetterIfAccessor(Node* value, Node* details,
59815982
59825983 // AccessorPair case.
59835984 {
5984- Node* accessor_pair = value;
5985- Node* getter = LoadObjectField(accessor_pair, AccessorPair::kGetterOffset);
5986- Node* getter_map = LoadMap(getter);
5987- Node* instance_type = LoadMapInstanceType(getter_map);
5988- // FunctionTemplateInfo getters are not supported yet.
5989- GotoIf(
5990- Word32Equal(instance_type, Int32Constant(FUNCTION_TEMPLATE_INFO_TYPE)),
5991- if_bailout);
5992-
5993- // Return undefined if the {getter} is not callable.
5994- var_value.Bind(UndefinedConstant());
5995- GotoIfNot(IsCallableMap(getter_map), &done);
5996-
5997- // Call the accessor.
5998- Callable callable = CodeFactory::Call(isolate());
5999- Node* result = CallJS(callable, context, getter, receiver);
6000- var_value.Bind(result);
5985+ if (mode == kCallJSGetter) {
5986+ Node* accessor_pair = value;
5987+ Node* getter =
5988+ LoadObjectField(accessor_pair, AccessorPair::kGetterOffset);
5989+ Node* getter_map = LoadMap(getter);
5990+ Node* instance_type = LoadMapInstanceType(getter_map);
5991+ // FunctionTemplateInfo getters are not supported yet.
5992+ GotoIf(Word32Equal(instance_type,
5993+ Int32Constant(FUNCTION_TEMPLATE_INFO_TYPE)),
5994+ if_bailout);
5995+
5996+ // Return undefined if the {getter} is not callable.
5997+ var_value.Bind(UndefinedConstant());
5998+ GotoIfNot(IsCallableMap(getter_map), &done);
5999+
6000+ // Call the accessor.
6001+ Callable callable = CodeFactory::Call(isolate());
6002+ Node* result = CallJS(callable, context, getter, receiver);
6003+ var_value.Bind(result);
6004+ }
60016005 Goto(&done);
60026006 }
60036007
@@ -6067,14 +6071,14 @@ void CodeStubAssembler::TryGetOwnProperty(
60676071 Label* if_not_found, Label* if_bailout) {
60686072 TryGetOwnProperty(context, receiver, object, map, instance_type, unique_name,
60696073 if_found_value, var_value, nullptr, nullptr, if_not_found,
6070- if_bailout);
6074+ if_bailout, kCallJSGetter );
60716075}
60726076
60736077void CodeStubAssembler::TryGetOwnProperty(
60746078 Node* context, Node* receiver, Node* object, Node* map, Node* instance_type,
60756079 Node* unique_name, Label* if_found_value, Variable* var_value,
60766080 Variable* var_details, Variable* var_raw_value, Label* if_not_found,
6077- Label* if_bailout) {
6081+ Label* if_bailout, GetOwnPropertyMode mode ) {
60786082 DCHECK_EQ(MachineRepresentation::kTagged, var_value->rep());
60796083 Comment("TryGetOwnProperty");
60806084
@@ -6125,7 +6129,7 @@ void CodeStubAssembler::TryGetOwnProperty(
61256129 var_raw_value->Bind(var_value->value());
61266130 }
61276131 Node* value = CallGetterIfAccessor(var_value->value(), var_details->value(),
6128- context, receiver, if_bailout);
6132+ context, receiver, if_bailout, mode );
61296133 var_value->Bind(value);
61306134 Goto(if_found_value);
61316135 }
0 commit comments