Title: [177582] trunk/Source/_javascript_Core
- Revision
- 177582
- Author
- [email protected]
- Date
- 2014-12-19 11:26:36 -0800 (Fri, 19 Dec 2014)
Log Message
[Win] Endless compiler warnings created by DFGEdge.h.
<https://webkit.org/b/139801>
Reviewed by Brent Fulgham.
Add a cast to fix the type just the way the 64-bit version does.
* dfg/DFGEdge.h:
(JSC::DFG::Edge::makeWord):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (177581 => 177582)
--- trunk/Source/_javascript_Core/ChangeLog 2014-12-19 19:15:36 UTC (rev 177581)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-12-19 19:26:36 UTC (rev 177582)
@@ -1,3 +1,15 @@
+2014-12-19 Mark Lam <[email protected]>
+
+ [Win] Endless compiler warnings created by DFGEdge.h.
+ <https://webkit.org/b/139801>
+
+ Reviewed by Brent Fulgham.
+
+ Add a cast to fix the type just the way the 64-bit version does.
+
+ * dfg/DFGEdge.h:
+ (JSC::DFG::Edge::makeWord):
+
2014-12-19 Commit Queue <[email protected]>
Unreviewed, rolling out r177574.
Modified: trunk/Source/_javascript_Core/dfg/DFGEdge.h (177581 => 177582)
--- trunk/Source/_javascript_Core/dfg/DFGEdge.h 2014-12-19 19:15:36 UTC (rev 177581)
+++ trunk/Source/_javascript_Core/dfg/DFGEdge.h 2014-12-19 19:26:36 UTC (rev 177582)
@@ -207,7 +207,7 @@
#else
static uintptr_t makeWord(UseKind useKind, ProofStatus proofStatus, KillStatus killStatus)
{
- return (static_cast<uintptr_t>(useKind) << 2) | (DFG::doesKill(killStatus) << 1) | DFG::isProved(proofStatus);
+ return (static_cast<uintptr_t>(useKind) << 2) | (DFG::doesKill(killStatus) << 1) | static_cast<uintptr_t>(DFG::isProved(proofStatus));
}
Node* m_node;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
