Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 10 insertions, 5 deletions

diff --git a/Source/JavaScriptCore/dfg/DFGDisassembler.h b/Source/JavaScriptCore/dfg/DFGDisassembler.h
index 9f6c5b040..7b31946f9 100644
--- a/Source/JavaScriptCore/dfg/DFGDisassembler.h
+++ b/Source/JavaScriptCore/dfg/DFGDisassembler.h
@@ -26,18 +26,22 @@
 #ifndef DFGDisassembler_h
 #define DFGDisassembler_h
 
-#include <wtf/Platform.h>
-
 #if ENABLE(DFG_JIT)
 
+#include "CodeOrigin.h"
 #include "DFGCommon.h"
-#include "LinkBuffer.h"
+#include "DumpContext.h"
 #include "MacroAssembler.h"
+#include "ProfilerCompilation.h"
 #include <wtf/HashMap.h>
 #include <wtf/StringPrintStream.h>
 #include <wtf/Vector.h>
 
-namespace JSC { namespace DFG {
+namespace JSC {
+
+class LinkBuffer;
+
+namespace DFG {
 
 class Graph;
 
@@ -47,7 +51,7 @@ public:
     Disassembler(Graph&);
     
     void setStartOfCode(MacroAssembler::Label label) { m_startOfCode = label; }
-    void setForBlock(BlockIndex blockIndex, MacroAssembler::Label label)
+    void setForBlockIndex(BlockIndex blockIndex, MacroAssembler::Label label)
     {
         m_labelForBlockIndex[blockIndex] = label;
     }
@@ -88,6 +92,7 @@ private:
     void dumpDisassembly(PrintStream&, const char* prefix, LinkBuffer&, MacroAssembler::Label& previousLabel, MacroAssembler::Label currentLabel, Node* context);
     
     Graph& m_graph;
+    DumpContext m_dumpContext;
     MacroAssembler::Label m_startOfCode;
     Vector<MacroAssembler::Label> m_labelForBlockIndex;
     HashMap<Node*, MacroAssembler::Label> m_labelForNode;