Bug 910829 - SpiderMonkey: Delete redundant null checks. r=jandem

js/src/builtin/Profilers.cpp

@@ -213,8 +213,7 @@ struct RequiredStringArg {
         return (void*) mBytes;
     }
     ~RequiredStringArg() {
-        if (mBytes)
-            js_free(mBytes);
+        js_free(mBytes);
     }
 };
 

js/src/ctypes/CTypes.h

@@ -298,8 +298,7 @@ struct ClosureInfo
   ~ClosureInfo() {
     if (closure)
       ffi_closure_free(closure);
-    if (errResult)
-      js_free(errResult);
+    js_free(errResult);
   }
 };
 

js/src/frontend/TokenStream.cpp

@@ -333,8 +333,7 @@ TokenStream::TokenStream(ExclusiveContext *cx, const CompileOptions &options,
 
 TokenStream::~TokenStream()
 {
-    if (sourceMap)
-        js_free(sourceMap);
+    js_free(sourceMap);
 
     JS_ASSERT_IF(originPrincipals, originPrincipals->refcount);
 }
@@ -847,8 +846,7 @@ TokenStream::getSourceMappingURL(bool isMultiline, bool shouldWarnDeprecated)
 
         size_t sourceMapLength = tokenbuf.length();
 
-        if (sourceMap)
-            js_free(sourceMap);
+        js_free(sourceMap);
         sourceMap = cx->pod_malloc<jschar>(sourceMapLength + 1);
         if (!sourceMap)
             return false;

js/src/jit/BaselineBailouts.cpp

@@ -96,8 +96,7 @@ struct BaselineStackBuilder
     }
 
     ~BaselineStackBuilder() {
-        if (buffer_)
-            js_free(buffer_);
+        js_free(buffer_);
     }
 
     bool init() {

js/src/jit/Ion.cpp

@@ -478,8 +478,7 @@ IonCompartment::IonCompartment(IonRuntime *rt)
 
 IonCompartment::~IonCompartment()
 {
-    if (stubCodes_)
-        js_delete(stubCodes_);
+    js_delete(stubCodes_);
 }
 
 bool

js/src/jit/IonCaches.cpp

@@ -1807,8 +1807,7 @@ void
 ParallelIonCache::destroy()
 {
     DispatchIonCache::destroy();
-    if (stubbedShapes_)
-        js_delete(stubbedShapes_);
+    js_delete(stubbedShapes_);
 }
 
 void

js/src/jit/IonCode.h

@@ -586,10 +586,8 @@ struct IonBlockCounts
     }
 
     void destroy() {
-        if (successors_)
-            js_free(successors_);
-        if (code_)
-            js_free(code_);
+        js_free(successors_);
+        js_free(code_);
     }
 
     uint32_t id() const {
@@ -673,8 +671,7 @@ struct IonScriptCounts
         for (size_t i = 0; i < numBlocks_; i++)
             blocks_[i].destroy();
         js_free(blocks_);
-        if (previous_)
-            js_delete(previous_);
+        js_delete(previous_);
     }
 
     bool init(size_t numBlocks) {

js/src/jscntxt.cpp

@@ -831,8 +831,7 @@ js_ReportErrorNumberVA(JSContext *cx, unsigned flags, JSErrorCallback callback,
 
     ReportError(cx, message, &report, callback, userRef);
 
-    if (message)
-        js_free(message);
+    js_free(message);
     if (report.messageArgs) {
         /*
          * js_ExpandErrorArguments owns its messageArgs only if it had to
@@ -845,8 +844,7 @@ js_ReportErrorNumberVA(JSContext *cx, unsigned flags, JSErrorCallback callback,
         }
         js_free((void *)report.messageArgs);
     }
-    if (report.ucmessage)
-        js_free((void *)report.ucmessage);
+    js_free((void *)report.ucmessage);
 
     return warning;
 }
@@ -876,10 +874,8 @@ js_ReportErrorNumberUCArray(JSContext *cx, unsigned flags, JSErrorCallback callb
 
     ReportError(cx, message, &report, callback, userRef);
 
-    if (message)
-        js_free(message);
-    if (report.ucmessage)
-        js_free((void *)report.ucmessage);
+    js_free(message);
+    js_free((void *)report.ucmessage);
 
     return warning;
 }

js/src/jsinfer.cpp

@@ -6386,17 +6386,10 @@ JSCompartment::sweepNewTypeObjectTable(TypeObjectSet &table)
 
 TypeCompartment::~TypeCompartment()
 {
-    if (pendingArray)
-        js_free(pendingArray);
-
-    if (arrayTypeTable)
-        js_delete(arrayTypeTable);
-
-    if (objectTypeTable)
-        js_delete(objectTypeTable);
-
-    if (allocationSiteTable)
-        js_delete(allocationSiteTable);
+    js_free(pendingArray);
+    js_delete(arrayTypeTable);
+    js_delete(objectTypeTable);
+    js_delete(allocationSiteTable);
 }
 
 /* static */ void

js/src/jsnum.cpp

@@ -532,8 +532,7 @@ ToCStringBuf::ToCStringBuf() :dbuf(NULL)
 
 ToCStringBuf::~ToCStringBuf()
 {
-    if (dbuf)
-        js_free(dbuf);
+    js_free(dbuf);
 }
 
 template <AllowGC allowGC>

js/src/jsobj.cpp

@@ -1868,10 +1868,8 @@ struct JSObject::TradeGutsReserved {
 
     ~TradeGutsReserved()
     {
-        if (newaslots)
-            js_free(newaslots);
-        if (newbslots)
-            js_free(newbslots);
+        js_free(newaslots);
+        js_free(newbslots);
     }
 };
 

js/src/jsprf.cpp

@@ -1053,11 +1053,7 @@ static int GrowStuff(SprintfState *ss, const char *sp, uint32_t len)
     if (off + len >= ss->maxlen) {
         /* Grow the buffer */
         newlen = ss->maxlen + ((len > 32) ? len : 32);
-        if (ss->base) {
-            newbase = (char*) js_realloc(ss->base, newlen);
-        } else {
-            newbase = (char*) js_malloc(newlen);
-        }
+        newbase = (char*) js_realloc(ss->base, newlen);
         if (!newbase) {
             /* Ran out of memory */
             return -1;
@@ -1109,9 +1105,7 @@ JS_PUBLIC_API(char *) JS_vsmprintf(const char *fmt, va_list ap)
     ss.maxlen = 0;
     rv = dosprintf(&ss, fmt, ap);
     if (rv < 0) {
-        if (ss.base) {
-            js_free(ss.base);
-        }
+        js_free(ss.base);
         return 0;
     }
     return ss.base;
@@ -1208,9 +1202,7 @@ JS_PUBLIC_API(char *) JS_vsprintf_append(char *last, const char *fmt, va_list ap
     }
     rv = dosprintf(&ss, fmt, ap);
     if (rv < 0) {
-        if (ss.base) {
-            js_free(ss.base);
-        }
+        js_free(ss.base);
         return 0;
     }
     return ss.base;

js/src/vm/RegExpObject.cpp

@@ -393,8 +393,7 @@ RegExpShared::~RegExpShared()
 #if ENABLE_YARR_JIT
     codeBlock.release();
 #endif
-    if (bytecode)
-        js_delete<BytecodePattern>(bytecode);
+    js_delete<BytecodePattern>(bytecode);
 }
 
 void

js/src/vm/Runtime.cpp

@@ -390,8 +390,7 @@ JSRuntime::~JSRuntime()
     mainThread.removeFromThreadList();
 
 #ifdef JS_WORKER_THREADS
-    if (workerThreadState)
-        js_delete(workerThreadState);
+    js_delete(workerThreadState);
 
     JS_ASSERT(!exclusiveAccessOwner);
     if (exclusiveAccessLock)
@@ -451,8 +450,7 @@ JSRuntime::~JSRuntime()
 #endif
     js_delete(execAlloc_);  /* Delete after ionRuntime_. */
 
-    if (ionPcScriptCache)
-        js_delete(ionPcScriptCache);
+    js_delete(ionPcScriptCache);
 
 #ifdef JSGC_GENERATIONAL
     gcStoreBuffer.disable();

js/src/vm/StructuredClone.cpp

@@ -971,7 +971,7 @@ class Chars {
     jschar *p;
   public:
     Chars(JSContext *cx) : cx(cx), p(NULL) {}
-    ~Chars() { if (p) js_free(p); }
+    ~Chars() { js_free(p); }
 
     bool allocate(size_t len) {
         JS_ASSERT(!p);

js/src/yarr/wtfbridge.h

@@ -82,8 +82,7 @@ class OwnPtr {
     OwnPtr(PassOwnPtr<T> p) : ptr(p.get()) { }
 
     ~OwnPtr() {
-        if (ptr)
-            js_delete(ptr);
+        js_delete(ptr);
     }
 
     OwnPtr<T> &operator=(PassOwnPtr<T> p) {