Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (142480 => 142481)
--- trunk/Source/_javascript_Core/ChangeLog 2013-02-11 16:52:27 UTC (rev 142480)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-02-11 17:01:06 UTC (rev 142481)
@@ -1,3 +1,22 @@
+2013-02-11 Gabor Rapcsanyi <rga...@webkit.org>
+
+ JSC build failing with verbose debug mode
+ https://bugs.webkit.org/show_bug.cgi?id=109441
+
+ Reviewed by Darin Adler.
+
+ Fixing some verbose messages which caused build errors.
+
+ * dfg/DFGAbstractState.cpp:
+ (JSC::DFG::AbstractState::mergeToSuccessors):
+ * dfg/DFGCFAPhase.cpp:
+ (JSC::DFG::CFAPhase::performBlockCFA):
+ * dfg/DFGCSEPhase.cpp:
+ (JSC::DFG::CSEPhase::setReplacement):
+ (JSC::DFG::CSEPhase::eliminate):
+ * dfg/DFGPredictionInjectionPhase.cpp:
+ (JSC::DFG::PredictionInjectionPhase::run):
+
2013-02-10 Martin Robinson <mrobin...@igalia.com>
Fix the GTK+ gyp build
Modified: trunk/Source/_javascript_Core/dfg/DFGAbstractState.cpp (142480 => 142481)
--- trunk/Source/_javascript_Core/dfg/DFGAbstractState.cpp 2013-02-11 16:52:27 UTC (rev 142480)
+++ trunk/Source/_javascript_Core/dfg/DFGAbstractState.cpp 2013-02-11 17:01:06 UTC (rev 142481)
@@ -2010,7 +2010,7 @@
case Jump: {
ASSERT(basicBlock->cfaBranchDirection == InvalidBranchDirection);
#if DFG_ENABLE(DEBUG_PROPAGATION_VERBOSE)
- dataLogF(" Merging to block #%u.\n", terminal.takenBlockIndex());
+ dataLogF(" Merging to block #%u.\n", terminal->takenBlockIndex());
#endif
return merge(basicBlock, graph.m_blocks[terminal->takenBlockIndex()].get());
}
@@ -2024,7 +2024,7 @@
if (basicBlock->cfaBranchDirection != TakeFalse)
changed |= merge(basicBlock, graph.m_blocks[terminal->takenBlockIndex()].get());
#if DFG_ENABLE(DEBUG_PROPAGATION_VERBOSE)
- dataLogF(" Merging to block #%u.\n", terminal.notTakenBlockIndex());
+ dataLogF(" Merging to block #%u.\n", terminal->notTakenBlockIndex());
#endif
if (basicBlock->cfaBranchDirection != TakeTrue)
changed |= merge(basicBlock, graph.m_blocks[terminal->notTakenBlockIndex()].get());
Modified: trunk/Source/_javascript_Core/dfg/DFGCFAPhase.cpp (142480 => 142481)
--- trunk/Source/_javascript_Core/dfg/DFGCFAPhase.cpp 2013-02-11 16:52:27 UTC (rev 142480)
+++ trunk/Source/_javascript_Core/dfg/DFGCFAPhase.cpp 2013-02-11 17:01:06 UTC (rev 142481)
@@ -92,7 +92,7 @@
if (!node->shouldGenerate())
continue;
#if DFG_ENABLE(DEBUG_PROPAGATION_VERBOSE)
- dataLogF(" %s @%u: ", Graph::opName(m_graph[nodeIndex].op()), node->index());
+ dataLogF(" %s @%u: ", Graph::opName(node->op()), node->index());
m_state.dump(WTF::dataFile());
dataLogF("\n");
#endif
Modified: trunk/Source/_javascript_Core/dfg/DFGCSEPhase.cpp (142480 => 142481)
--- trunk/Source/_javascript_Core/dfg/DFGCSEPhase.cpp 2013-02-11 16:52:27 UTC (rev 142480)
+++ trunk/Source/_javascript_Core/dfg/DFGCSEPhase.cpp 2013-02-11 17:01:06 UTC (rev 142481)
@@ -1006,7 +1006,7 @@
return false;
#if DFG_ENABLE(DEBUG_PROPAGATION_VERBOSE)
- dataLogF(" Replacing @%u -> @%u", m_compileNode->index(), replacement->index());
+ dataLogF(" Replacing @%u -> @%u", m_currentNode->index(), replacement->index());
#endif
m_currentNode->setOpAndDefaultFlags(Phantom);
@@ -1024,7 +1024,7 @@
void eliminate()
{
#if DFG_ENABLE(DEBUG_PROPAGATION_VERBOSE)
- dataLogF(" Eliminating @%u", m_compileIndex);
+ dataLogF(" Eliminating @%u", m_currentNode->index());
#endif
ASSERT(m_currentNode->refCount() == 1);
Modified: trunk/Source/_javascript_Core/dfg/DFGPredictionInjectionPhase.cpp (142480 => 142481)
--- trunk/Source/_javascript_Core/dfg/DFGPredictionInjectionPhase.cpp 2013-02-11 16:52:27 UTC (rev 142480)
+++ trunk/Source/_javascript_Core/dfg/DFGPredictionInjectionPhase.cpp 2013-02-11 17:01:06 UTC (rev 142481)
@@ -58,7 +58,7 @@
#if DFG_ENABLE(DEBUG_VERBOSE)
dataLog(
"Argument [", arg, "] prediction: ",
- SpeculationDump(m_arguments[arg]->variableAccessData()->prediction()), "\n");
+ SpeculationDump(m_graph.m_arguments[arg]->variableAccessData()->prediction()), "\n");
#endif
}
