Unreviewed, rolling out r197873.
https://bugs.webkit.org/show_bug.cgi?id=155262
"Crashes some JSC tests" (Requested by mlam on #webkit).
Reverted changeset:
"Add dumping of function expression names in CodeBlock
bytecode dump."
https://bugs.webkit.org/show_bug.cgi?id=155248
http://trac.webkit.org/changeset/197873
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@197888 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.cpp b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
index 817d329..f436c52 100644
--- a/Source/JavaScriptCore/bytecode/CodeBlock.cpp
+++ b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
@@ -769,19 +769,6 @@
out.printf("%s", registerName(operand).data());
}
-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,
const StubInfoMap& stubInfos, const CallLinkInfoMap& callLinkInfos)
@@ -1349,8 +1336,7 @@
int r1 = (++it)->u.operand;
int f0 = (++it)->u.operand;
printLocationAndOp(out, exec, location, it, "new_func");
- out.printf("%s, %s, ", registerName(r0).data(), registerName(r1).data());
- dumpFunctionExpr(out, f0);
+ out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
break;
}
case op_new_generator_func: {
@@ -1358,8 +1344,7 @@
int r1 = (++it)->u.operand;
int f0 = (++it)->u.operand;
printLocationAndOp(out, exec, location, it, "new_generator_func");
- out.printf("%s, %s, ", registerName(r0).data(), registerName(r1).data());
- dumpFunctionExpr(out, f0);
+ out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
break;
}
case op_new_arrow_func_exp: {
@@ -1367,8 +1352,7 @@
int r1 = (++it)->u.operand;
int f0 = (++it)->u.operand;
printLocationAndOp(out, exec, location, it, "op_new_arrow_func_exp");
- out.printf("%s, %s, ", registerName(r0).data(), registerName(r1).data());
- dumpFunctionExpr(out, f0);
+ out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
break;
}
case op_new_func_exp: {
@@ -1376,8 +1360,7 @@
int r1 = (++it)->u.operand;
int f0 = (++it)->u.operand;
printLocationAndOp(out, exec, location, it, "new_func_exp");
- out.printf("%s, %s, ", registerName(r0).data(), registerName(r1).data());
- dumpFunctionExpr(out, f0);
+ out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
break;
}
case op_new_generator_func_exp: {
@@ -1385,8 +1368,7 @@
int r1 = (++it)->u.operand;
int f0 = (++it)->u.operand;
printLocationAndOp(out, exec, location, it, "new_generator_func_exp");
- out.printf("%s, %s", registerName(r0).data(), registerName(r1).data());
- dumpFunctionExpr(out, f0);
+ out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
break;
}
case op_call: {