[webkit-changes] [197888] trunk/Source/JavaScriptCore

Wed, 09 Mar 2016 14:34:04 -0800

Title: [197888] trunk/Source/_javascript_Core
Revision
197888
Author
[email protected]
Date
2016-03-09 14:34:08 -0800 (Wed, 09 Mar 2016)

Log Message

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

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (197887 => 197888)


--- trunk/Source/_javascript_Core/ChangeLog	2016-03-09 22:29:33 UTC (rev 197887)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-03-09 22:34:08 UTC (rev 197888)
@@ -1,3 +1,17 @@
+2016-03-09  Commit Queue  <[email protected]>
+
+        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
+
 2016-03-09  Oliver Hunt  <[email protected]>
 
         Fix old iOS

Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (197887 => 197888)


--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp	2016-03-09 22:29:33 UTC (rev 197887)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp	2016-03-09 22:34:08 UTC (rev 197888)
@@ -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: {

Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.h (197887 => 197888)


--- trunk/Source/_javascript_Core/bytecode/CodeBlock.h	2016-03-09 22:29:33 UTC (rev 197887)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.h	2016-03-09 22:34:08 UTC (rev 197888)
@@ -958,7 +958,6 @@
         m_constantRegisters[index - FirstConstantRegisterIndex].set(m_globalObject->vm(), this, value);
     }
 
-    void dumpFunctionExpr(PrintStream&, int funcExprIndex);
     void dumpBytecode(
         PrintStream&, ExecState*, const Instruction* begin, const Instruction*&,
         const StubInfoMap& = StubInfoMap(), const CallLinkInfoMap& = CallLinkInfoMap());

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to