Changeset 192935 in webkit for trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp

Timestamp:

Dec 1, 2015, 5:37:19 PM (10 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r192914.
​https://bugs.webkit.org/show_bug.cgi?id=151734

JSC tests for this change are failing on 32 and 64-bit bots
(Requested by ryanhaddad on #webkit).

Reverted changeset:

"[ES6] Implement LLInt/Baseline Support for ES6 Generators and
enable this feature"
​https://bugs.webkit.org/show_bug.cgi?id=150792
​http://trac.webkit.org/changeset/192914

File:

• trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp

@@ -44 +44 @@
 #include "JSCInlines.h"
 #include "JSCJSValue.h"
-#include "JSGeneratorFunction.h"
 #include "JSGlobalObjectFunctions.h"
 #include "JSStackInlines.h"
@@ -226 +225 @@
     FunctionExecutable* executable = callee->jsExecutable();
     CodeBlock* codeBlock = executable->codeBlockFor(kind);
-    dataLogF("%p / %p: in %s of function %p, executable %p; numVars = %u, numParameters = %u, numCalleeLocals = %u, caller = %p.\n",
+    dataLogF("%p / %p: in %s of function %p, executable %p; numVars = %u, numParameters = %u, numCalleeRegisters = %u, caller = %p.\n",
             codeBlock, exec, comment, callee, executable,
-            codeBlock->m_numVars, codeBlock->numParameters(), codeBlock->m_numCalleeLocals,
+            codeBlock->m_numVars, codeBlock->numParameters(), codeBlock->m_numCalleeRegisters,
             exec->callerFrame());
 }
@@ -460 +459 @@
     dataLogF("Checking stack height with exec = %p.\n", exec);
     dataLogF("CodeBlock = %p.\n", exec->codeBlock());
-    dataLogF("Num callee registers = %u.\n", exec->codeBlock()->m_numCalleeLocals);
+    dataLogF("Num callee registers = %u.\n", exec->codeBlock()->m_numCalleeRegisters);
     dataLogF("Num vars = %u.\n", exec->codeBlock()->m_numVars);
 
@@ -1043 +1042 @@
 }
 
-LLINT_SLOW_PATH_DECL(slow_path_new_generator_func)
-{
-    LLINT_BEGIN();
-    CodeBlock* codeBlock = exec->codeBlock();
-    ASSERT(codeBlock->codeType() != FunctionCode || !codeBlock->needsActivation() || exec->hasActivation());
-    JSScope* scope = exec->uncheckedR(pc[2].u.operand).Register::scope();
-#if LLINT_SLOW_PATH_TRACING
-    dataLogF("Creating function!\n");
-#endif
-    LLINT_RETURN(JSGeneratorFunction::create(vm, codeBlock->functionDecl(pc[3].u.operand), scope));
-}
-
 LLINT_SLOW_PATH_DECL(slow_path_new_func_exp)
 {
@@ -1064 +1051 @@
     
     LLINT_RETURN(JSFunction::create(vm, executable, scope));
-}
-
-LLINT_SLOW_PATH_DECL(slow_path_new_generator_func_exp)
-{
-    LLINT_BEGIN();
-
-    CodeBlock* codeBlock = exec->codeBlock();
-    JSScope* scope = exec->uncheckedR(pc[2].u.operand).Register::scope();
-    FunctionExecutable* executable = codeBlock->functionExpr(pc[3].u.operand);
-
-    LLINT_RETURN(JSGeneratorFunction::create(vm, executable, scope));
 }