Changeset 155820 in webkit for trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompiler.cpp

Timestamp:

Sep 15, 2013, 11:53:23 AM (12 years ago)

Author:

[email protected]

Message:

Deoptimize deoptimization: make DFGOSRExitCompiler64.cpp more hackable
​https://bugs.webkit.org/show_bug.cgi?id=121374

Reviewed by Geoffrey Garen.

This reduces the size of DFGOSRExitCompiler64.cpp by almost 50%, and makes it
super easy to add new recovery kinds. For recoveries that involve reboxing, it
allows you to keep most of the code common between the on-stack and in-reg
cases: they all get funneled through the "load from scratch buffer, convert,
and then store to stack" logic.

This opens up a bunch of possibilities. It'll make adding Int48 much easier,
and it probably will come in handy as we do various DFG stack layout changes in
support of the FTL.

• bytecode/ValueRecovery.h:

(JSC::ValueRecovery::dumpInContext):
(JSC::ValueRecovery::dump):

• dfg/DFGOSRExitCompiler.cpp:

(JSC::DFG::shortOperandsDump):

• dfg/DFGOSRExitCompiler64.cpp:

(JSC::DFG::OSRExitCompiler::compileExit):

File:

• trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompiler.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompiler.cpp

@@ -34 +34 @@
 #include "DFGOSRExitPreparation.h"
 #include "LinkBuffer.h"
+#include "OperandsInlines.h"
 #include "Operations.h"
 #include "RepatchBuffer.h"
@@ -39 +40 @@
 
 namespace JSC { namespace DFG {
+
+static CString shortOperandsDump(const Operands<ValueRecovery>& operands)
+{
+    DumpContext context;
+    StringPrintStream out;
+    out.print(inContext(operands, &context));
+    return out.toCString();
+}
 
 extern "C" {
@@ -102 +111 @@
             shouldShowDisassembly(),
             patchBuffer,
-            ("DFG OSR exit #%u (%s, %s) from %s",
+            ("DFG OSR exit #%u (%s, %s) from %s, with operands = %s",
                 exitIndex, toCString(exit.m_codeOrigin).data(),
-                exitKindToString(exit.m_kind), toCString(*codeBlock).data()));
+                exitKindToString(exit.m_kind), toCString(*codeBlock).data(),
+                shortOperandsDump(operands).data()));
     }