YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework the Reflect.setPrototypeOf method (#3774)

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Adam Szilagyi aszilagy@inf.u-szeged.hu
This commit is contained in:
Szilagyi Adam
2020-05-25 18:24:04 +02:00
committed by GitHub
parent e50e2719df
commit 843c542053
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/ecma/builtin-objects/ecma-builtin-reflect.c
+15 -7
View File
@@ -22,6 +22,7 @@
#include "ecma-exceptions.h"
#include "ecma-function-object.h"
#include "ecma-gc.h"
#include "ecma-proxy-object.h"
#include "jcontext.h"
#if ENABLED (JERRY_ES2015_BUILTIN_REFLECT)
@@ -227,19 +228,26 @@ ecma_builtin_reflect_dispatch_routine (uint16_t builtin_routine_id, /**< built-i
}
case ECMA_REFLECT_OBJECT_SET_PROTOTYPE_OF:
{
ecma_value_t result = ecma_builtin_object_object_set_prototype_of (arguments_list[0], arguments_list[1]);
bool is_error = ECMA_IS_VALUE_ERROR (result);
if (is_error)
if (!ecma_is_value_object (arguments_list[1]) && !ecma_is_value_null (arguments_list[1]))
{
jcontext_release_exception ();
return ecma_raise_type_error (ECMA_ERR_MSG ("proto is neither Object nor Null."));
}
ecma_object_t *obj_p = ecma_get_object_from_value (arguments_list[0]);
ecma_value_t status;
#if ENABLED (JERRY_ES2015_BUILTIN_PROXY)
if (ECMA_OBJECT_IS_PROXY (obj_p))
{
status = ecma_proxy_object_set_prototype_of (obj_p, arguments_list[1]);
}
else
#endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */
{
ecma_free_value (result);
status = ecma_op_ordinary_object_set_prototype_of (obj_p, arguments_list[1]);
}
return ecma_make_boolean_value (!is_error);
return status;
}
case ECMA_REFLECT_OBJECT_APPLY:
{
tests/test262-es6-excludelist.xml
-3
View File
@@ -190,9 +190,6 @@
<test id="built-ins/Reflect/preventExtensions/return-boolean-from-proxy-object.js"><reason></reason></test>
<test id="built-ins/Reflect/set/name.js"><reason></reason></test>
<test id="built-ins/Reflect/setPrototypeOf/name.js"><reason></reason></test>
<test id="built-ins/Reflect/setPrototypeOf/proto-is-not-object-and-not-null-throws.js"><reason></reason></test>
<test id="built-ins/Reflect/setPrototypeOf/proto-is-symbol-throws.js"><reason></reason></test>
<test id="built-ins/Reflect/setPrototypeOf/return-abrupt-from-result.js"><reason></reason></test>
<test id="built-ins/RegExp/prototype/exec/get-sticky-coerce.js"><reason></reason></test>
<test id="built-ins/RegExp/prototype/exec/get-sticky-err.js"><reason></reason></test>
<test id="built-ins/RegExp/prototype/flags/name.js"><reason></reason></test>