Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

chakrashim: Improve AddLocal and Object::GetPropertyAttributes #101

Merged
merged 1 commit into from
Jul 28, 2016
Merged

chakrashim: Improve AddLocal and Object::GetPropertyAttributes #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions deps/chakrashim/include/v8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,10 +734,11 @@ class V8_EXPORT HandleScope {
private:
friend class EscapableHandleScope;
template <class T> friend class Local;
static const int kOnStackLocals = 5; // Arbitrary number of refs on stack
static const int kOnStackLocals = 8; // Arbitrary number of refs on stack

JsValueRef _locals[kOnStackLocals]; // Save some refs on stack
JsValueRef _refs; // More refs go to a JS array
// Save some refs on stack. 1st element on stack
// is the JavascriptArray where other refs go.
JsValueRef _locals[kOnStackLocals + 1];
int _count;
HandleScope *_prev;
JsContextRef _contextRef;
Expand Down
20 changes: 20 additions & 0 deletions deps/chakrashim/lib/chakra_shim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,26 @@
// CHAKRA-TODO: Need to add JSRT API to detect this
return false;
};
utils.getPropertyAttributes = function(object, value) {
var descriptor = Object_getOwnPropertyDescriptor(object, value);
if (descriptor == undefined) {
return -1;
}

var attributes = 0;
// taken from v8.h. Update if this changes in future
const ReadOnly = 1, DontEnum = 2, DontDelete = 4;
if (!descriptor.writable) {
attributes |= ReadOnly;
}
if (!descriptor.enumerable) {
attributes |= DontEnum;
}
if (!descriptor.configurable) {
attributes |= DontDelete;
}
return attributes;
};
}

patchErrorTypes();
Expand Down
3 changes: 3 additions & 0 deletions deps/chakrashim/src/jsrtcachedpropertyidref.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

DEF(apply)
DEF(concat)
DEF(push)
DEF(construct)
DEF(constructor)
DEF(defineProperty)
Expand Down Expand Up @@ -72,6 +73,8 @@ DEF(getSymbolFor)
DEF(ensureDebug)
DEF(enqueueMicrotask)
DEF(dequeueMicrotask)
DEF(saveInHandleScope)
DEF(getPropertyAttributes)
DEF(getFunctionName)
DEF(getFileName)
DEF(getColumnNumber)
Expand Down
4 changes: 4 additions & 0 deletions deps/chakrashim/src/jsrtcontextcachedobj.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ DEFTYPE(Number)
DEFTYPE(Object)
DEFTYPE(Proxy)
DEFTYPE(String)
DEFTYPE(Array)
DEFTYPE(Uint8Array)
DEFTYPE(Uint8ClampedArray)
DEFTYPE(Int8Array)
Expand All @@ -46,9 +47,12 @@ DEFTYPE(Float64Array)


// These prototype functions will be cached/shimmed
DEFMETHOD(Object, getOwnPropertyDescriptor)
DEFMETHOD(Object, hasOwnProperty)
DEFMETHOD(Object, toString)
DEFMETHOD(String, concat)
DEFMETHOD(Array, push)


#undef DEFTYPE
#undef DEFMETHOD
21 changes: 8 additions & 13 deletions deps/chakrashim/src/jsrtcontextshim.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ ContextShim::ContextShim(IsolateShim * isolateShim,
#undef DEF_IS_TYPE
cloneObjectFunction(JS_INVALID_REFERENCE),
getPropertyNamesFunction(JS_INVALID_REFERENCE),
getOwnPropertyDescriptorFunction(JS_INVALID_REFERENCE),
getEnumerableNamedPropertiesFunction(JS_INVALID_REFERENCE),
getEnumerableIndexedPropertiesFunction(JS_INVALID_REFERENCE),
createEnumerationIteratorFunction(JS_INVALID_REFERENCE),
Expand All @@ -86,7 +85,8 @@ ContextShim::ContextShim(IsolateShim * isolateShim,
getSymbolForFunction(JS_INVALID_REFERENCE),
ensureDebugFunction(JS_INVALID_REFERENCE),
enqueueMicrotaskFunction(JS_INVALID_REFERENCE),
dequeueMicrotaskFunction(JS_INVALID_REFERENCE) {
dequeueMicrotaskFunction(JS_INVALID_REFERENCE),
getPropertyAttributesFunction(JS_INVALID_REFERENCE) {
memset(globalConstructor, 0, sizeof(globalConstructor));
memset(globalPrototypeFunction, 0, sizeof(globalPrototypeFunction));
}
Expand Down Expand Up @@ -302,16 +302,6 @@ bool ContextShim::InitializeBuiltIns() {
return false;
}

if (!InitializeBuiltIn(&getOwnPropertyDescriptorFunction,
[this](JsValueRef * value) {
return GetProperty(
GetObjectConstructor(),
CachedPropertyIdRef::getOwnPropertyDescriptor,
value);
})) {
return false;
}

if (DefineProperty(globalObject,
GetIsolateShim()->GetKeepAliveObjectSymbolPropertyIdRef(),
PropertyDescriptorOptionValues::False,
Expand Down Expand Up @@ -516,10 +506,14 @@ DECLARE_GETOBJECT(DateConstructor,
DECLARE_GETOBJECT(ProxyConstructor,
globalConstructor[GlobalType::Proxy])
DECLARE_GETOBJECT(GetOwnPropertyDescriptorFunction,
getOwnPropertyDescriptorFunction)
globalPrototypeFunction[GlobalPrototypeFunction
::Object_getOwnPropertyDescriptor])
DECLARE_GETOBJECT(StringConcatFunction,
globalPrototypeFunction[GlobalPrototypeFunction
::String_concat])
DECLARE_GETOBJECT(ArrayPushFunction,
globalPrototypeFunction[GlobalPrototypeFunction
::Array_push])


JsValueRef ContextShim::GetProxyOfGlobal() {
Expand Down Expand Up @@ -571,6 +565,7 @@ CHAKRASHIM_FUNCTION_GETTER(getSymbolFor)
CHAKRASHIM_FUNCTION_GETTER(ensureDebug)
CHAKRASHIM_FUNCTION_GETTER(enqueueMicrotask);
CHAKRASHIM_FUNCTION_GETTER(dequeueMicrotask);
CHAKRASHIM_FUNCTION_GETTER(getPropertyAttributes);

#define DEF_IS_TYPE(F) CHAKRASHIM_FUNCTION_GETTER(F)
#include "jsrtcachedpropertyidref.inc"
Expand Down
10 changes: 6 additions & 4 deletions deps/chakrashim/src/jsrtcontextshim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ class ContextShim {
JsValueRef GetGlobalType(GlobalType index);
JsValueRef GetGetOwnPropertyDescriptorFunction();
JsValueRef GetStringConcatFunction();
JsValueRef GetArrayPushFunction();
JsValueRef GetGlobalPrototypeFunction(GlobalPrototypeFunction index);
JsValueRef GetProxyOfGlobal();

Expand Down Expand Up @@ -124,10 +125,10 @@ class ContextShim {
std::vector<void*> embedderData;

#define DECLARE_CHAKRASHIM_FUNCTION_GETTER(F) \
public: \
JsValueRef Get##F##Function(); \
private: \
JsValueRef F##Function; \
public: \
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: should indent by 1 (keep change from your previous commit)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lint was complaining about this, thats why did this change.

JsValueRef Get##F##Function(); \
private: \
JsValueRef F##Function; \

DECLARE_CHAKRASHIM_FUNCTION_GETTER(cloneObject);
DECLARE_CHAKRASHIM_FUNCTION_GETTER(getPropertyNames);
Expand All @@ -144,6 +145,7 @@ class ContextShim {
DECLARE_CHAKRASHIM_FUNCTION_GETTER(ensureDebug);
DECLARE_CHAKRASHIM_FUNCTION_GETTER(enqueueMicrotask);
DECLARE_CHAKRASHIM_FUNCTION_GETTER(dequeueMicrotask);
DECLARE_CHAKRASHIM_FUNCTION_GETTER(getPropertyAttributes);

#define DEF_IS_TYPE(F) DECLARE_CHAKRASHIM_FUNCTION_GETTER(F)
#include "jsrtcachedpropertyidref.inc"
Expand Down
98 changes: 2 additions & 96 deletions deps/chakrashim/src/jsrtutils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,102 +282,6 @@ JsErrorCode HasOwnProperty(JsValueRef object,
return JsCallFunction(hasOwnPropertyFunction, args, _countof(args), result);
}

JsErrorCode IsValueInArray(
JsValueRef arrayRef,
JsValueRef valueRef,
std::function<JsErrorCode(JsValueRef, JsValueRef, bool*)> comparator,
bool* result) {
JsErrorCode error;
unsigned int length;
*result = false;
error = GetArrayLength(arrayRef, &length);
if (error != JsNoError) {
return error;
}

for (unsigned int index = 0; index < length; index++) {
JsValueRef indexValue;
error = JsIntToNumber(index, &indexValue);
if (error != JsNoError) {
return error;
}

JsValueRef itemRef;
error = JsGetIndexedProperty(arrayRef, indexValue, &itemRef);
if (error != JsNoError) {
return error;
}

if (comparator != nullptr) {
error = comparator(valueRef, itemRef, result);
} else {
error = JsEquals(itemRef, valueRef, result);
}

if (error != JsNoError) {
return error;
}

if (*result)
return JsNoError;
}

return JsNoError;
}

JsErrorCode IsValueInArray(JsValueRef arrayRef,
JsValueRef valueRef,
bool* result) {
return IsValueInArray(arrayRef, valueRef, nullptr, result);
}

JsErrorCode IsCaseInsensitiveStringValueInArray(JsValueRef arrayRef,
JsValueRef valueRef,
bool* result) {
return IsValueInArray(arrayRef, valueRef, [=](
JsValueRef first, JsValueRef second, bool* areEqual) -> JsErrorCode {
JsValueType type;
*areEqual = false;

JsErrorCode error = JsGetValueType(first, &type);
if (error != JsNoError) {
return error;
}
if (type != JsString) {
return JsNoError;
}

error = JsGetValueType(second, &type);
if (error != JsNoError) {
return error;
}
if (type != JsString) {
return JsNoError;
}

const wchar_t* firstPtr;
size_t firstLength;

error = JsStringToPointer(first, &firstPtr, &firstLength);
if (error != JsNoError) {
return error;
}

const wchar_t* secondPtr;
size_t secondLength;

error = JsStringToPointer(second, &secondPtr, &secondLength);
if (error != JsNoError) {
return error;
}

size_t maxCount = min(firstLength, secondLength);
*areEqual = (_wcsnicmp(firstPtr, secondPtr, maxCount) == 0);
return JsNoError;
},
result);
}

JsErrorCode GetOwnPropertyDescriptor(JsValueRef ref,
JsValueRef prop,
JsValueRef* result) {
Expand Down Expand Up @@ -571,6 +475,7 @@ PropertyDescriptorOptionValues GetPropertyDescriptorOptionValue(bool b) {
PropertyDescriptorOptionValues::False;
}

// CHAKRA-TODO: Convert this function to javascript
JsErrorCode CreatePropertyDescriptor(
PropertyDescriptorOptionValues writable,
PropertyDescriptorOptionValues enumerable,
Expand Down Expand Up @@ -911,6 +816,7 @@ bool DeletePrivate(JsValueRef object, JsValueRef key) {
return hasDeleted;
}

// CHAKRA-TODO: Convert this function to javascript
JsErrorCode GetPrivate(JsValueRef object, JsValueRef key,
JsValueRef *result) {
JsPropertyIdRef hiddenValuesIdRef;
Expand Down
14 changes: 0 additions & 14 deletions deps/chakrashim/src/jsrtutils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,20 +101,6 @@ JsErrorCode GetOwnPropertyDescriptor(JsValueRef ref,
JsValueRef prop,
JsValueRef* result);

JsErrorCode IsValueInArray(JsValueRef arrayRef,
JsValueRef valueRef,
bool* result);

JsErrorCode IsValueInArray(
JsValueRef arrayRef,
JsValueRef valueRef,
std::function<JsErrorCode(JsValueRef, JsValueRef, bool*)> comperator,
bool* result);

JsErrorCode IsCaseInsensitiveStringValueInArray(JsValueRef arrayRef,
JsValueRef valueRef,
bool* result);

JsErrorCode IsZero(JsValueRef value,
bool *result);

Expand Down
3 changes: 2 additions & 1 deletion deps/chakrashim/src/v8chakra.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ bool TemplateData::Is(ExternalData* data) {
|| data->GetType() == ExternalDataTypes::FunctionTemplateData;
}

// CHAKRA-TODO: Convert this function to javascript?
// Clone the template properties into the new instance
JsErrorCode TemplateData::CopyPropertiesTo(JsValueRef newInstance) {
if (properties.IsEmpty()) {
Expand Down Expand Up @@ -84,7 +85,7 @@ JsErrorCode TemplateData::CopyPropertiesTo(JsValueRef newInstance) {
TemplateData* templateData = static_cast<TemplateData*>(data);
value = templateData->NewInstance(value);
if (value == JS_INVALID_REFERENCE) {
return JsErrorFatal; // Just to indicate failed
return JsErrorFatal; // Just to indicate failed
}
IfJsErrorRet(JsSetProperty(propertyDescriptor, valueIdRef, value, false));
}
Expand Down
35 changes: 16 additions & 19 deletions deps/chakrashim/src/v8handlescope.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ __declspec(thread) HandleScope *current = nullptr;
HandleScope::HandleScope(Isolate* isolate)
: _prev(current),
_locals(),
_refs(JS_INVALID_REFERENCE),
_count(0),
_contextRef(JS_INVALID_REFERENCE),
_addRefRecordHead(nullptr) {
_locals[0] = JS_INVALID_REFERENCE;
current = this;
}

Expand All @@ -54,28 +54,25 @@ HandleScope *HandleScope::GetCurrent() {
}

bool HandleScope::AddLocal(JsValueRef value) {
if (_count < _countof(_locals)) {
_locals[_count++] = value;
return true;
}

if (_refs == JS_INVALID_REFERENCE) {
if (JsCreateArray(1, &_refs) != JsNoError) {
return AddLocalAddRef(value);
// _locals is full, save them in _locals[0]
if (_count == kOnStackLocals) {
if (_locals[0] == JS_INVALID_REFERENCE) {
if (JsCreateArray(0, &_locals[0]) != JsNoError) {
return AddLocalAddRef(value);
}
}
}

JsValueRef index;
JsValueRef arrayPushFunction =
jsrt::ContextShim::GetCurrent()->GetArrayPushFunction();

if (JsIntToNumber(_count - _countof(_locals), &index) != JsNoError) {
return AddLocalAddRef(value);
}

if (JsSetIndexedProperty(_refs, index, value) != JsNoError) {
return AddLocalAddRef(value);
JsValueRef result;
if (JsCallFunction(arrayPushFunction, _locals,
_countof(_locals), &result) != JsNoError) {
return AddLocalAddRef(value);
}
_count = 0;
}

_count++;
_locals[1 + _count++] = value;
return true;
}

Expand Down
Loading