@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2014/11/03 12:18:31 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2014/11/06 12:26:50 joerg Exp $
 
 SHA1 (firefox-31.2.0esr.source.tar.bz2) = 9ddfde95fcd19633446f859c5bca77c62815d390
 RMD160 (firefox-31.2.0esr.source.tar.bz2) = 51d1600f1f2ee84cdef97a343b0ab03c8a0e4859
@@ -75,7 +75,9 @@
 SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 2ef9504e462d0e3db16f9b0a6303ea5971b9c2a2
 SHA1 (patch-js__src__vm__SPSProfiler.cpp) = 989ba25e4c5308d21d07baa802decce13609a475
 SHA1 (patch-js_src_Makefile.in) = 780e408dfddfd90c6013b316e2e52800c62eee5e
+SHA1 (patch-js_src_builtin_TypedObject.cpp) = d44063579a0e36349d4c370a2e2cf09ebe6071e6
 SHA1 (patch-js_src_ctypes_CTypes.h) = 768a084239f92a424c1c7dc9eaaf9be9456ca9f0
+SHA1 (patch-js_src_frontend_BytecodeCompiler.cpp) = add5dee91325ee76df84beaf6b66eb7b7fed4aca
 SHA1 (patch-js_src_frontend_ParseMaps.cpp) = c00117d79b78904bc50a1d664a8fc0e4e339bfbc
 SHA1 (patch-js_src_gc_Memory.cpp) = 3db31553ec6f7b1fac4fd4ce11b77be1ea4208b8
 SHA1 (patch-js_src_jsmath.cpp) = 7d4993ae91e9b5e6820358165603819aefb586f9

$NetBSD: patch-js_src_builtin_TypedObject.cpp,v 1.1 2014/11/06 12:26:51 joerg Exp $ --- js/src/builtin/TypedObject.cpp.orig 2014-11-05 15:45:47.000000000 +0000 +++ js/src/builtin/TypedObject.cpp @@ -710,12 +710,12 @@ ArrayMetaTypeDescr::construct(JSContext contents.append(")"); RootedAtom stringRepr(cx, contents.finishAtom()); if (!stringRepr) - return nullptr; + return false; // Extract ArrayType.prototype RootedObject arrayTypePrototype(cx, GetPrototype(cx, arrayTypeGlobal)); if (!arrayTypePrototype) - return nullptr; + return false; // Create the instance of ArrayType Rooted<UnsizedArrayTypeDescr *> obj(cx); @@ -728,7 +728,7 @@ ArrayMetaTypeDescr::construct(JSContext if (!JSObject::defineProperty(cx, obj, cx->names().length, UndefinedHandleValue, nullptr, nullptr, JSPROP_READONLY | JSPROP_PERMANENT)) - return nullptr; + return false; args.rval().setObject(*obj); return true; @@ -762,7 +762,7 @@ UnsizedArrayTypeDescr::dimension(JSConte if (!size.isValid()) { JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPEDOBJECT_TOO_BIG); - return nullptr; + return false; } // Construct a canonical string `new ArrayType(<elementType>).dimension(N)`: @@ -775,7 +775,7 @@ UnsizedArrayTypeDescr::dimension(JSConte contents.append(")"); RootedAtom stringRepr(cx, contents.finishAtom()); if (!stringRepr) - return nullptr; + return false; // Create the sized type object. Rooted<SizedArrayTypeDescr*> obj(cx); @@ -793,7 +793,7 @@ UnsizedArrayTypeDescr::dimension(JSConte if (!JSObject::defineProperty(cx, obj, cx->names().length, lengthVal, nullptr, nullptr, JSPROP_READONLY | JSPROP_PERMANENT)) - return nullptr; + return false; // Add `unsized` property, which is a link from the sized // array to the unsized array. @@ -801,7 +801,7 @@ UnsizedArrayTypeDescr::dimension(JSConte if (!JSObject::defineProperty(cx, obj, cx->names().unsized, unsizedTypeDescrValue, nullptr, nullptr, JSPROP_READONLY | JSPROP_PERMANENT)) - return nullptr; + return false; args.rval().setObject(*obj); return true; @@ -1253,7 +1253,7 @@ DefineSimpleTypeDescr(JSContext *cx, Rooted<TypedProto*> proto(cx); proto = NewObjectWithProto<TypedProto>(cx, objProto, nullptr, TenuredObject); if (!proto) - return nullptr; + return false; proto->initTypeDescrSlot(*descr); descr->initReservedSlot(JS_DESCR_SLOT_TYPROTO, ObjectValue(*proto)); @@ -1358,14 +1358,14 @@ GlobalObject::initTypedObjectModule(JSCo #define BINARYDATA_SCALAR_DEFINE(constant_, type_, name_) \ if (!DefineSimpleTypeDescr<ScalarTypeDescr>(cx, global, module, constant_, \ cx->names().name_)) \ - return nullptr; + return false; JS_FOR_EACH_SCALAR_TYPE_REPR(BINARYDATA_SCALAR_DEFINE) #undef BINARYDATA_SCALAR_DEFINE #define BINARYDATA_REFERENCE_DEFINE(constant_, type_, name_) \ if (!DefineSimpleTypeDescr<ReferenceTypeDescr>(cx, global, module, constant_, \ cx->names().name_)) \ - return nullptr; + return false; JS_FOR_EACH_REFERENCE_TYPE_REPR(BINARYDATA_REFERENCE_DEFINE) #undef BINARYDATA_REFERENCE_DEFINE @@ -1375,14 +1375,14 @@ GlobalObject::initTypedObjectModule(JSCo arrayType = DefineMetaTypeDescr<ArrayMetaTypeDescr>( cx, global, module, TypedObjectModuleObject::ArrayTypePrototype); if (!arrayType) - return nullptr; + return false; RootedValue arrayTypeValue(cx, ObjectValue(*arrayType)); if (!JSObject::defineProperty(cx, module, cx->names().ArrayType, arrayTypeValue, nullptr, nullptr, JSPROP_READONLY | JSPROP_PERMANENT)) - return nullptr; + return false; // StructType. @@ -1390,14 +1390,14 @@ GlobalObject::initTypedObjectModule(JSCo structType = DefineMetaTypeDescr<StructMetaTypeDescr>( cx, global, module, TypedObjectModuleObject::StructTypePrototype); if (!structType) - return nullptr; + return false; RootedValue structTypeValue(cx, ObjectValue(*structType)); if (!JSObject::defineProperty(cx, module, cx->names().StructType, structTypeValue, nullptr, nullptr, JSPROP_READONLY | JSPROP_PERMANENT)) - return nullptr; + return false; // Everything is setup, install module on the global object: RootedValue moduleValue(cx, ObjectValue(*module)); @@ -1407,7 +1407,7 @@ GlobalObject::initTypedObjectModule(JSCo nullptr, nullptr, 0)) { - return nullptr; + return false; } return module; @@ -2466,7 +2466,7 @@ TypedObject::constructUnsized(JSContext if (length < 0) { JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPEDOBJECT_BAD_ARGS); - return nullptr; + return false; } Rooted<TypedObject*> obj(cx, createZeroed(cx, callee, length)); if (!obj)

$NetBSD: patch-js_src_frontend_BytecodeCompiler.cpp,v 1.1 2014/11/06 12:26:51 joerg Exp $ --- js/src/frontend/BytecodeCompiler.cpp.orig 2014-11-05 15:54:54.000000000 +0000 +++ js/src/frontend/BytecodeCompiler.cpp @@ -544,7 +544,7 @@ CompileFunctionBody(JSContext *cx, Mutab RootedScriptSource sourceObject(cx, CreateScriptSourceObject(cx, options)); if (!sourceObject) - return nullptr; + return false; ScriptSource *ss = sourceObject->source(); SourceCompressionTask sct(cx);