Modified: branches/dfgFourthTier/Source/_javascript_Core/ChangeLog (152338 => 152339)
--- branches/dfgFourthTier/Source/_javascript_Core/ChangeLog 2013-07-03 05:21:08 UTC (rev 152338)
+++ branches/dfgFourthTier/Source/_javascript_Core/ChangeLog 2013-07-03 05:30:03 UTC (rev 152339)
@@ -1,5 +1,15 @@
2013-07-02 Filip Pizlo <[email protected]>
+ fourthTier: DFG::Node::m_opInfo2 should also be a uintptr_t
+ https://bugs.webkit.org/show_bug.cgi?id=118340
+
+ Reviewed by Sam Weinig.
+
+ * dfg/DFGNode.h:
+ (JSC::DFG::Node::Node):
+
+2013-07-02 Filip Pizlo <[email protected]>
+
Unreviewed, fix 32-bit build.
* assembler/MacroAssembler.h:
Modified: branches/dfgFourthTier/Source/_javascript_Core/dfg/DFGNode.h (152338 => 152339)
--- branches/dfgFourthTier/Source/_javascript_Core/dfg/DFGNode.h 2013-07-03 05:21:08 UTC (rev 152338)
+++ branches/dfgFourthTier/Source/_javascript_Core/dfg/DFGNode.h 2013-07-03 05:30:03 UTC (rev 152339)
@@ -168,8 +168,8 @@
, children(AdjacencyList::Fixed, child1, child2, child3)
, m_virtualRegister(InvalidVirtualRegister)
, m_refCount(1)
+ , m_prediction(SpecNone)
, m_opInfo(imm.m_value)
- , m_prediction(SpecNone)
{
setOpAndDefaultFlags(op);
ASSERT(!(m_flags & NodeHasVarArgs));
@@ -181,9 +181,9 @@
, children(AdjacencyList::Fixed, child1, child2, child3)
, m_virtualRegister(InvalidVirtualRegister)
, m_refCount(1)
+ , m_prediction(SpecNone)
, m_opInfo(imm1.m_value)
- , m_opInfo2(safeCast<unsigned>(imm2.m_value))
- , m_prediction(SpecNone)
+ , m_opInfo2(imm2.m_value)
{
setOpAndDefaultFlags(op);
ASSERT(!(m_flags & NodeHasVarArgs));
@@ -195,9 +195,9 @@
, children(AdjacencyList::Variable, firstChild, numChildren)
, m_virtualRegister(InvalidVirtualRegister)
, m_refCount(1)
+ , m_prediction(SpecNone)
, m_opInfo(imm1.m_value)
- , m_opInfo2(safeCast<unsigned>(imm2.m_value))
- , m_prediction(SpecNone)
+ , m_opInfo2(imm2.m_value)
{
setOpAndDefaultFlags(op);
ASSERT(m_flags & NodeHasVarArgs);
@@ -1370,12 +1370,12 @@
VirtualRegister m_virtualRegister;
// The number of uses of the result of this operation (+1 for 'must generate' nodes, which have side-effects).
unsigned m_refCount;
+ // The prediction ascribed to this node after propagation.
+ SpeculatedType m_prediction;
// Immediate values, accesses type-checked via accessors above. The first one is
// big enough to store a pointer.
uintptr_t m_opInfo;
- unsigned m_opInfo2;
- // The prediction ascribed to this node after propagation.
- SpeculatedType m_prediction;
+ uintptr_t m_opInfo2;
public:
// Fields used by various analyses.
