Index: src/mips/full-codegen-mips.cc |
diff --git a/src/mips/full-codegen-mips.cc b/src/mips/full-codegen-mips.cc |
index 10afeb1fcb636555ddd5424be3e480a6a69f6924..2d8c6944e51fd5ff904af37d9744914e0ade8c0d 100644 |
--- a/src/mips/full-codegen-mips.cc |
+++ b/src/mips/full-codegen-mips.cc |
@@ -2036,10 +2036,10 @@ void FullCodeGenerator::VisitYield(Yield* expr) { |
// [sp + 1 * kPointerSize] iter |
// [sp + 0 * kPointerSize] g |
- Label l_catch, l_try, l_resume, l_send, l_call, l_loop; |
+ Label l_catch, l_try, l_resume, l_next, l_call, l_loop; |
// Initial send value is undefined. |
__ LoadRoot(a0, Heap::kUndefinedValueRootIndex); |
- __ Branch(&l_send); |
+ __ Branch(&l_next); |
// catch (e) { receiver = iter; f = iter.throw; arg = e; goto l_call; } |
__ bind(&l_catch); |
@@ -2049,12 +2049,10 @@ void FullCodeGenerator::VisitYield(Yield* expr) { |
__ push(a3); // iter |
__ push(a0); // exception |
__ mov(a0, a3); // iter |
- __ push(a0); // push LoadIC state |
__ LoadRoot(a2, Heap::kthrow_stringRootIndex); // "throw" |
Handle<Code> throw_ic = isolate()->builtins()->LoadIC_Initialize(); |
CallIC(throw_ic); // iter.throw in a0 |
__ mov(a0, v0); |
- __ Addu(sp, sp, Operand(kPointerSize)); // drop LoadIC state |
__ jmp(&l_call); |
// try { received = yield result.value } |
@@ -2076,18 +2074,16 @@ void FullCodeGenerator::VisitYield(Yield* expr) { |
__ bind(&l_resume); // received in a0 |
__ PopTryHandler(); |
- // receiver = iter; f = iter.send; arg = received; |
- __ bind(&l_send); |
+ // receiver = iter; f = iter.next; arg = received; |
+ __ bind(&l_next); |
__ lw(a3, MemOperand(sp, 1 * kPointerSize)); // iter |
__ push(a3); // iter |
__ push(a0); // received |
__ mov(a0, a3); // iter |
- __ push(a0); // push LoadIC state |
- __ LoadRoot(a2, Heap::ksend_stringRootIndex); // "send" |
- Handle<Code> send_ic = isolate()->builtins()->LoadIC_Initialize(); |
- CallIC(send_ic); // iter.send in a0 |
+ __ LoadRoot(a2, Heap::knext_stringRootIndex); // "next" |
+ Handle<Code> next_ic = isolate()->builtins()->LoadIC_Initialize(); |
+ CallIC(next_ic); // iter.next in a0 |
__ mov(a0, v0); |
- __ Addu(sp, sp, Operand(kPointerSize)); // drop LoadIC state |
// result = f.call(receiver, arg); |
__ bind(&l_call); |
@@ -2117,11 +2113,9 @@ void FullCodeGenerator::VisitYield(Yield* expr) { |
__ pop(a1); // result |
__ push(a0); // result.value |
__ mov(a0, a1); // result |
- __ push(a0); // push LoadIC state |
__ LoadRoot(a2, Heap::kdone_stringRootIndex); // "done" |
Handle<Code> done_ic = isolate()->builtins()->LoadIC_Initialize(); |
CallIC(done_ic); // result.done in v0 |
- __ Addu(sp, sp, Operand(kPointerSize)); // drop LoadIC state |
__ mov(a0, v0); |
Handle<Code> bool_ic = ToBooleanStub::GetUninitialized(isolate()); |
CallIC(bool_ic); |
@@ -2193,7 +2187,7 @@ void FullCodeGenerator::EmitGeneratorResume(Expression *generator, |
// If we are sending a value and there is no operand stack, we can jump back |
// in directly. |
- if (resume_mode == JSGeneratorObject::SEND) { |
+ if (resume_mode == JSGeneratorObject::NEXT) { |
Label slow_resume; |
__ Branch(&slow_resume, ne, a3, Operand(zero_reg)); |
__ lw(a3, FieldMemOperand(t0, JSFunction::kCodeEntryOffset)); |