mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Header changes for sixgill, annotations. bug 601129, r=jorendorff

This commit is contained in:
Brian Hackett 2010-10-01 21:00:55 -07:00
Родитель 82d757bd1f
Коммит e25970c4da
16 изменённых файлов: 105 добавлений и 24 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
js/src/ctypes/CTypes.cpp
Просмотреть файл

@ -4289,6 +4289,7 @@ StructType::ConstructData(JSContext* cx,
if (argc == fields->count()) {
for (FieldInfoHash::Range r = fields->all(); !r.empty(); r.popFront()) {
const FieldInfo& field = r.front().value;
STATIC_ASSUME(field.mIndex < fields->count()); /* Quantified invariant */
if (!ImplicitConvert(cx, argv[field.mIndex], field.mType,
buffer + field.mOffset,
false, NULL))

1
js/src/jsapi.cpp
Просмотреть файл

@ -3955,6 +3955,7 @@ JS_NextProperty(JSContext *cx, JSObject *iterobj, jsid *idp)
/* Non-native case: use the ida enumerated when iterobj was created. */
ida = (JSIdArray *) iterobj->getPrivate();
JS_ASSERT(i <= ida->length);
STATIC_ASSUME(i <= ida->length);
if (i == 0) {
*idp = JSID_VOID;
} else {

2
js/src/jsarena.cpp
Просмотреть файл

@ -48,7 +48,7 @@
#include "jsstdint.h"
#include "jsbit.h"
#include "jsarena.h"
#include "jsutil.h"
#include "jsprvtd.h"
#ifdef JS_ARENAMETER
static JSArenaStats *arena_stats_list;

2
js/src/jsarena.h
Просмотреть файл

@ -126,6 +126,7 @@ struct JSArenaPool {
else \
_a->avail = _p + _nb; \
p = (type) _p; \
STATIC_ASSUME(!p || ubound((char *)p) >= nb) \
JS_ArenaCountAllocation(pool, nb); \
JS_END_MACRO
@ -149,6 +150,7 @@ struct JSArenaPool {
} else { \
p = (type) JS_ArenaGrow(pool, p, size, incr); \
} \
STATIC_ASSUME(!p || ubound((char *)p) >= size + incr); \
JS_ArenaCountGrowth(pool, size, incr); \
JS_END_MACRO

1
js/src/jscntxt.cpp
Просмотреть файл

@ -221,6 +221,7 @@ StackSpace::mark(JSTracer *trc)
*/
Value *end = firstUnused();
for (StackSegment *seg = currentSegment; seg; seg = seg->getPreviousInMemory()) {
STATIC_ASSERT(ubound(end) >= 0);
if (seg->inContext()) {
/* This may be the only pointer to the initialVarObj. */
if (seg->hasInitialVarObj())

3
js/src/jscntxtinlines.h
Просмотреть файл

@ -139,6 +139,7 @@ StackSpace::isCurrentAndActive(JSContext *cx) const
currentSegment == cx->getCurrentSegment();
}
STATIC_POSTCONDITION(!return || ubound(from) >= nvals)
JS_ALWAYS_INLINE bool
StackSpace::ensureSpace(JSContext *maybecx, Value *from, ptrdiff_t nvals) const
{
@ -642,6 +643,7 @@ assertSameCompartment(JSContext *cx, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
#undef START_ASSERT_SAME_COMPARTMENT
STATIC_PRECONDITION_ASSUME(ubound(vp) >= argc + 2)
JS_ALWAYS_INLINE bool
CallJSNative(JSContext *cx, js::Native native, uintN argc, js::Value *vp)
{
@ -657,6 +659,7 @@ CallJSNative(JSContext *cx, js::Native native, uintN argc, js::Value *vp)
return ok;
}
STATIC_PRECONDITION(ubound(vp) >= argc + 2)
JS_ALWAYS_INLINE bool
CallJSNativeConstructor(JSContext *cx, js::Native native, uintN argc, js::Value *vp)
{

4
js/src/jsfun.cpp
Просмотреть файл

@ -210,7 +210,7 @@ NewArguments(JSContext *cx, JSObject *parent, uint32 argc, JSObject &callee)
namespace {
struct PutArg
struct STATIC_SKIP_INFERENCE PutArg
{
PutArg(Value *dst) : dst(dst) {}
Value *dst;
@ -2288,7 +2288,7 @@ js_fun_call(JSContext *cx, uintN argc, Value *vp)
namespace {
struct CopyNonHoleArgs
struct STATIC_SKIP_INFERENCE CopyNonHoleArgs
{
CopyNonHoleArgs(JSObject *aobj, Value *dst) : aobj(aobj), dst(dst) {}
JSObject *aobj;

1
js/src/jsgc.h
Просмотреть файл

@ -328,6 +328,7 @@ Cell::bitmap() const
return &chunk()->bitmaps[arena()->arenaIndex()];
}
STATIC_POSTCONDITION_ASSUME(return < ArenaBitmap::BitCount)
size_t
Cell::cellIndex() const
{

1
js/src/jsinterp.h
Просмотреть файл

@ -52,6 +52,7 @@
struct JSFrameRegs
{
STATIC_SKIP_INFERENCE
js::Value *sp; /* stack pointer */
jsbytecode *pc; /* program counter */
JSStackFrame *fp; /* active frame */

1
js/src/jsprvtd.h
Просмотреть файл

@ -55,6 +55,7 @@
*/
#include "jspubtd.h"
#include "jsstaticcheck.h"
#include "jsutil.h"
JS_BEGIN_EXTERN_C

56
js/src/jsstaticcheck.h
Просмотреть файл

@ -66,4 +66,60 @@ JS_ASSERT_NOT_ON_TRACE(JSContext *cx)
#endif
#define VOUCH_HAVE_STACK VOUCH_DOES_NOT_REQUIRE_STACK
/* sixgill annotation defines */
/* Avoid name collision if included with other headers defining annotations. */
#ifndef HAVE_STATIC_ANNOTATIONS
#define HAVE_STATIC_ANNOTATIONS
#ifdef XGILL_PLUGIN
#define STATIC_PRECONDITION(COND) __attribute__((precondition(#COND)))
#define STATIC_PRECONDITION_ASSUME(COND) __attribute__((precondition_assume(#COND)))
#define STATIC_POSTCONDITION(COND) __attribute__((postcondition(#COND)))
#define STATIC_POSTCONDITION_ASSUME(COND) __attribute__((postcondition_assume(#COND)))
#define STATIC_INVARIANT(COND) __attribute__((invariant(#COND)))
#define STATIC_INVARIANT_ASSUME(COND) __attribute__((invariant_assume(#COND)))
/* Used to make identifiers for assert/assume annotations in a function. */
#define STATIC_PASTE2(X,Y) X ## Y
#define STATIC_PASTE1(X,Y) STATIC_PASTE2(X,Y)
#define STATIC_ASSERT(COND) \
JS_BEGIN_MACRO \
__attribute__((assert_static(#COND), unused)) \
int STATIC_PASTE1(assert_static_, __COUNTER__); \
JS_END_MACRO
#define STATIC_ASSUME(COND) \
JS_BEGIN_MACRO \
__attribute__((assume_static(#COND), unused)) \
int STATIC_PASTE1(assume_static_, __COUNTER__); \
JS_END_MACRO
#define STATIC_ASSERT_RUNTIME(COND) \
JS_BEGIN_MACRO \
__attribute__((assert_static_runtime(#COND), unused)) \
int STATIC_PASTE1(assert_static_runtime_, __COUNTER__); \
JS_END_MACRO
#else /* XGILL_PLUGIN */
#define STATIC_PRECONDITION(COND) /* nothing */
#define STATIC_PRECONDITION_ASSUME(COND) /* nothing */
#define STATIC_POSTCONDITION(COND) /* nothing */
#define STATIC_POSTCONDITION_ASSUME(COND) /* nothing */
#define STATIC_INVARIANT(COND) /* nothing */
#define STATIC_INVARIANT_ASSUME(COND) /* nothing */
#define STATIC_ASSERT(COND) JS_BEGIN_MACRO /* nothing */ JS_END_MACRO
#define STATIC_ASSUME(COND) JS_BEGIN_MACRO /* nothing */ JS_END_MACRO
#define STATIC_ASSERT_RUNTIME(COND) JS_BEGIN_MACRO /* nothing */ JS_END_MACRO
#endif /* XGILL_PLUGIN */
#define STATIC_SKIP_INFERENCE STATIC_INVARIANT(skip_inference())
#endif /* HAVE_STATIC_ANNOTATIONS */
#endif /* jsstaticcheck_h___ */

1
js/src/jstl.h
Просмотреть файл

@ -212,6 +212,7 @@ class ReentrancyGuard
* Round x up to the nearest power of 2. This function assumes that the most
* significant bit of x is not set, which would lead to overflow.
*/
STATIC_POSTCONDITION_ASSUME(return >= x)
JS_ALWAYS_INLINE size_t
RoundUpPow2(size_t x)
{

2
js/src/jsvector.h
Просмотреть файл

@ -467,6 +467,7 @@ Vector<T,N,AP>::~Vector()
* curLength and check for overflow.
*/
template <class T, size_t N, class AP>
STATIC_POSTCONDITION(!return || newCap >= curLength + lengthInc)
inline bool
Vector<T,N,AP>::calculateNewCapacity(size_t curLength, size_t lengthInc,
size_t &newCap)
@ -622,6 +623,7 @@ Vector<T,N,AP>::growByUninitialized(size_t incr)
}
template <class T, size_t N, class AP>
STATIC_POSTCONDITION(!return || ubound(this->begin()) >= newLength)
inline bool
Vector<T,N,AP>::resize(size_t newLength)
{

2
js/src/methodjit/InvokeHelpers.cpp
Просмотреть файл

@ -530,7 +530,7 @@ stubs::UncachedCallHelper(VMFrame &f, uint32 argc, UncachedCallResult *ucr)
}
if (ucr->fun->isNative()) {
if (!ucr->fun->u.n.native(cx, argc, vp))
if (!CallJSNative(cx, ucr->fun->u.n.native, argc, vp))
THROW();
return;
}

3
js/src/methodjit/MonoIC.cpp
Просмотреть файл

@ -442,8 +442,7 @@ class CallCompiler : public BaseCompiler
if (callingNew)
vp[1].setMagicWithObjectOrNullPayload(NULL);
Native fn = fun->u.n.native;
if (!fn(cx, ic.argc, vp))
if (!CallJSNative(cx, fun->u.n.native, ic.argc, vp))
THROWV(true);
/* Right now, take slow-path for IC misses or multiple stubs. */

48
xpcom/glue/nsDebug.h
Просмотреть файл

@ -189,6 +189,10 @@
** When the tool is not running these macros are no-ops.
******************************************************************************/
/* Avoid name collision if included with other headers defining annotations. */
#ifndef HAVE_STATIC_ANNOTATIONS
#define HAVE_STATIC_ANNOTATIONS
#ifdef XGILL_PLUGIN
#define STATIC_PRECONDITION(COND) __attribute__((precondition(#COND)))
@ -204,34 +208,22 @@
#define STATIC_ASSERT(COND) \
PR_BEGIN_MACRO \
__attribute__((assert(#COND), unused)) \
int STATIC_PASTE1(static_assert_, __COUNTER__); \
__attribute__((assert_static(#COND), unused)) \
int STATIC_PASTE1(assert_static_, __COUNTER__); \
PR_END_MACRO
#define STATIC_ASSUME(COND) \
PR_BEGIN_MACRO \
__attribute__((assume(#COND), unused)) \
int STATIC_PASTE1(static_assume_, __COUNTER__); \
__attribute__((assume_static(#COND), unused)) \
int STATIC_PASTE1(assume_static_, __COUNTER__); \
PR_END_MACRO
#define STATIC_ASSERT_RUNTIME(COND) \
PR_BEGIN_MACRO \
__attribute__((assert_runtime(#COND), unused)) \
int STATIC_PASTE1(static_assert_runtime_, __COUNTER__); \
__attribute__((assert_static_runtime(#COND), unused)) \
int STATIC_PASTE1(assert_static_runtime_, __COUNTER__); \
PR_END_MACRO
/* Redefine runtime assertion macros to perform static assertions, for both
* debug and release builds. Don't include the original runtime assertions;
* this ensures the tool will consider cases where the assertion fails. */
#undef NS_PRECONDITION
#undef NS_ASSERTION
#undef NS_POSTCONDITION
#define NS_PRECONDITION(expr, str) STATIC_ASSERT_RUNTIME(expr)
#define NS_ASSERTION(expr, str) STATIC_ASSERT_RUNTIME(expr)
#define NS_POSTCONDITION(expr, str) STATIC_ASSERT_RUNTIME(expr)
#else /* XGILL_PLUGIN */
#define STATIC_PRECONDITION(COND) /* nothing */
@ -247,6 +239,26 @@
#endif /* XGILL_PLUGIN */
#define STATIC_SKIP_INFERENCE STATIC_INVARIANT(skip_inference())
#endif /* HAVE_STATIC_ANNOTATIONS */
#ifdef XGILL_PLUGIN
/* Redefine runtime assertion macros to perform static assertions, for both
* debug and release builds. Don't include the original runtime assertions;
* this ensures the tool will consider cases where the assertion fails. */
#undef NS_PRECONDITION
#undef NS_ASSERTION
#undef NS_POSTCONDITION
#define NS_PRECONDITION(expr, str) STATIC_ASSERT_RUNTIME(expr)
#define NS_ASSERTION(expr, str) STATIC_ASSERT_RUNTIME(expr)
#define NS_POSTCONDITION(expr, str) STATIC_ASSERT_RUNTIME(expr)
#endif /* XGILL_PLUGIN */
/******************************************************************************
** Macros for terminating execution when an unrecoverable condition is
** reached. These need to be compiled regardless of the NS_DEBUG flag.