Changeset 197873 in webkit

Timestamp:

Mar 9, 2016, 12:36:40 PM (9 years ago)

Author:

mark.lam@apple.com

Message:

Add dumping of function expression names in CodeBlock bytecode dump.
​https://bugs.webkit.org/show_bug.cgi?id=155248

Reviewed by Filip Pizlo.

Because ...
[ 19] new_func_exp loc5, loc3, f0:foo

... is more informative than
[ 19] new_func_exp loc5, loc3, f0

Anonymous functions will be dumped as <anon>.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::dumpFunctionExpr):
(JSC::CodeBlock::dumpBytecode):

• bytecode/CodeBlock.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/CodeBlock.cpp (modified) (6 diffs)
• bytecode/CodeBlock.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-03-09  Mark Lam  <mark.lam@apple.com>
+
+        Add dumping of function expression names in CodeBlock bytecode dump.
+        https://bugs.webkit.org/show_bug.cgi?id=155248
+
+        Reviewed by Filip Pizlo.
+
+        Because ...
+        [  19] new_func_exp      loc5, loc3, f0:foo
+
+        ... is more informative than
+        [  19] new_func_exp      loc5, loc3, f0
+
+        Anonymous functions will be dumped as <anon>.
+
+        * bytecode/CodeBlock.cpp:
+        (JSC::CodeBlock::dumpFunctionExpr):
+        (JSC::CodeBlock::dumpBytecode):
+        * bytecode/CodeBlock.h:
+
 2016-03-09  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -770 +770 @@
 }
 
+void CodeBlock::dumpFunctionExpr(PrintStream& out, int funcExprIndex)
+{
+    out.printf("f%d", funcExprIndex);
+    if (!isCompilationThread()) {
+        FunctionExecutable* executable = functionExpr(funcExprIndex);
+        String name = executable->inferredName().string();
+        if (name.isEmpty())
+            out.print(":<anon>");
+        else
+            out.print(":", name.utf8());
+    }
+}
+
 void CodeBlock::dumpBytecode(
     PrintStream& out, ExecState* exec, const Instruction* begin, const Instruction*& it,
@@ -1337 +1350 @@
             int f0 = (++it)->u.operand;
             printLocationAndOp(out, exec, location, it, "new_func");
-            out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
+            out.printf("%s, %s, ", registerName(r0).data(), registerName(r1).data());
+            dumpFunctionExpr(out, f0);
             break;
         }
@@ -1345 +1359 @@
             int f0 = (++it)->u.operand;
             printLocationAndOp(out, exec, location, it, "new_generator_func");
-            out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
+            out.printf("%s, %s, ", registerName(r0).data(), registerName(r1).data());
+            dumpFunctionExpr(out, f0);
             break;
         }
@@ -1353 +1368 @@
             int f0 = (++it)->u.operand;
             printLocationAndOp(out, exec, location, it, "op_new_arrow_func_exp");
-            out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
+            out.printf("%s, %s, ", registerName(r0).data(), registerName(r1).data());
+            dumpFunctionExpr(out, f0);
             break;
         }
@@ -1361 +1377 @@
             int f0 = (++it)->u.operand;
             printLocationAndOp(out, exec, location, it, "new_func_exp");
-            out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
+            out.printf("%s, %s, ", registerName(r0).data(), registerName(r1).data());
+            dumpFunctionExpr(out, f0);
             break;
         }
@@ -1369 +1386 @@
             int f0 = (++it)->u.operand;
             printLocationAndOp(out, exec, location, it, "new_generator_func_exp");
-            out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
+            out.printf("%s, %s", registerName(r0).data(), registerName(r1).data());
+            dumpFunctionExpr(out, f0);
             break;
         }

trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

@@ -959 +959 @@
     }
 
+    void dumpFunctionExpr(PrintStream&, int funcExprIndex);
     void dumpBytecode(
         PrintStream&, ExecState*, const Instruction* begin, const Instruction*&,