136 lines
4.5 KiB
Diff
136 lines
4.5 KiB
Diff
--- js/src/jsapi.cpp
|
|
+++ js/src/jsapi.cpp
|
|
@@ -3985,7 +3985,7 @@ JS_Enumerate(JSContext *cx, JSObject *ob
|
|
AutoIdVector props(cx);
|
|
JSIdArray *ida;
|
|
if (!GetPropertyNames(cx, obj, JSITER_OWNONLY, &props) || !VectorToIdArray(cx, props, &ida))
|
|
- return false;
|
|
+ return NULL;
|
|
for (size_t n = 0; n < size_t(ida->length); ++n)
|
|
JS_ASSERT(js_CheckForStringIndex(ida->vector[n]) == ida->vector[n]);
|
|
return ida;
|
|
--- js/src/jsfun.cpp
|
|
+++ js/src/jsfun.cpp
|
|
@@ -2051,7 +2051,7 @@ fun_toStringHelper(JSContext *cx, JSObje
|
|
|
|
JSString *str = JS_DecompileFunction(cx, fun, indent);
|
|
if (!str)
|
|
- return false;
|
|
+ return NULL;
|
|
|
|
if (!indent)
|
|
cx->compartment->toSourceCache.put(fun, str);
|
|
@@ -2657,7 +2657,7 @@ LookupInterpretedFunctionPrototype(JSCon
|
|
const Shape *shape = funobj->nativeLookup(id);
|
|
if (!shape) {
|
|
if (!ResolveInterpretedFunctionPrototype(cx, funobj))
|
|
- return false;
|
|
+ return NULL;
|
|
shape = funobj->nativeLookup(id);
|
|
}
|
|
JS_ASSERT(!shape->configurable());
|
|
--- js/src/jsiter.cpp
|
|
+++ js/src/jsiter.cpp
|
|
@@ -425,7 +425,7 @@ NewIteratorObject(JSContext *cx, uintN f
|
|
*/
|
|
JSObject *obj = js_NewGCObject(cx, FINALIZE_OBJECT0);
|
|
if (!obj)
|
|
- return false;
|
|
+ return NULL;
|
|
obj->init(cx, &js_IteratorClass, NULL, NULL, NULL, false);
|
|
obj->setMap(cx->compartment->emptyEnumeratorShape);
|
|
return obj;
|
|
--- js/src/jsparse.cpp
|
|
+++ js/src/jsparse.cpp
|
|
@@ -3352,7 +3352,7 @@ Parser::functionDef(JSAtom *funAtom, Fun
|
|
if (!outertc->inFunction() && bodyLevel && funAtom && !lambda && outertc->compiling()) {
|
|
JS_ASSERT(pn->pn_cookie.isFree());
|
|
if (!DefineGlobal(pn, outertc->asCodeGenerator(), funAtom))
|
|
- return false;
|
|
+ return NULL;
|
|
}
|
|
|
|
pn->pn_blockid = outertc->blockid();
|
|
--- js/src/jsstr.cpp
|
|
+++ js/src/jsstr.cpp
|
|
@@ -1734,7 +1734,7 @@ class RegExpGuard
|
|
if (flat) {
|
|
patstr = flattenPattern(cx, fm.patstr);
|
|
if (!patstr)
|
|
- return false;
|
|
+ return NULL;
|
|
} else {
|
|
patstr = fm.patstr;
|
|
}
|
|
@@ -3400,7 +3400,7 @@ js_InitStringClass(JSContext *cx, JSObje
|
|
UndefinedValue(), NULL, NULL,
|
|
JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0,
|
|
NULL)) {
|
|
- return JS_FALSE;
|
|
+ return NULL;
|
|
}
|
|
|
|
return proto;
|
|
--- js/src/jstypedarray.cpp
|
|
+++ js/src/jstypedarray.cpp
|
|
@@ -1334,7 +1334,7 @@ class TypedArrayTemplate
|
|
if (size != 0 && count >= INT32_MAX / size) {
|
|
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
|
|
JSMSG_NEED_DIET, "size and count");
|
|
- return false;
|
|
+ return NULL;
|
|
}
|
|
|
|
int32 bytelen = size * count;
|
|
@@ -1668,7 +1668,7 @@ TypedArrayConstruct(JSContext *cx, jsint
|
|
|
|
default:
|
|
JS_NOT_REACHED("shouldn't have gotten here");
|
|
- return false;
|
|
+ return NULL;
|
|
}
|
|
}
|
|
|
|
--- js/src/jsxml.cpp
|
|
+++ js/src/jsxml.cpp
|
|
@@ -282,7 +282,7 @@ NewXMLNamespace(JSContext *cx, JSLinearS
|
|
|
|
obj = NewBuiltinClassInstanceXML(cx, &js_NamespaceClass);
|
|
if (!obj)
|
|
- return JS_FALSE;
|
|
+ return NULL;
|
|
JS_ASSERT(JSVAL_IS_VOID(obj->getNamePrefixVal()));
|
|
JS_ASSERT(JSVAL_IS_VOID(obj->getNameURIVal()));
|
|
JS_ASSERT(JSVAL_IS_VOID(obj->getNamespaceDeclared()));
|
|
@@ -431,7 +431,7 @@ ConvertQNameToString(JSContext *cx, JSOb
|
|
size_t length = str->length();
|
|
jschar *chars = (jschar *) cx->malloc((length + 2) * sizeof(jschar));
|
|
if (!chars)
|
|
- return JS_FALSE;
|
|
+ return NULL;
|
|
*chars = '@';
|
|
const jschar *strChars = str->getChars(cx);
|
|
if (!strChars) {
|
|
--- js/src/methodjit/InvokeHelpers.cpp
|
|
+++ js/src/methodjit/InvokeHelpers.cpp
|
|
@@ -728,7 +728,7 @@ AtSafePoint(JSContext *cx)
|
|
{
|
|
JSStackFrame *fp = cx->fp();
|
|
if (fp->hasImacropc())
|
|
- return false;
|
|
+ return NULL;
|
|
|
|
JSScript *script = fp->script();
|
|
return script->maybeNativeCodeForPC(fp->isConstructing(), cx->regs->pc);
|
|
--- js/src/nanojit/NativeX64.cpp
|
|
+++ js/src/nanojit/NativeX64.cpp
|
|
@@ -1899,7 +1899,7 @@ namespace nanojit
|
|
}
|
|
}
|
|
|
|
- static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {0x8000000000000000LL,0};
|
|
+ static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {int64_t(0x8000000000000000LL),0};
|
|
|
|
void Assembler::asm_fneg(LIns *ins) {
|
|
Register rr, ra;
|