diff options
Diffstat (limited to 'Source/JavaScriptCore/dfg/DFGDisassembler.cpp')
| -rw-r--r-- | Source/JavaScriptCore/dfg/DFGDisassembler.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Source/JavaScriptCore/dfg/DFGDisassembler.cpp b/Source/JavaScriptCore/dfg/DFGDisassembler.cpp index 0a06c02f5..15cbea0a5 100644 --- a/Source/JavaScriptCore/dfg/DFGDisassembler.cpp +++ b/Source/JavaScriptCore/dfg/DFGDisassembler.cpp @@ -26,11 +26,14 @@ #include "config.h" #include "DFGDisassembler.h" -#if ENABLE(DFG_JIT) && ENABLE(DISASSEMBLER) +#if ENABLE(DFG_JIT) #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 { @@ -91,8 +94,8 @@ Vector<Disassembler::DumpedOp> Disassembler::createDumpList(LinkBuffer& linkBuff dumpHeader(out, linkBuffer); append(result, out, previousOrigin); - m_graph.m_dominators.computeIfNecessary(m_graph); - m_graph.m_naturalLoops.computeIfNecessary(m_graph); + m_graph.ensureDominators(); + m_graph.ensureNaturalLoops(); const char* prefix = " "; const char* disassemblyPrefix = " "; @@ -109,8 +112,6 @@ 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()) @@ -127,10 +128,10 @@ Vector<Disassembler::DumpedOp> Disassembler::createDumpList(LinkBuffer& linkBuff } dumpDisassembly(out, disassemblyPrefix, linkBuffer, previousLabel, currentLabel, lastNodeForDisassembly); append(result, out, previousOrigin); - previousOrigin = block->at(i)->codeOrigin; + previousOrigin = block->at(i)->origin.semantic; if (m_graph.dumpCodeOrigin(out, prefix, lastNode, block->at(i), &m_dumpContext)) { append(result, out, previousOrigin); - previousOrigin = block->at(i)->codeOrigin; + previousOrigin = block->at(i)->origin.semantic; } m_graph.dump(out, prefix, block->at(i), &m_dumpContext); lastNode = block->at(i); @@ -172,4 +173,4 @@ void Disassembler::dumpDisassembly(PrintStream& out, const char* prefix, LinkBuf } } // namespace JSC::DFG -#endif // ENABLE(DFG_JIT) && ENABLE(DISASSEMBLER) +#endif // ENABLE(DFG_JIT) |