Bug 1275001 - Fix Windows bustage. (r=me)
authorShu-yu Guo <shu@rfrn.org>
Wed, 08 Jun 2016 21:24:46 -0700
changeset 301207 d7978f23ee54c439d729c95c6b6d79069ff39406
parent 301206 4b405b61dff56d3e5bc93cb60571db77187bb16a
child 301208 d922a8d7ed26353247f04ef490b2827b0587b32b
push id78251
push usershu@rfrn.org
push dateThu, 09 Jun 2016 04:23:57 +0000
treeherdermozilla-inbound@d7978f23ee54 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1275001
milestone50.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 1275001 - Fix Windows bustage. (r=me)
js/src/jit/RematerializedFrame.h
--- a/js/src/jit/RematerializedFrame.h
+++ b/js/src/jit/RematerializedFrame.h
@@ -178,17 +178,17 @@ class RematerializedFrame
 
     unsigned numFormalArgs() const {
         return isFunctionFrame() ? callee()->nargs() : 0;
     }
     unsigned numActualArgs() const {
         return numActualArgs_;
     }
     unsigned numArgSlots() const {
-        return std::max(numFormalArgs(), numActualArgs());
+        return (std::max)(numFormalArgs(), numActualArgs());
     }
 
     Value* argv() {
         return slots_;
     }
     Value* locals() {
         return slots_ + numArgSlots() + isConstructing_;
     }