wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

[INFER] Cleanup for review, bug 657412.

Browse Source
This commit is contained in:
Brian Hackett 2011-05-16 22:59:40 -07:00
parent 98763bc2cb
commit 4cb0c5c5ef
22 changed files with 28 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
js/src/jsapi.cpp
View File

@ -3465,9 +3465,7 @@ DefineUCProperty(JSContext *cx, JSObject *obj, const jschar *name, size_t namele
uintN flags, intN tinyid)
{
JSAtom *atom = js_AtomizeChars(cx, name, AUTO_NAMELEN(name, namelen), 0);
if (!atom)
return false;
return DefinePropertyById(cx, obj, ATOM_TO_JSID(atom), value, getter, setter, attrs,
return atom && DefinePropertyById(cx, obj, ATOM_TO_JSID(atom), value, getter, setter, attrs,
flags, tinyid);
}
@ -3857,7 +3855,6 @@ JS_SetPropertyById(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
CHECK_REQUEST(cx);
assertSameCompartment(cx, obj, id);
JSAutoResolveFlags rf(cx, JSRESOLVE_QUALIFIED | JSRESOLVE_ASSIGNING);
return obj->setProperty(cx, id, Valueify(vp), false);
}
@ -4128,14 +4125,6 @@ JS_NewArrayObject(JSContext *cx, jsint length, jsval *vector)
CHECK_REQUEST(cx);
/* NB: jsuint cast does ToUint32. */
assertSameCompartment(cx, JSValueArray(vector, vector ? (jsuint)length : 0));
#ifdef DEBUG
if (vector) {
for (int i = 0; i < length; i++)
JS_ASSERT(!Valueify(vector[i]).isMagic(JS_ARRAY_HOLE));
}
#endif
return NewDenseCopiedArray(cx, (jsuint)length, Valueify(vector));
}
@ -4234,7 +4223,7 @@ JS_GetSecurityCallbacks(JSContext *cx)
JS_PUBLIC_API(JSFunction *)
JS_NewFunctionWithType(JSContext *cx, JSNative native, uintN nargs, uintN flags,
JSObject *parent, const char *name,
JSTypeHandler handler, const char *fullName)
JSTypeHandler handler)
{
JS_THREADSAFE_ASSERT(cx->compartment != cx->runtime->atomsCompartment);
JSAtom *atom;
@ -4249,13 +4238,7 @@ JS_NewFunctionWithType(JSContext *cx, JSNative native, uintN nargs, uintN flags,
if (!atom)
return NULL;
}
if (!handler) {
handler = JS_TypeHandlerDynamic;
if (!fullName)
fullName = "Unknown";
}
return js_NewFunction(cx, NULL, Valueify(native), nargs, flags, parent, atom,
handler, fullName);
return js_NewFunction(cx, NULL, Valueify(native), nargs, flags, parent, atom, handler, name);
}
JS_PUBLIC_API(JSFunction *)
@ -4556,10 +4539,8 @@ JS_DefineFunctions(JSContext *cx, JSObject *obj, JSFunctionSpec *fs)
if (!fun)
return JS_FALSE;
if (cx->typeInferenceEnabled()) {
/* Mark the type handler for this function as generic. */
if (cx->typeInferenceEnabled())
fun->getType()->asFunction()->isGeneric = true;
}
/*
* As jsapi.h notes, fs must point to storage that lives as long
@ -5151,9 +5132,9 @@ EvaluateUCScriptForPrincipalsCommon(JSContext *cx, JSObject *obj,
JS_ASSERT(script->getVersion() == compileVersion);
bool ok = Execute(cx, *obj, script, NULL, 0, Valueify(rval));
LAST_FRAME_CHECKS(cx, ok);
js_DestroyScript(cx, script);
return ok;
}
JS_PUBLIC_API(JSBool)

5
js/src/jsapi.h
View File

@ -2627,14 +2627,13 @@ JS_GetSecurityCallbacks(JSContext *cx);
extern JS_PUBLIC_API(JSFunction *)
JS_NewFunctionWithType(JSContext *cx, JSNative call, uintN nargs, uintN flags,
JSObject *parent, const char *name,
JSTypeHandler handler, const char *fullName);
JSTypeHandler handler);
static JS_ALWAYS_INLINE JSFunction*
JS_NewFunction(JSContext *cx, JSNative call, uintN nargs, uintN flags,
JSObject *parent, const char *name)
{
return JS_NewFunctionWithType(cx, call, nargs, flags, parent, name,
NULL, NULL);
return JS_NewFunctionWithType(cx, call, nargs, flags, parent, name, NULL);
}
/*

7
js/src/jsarray.cpp
View File

@ -605,7 +605,6 @@ js_SetLengthProperty(JSContext *cx, JSObject *obj, jsdouble length)
v.setNumber(length);
id = ATOM_TO_JSID(cx->runtime->atomState.lengthAtom);
/* We don't support read-only array length yet. */
return obj->setProperty(cx, id, &v, false);
}
@ -2529,11 +2528,6 @@ array_splice(JSContext *cx, uintN argc, Value *vp)
/* Get the type of the result object. */
TypeObject *type;
if (obj->isArray()) {
/*
* :FIXME: This is getting a type whose prototype is that of the
* argument, even if it is the Array.prototype on a different
* global than the current frame.
*/
type = obj->getType();
} else {
/*
@ -2839,7 +2833,6 @@ array_slice(JSContext *cx, uintN argc, Value *vp)
/* Get the type object for the returned array. */
TypeObject *type;
if (obj->isArray()) {
/* :FIXME: Same issue as array_splice. */
type = obj->getType();
} else {
/*

30
js/src/jscompartment.cpp
View File

@ -333,6 +333,9 @@ JSCompartment::wrap(JSContext *cx, Value *vp)
vp->setObject(*wrapper);
if (wrapper->getProto() != proto && !SetProto(cx, wrapper, proto, false))
return false;
if (!crossCompartmentWrappers.put(wrapper->getProxyPrivate(), *vp))
return false;
@ -415,7 +418,6 @@ JSCompartment::wrap(JSContext *cx, AutoIdVector &props)
}
#if defined JS_METHODJIT && defined JS_MONOIC
/*
* Check if the pool containing the code for jit should be destroyed, per the
* heuristics in JSCompartment::sweep.
@ -445,33 +447,10 @@ static inline void
ScriptTryDestroyCode(JSContext *cx, JSScript *script, bool normal,
uint32 releaseInterval, uint32 &counter)
{
/*
* Check if the JIT code for script should be destroyed. When JIT code has
* inlined frames, destroy the outer script if any of the inner scripts
* will need to be destroyed, preserving the invariant that we always have
* JIT code for any inlined frame which may need to be expanded.
*/
mjit::JITScript *jit = normal ? script->jitNormal : script->jitCtor;
if (!jit)
return;
if (ScriptPoolDestroyed(cx, jit, releaseInterval, counter)) {
if (jit && ScriptPoolDestroyed(cx, jit, releaseInterval, counter))
mjit::ReleaseScriptCode(cx, script, normal);
return;
}
for (unsigned i = 0; i < jit->nInlineFrames; i++) {
JSScript *inner = jit->inlineFrames()[i].fun->script();
if (!inner->jitNormal || /* Found inner first in the walk. */
ScriptPoolDestroyed(cx, inner->jitNormal, releaseInterval, counter)) {
mjit::ReleaseScriptCode(cx, script, true);
return;
}
}
}
#endif // JS_METHODJIT && JS_MONOIC
/*
@ -570,7 +549,6 @@ JSCompartment::sweep(JSContext *cx, uint32 releaseInterval)
for (JSCList *cursor = scripts.next; cursor != &scripts; cursor = cursor->next) {
JSScript *script = reinterpret_cast<JSScript *>(cursor);
if (script->hasJITCode()) {
mjit::ic::SweepCallICs(cx, script, discardScripts);
if (discardScripts) {

5
js/src/jsdate.cpp
View File

@ -2658,9 +2658,8 @@ js_InitDateClass(JSContext *cx, JSObject *obj)
AutoValueRooter toUTCStringFun(cx);
jsid toUTCStringId = ATOM_TO_JSID(cx->runtime->atomState.toUTCStringAtom);
jsid toGMTStringId = ATOM_TO_JSID(cx->runtime->atomState.toGMTStringAtom);
if (!js_GetProperty(cx, proto, toUTCStringId, toUTCStringFun.addr()))
return NULL;
if (!js_DefineProperty(cx, proto, toGMTStringId, toUTCStringFun.addr(),
if (!js_GetProperty(cx, proto, toUTCStringId, toUTCStringFun.addr()) ||
!js_DefineProperty(cx, proto, toGMTStringId, toUTCStringFun.addr(),
PropertyStub, StrictPropertyStub, 0)) {
return NULL;
}

30
js/src/jsfun.cpp
View File

@ -984,7 +984,7 @@ NewCallObject(JSContext *cx, JSScript *script, JSObject &scopeChain, JSObject *c
Bindings &bindings = script->bindings;
size_t argsVars = bindings.countArgsAndVars();
size_t slots = JSObject::CALL_RESERVED_SLOTS + argsVars;
gc::FinalizeKind kind = gc::GetGCObjectKind(slots, gc::FINALIZE_OBJECT2);
gc::FinalizeKind kind = gc::GetGCObjectKind(slots);
JSObject *callobj = js_NewGCObject(cx, kind);
if (!callobj)
@ -1634,8 +1634,6 @@ fun_getProperty(JSContext *cx, JSObject *obj, jsid id, Value *vp)
}
#endif
JSAtom *atom = NULL;
switch (slot) {
case FUN_ARGUMENTS:
/* Warn if strict about f.arguments or equivalent unqualified uses. */
@ -1652,23 +1650,16 @@ fun_getProperty(JSContext *cx, JSObject *obj, jsid id, Value *vp)
} else {
vp->setNull();
}
atom = cx->runtime->atomState.argumentsAtom;
break;
case FUN_LENGTH:
vp->setInt32(fun->nargs);
atom = cx->runtime->atomState.lengthAtom;
break;
case FUN_ARITY:
vp->setInt32(fun->nargs);
atom = cx->runtime->atomState.arityAtom;
break;
case FUN_NAME:
vp->setString(fun->atom ? fun->atom
: cx->runtime->emptyString);
atom = cx->runtime->atomState.nameAtom;
break;
case FUN_CALLER:
@ -1691,7 +1682,6 @@ fun_getProperty(JSContext *cx, JSObject *obj, jsid id, Value *vp)
}
}
}
atom = cx->runtime->atomState.callerAtom;
break;
default:
@ -1835,7 +1825,6 @@ fun_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
if (!ResolveInterpretedFunctionPrototype(cx, obj))
return false;
*objp = obj;
return true;
}
@ -2467,26 +2456,13 @@ fun_bind(JSContext *cx, uintN argc, Value *vp)
return true;
}
static void
type_HandlerMonitored(JSContext *cx, JSTypeFunction *jsfun, JSTypeCallsite *jssite)
{
/*
* Mark all calls to Function.prototype.call and Function.prototype.apply
* as monitored, so the compiler knows to keep track of all passed arguments.
*/
TypeCallsite *site = Valueify(jssite);
cx->compartment->types.monitorBytecode(cx, site->script, site->pc - site->script->code);
if (site->returnTypes)
site->returnTypes->addType(cx, TYPE_UNKNOWN);
}
static JSFunctionSpec function_methods[] = {
#if JS_HAS_TOSOURCE
JS_FN_TYPE(js_toSource_str, fun_toSource, 0,0, JS_TypeHandlerString),
#endif
JS_FN_TYPE(js_toString_str, fun_toString, 0,0, JS_TypeHandlerString),
JS_FN_TYPE(js_apply_str, js_fun_apply, 2,0, type_HandlerMonitored),
JS_FN_TYPE(js_call_str, js_fun_call, 1,0, type_HandlerMonitored),
JS_FN_TYPE(js_apply_str, js_fun_apply, 2,0, JS_TypeHandlerDynamic),
JS_FN_TYPE(js_call_str, js_fun_call, 1,0, JS_TypeHandlerDynamic),
JS_FN_TYPE("bind", fun_bind, 1,0, JS_TypeHandlerDynamic),
#if JS_HAS_GENERATORS
JS_FN_TYPE("isGenerator", fun_isGenerator,0,0, JS_TypeHandlerBool),

1
js/src/jsgc.cpp
View File

@ -1994,7 +1994,6 @@ js_DestroyScriptsToGC(JSContext *cx, JSCompartment *comp)
while ((script = *listp) != NULL) {
*listp = script->u.nextToGC;
script->u.nextToGC = NULL;
js_DestroyCachedScript(cx, script);
}
}

9
js/src/jsgcinlines.h
View File

@ -120,13 +120,9 @@ GetGCThingTraceKind(const void *thing)
/* Capacity for slotsToThingKind */
const size_t SLOTS_TO_THING_KIND_LIMIT = 17;
/*
* Get the best kind to use when making an object with the given slot count.
* fallback is the kind to use if the number of slots exceeds the maximum
* number of fixed slots for an object.
*/
/* Get the best kind to use when making an object with the given slot count. */
static inline FinalizeKind
GetGCObjectKind(size_t numSlots, FinalizeKind fallback = FINALIZE_OBJECT0)
GetGCObjectKind(size_t numSlots)
{
extern FinalizeKind slotsToThingKind[];
@ -253,4 +249,5 @@ js_NewGCXML(JSContext *cx)
}
#endif
#endif /* jsgcinlines_h___ */

10
js/src/jshashtable.h
View File

@ -46,12 +46,6 @@
#include "jsalloc.h"
#include "jstl.h"
/* Gross special case for Gecko, which defines malloc/calloc/free. */
#ifdef mozilla_mozalloc_macro_wrappers_h
# define JSHASHTABLE_UNDEFD_MOZALLOC_WRAPPERS
# include "mozilla/mozalloc_undef_macro_wrappers.h"
#endif
namespace js {
/* Integral types for all hash functions. */
@ -1223,8 +1217,4 @@ class HashSet
} /* namespace js */
#ifdef JSHASHTABLE_UNDEFD_MOZALLOC_WRAPPERS
# include "mozilla/mozalloc_macro_wrappers.h"
#endif
#endif

4
js/src/jsinterp.cpp
View File

@ -1900,8 +1900,6 @@ namespace reprmeter {
#define POP_COPY_TO(v) v = *--regs.sp
#define POP_RETURN_VALUE() regs.fp()->setReturnValue(*--regs.sp)
/* Definitions for performing runtime checks required by type inference. */
#define POP_BOOLEAN(cx, vp, b) \
JS_BEGIN_MACRO \
vp = &regs.sp[-1]; \
@ -2630,6 +2628,7 @@ Interpret(JSContext *cx, StackFrame *entryFrame, uintN inlineCallCount, InterpMo
advance_pc:
regs.pc += len;
op = (JSOp) *regs.pc;
do_op:
CHECK_RECORDER();
LOG_OPCODE(op);
@ -3302,7 +3301,6 @@ BEGIN_CASE(JSOP_SETCONST)
LOAD_ATOM(0, atom);
JSObject &obj = cx->stack.currentVarObj();
const Value &ref = regs.sp[-1];
if (!obj.defineProperty(cx, ATOM_TO_JSID(atom), ref,
PropertyStub, StrictPropertyStub,
JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_READONLY)) {

1
js/src/jsiter.cpp
View File

@ -402,7 +402,6 @@ GetCustomIterator(JSContext *cx, JSObject *obj, uintN flags, Value *vp)
-1, ObjectValue(*obj), NULL, bytes.ptr());
return false;
}
return true;
}

1
js/src/jsnum.cpp
View File

@ -1129,7 +1129,6 @@ js_InitNumberClass(JSContext *cx, JSObject *obj)
JSPROP_PERMANENT | JSPROP_READONLY)) {
return NULL;
}
return proto;
}

9
js/src/jsobj.cpp
View File

@ -1649,7 +1649,6 @@ js_obj_defineGetter(JSContext *cx, uintN argc, Value *vp)
uintN attrs;
if (!CheckAccess(cx, obj, id, JSACC_WATCH, &junk, &attrs))
return JS_FALSE;
call.rval().setUndefined();
return obj->defineProperty(cx, id, UndefinedValue(), getter, StrictPropertyStub,
JSPROP_ENUMERATE | JSPROP_GETTER | JSPROP_SHARED);
@ -1684,7 +1683,6 @@ js_obj_defineSetter(JSContext *cx, uintN argc, Value *vp)
uintN attrs;
if (!CheckAccess(cx, obj, id, JSACC_WATCH, &junk, &attrs))
return JS_FALSE;
call.rval().setUndefined();
return obj->defineProperty(cx, id, UndefinedValue(), PropertyStub, setter,
JSPROP_ENUMERATE | JSPROP_SETTER | JSPROP_SHARED);
@ -2519,10 +2517,7 @@ obj_defineProperty(JSContext* cx, uintN argc, Value* vp)
/* 15.2.3.6 step 4 */
JSBool junk;
if (!js_DefineOwnProperty(cx, obj, nameidr.id(), descval, &junk))
return JS_FALSE;
return JS_TRUE;
return js_DefineOwnProperty(cx, obj, nameidr.id(), descval, &junk);
}
static bool
@ -3373,7 +3368,7 @@ js_CloneBlockObject(JSContext *cx, JSObject *proto, StackFrame *fp)
JS_ASSERT(proto->isStaticBlock());
size_t count = OBJ_BLOCK_COUNT(cx, proto);
gc::FinalizeKind kind = gc::GetGCObjectKind(count + 1, gc::FINALIZE_OBJECT2);
gc::FinalizeKind kind = gc::GetGCObjectKind(count + 1);
js::types::TypeObject *type = proto->getNewType(cx);
if (!type)

1
js/src/json.cpp
View File

@ -924,6 +924,7 @@ JSONParseError(JSONParser *jp, JSContext *cx)
static bool
Revive(JSContext *cx, const Value &reviver, Value *vp)
{
JSObject *obj = NewBuiltinClassInstance(cx, &js_ObjectClass);
if (!obj)
return false;

1
js/src/jsprf.cpp
View File

@ -51,7 +51,6 @@
#include "jsutil.h"
#include "jspubtd.h"
#include "jsstr.h"
#include "jsobjinlines.h"
using namespace js;

1
js/src/jsprobes.cpp
View File

@ -43,7 +43,6 @@
#include "jsobj.h"
#include "jsscript.h"
#include "jsstr.h"
#include "jsobjinlines.h"
#ifdef __APPLE__
#include "sharkctl.h"

5
js/src/jsproxy.cpp
View File

@ -56,7 +56,6 @@
using namespace js;
using namespace js::gc;
using namespace js::types;
namespace js {
@ -1098,8 +1097,6 @@ JS_FRIEND_API(Class) OuterWindowProxyClass = {
}
};
static const char proxy_type_str[] = "Proxy:new";
JSBool
proxy_Call(JSContext *cx, uintN argc, Value *vp)
{
@ -1463,7 +1460,7 @@ js_InitProxyClass(JSContext *cx, JSObject *obj)
if (!module)
return NULL;
TypeObject *type = cx->newTypeObject(js_ProxyClass.name, module->getProto());
types::TypeObject *type = cx->newTypeObject(js_ProxyClass.name, module->getProto());
if (!type || !module->setTypeAndUniqueShape(cx, type))
return NULL;

2
js/src/jsregexpinlines.h
View File

@ -67,7 +67,7 @@ extern Class regexp_statics_class;
static inline JSObject *
regexp_statics_construct(JSContext *cx, GlobalObject *parent)
{
JSObject *obj = NewObject<WithProto::Given>(cx, &regexp_statics_class, parent, NULL);
JSObject *obj = NewObject<WithProto::Given>(cx, &regexp_statics_class, NULL, parent);
if (!obj)
return NULL;
RegExpStatics *res = cx->new_<RegExpStatics>();

1
js/src/jsstr.cpp
View File

@ -1864,7 +1864,6 @@ BuildFlatMatchArray(JSContext *cx, JSString *textstr, const FlatMatch &fm, Value
JSObject *obj = NewSlowEmptyArray(cx);
if (!obj)
return false;
vp->setObject(*obj);
return obj->defineProperty(cx, INT_TO_JSID(0), StringValue(fm.pattern())) &&

2
js/src/jstypedarray.cpp
View File

@ -130,8 +130,6 @@ ArrayBuffer::class_finalize(JSContext *cx, JSObject *obj)
}
}
static const char arraybuffer_type_str[] = "ArrayBuffer:new";
/*
* new ArrayBuffer(byteLength)
*/

6
js/src/jsvalue.h
View File

@ -197,14 +197,11 @@ BOX_NON_DOUBLE_JSVAL(JSValueType type, uint64 *slot)
{
jsval_layout l;
JS_ASSERT(type > JSVAL_TYPE_DOUBLE && type <= JSVAL_UPPER_INCL_TYPE_OF_BOXABLE_SET);
/*
// FIXME overasserting
JS_ASSERT_IF(type == JSVAL_TYPE_STRING ||
type == JSVAL_TYPE_OBJECT ||
type == JSVAL_TYPE_NONFUNOBJ ||
type == JSVAL_TYPE_FUNOBJ,
*(uint32 *)slot != 0);
*/
l.s.tag = JSVAL_TYPE_TO_TAG(type & 0xF);
/* A 32-bit value in a 64-bit slot always occupies the low-addressed end. */
l.s.payload.u32 = *(uint32 *)slot;
@ -304,14 +301,11 @@ BOX_NON_DOUBLE_JSVAL(JSValueType type, uint64 *slot)
uint32 shift = isI32 * 32;
uint64 mask = ((uint64)-1) >> shift;
uint64 payload = *slot & mask;
/*
// FIXME overasserting
JS_ASSERT_IF(type == JSVAL_TYPE_STRING ||
type == JSVAL_TYPE_OBJECT ||
type == JSVAL_TYPE_NONFUNOBJ ||
type == JSVAL_TYPE_FUNOBJ,
payload != 0);
*/
l.asBits = payload | JSVAL_TYPE_TO_SHIFTED_TAG(type & 0xF);
return l;
}

5
js/src/jsxml.cpp
View File

@ -223,7 +223,7 @@ namespace_equality(JSContext *cx, JSObject *obj, const Value *v, JSBool *bp)
}
JS_FRIEND_DATA(Class) js_NamespaceClass = {
js_Namespace_str,
"Namespace",
JSCLASS_CONSTRUCT_PROTOTYPE |
JSCLASS_HAS_RESERVED_SLOTS(JSObject::NAMESPACE_CLASS_RESERVED_SLOTS) |
JSCLASS_HAS_CACHED_PROTO(JSProto_Namespace),
@ -336,7 +336,7 @@ qname_equality(JSContext *cx, JSObject *qn, const Value *v, JSBool *bp)
}
JS_FRIEND_DATA(Class) js_QNameClass = {
js_QName_str,
"QName",
JSCLASS_CONSTRUCT_PROTOTYPE |
JSCLASS_HAS_RESERVED_SLOTS(JSObject::QNAME_CLASS_RESERVED_SLOTS) |
JSCLASS_HAS_CACHED_PROTO(JSProto_QName),
@ -7318,7 +7318,6 @@ js_SetDefaultXMLNamespace(JSContext *cx, const Value &v)
return JS_FALSE;
JSObject &varobj = cx->stack.currentVarObj();
if (!varobj.defineProperty(cx, JS_DEFAULT_XML_NAMESPACE_ID, ObjectValue(*ns),
PropertyStub, StrictPropertyStub, JSPROP_PERMANENT)) {
return JS_FALSE;