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

Correctly handle call arguments when using 'super' calls (#2996)

Browse Source 
There are two interconnected changes here:
* Added missing argument number handling for `super.propname(..)` calls.
* The `super.propname.call(...)` is does not need extra 'this' binding helper.

Fixes #2990.

JerryScript-DCO-1.0-Signed-off-by: Peter Gal pgal.u-szeged@partner.samsung.com
This commit is contained in:
Péter Gál
2019-07-31 15:13:06 +02:00
committed by Robert Fancsik
parent dfafb1aa6b
commit c90306449e
5 changed files with 332 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/parser/js/js-parser-expr.c
+22
View File
@@ -1532,9 +1532,31 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */
static void
parser_process_unary_expression (parser_context_t *context_p) /**< context */
{
#if ENABLED (JERRY_ES2015_CLASS)
/* Track to see if a property was accessed or not */
bool property_accessed = false;
#endif /* ENABLED (JERRY_ES2015_CLASS) */
/* Parse postfix part of a primary expression. */
while (true)
{
#if ENABLED (JERRY_ES2015_CLASS)
if (context_p->token.type == LEXER_DOT || context_p->token.type == LEXER_LEFT_SQUARE)
{
if (property_accessed)
{
/**
* In the case of "super.prop1.prop2(...)" the second property access should not
* generate a super prop call thus the 'PARSER_CLASS_SUPER_PROP_REFERENCE' flags should be removed.
*
* Similar case: "super[propname].prop2(...)"
*/
context_p->status_flags &= (uint32_t) ~PARSER_CLASS_SUPER_PROP_REFERENCE;
}
property_accessed = true;
}
#endif /* ENABLED (JERRY_ES2015_CLASS) */
/* Since break would only break the switch, we use
* continue to continue this loop. Without continue,
* the code abandons the loop. */
jerry-core/vm/vm.c
+42 -1
View File
@@ -1566,7 +1566,48 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
}
case VM_OC_SUPER_PROP_REFERENCE:
{
const int index = (byte_code_start_p[1] == CBC_EXT_SUPER_PROP_ASSIGN) ? -1 : -3;
/**
* In case of this VM_OC_SUPER_PROP_REFERENCE the previously pushed 'super' must be replaced
* with the current 'this' value to correctly access the properties.
*/
int index = -1; /* -1 in case of CBC_EXT_SUPER_PROP_ASSIGN */
if (JERRY_LIKELY (byte_code_start_p[1] == CBC_EXT_SUPER_PROP_CALL))
{
cbc_opcode_t next_call_opcode = (cbc_opcode_t) byte_code_start_p[2];
/* The next opcode must be a call opcode */
JERRY_ASSERT (CBC_CALL <= next_call_opcode && next_call_opcode <= CBC_CALL2_PROP_BLOCK);
int arguments_list_len;
if (next_call_opcode >= CBC_CALL0)
{
/* CBC_CALL{0,1,2}* have their arg count encoded, extract it from there */
arguments_list_len = (int) ((next_call_opcode - CBC_CALL0) / 6);
}
else
{
/**
* In this case the arguments are coded into the byte code stream as a byte argument
* following the call opcode.
*/
arguments_list_len = (int) byte_code_start_p[3];
}
/* The old 'super' value is at least '-3' element away from the current position on the stack. */
index = -3 - arguments_list_len;
}
else
{
/**
* The bytecode order for super assignment should be one of this:
* - CBC_EXT_PUSH_SUPER, CBC_EXT_SUPER_PROP_ASSIGN.
* - CBC_EXT_PUSH_CONSTRUCTOR_SUPER_PROP, CBC_EXT_SUPER_PROP_ASSIGN.
* That is one ext opcode back (-1).
*/
JERRY_ASSERT (byte_code_start_p[-1] == CBC_EXT_PUSH_SUPER
|| byte_code_start_p[-1] == CBC_EXT_PUSH_CONSTRUCTOR_SUPER_PROP);
}
/* Replace the old 'super' value with the correct 'this' binding */
ecma_free_value (stack_top_p[index]);
stack_top_p[index] = ecma_copy_value (frame_ctx_p->this_binding);
continue;