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

move VM-bound data into VMInstance from context

Browse source 
Signed-off-by: seonghyun kim <sh8281.kim@samsung.com>
This commit is contained in:
seonghyun kim 2017-03-23 16:13:06 +09:00
commit 34dad07c79
12 changed files with 352 additions and 299 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/runtime/Object.cpp
View file

@ -18,6 +18,7 @@
#include "Object.h"
#include "ExecutionContext.h"
#include "Context.h"
#include "VMInstance.h"
#include "ErrorObject.h"
#include "FunctionObject.h"
#include "ArrayObject.h"
@ -359,9 +360,9 @@ void Object::markAsPrototypeObject(ExecutionState& state)
ensureObjectRareData();
rareData()->m_isEverSetAsPrototypeObject = true;
if (!state.context()->didSomePrototypeObjectDefineIndexedProperty()) {
if (!state.context()->vmInstance()->didSomePrototypeObjectDefineIndexedProperty()) {
if (structure()->hasIndexPropertyName()) {
state.context()->somePrototypeObjectDefineIndexedProperty(state);
state.context()->vmInstance()->somePrototypeObjectDefineIndexedProperty(state);
}
}
}
@ -395,9 +396,9 @@ ObjectGetResult Object::getOwnProperty(ExecutionState& state, const ObjectProper
bool Object::defineOwnProperty(ExecutionState& state, const ObjectPropertyName& P, const ObjectPropertyDescriptor& desc) ESCARGOT_OBJECT_SUBCLASS_MUST_REDEFINE
{
if (isEverSetAsPrototypeObject()) {
if (!state.context()->didSomePrototypeObjectDefineIndexedProperty() && isIndexString(P.string(state))) {
state.context()->somePrototypeObjectDefineIndexedProperty(state);
if (UNLIKELY(isEverSetAsPrototypeObject())) {
if (UNLIKELY(!state.context()->vmInstance()->didSomePrototypeObjectDefineIndexedProperty() && isIndexString(P.string(state)))) {
state.context()->vmInstance()->somePrototypeObjectDefineIndexedProperty(state);
}
}