diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2015-05-20 09:56:07 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2015-05-20 09:56:07 +0000 |
| commit | 41386e9cb918eed93b3f13648cbef387e371e451 (patch) | |
| tree | a97f9d7bd1d9d091833286085f72da9d83fd0606 /Source/JavaScriptCore/dfg/DFGDisassembler.cpp | |
| parent | e15dd966d523731101f70ccf768bba12435a0208 (diff) | |
| download | WebKitGtk-tarball-41386e9cb918eed93b3f13648cbef387e371e451.tar.gz | |
webkitgtk-2.4.9webkitgtk-2.4.9
Diffstat (limited to 'Source/JavaScriptCore/dfg/DFGDisassembler.cpp')
| -rw-r--r-- | Source/JavaScriptCore/dfg/DFGDisassembler.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/JavaScriptCore/dfg/DFGDisassembler.cpp b/Source/JavaScriptCore/dfg/DFGDisassembler.cpp index e221c4c4f..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 { @@ -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) |