32-bit build fix after r185640.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Jun 2015 07:07:42 +0000 (07:07 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Jun 2015 07:07:42 +0000 (07:07 +0000)
* dfg/DFGIntegerRangeOptimizationPhase.cpp:
Explicitly cast clamped int64_t to an int.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@185646 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/dfg/DFGIntegerRangeOptimizationPhase.cpp

index 1d6df49..a2ce090 100644 (file)
@@ -1,3 +1,10 @@
+2015-06-16  Alex Christensen  <achristensen@webkit.org>
+
+        32-bit build fix after r185640.
+
+        * dfg/DFGIntegerRangeOptimizationPhase.cpp:
+        Explicitly cast clamped int64_t to an int.
+
 2015-06-09  Filip Pizlo  <fpizlo@apple.com>
 
         FTL should eliminate array bounds checks in loops
index bce43e7..e096412 100644 (file)
@@ -54,11 +54,11 @@ template<typename... Args>
 int clampedSum(Args... args)
 {
     int64_t result = clampedSumImpl(args...);
-    return std::min(
+    return static_cast<int>(std::min(
         static_cast<int64_t>(std::numeric_limits<int>::max()),
         std::max(
             static_cast<int64_t>(std::numeric_limits<int>::min()),
-            result));
+            result)));
 }
 
 class Relationship {