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

Fix warnings.

Browse Source
This commit is contained in:
Brian Hackett 2011-10-26 13:30:51 -07:00
parent 914cb44c0c
commit 7254ac96f7
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jsobj.cpp
View File

@ -3526,8 +3526,6 @@ js_CloneBlockObject(JSContext *cx, JSObject *proto, StackFrame *fp)
{
JS_ASSERT(proto->isStaticBlock());
size_t count = OBJ_BLOCK_COUNT(cx, proto);
TypeObject *type = proto->getNewType(cx);
if (!type)
return NULL;
@ -3542,7 +3540,7 @@ js_CloneBlockObject(JSContext *cx, JSObject *proto, StackFrame *fp)
if (!clone->initClonedBlock(cx, type, priv))
return NULL;
JS_ASSERT(clone->slotSpan() >= count + BLOCK_RESERVED_SLOTS);
JS_ASSERT(clone->slotSpan() >= OBJ_BLOCK_COUNT(cx, proto) + BLOCK_RESERVED_SLOTS);
clone->setSlot(JSSLOT_BLOCK_DEPTH, proto->getSlot(JSSLOT_BLOCK_DEPTH));
@ -7098,9 +7096,7 @@ js_SetReservedSlot(JSContext *cx, JSObject *obj, uint32 slot, const Value &v)
if (!obj->isNative())
return true;
Class *clasp = obj->getClass();
JS_ASSERT(slot < JSSLOT_FREE(clasp));
JS_ASSERT(slot < JSSLOT_FREE(obj->getClass()));
obj->setSlot(slot, v);
GCPoke(cx, NullValue());
return true;

21
js/src/jstracer.cpp
View File

@ -1414,6 +1414,7 @@ RawLookupFirstPeer(TraceMonitor* tm, const void *ip, JSObject* globalObj,
return;
}
#ifdef DEBUG
static TreeFragment*
LookupLoop(TraceMonitor* tm, const void *ip, JSObject* globalObj,
uint32 globalShape, uint32 argc)
@ -1422,6 +1423,7 @@ LookupLoop(TraceMonitor* tm, const void *ip, JSObject* globalObj,
RawLookupFirstPeer(tm, ip, globalObj, globalShape, argc, _, prevTreeNextp);
return *prevTreeNextp;
}
#endif
static TreeFragment*
LookupOrAddLoop(TraceMonitor* tm, const void *ip, JSObject* globalObj,
@ -10915,6 +10917,7 @@ TraceRecorder::record_JSOP_OBJTOP()
RecordingStatus
TraceRecorder::getClassPrototype(JSObject* ctor, LIns*& proto_ins)
{
proto_ins = NULL;
JS_NOT_REACHED("FIXME");
#if 0
/*
@ -10965,6 +10968,7 @@ TraceRecorder::getClassPrototype(JSObject* ctor, LIns*& proto_ins)
RecordingStatus
TraceRecorder::getClassPrototype(JSProtoKey key, LIns*& proto_ins)
{
proto_ins = NULL;
JS_NOT_REACHED("FIXME");
#if 0
#ifdef DEBUG
@ -11958,6 +11962,9 @@ JS_REQUIRES_STACK RecordingStatus
TraceRecorder::lookupForSetPropertyOp(JSObject* obj, LIns* obj_ins, jsid id,
bool* safep, JSObject** pobjp, const Shape** shapep)
{
*safep = false;
*pobjp = NULL;
*shapep = NULL;
JS_NOT_REACHED("FIXME");
#if 0
@ -13279,6 +13286,7 @@ TraceRecorder::record_JSOP_CALLNAME()
RETURN_STOP_A("callee is not a function");
} else {
JS_NOT_REACHED("FIXME");
funobj = NULL;
#if 0
LIns* obj_ins = w.immpObjGC(globalObj);
JSObject* obj2;
@ -13944,6 +13952,9 @@ TraceRecorder::prop(JSObject* obj, LIns* obj_ins, uint32 *slotp, LIns** v_insp,
JS_ASSERT((slotp && v_insp && !outp) || (!slotp && !v_insp && outp));
*slotp = 0;
*v_insp = NULL;
JS_NOT_REACHED("FIXME");
return ARECORD_CONTINUE;
@ -14005,12 +14016,12 @@ JS_REQUIRES_STACK RecordingStatus
TraceRecorder::propTail(JSObject* obj, LIns* obj_ins, JSObject* obj2, PCVal pcval,
uint32 *slotp, LIns** v_insp, Value *outp)
{
const JSCodeSpec& cs = js_CodeSpec[*cx->regs().pc];
JS_ASSERT(!(cs.format & JOF_SET));
JS_NOT_REACHED("FIXME");
return RECORD_CONTINUE;
#if 0
const JSCodeSpec& cs = js_CodeSpec[*cx->regs().pc];
JS_ASSERT(!(cs.format & JOF_SET));
const Shape* shape;
uint32 slot;
bool isMethod;
@ -15387,8 +15398,8 @@ TraceRecorder::record_JSOP_LAMBDA()
LIns *proto_ins;
CHECK_STATUS_A(getClassPrototype(JSProto_Function, proto_ins));
LIns* scopeChain_ins = scopeChain();
JS_ASSERT(scopeChain_ins);
//LIns* scopeChain_ins = scopeChain();
//JS_ASSERT(scopeChain_ins);
//LIns* args[] = { proto_ins, scopeChain_ins, w.nameImmpNonGC(fun), cx_ins };
LIns* call_ins = NULL; // w.call(&js_CloneFunctionObject_ci, args);

1
js/src/methodjit/Compiler.h
View File

@ -160,7 +160,6 @@ class Compiler : public BaseCompiler
Jump oolJump;
Label icCall;
RegisterID funObjReg;
RegisterID funPtrReg;
FrameSize frameSize;
bool typeMonitored;
};

4
js/src/methodjit/StubCalls.cpp
View File

@ -1383,7 +1383,7 @@ stubs::RegExp(VMFrame &f, JSObject *regex)
JSObject * JS_FASTCALL
stubs::LambdaJoinableForInit(VMFrame &f, JSFunction *fun)
{
jsbytecode *nextpc = (jsbytecode *) f.scratch;
DebugOnly<jsbytecode*> nextpc = (jsbytecode *) f.scratch;
JS_ASSERT(fun->joinable());
JS_ASSERT(fun->methodAtom() == f.script()->getAtom(GET_SLOTNO(nextpc)));
return fun;
@ -1393,7 +1393,7 @@ JSObject * JS_FASTCALL
stubs::LambdaJoinableForSet(VMFrame &f, JSFunction *fun)
{
JS_ASSERT(fun->joinable());
jsbytecode *nextpc = (jsbytecode *) f.scratch;
DebugOnly<jsbytecode*> nextpc = (jsbytecode *) f.scratch;
const Value &lref = f.regs.sp[-1];
if (lref.isObject() && lref.toObject().canHaveMethodBarrier()) {
JS_ASSERT(fun->methodAtom() == f.script()->getAtom(GET_SLOTNO(nextpc)));