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

Followup build bustage fixes. r=failtastic-tinderboxen

Browse Source
This commit is contained in:
Jeff Walden 2011-05-10 15:53:27 -07:00
parent be37c9c02b
commit 2387589ebc
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jsscope.h
View File

@ -59,8 +59,6 @@
#include "jspubtd.h"
#include "jspropertytree.h"
#include "vm/ArgumentsObject.h"
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4800)
@ -637,9 +635,7 @@ struct EmptyShape : public js::Shape
return shape;
}
static EmptyShape *getEmptyArgumentsShape(JSContext *cx) {
return ensure(cx, &NormalArgumentsObject::jsClass, &cx->compartment->emptyArgumentsShape);
}
static inline EmptyShape *getEmptyArgumentsShape(JSContext *cx);
static EmptyShape *getEmptyBlockShape(JSContext *cx) {
return ensure(cx, &js_BlockClass, &cx->compartment->emptyBlockShape);

8
js/src/jsscopeinlines.h
View File

@ -49,6 +49,7 @@
#include "jsscope.h"
#include "jsgc.h"
#include "vm/ArgumentsObject.h"
#include "vm/StringObject.h"
#include "jscntxtinlines.h"
@ -355,6 +356,13 @@ EmptyShape::EmptyShape(JSCompartment *comp, js::Class *aclasp)
#endif
}
/* static */ inline EmptyShape *
EmptyShape::getEmptyArgumentsShape(JSContext *cx)
{
return ensure(cx, &NormalArgumentsObject::jsClass, &cx->compartment->emptyArgumentsShape);
}
} /* namespace js */
#endif /* jsscopeinlines_h___ */

2
js/src/vm/ArgumentsObject-inl.h
View File

@ -50,7 +50,7 @@ ArgumentsObject::setInitialLength(uint32 length)
{
JS_ASSERT(getSlot(INITIAL_LENGTH_SLOT).isUndefined());
setSlot(INITIAL_LENGTH_SLOT, Int32Value(length << PACKED_BITS_COUNT));
JS_ASSERT((getSlot(INITIAL_LENGTH_SLOT).toInt32() >> PACKED_BITS_COUNT) == length);
JS_ASSERT((getSlot(INITIAL_LENGTH_SLOT).toInt32() >> PACKED_BITS_COUNT) == int32(length));
JS_ASSERT(!hasOverriddenLength());
}

6
js/src/vm/ArgumentsObject.h
View File

@ -43,7 +43,6 @@
#include "jsfun.h"
#include "jstracer.h"
#include "Writer.h"
#ifdef JS_POLYIC
class GetPropCompiler;
@ -58,6 +57,11 @@ struct VMFrame;
namespace mjit {
namespace ic {
struct PICInfo;
/* Aargh, Windows. */
#ifdef GetProp
#undef GetProp
#endif
extern void GetProp(VMFrame &f, PICInfo *pic);
}
}