Title: [185646] trunk/Source/_javascript_Core
- Revision
- 185646
- Author
- [email protected]
- Date
- 2015-06-17 00:07:42 -0700 (Wed, 17 Jun 2015)
Log Message
32-bit build fix after r185640.
* dfg/DFGIntegerRangeOptimizationPhase.cpp:
Explicitly cast clamped int64_t to an int.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (185645 => 185646)
--- trunk/Source/_javascript_Core/ChangeLog 2015-06-17 06:57:50 UTC (rev 185645)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-06-17 07:07:42 UTC (rev 185646)
@@ -1,3 +1,10 @@
+2015-06-16 Alex Christensen <[email protected]>
+
+ 32-bit build fix after r185640.
+
+ * dfg/DFGIntegerRangeOptimizationPhase.cpp:
+ Explicitly cast clamped int64_t to an int.
+
2015-06-09 Filip Pizlo <[email protected]>
FTL should eliminate array bounds checks in loops
Modified: trunk/Source/_javascript_Core/dfg/DFGIntegerRangeOptimizationPhase.cpp (185645 => 185646)
--- trunk/Source/_javascript_Core/dfg/DFGIntegerRangeOptimizationPhase.cpp 2015-06-17 06:57:50 UTC (rev 185645)
+++ trunk/Source/_javascript_Core/dfg/DFGIntegerRangeOptimizationPhase.cpp 2015-06-17 07:07:42 UTC (rev 185646)
@@ -54,11 +54,11 @@
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 {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
