Changeset 179503 in webkit for trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

Timestamp:

Feb 2, 2015, 3:32:00 PM (10 years ago)

Author:

[email protected]

Message:

VirtualRegister should really know how to dump itself
​https://bugs.webkit.org/show_bug.cgi?id=141171

Reviewed by Geoffrey Garen.

Gives VirtualRegister a dump() method that pretty-prints the virtual register. The rest of
the patch is all about using this new power.

• CMakeLists.txt:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• bytecode/CodeBlock.cpp:

(JSC::constantName):
(JSC::CodeBlock::registerName):

• bytecode/CodeBlock.h:

(JSC::missingThisObjectMarker): Deleted.

• bytecode/VirtualRegister.cpp: Added.

(JSC::VirtualRegister::dump):

• bytecode/VirtualRegister.h:

(WTF::printInternal): Deleted.

• dfg/DFGArgumentPosition.h:

(JSC::DFG::ArgumentPosition::dump):

• dfg/DFGFlushedAt.cpp:

(JSC::DFG::FlushedAt::dump):

• dfg/DFGGraph.cpp:

(JSC::DFG::Graph::dump):

• dfg/DFGPutLocalSinkingPhase.cpp:
• dfg/DFGSSAConversionPhase.cpp:

(JSC::DFG::SSAConversionPhase::run):

• dfg/DFGValidate.cpp:

(JSC::DFG::Validate::reportValidationContext):

• dfg/DFGValueSource.cpp:

(JSC::DFG::ValueSource::dump):

• dfg/DFGVariableEvent.cpp:

(JSC::DFG::VariableEvent::dump):
(JSC::DFG::VariableEvent::dumpSpillInfo):

• ftl/FTLExitArgumentForOperand.cpp:

(JSC::FTL::ExitArgumentForOperand::dump):

• ftl/FTLExitValue.cpp:

(JSC::FTL::ExitValue::dumpInContext):

• profiler/ProfilerBytecodeSequence.cpp:

(JSC::Profiler::BytecodeSequence::BytecodeSequence):

File:

• trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -175 +175 @@
 static CString constantName(int k, JSValue value)
 {
-    return toCString(value, "(@k", k - FirstConstantRegisterIndex, ")");
+    return toCString(value, "(", VirtualRegister(k), ")");
 }
 
@@ -185 +185 @@
 CString CodeBlock::registerName(int r) const
 {
-    if (r == missingThisObjectMarker())
-        return "<null>";
-
     if (isConstantRegisterIndex(r))
         return constantName(r, getConstant(r));
 
-    if (operandIsArgument(r)) {
-        if (!VirtualRegister(r).toArgument())
-            return "this";
-        return toCString("arg", VirtualRegister(r).toArgument());
-    }
-
-    return toCString("loc", VirtualRegister(r).toLocal());
+    return toCString(VirtualRegister(r));
 }
 
@@ -3947 +3938 @@
         if (codeBlock->captureCount() && codeBlock->symbolTable()->isCaptured(operand)) {
             codeBlock->beginValidationDidFail();
-            dataLog("    At bc#", bytecodeOffset, " encountered invalid assignment to captured variable loc", virtualReg.toLocal(), ".\n");
+            dataLog("    At bc#", bytecodeOffset, " encountered invalid assignment to captured variable ", virtualReg, ".\n");
             codeBlock->endValidationDidFail();
             return;