webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 8 insertions, 9 deletions

diff --git a/Source/JavaScriptCore/dfg/DFGDisassembler.cpp b/Source/JavaScriptCore/dfg/DFGDisassembler.cpp
index 15cbea0a5..0a06c02f5 100644
--- a/Source/JavaScriptCore/dfg/DFGDisassembler.cpp
+++ b/Source/JavaScriptCore/dfg/DFGDisassembler.cpp
@@ -26,14 +26,11 @@
 #include "config.h"
 #include "DFGDisassembler.h"
 
-#if ENABLE(DFG_JIT)
+#if ENABLE(DFG_JIT) && ENABLE(DISASSEMBLER)
 
 #include "CodeBlockWithJITType.h"
 #include "DFGGraph.h"
 #include "DFGJITCode.h"
-#include "JSCInlines.h"
-#include "LinkBuffer.h"
-#include "ProfilerDatabase.h"
 #include <wtf/StdLibExtras.h>
 
 namespace JSC { namespace DFG {
@@ -94,8 +91,8 @@ Vector<Disassembler::DumpedOp> Disassembler::createDumpList(LinkBuffer& linkBuff
     dumpHeader(out, linkBuffer);
     append(result, out, previousOrigin);
     
-    m_graph.ensureDominators();
-    m_graph.ensureNaturalLoops();
+    m_graph.m_dominators.computeIfNecessary(m_graph);
+    m_graph.m_naturalLoops.computeIfNecessary(m_graph);
     
     const char* prefix = "    ";
     const char* disassemblyPrefix = "        ";
@@ -112,6 +109,8 @@ Vector<Disassembler::DumpedOp> Disassembler::createDumpList(LinkBuffer& linkBuff
         append(result, out, previousOrigin);
         Node* lastNodeForDisassembly = block->at(0);
         for (size_t i = 0; i < block->size(); ++i) {
+            if (!block->at(i)->willHaveCodeGenOrOSR() && !Options::showAllDFGNodes())
+                continue;
             MacroAssembler::Label currentLabel;
             HashMap<Node*, MacroAssembler::Label>::iterator iter = m_labelForNode.find(block->at(i));
             if (iter != m_labelForNode.end())
@@ -128,10 +127,10 @@ Vector<Disassembler::DumpedOp> Disassembler::createDumpList(LinkBuffer& linkBuff
             }
             dumpDisassembly(out, disassemblyPrefix, linkBuffer, previousLabel, currentLabel, lastNodeForDisassembly);
             append(result, out, previousOrigin);
-            previousOrigin = block->at(i)->origin.semantic;
+            previousOrigin = block->at(i)->codeOrigin;
             if (m_graph.dumpCodeOrigin(out, prefix, lastNode, block->at(i), &m_dumpContext)) {
                 append(result, out, previousOrigin);
-                previousOrigin = block->at(i)->origin.semantic;
+                previousOrigin = block->at(i)->codeOrigin;
             }
             m_graph.dump(out, prefix, block->at(i), &m_dumpContext);
             lastNode = block->at(i);
@@ -173,4 +172,4 @@ void Disassembler::dumpDisassembly(PrintStream& out, const char* prefix, LinkBuf
 
 } } // namespace JSC::DFG
 
-#endif // ENABLE(DFG_JIT)
+#endif // ENABLE(DFG_JIT) && ENABLE(DISASSEMBLER)