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

Support spreaded argument list in super property reference. (#3415)

Browse Source 
This patch fixes #3394.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
This commit is contained in:
Robert Fancsik 2019-12-04 14:13:00 +01:00 committed by Dániel Bátyai
parent 99ae94b7c0
commit e188407d3a
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jerry-core/vm/vm.c
View File

@ -1862,7 +1862,10 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
{ {
cbc_opcode_t next_call_opcode = (cbc_opcode_t) byte_code_start_p[2]; cbc_opcode_t next_call_opcode = (cbc_opcode_t) byte_code_start_p[2];
/* The next opcode must be a call opcode */ /* The next opcode must be a call opcode */
JERRY_ASSERT (CBC_CALL <= next_call_opcode && next_call_opcode <= CBC_CALL2_PROP_BLOCK); JERRY_ASSERT ((next_call_opcode >= CBC_CALL && next_call_opcode <= CBC_CALL2_PROP_BLOCK)
|| (next_call_opcode == CBC_EXT_OPCODE
&& byte_code_start_p[3] >= CBC_EXT_SPREAD_CALL
&& byte_code_start_p[3] <= CBC_EXT_SPREAD_CALL_PROP_BLOCK));
int arguments_list_len; int arguments_list_len;
if (next_call_opcode >= CBC_CALL0) if (next_call_opcode >= CBC_CALL0)
@ -1876,7 +1879,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
* In this case the arguments are coded into the byte code stream as a byte argument * In this case the arguments are coded into the byte code stream as a byte argument
* following the call opcode. * following the call opcode.
*/ */
arguments_list_len = (int) byte_code_start_p[3]; arguments_list_len = (int) byte_code_start_p[next_call_opcode == CBC_EXT_OPCODE ? 4 : 3];
} }
/* The old 'super' value is at least '-3' element away from the current position on the stack. */ /* The old 'super' value is at least '-3' element away from the current position on the stack. */
index = -3 - arguments_list_len; index = -3 - arguments_list_len;

24
tests/jerry/fail/regression-test-issue-3394.js Normal file
View File

@ -0,0 +1,24 @@
// Copyright JS Foundation and other contributors, http://js.foundation
//
// 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.
class Animal { }
class Dog extends Animal {
static explain() {
super.explain(...[])
}
}
Dog.explain()