Changeset 192935 in webkit for trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h

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/bytecode/BytecodeUseDef.h (modified) (9 diffs)

trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h

@@ -33 +33 @@
 template<typename Functor>
 void computeUsesForBytecodeOffset(
-    CodeBlock* codeBlock, BytecodeBasicBlock* block, unsigned bytecodeOffset, const Functor& functor)
+    CodeBlock* codeBlock, unsigned bytecodeOffset, const Functor& functor)
 {
     Interpreter* interpreter = codeBlock->vm()->interpreter;
@@ -72 +72 @@
     case op_jneq_null:
     case op_dec:
-    case op_inc:
-    case op_resume: {
+    case op_inc: {
         functor(codeBlock, instruction, opcodeID, instruction[1].u.operand);
         return;
@@ -127 +126 @@
     case op_get_enumerable_length:
     case op_new_func_exp:
-    case op_new_generator_func_exp:
     case op_new_arrow_func_exp:
     case op_to_index_string:
@@ -156 +154 @@
     case op_unsigned:
     case op_new_func:
-    case op_new_generator_func:
     case op_get_parent_scope:
     case op_create_scoped_arguments:
@@ -238 +235 @@
         return;
     }
-    case op_save: {
-        functor(codeBlock, instruction, opcodeID, instruction[1].u.operand);
-        unsigned mergePointBytecodeOffset = bytecodeOffset + instruction[3].u.operand;
-        BytecodeBasicBlock* mergePointBlock = nullptr;
-        for (BytecodeBasicBlock* successor : block->successors()) {
-            if (successor->leaderBytecodeOffset() == mergePointBytecodeOffset) {
-                mergePointBlock = successor;
-                break;
-            }
-        }
-        ASSERT(mergePointBlock);
-        mergePointBlock->in().forEachSetBit([&](unsigned local) {
-            functor(codeBlock, instruction, opcodeID, virtualRegisterForLocal(local).offset());
-        });
-        return;
-    }
     default:
         RELEASE_ASSERT_NOT_REACHED();
@@ -261 +242 @@
 
 template<typename Functor>
-void computeDefsForBytecodeOffset(CodeBlock* codeBlock, BytecodeBasicBlock* block, unsigned bytecodeOffset, const Functor& functor)
+void computeDefsForBytecodeOffset(CodeBlock* codeBlock, unsigned bytecodeOffset, const Functor& functor)
 {
     Interpreter* interpreter = codeBlock->vm()->interpreter;
@@ -276 +257 @@
     case op_throw:
     case op_throw_static_error:
-    case op_save:
     case op_assert:
     case op_debug:
@@ -337 +317 @@
     case op_new_func:
     case op_new_func_exp:
-    case op_new_generator_func:
-    case op_new_generator_func_exp:
     case op_new_arrow_func_exp:
     case op_call_varargs:
@@ -415 +393 @@
             functor(codeBlock, instruction, opcodeID, virtualRegisterForLocal(i).offset());
         return;
-    }
-    case op_resume: {
-        RELEASE_ASSERT(block->successors().size() == 1);
-        block->successors()[0]->in().forEachSetBit([&](unsigned local) {
-            functor(codeBlock, instruction, opcodeID, virtualRegisterForLocal(local).offset());
-        });
-        return;
-    }
-    }
+    } }
 }