Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 921631 - Convert CTypes away from using propertyops to using JSNative-backed getters/setters, part 4. r=bholley

Browse Source 
--HG--
extra : rebase_source : 75d252a85aff64b4763ce09842e4fed2b4801346
This commit is contained in:
Jeff Walden 2013-09-20 15:04:53 -07:00
parent 6c4de76931
commit 5af7715661
3 changed files with 69 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
js/src/ctypes/CTypes.cpp
View File

@ -265,13 +265,12 @@ namespace FunctionType {
static bool Call(JSContext* cx, unsigned argc, jsval* vp);
static bool ArgTypesGetter(JSContext* cx, HandleObject obj, HandleId idval,
MutableHandleValue vp);
static bool ReturnTypeGetter(JSContext* cx, HandleObject obj, HandleId idval,
MutableHandleValue vp);
static bool ABIGetter(JSContext* cx, HandleObject obj, HandleId idval, MutableHandleValue vp);
static bool IsVariadicGetter(JSContext* cx, HandleObject obj, HandleId idval,
MutableHandleValue vp);
bool IsFunctionType(HandleValue v);
bool ArgTypesGetter(JSContext* cx, JS::CallArgs args);
bool ReturnTypeGetter(JSContext* cx, JS::CallArgs args);
bool ABIGetter(JSContext* cx, JS::CallArgs args);
bool IsVariadicGetter(JSContext* cx, JS::CallArgs args);
}
namespace CClosure {
@ -295,12 +294,11 @@ namespace CData {
static bool ToSource(JSContext* cx, unsigned argc, jsval* vp);
static JSString *GetSourceString(JSContext *cx, HandleObject typeObj,
void *data);
static bool ErrnoGetter(JSContext* cx, HandleObject obj, HandleId idval,
MutableHandleValue vp);
bool ErrnoGetter(JSContext* cx, JS::CallArgs args);
#if defined(XP_WIN)
static bool LastErrorGetter(JSContext* cx, HandleObject obj, HandleId idval,
MutableHandleValue vp);
bool LastErrorGetter(JSContext* cx, JS::CallArgs args);
#endif // defined(XP_WIN)
}
@ -553,9 +551,6 @@ static const JSClass sCDataFinalizerClass = {
#define CTYPESCTOR_FLAGS \
(CTYPESFN_FLAGS | JSFUN_CONSTRUCTOR)
#define CTYPESPROP_FLAGS \
(JSPROP_SHARED | JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT)
#define CTYPESACC_FLAGS \
(JSPROP_ENUMERATE | JSPROP_PERMANENT)
@ -701,15 +696,19 @@ static const JSFunctionSpec sFunctionFunction =
JS_FN("FunctionType", FunctionType::Create, 2, CTYPESCTOR_FLAGS);
static const JSPropertySpec sFunctionProps[] = {
{ "argTypes", 0, CTYPESPROP_FLAGS,
JSOP_WRAPPER(FunctionType::ArgTypesGetter), JSOP_NULLWRAPPER },
{ "returnType", 0, CTYPESPROP_FLAGS,
JSOP_WRAPPER(FunctionType::ReturnTypeGetter), JSOP_NULLWRAPPER },
{ "abi", 0, CTYPESPROP_FLAGS,
JSOP_WRAPPER(FunctionType::ABIGetter), JSOP_NULLWRAPPER },
{ "isVariadic", 0, CTYPESPROP_FLAGS,
JSOP_WRAPPER(FunctionType::IsVariadicGetter), JSOP_NULLWRAPPER },
{ 0, 0, 0, JSOP_NULLWRAPPER, JSOP_NULLWRAPPER }
JS_PSG("argTypes",
(Property<FunctionType::IsFunctionType, FunctionType::ArgTypesGetter>::Fun),
CTYPESACC_FLAGS),
JS_PSG("returnType",
(Property<FunctionType::IsFunctionType, FunctionType::ReturnTypeGetter>::Fun),
CTYPESACC_FLAGS),
JS_PSG("abi",
(Property<FunctionType::IsFunctionType, FunctionType::ABIGetter>::Fun),
CTYPESACC_FLAGS),
JS_PSG("isVariadic",
(Property<FunctionType::IsFunctionType, FunctionType::IsVariadicGetter>::Fun),
CTYPESACC_FLAGS),
JS_PS_END
};
static const JSFunctionSpec sFunctionInstanceFunctions[] = {
@ -775,13 +774,15 @@ static const JSFunctionSpec sUInt64Functions[] = {
};
static const JSPropertySpec sModuleProps[] = {
{ "errno", 0, JSPROP_SHARED | JSPROP_PERMANENT,
JSOP_WRAPPER(CData::ErrnoGetter), JSOP_NULLWRAPPER },
JS_PSG("errno",
(Property<IsCTypesGlobal, CData::ErrnoGetter>::Fun),
JSPROP_PERMANENT),
#if defined(XP_WIN)
{ "winLastError", 0, JSPROP_SHARED | JSPROP_PERMANENT,
JSOP_WRAPPER(CData::LastErrorGetter), JSOP_NULLWRAPPER },
JS_PSG("winLastError",
(Property<IsCTypesGlobal, CData::LastErrorGetter>::Fun),
JSPROP_PERMANENT),
#endif // defined(XP_WIN)
{ 0, 0, 0, JSOP_NULLWRAPPER, JSOP_NULLWRAPPER }
JS_PS_END
};
static const JSFunctionSpec sModuleFunctions[] = {
@ -1274,6 +1275,12 @@ IsCTypesGlobal(JSObject* obj)
return JS_GetClass(obj) == &sCTypesGlobalClass;
}
bool
IsCTypesGlobal(HandleValue v)
{
return v.isObject() && IsCTypesGlobal(&v.toObject());
}
// Get the JSCTypesCallbacks struct from the 'ctypes' object 'obj'.
JSCTypesCallbacks*
GetCallbacks(JSObject* obj)
@ -5913,80 +5920,71 @@ FunctionType::GetFunctionInfo(JSObject* obj)
return static_cast<FunctionInfo*>(JSVAL_TO_PRIVATE(slot));
}
static bool
CheckFunctionType(JSContext* cx, JSObject* obj)
bool
FunctionType::IsFunctionType(HandleValue v)
{
if (!CType::IsCType(obj) || CType::GetTypeCode(obj) != TYPE_function) {
JS_ReportError(cx, "not a FunctionType");
if (!v.isObject())
return false;
}
return true;
JSObject* obj = &v.toObject();
return CType::IsCType(obj) && CType::GetTypeCode(obj) == TYPE_function;
}
bool
FunctionType::ArgTypesGetter(JSContext* cx, HandleObject obj, HandleId idval, MutableHandleValue vp)
FunctionType::ArgTypesGetter(JSContext* cx, JS::CallArgs args)
{
if (!CheckFunctionType(cx, obj))
return false;
JS::Rooted<JSObject*> obj(cx, &args.thisv().toObject());
// Check if we have a cached argTypes array.
vp.set(JS_GetReservedSlot(obj, SLOT_ARGS_T));
if (!JSVAL_IS_VOID(vp))
args.rval().set(JS_GetReservedSlot(obj, SLOT_ARGS_T));
if (!args.rval().isUndefined())
return true;
FunctionInfo* fninfo = GetFunctionInfo(obj);
size_t len = fninfo->mArgTypes.length();
// Prepare a new array.
JS::AutoValueVector vec(cx);
if (!vec.resize(len))
return false;
JS::Rooted<JSObject*> argTypes(cx);
{
JS::AutoValueVector vec(cx);
if (!vec.resize(len))
return false;
for (size_t i = 0; i < len; ++i)
vec[i] = OBJECT_TO_JSVAL(fninfo->mArgTypes[i]);
for (size_t i = 0; i < len; ++i)
vec[i] = JS::ObjectValue(*fninfo->mArgTypes[i]);
RootedObject argTypes(cx, JS_NewArrayObject(cx, len, vec.begin()));
if (!argTypes)
return false;
argTypes = JS_NewArrayObject(cx, len, vec.begin());
if (!argTypes)
return false;
}
// Seal and cache it.
if (!JS_FreezeObject(cx, argTypes))
return false;
JS_SetReservedSlot(obj, SLOT_ARGS_T, OBJECT_TO_JSVAL(argTypes));
JS_SetReservedSlot(obj, SLOT_ARGS_T, JS::ObjectValue(*argTypes));
vp.setObject(*argTypes);
args.rval().setObject(*argTypes);
return true;
}
bool
FunctionType::ReturnTypeGetter(JSContext* cx, HandleObject obj, HandleId idval, MutableHandleValue vp)
FunctionType::ReturnTypeGetter(JSContext* cx, JS::CallArgs args)
{
if (!CheckFunctionType(cx, obj))
return false;
// Get the returnType object from the FunctionInfo.
vp.setObject(*GetFunctionInfo(obj)->mReturnType);
args.rval().setObject(*GetFunctionInfo(&args.thisv().toObject())->mReturnType);
return true;
}
bool
FunctionType::ABIGetter(JSContext* cx, HandleObject obj, HandleId idval, MutableHandleValue vp)
FunctionType::ABIGetter(JSContext* cx, JS::CallArgs args)
{
if (!CheckFunctionType(cx, obj))
return false;
// Get the abi object from the FunctionInfo.
vp.setObject(*GetFunctionInfo(obj)->mABI);
args.rval().setObject(*GetFunctionInfo(&args.thisv().toObject())->mABI);
return true;
}
bool
FunctionType::IsVariadicGetter(JSContext* cx, HandleObject obj, HandleId idval, MutableHandleValue vp)
FunctionType::IsVariadicGetter(JSContext* cx, JS::CallArgs args)
{
if (!CheckFunctionType(cx, obj))
return false;
vp.setBoolean(GetFunctionInfo(obj)->mIsVariadic);
args.rval().setBoolean(GetFunctionInfo(&args.thisv().toObject())->mIsVariadic);
return true;
}
@ -6698,27 +6696,17 @@ CData::ToSource(JSContext* cx, unsigned argc, jsval* vp)
}
bool
CData::ErrnoGetter(JSContext* cx, HandleObject obj, HandleId, MutableHandleValue vp)
CData::ErrnoGetter(JSContext* cx, JS::CallArgs args)
{
if (!IsCTypesGlobal(obj)) {
JS_ReportError(cx, "this is not not global object ctypes");
return false;
}
vp.set(JS_GetReservedSlot(obj, SLOT_ERRNO));
args.rval().set(JS_GetReservedSlot(&args.thisv().toObject(), SLOT_ERRNO));
return true;
}
#if defined(XP_WIN)
bool
CData::LastErrorGetter(JSContext* cx, HandleObject obj, HandleId, MutableHandleValue vp)
CData::LastErrorGetter(JSContext* cx, JS::CallArgs args)
{
if (!IsCTypesGlobal(obj)) {
JS_ReportError(cx, "not global object ctypes");
return false;
}
vp.set(JS_GetReservedSlot(obj, SLOT_LASTERROR));
args.rval().set(JS_GetReservedSlot(&args.thisv().toObject(), SLOT_LASTERROR));
return true;
}
#endif // defined(XP_WIN)

1
js/src/ctypes/CTypes.h
View File

@ -305,6 +305,7 @@ struct ClosureInfo
}
};
bool IsCTypesGlobal(HandleValue v);
bool IsCTypesGlobal(JSObject* obj);
JSCTypesCallbacks* GetCallbacks(JSObject* obj);

2
toolkit/components/ctypes/tests/unit/test_jsctypes.js.in
View File

@ -1299,7 +1299,7 @@ function run_type_ctor_class_tests(c, t, t2, props, fns, instanceProps, instance
// Check that the shared properties and functions on 'c.prototype' throw.
for each (let p in props)
do_check_throws(function() { c.prototype[p]; }, Error);
do_check_throws(function() { c.prototype[p]; }, TypeError);
for each (let f in fns)
do_check_throws(function() { c.prototype[f](); }, Error);