archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix getter's this value (#1344)

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Yanhui Shen shen.elf@gmail.com
This commit is contained in:
Yanhui Shen 2016-09-13 14:53:26 +08:00 committed by László Langó
parent baeb83db8f
commit 15c53f7363
3 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jerry-core/ecma/operations/ecma-objects.c
View File

@ -227,7 +227,8 @@ ecma_op_object_has_property (ecma_object_t *object_p, /**< the object */
* Returned value must be freed with ecma_free_value * Returned value must be freed with ecma_free_value
*/ */
ecma_value_t ecma_value_t
ecma_op_object_find_own (ecma_object_t *object_p, /**< the object */ ecma_op_object_find_own (ecma_value_t base_value, /**< base value */
ecma_object_t *object_p, /**< target object */
ecma_string_t *property_name_p) /**< property name */ ecma_string_t *property_name_p) /**< property name */
{ {
JERRY_ASSERT (object_p != NULL JERRY_ASSERT (object_p != NULL
@ -241,7 +242,7 @@ ecma_op_object_find_own (ecma_object_t *object_p, /**< the object */
ecma_value_t *map_prop_p = ecma_get_internal_property (object_p, ECMA_INTERNAL_PROPERTY_PARAMETERS_MAP); ecma_value_t *map_prop_p = ecma_get_internal_property (object_p, ECMA_INTERNAL_PROPERTY_PARAMETERS_MAP);
ecma_object_t *map_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t, *map_prop_p); ecma_object_t *map_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t, *map_prop_p);
ecma_value_t arg_name = ecma_op_object_find_own (map_p, property_name_p); ecma_value_t arg_name = ecma_op_object_find_own (*map_prop_p, map_p, property_name_p);
if (ecma_is_value_found (arg_name)) if (ecma_is_value_found (arg_name))
{ {
@ -333,7 +334,7 @@ ecma_op_object_find_own (ecma_object_t *object_p, /**< the object */
return ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED); return ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
} }
return ecma_op_function_call (getter_p, ecma_make_object_value (object_p), NULL, 0); return ecma_op_function_call (getter_p, base_value, NULL, 0);
} /* ecma_op_object_find_own */ } /* ecma_op_object_find_own */
/** /**
@ -352,9 +353,10 @@ ecma_op_object_find (ecma_object_t *object_p, /**< the object */
/* Circular reference is possible in JavaScript and testing it is complicated. */ /* Circular reference is possible in JavaScript and testing it is complicated. */
int max_depth = 128; int max_depth = 128;
ecma_value_t base_value = ecma_make_object_value (object_p);
do do
{ {
ecma_value_t value = ecma_op_object_find_own (object_p, property_name_p); ecma_value_t value = ecma_op_object_find_own (base_value, object_p, property_name_p);
if (ecma_is_value_found (value)) if (ecma_is_value_found (value))
{ {
@ -455,7 +457,7 @@ ecma_op_object_put (ecma_object_t *object_p, /**< the object */
ecma_value_t *map_prop_p = ecma_get_internal_property (object_p, ECMA_INTERNAL_PROPERTY_PARAMETERS_MAP); ecma_value_t *map_prop_p = ecma_get_internal_property (object_p, ECMA_INTERNAL_PROPERTY_PARAMETERS_MAP);
ecma_object_t *map_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t, *map_prop_p); ecma_object_t *map_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t, *map_prop_p);
ecma_value_t arg_name = ecma_op_object_find_own (map_p, property_name_p); ecma_value_t arg_name = ecma_op_object_find_own (*map_prop_p, map_p, property_name_p);
if (ecma_is_value_found (arg_name)) if (ecma_is_value_found (arg_name))
{ {

2
jerry-core/ecma/operations/ecma-objects.h
View File

@ -30,7 +30,7 @@ extern ecma_property_t *ecma_op_object_get_own_property (ecma_object_t *, ecma_s
extern ecma_property_t *ecma_op_object_get_property (ecma_object_t *, ecma_string_t *); extern ecma_property_t *ecma_op_object_get_property (ecma_object_t *, ecma_string_t *);
extern bool ecma_op_object_has_own_property (ecma_object_t *, ecma_string_t *); extern bool ecma_op_object_has_own_property (ecma_object_t *, ecma_string_t *);
extern bool ecma_op_object_has_property (ecma_object_t *, ecma_string_t *); extern bool ecma_op_object_has_property (ecma_object_t *, ecma_string_t *);
extern ecma_value_t ecma_op_object_find_own (ecma_object_t *, ecma_string_t *); extern ecma_value_t ecma_op_object_find_own (ecma_value_t, ecma_object_t *, ecma_string_t *);
extern ecma_value_t ecma_op_object_find (ecma_object_t *, ecma_string_t *); extern ecma_value_t ecma_op_object_find (ecma_object_t *, ecma_string_t *);
extern ecma_value_t ecma_op_object_get_own_data_prop (ecma_object_t *, ecma_string_t *); extern ecma_value_t ecma_op_object_get_own_data_prop (ecma_object_t *, ecma_string_t *);
extern ecma_value_t ecma_op_object_get (ecma_object_t *, ecma_string_t *); extern ecma_value_t ecma_op_object_get (ecma_object_t *, ecma_string_t *);

34
tests/jerry/getter-setter-this-value.js Normal file
View File

@ -0,0 +1,34 @@
// Copyright 2016 Samsung Electronics Co., Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
function Box(data) {
this._data = data;
}
var box = new Box('=');
Object.defineProperty(Box.prototype, 'data', {
get: function () {
assert(this === box);
return this._data;
},
set: function (data) {
assert(this === box);
this._data = data;
}
});
assert(box.data === '=');
box.data = '+';
assert(box.data === '+');