mirrors/escargot
2
0
Fork 0
mirror of https://github.com/Samsung/escargot.git synced 2026-06-29 10:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't store argc, argv on FunctionEnvironmentRecord. (#358)

Browse source 
Save argc, argv on ExecutionState is enough.
and if function call is end, argv member on env points wrong place.

Signed-off-by: seonghyun kim <sh8281.kim@samsung.com>
This commit is contained in:
Patrick Kim 2019-08-09 13:52:17 +09:00 • committed by Hyukwoo Park
commit 3bc6cb5cca
13 changed files with 88 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/interpreter/ByteCodeInterpreter.cpp
View file

@ -1028,7 +1028,7 @@ Value ByteCodeInterpreter::interpret(ExecutionState& state, ByteCodeBlock* byteC
:
{
CreateRestElement* code = (CreateRestElement*)programCounter;
registerFile[code->m_registerIndex] = createRestElementOperation(state, state.lexicalEnvironment()->record(), byteCodeBlock);
registerFile[code->m_registerIndex] = createRestElementOperation(state, byteCodeBlock);
ADD_PROGRAM_COUNTER(CreateRestElement);
NEXT_INSTRUCTION();
}
@ -2237,14 +2237,14 @@ NEVER_INLINE void ByteCodeInterpreter::createFunctionOperation(ExecutionState& s
}
}
NEVER_INLINE ArrayObject* ByteCodeInterpreter::createRestElementOperation(ExecutionState& state, EnvironmentRecord* record, ByteCodeBlock* byteCodeBlock)
NEVER_INLINE ArrayObject* ByteCodeInterpreter::createRestElementOperation(ExecutionState& state, ByteCodeBlock* byteCodeBlock)
{
ASSERT(record->isDeclarativeEnvironmentRecord() && record->asDeclarativeEnvironmentRecord()->isFunctionEnvironmentRecord());
ASSERT(state.callee());
ArrayObject* newArray;
size_t parameterLen = (size_t)byteCodeBlock->m_codeBlock->parameterCount();
size_t argc = record->asDeclarativeEnvironmentRecord()->asFunctionEnvironmentRecord()->argc();
Value* argv = record->asDeclarativeEnvironmentRecord()->asFunctionEnvironmentRecord()->argv();
size_t argc = state.argc();
Value* argv = state.argv();
if (argc > parameterLen) {
size_t arrLen = argc - parameterLen;