Bug 685468 - warnaserr: js/src/jsinterp.cpp(6176) : warning C4805: '&=' : unsafe mix of type 'JSBool' and type 'bool' in operation. r=luke
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Tue, 13 Sep 2011 18:08:17 +0900
changeset 76909 8232d500fd8908d358fef45be9e05fcb5e3c6e36
parent 76906 3950656acf1bbca750db300bc00b03bba4dfd657
child 76910 e864670fad4e29229ebd1fa492f81fc318caa85b
push id21154
push usereakhgari@mozilla.com
push dateTue, 13 Sep 2011 19:43:58 +0000
treeherdermozilla-central@d86ee57cdbcc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersluke
bugs685468
milestone9.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 685468 - warnaserr: js/src/jsinterp.cpp(6176) : warning C4805: '&=' : unsafe mix of type 'JSBool' and type 'bool' in operation. r=luke
js/src/jsinterp.cpp
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -6168,17 +6168,17 @@ END_CASE(JSOP_ARRAYPUSH)
   forced_return:
     /*
      * Unwind the scope making sure that interpReturnOK stays false even when
      * UnwindScope returns true.
      *
      * When a trap handler returns JSTRAP_RETURN, we jump here with
      * interpReturnOK set to true bypassing any finally blocks.
      */
-    interpReturnOK &= UnwindScope(cx, 0, interpReturnOK || cx->isExceptionPending());
+    interpReturnOK &= (JSBool)UnwindScope(cx, 0, interpReturnOK || cx->isExceptionPending());
     JS_ASSERT(regs.sp == regs.fp()->base());
 
     if (entryFrame != regs.fp())
         goto inline_return;
 
   exit:
     interpReturnOK = ScriptEpilogueOrGeneratorYield(cx, regs.fp(), interpReturnOK);
     regs.fp()->setFinishedInInterpreter();