--- a/js/public/HashTable.h
+++ b/js/public/HashTable.h
@@ -1148,17 +1148,17 @@ class HashMap
     unsigned generation() const                       { return impl.generation(); }
 
     /* Shorthand operations: */
 
     bool has(const Lookup &l) const {
         return impl.lookup(l) != NULL;
     }
 
-    /* Overwrite existing value with v. Return NULL on oom. */
+    /* Overwrite existing value with v. Return false on oom. */
     template<typename KeyInput, typename ValueInput>
     bool put(const KeyInput &k, const ValueInput &v) {
         AddPtr p = lookupForAdd(k);
         if (p) {
             p->value = v;
             return true;
         }
         return add(p, k, v);

--- a/js/src/shell/jsworkers.cpp
+++ b/js/src/shell/jsworkers.cpp
@@ -162,17 +162,17 @@ class WorkerParent {
   public:
     virtual PRLock *getLock() = 0;
     virtual ThreadPool *getThreadPool() = 0;
     virtual bool post(Event *item) = 0;  // false on OOM or queue closed
     virtual void trace(JSTracer *trc) = 0;
 
     bool addChild(Worker *w) {
         AutoLock hold(getLock());
-        return children.put(w) != NULL;
+        return children.put(w);
     }
 
     // This must be called only from GC or when all threads are shut down. It
     // does not bother with locking.
     void removeChild(Worker *w) {
         ChildSet::Ptr p = children.lookup(w);
         JS_ASSERT(p);
         children.remove(p);