Title: [144452] trunk/Source/_javascript_Core
- Revision
- 144452
- Author
- [email protected]
- Date
- 2013-03-01 07:10:15 -0800 (Fri, 01 Mar 2013)
Log Message
[JSC] Fix sign comparison warning/error after r144340.
https://bugs.webkit.org/show_bug.cgi?id=111164
Reviewed by Mark Hahnenberg.
gcc (both 4.2.1 and 4.7.2) complain about comparing signed and
unsigned terms (clang accepts it just fine).
Work around that by casting the 1 to an uintptr_t as well.
* dfg/DFGEdge.h:
(JSC::DFG::Edge::makeWord):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (144451 => 144452)
--- trunk/Source/_javascript_Core/ChangeLog 2013-03-01 14:47:02 UTC (rev 144451)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-03-01 15:10:15 UTC (rev 144452)
@@ -1,3 +1,18 @@
+2013-03-01 Raphael Kubo da Costa <[email protected]>
+
+ [JSC] Fix sign comparison warning/error after r144340.
+ https://bugs.webkit.org/show_bug.cgi?id=111164
+
+ Reviewed by Mark Hahnenberg.
+
+ gcc (both 4.2.1 and 4.7.2) complain about comparing signed and
+ unsigned terms (clang accepts it just fine).
+
+ Work around that by casting the 1 to an uintptr_t as well.
+
+ * dfg/DFGEdge.h:
+ (JSC::DFG::Edge::makeWord):
+
2013-02-28 Filip Pizlo <[email protected]>
DFG CFA should not do liveness pruning
Modified: trunk/Source/_javascript_Core/dfg/DFGEdge.h (144451 => 144452)
--- trunk/Source/_javascript_Core/dfg/DFGEdge.h 2013-03-01 14:47:02 UTC (rev 144451)
+++ trunk/Source/_javascript_Core/dfg/DFGEdge.h 2013-03-01 15:10:15 UTC (rev 144452)
@@ -156,7 +156,7 @@
uintptr_t shiftedValue = bitwise_cast<uintptr_t>(node) << shift();
ASSERT((shiftedValue >> shift()) == bitwise_cast<uintptr_t>(node));
ASSERT(useKind >= 0 && useKind < LastUseKind);
- ASSERT((static_cast<uintptr_t>(LastUseKind) << 1) <= (1 << shift()));
+ ASSERT((static_cast<uintptr_t>(LastUseKind) << 1) <= (static_cast<uintptr_t>(1) << shift()));
return shiftedValue | (static_cast<uintptr_t>(useKind) << 1) | DFG::isProved(proofStatus);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
