Index: src/mips64/full-codegen-mips64.cc |
diff --git a/src/mips64/full-codegen-mips64.cc b/src/mips64/full-codegen-mips64.cc |
index 02f25c509481c14960a5278780366360d8e98dd4..4f5139b129dd9ac39d51a70d7fddb9d7547d35ca 100644 |
--- a/src/mips64/full-codegen-mips64.cc |
+++ b/src/mips64/full-codegen-mips64.cc |
@@ -113,10 +113,6 @@ class JumpPatchSite BASE_EMBEDDED { |
// frames-mips.h for its layout. |
void FullCodeGenerator::Generate() { |
CompilationInfo* info = info_; |
- handler_table_ = |
- Handle<HandlerTable>::cast(isolate()->factory()->NewFixedArray( |
- HandlerTable::LengthForRange(function()->handler_count()), TENURED)); |
- |
profiling_counter_ = isolate()->factory()->NewCell( |
Handle<Smi>(Smi::FromInt(FLAG_interrupt_budget), isolate())); |
SetFunctionPosition(function()); |
@@ -2190,7 +2186,8 @@ void FullCodeGenerator::VisitYield(Yield* expr) { |
// re-boxing. |
__ bind(&l_try); |
__ pop(a0); // result |
- EnterTryBlock(expr->index(), &l_catch); |
+ int handler_index = NewHandlerTableEntry(); |
+ EnterTryBlock(handler_index, &l_catch); |
const int try_block_size = TryCatch::kElementCount * kPointerSize; |
__ push(a0); // result |
__ jmp(&l_suspend); |
@@ -2201,7 +2198,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) { |
const int generator_object_depth = kPointerSize + try_block_size; |
__ ld(a0, MemOperand(sp, generator_object_depth)); |
__ push(a0); // g |
- __ Push(Smi::FromInt(expr->index())); // handler-index |
+ __ Push(Smi::FromInt(handler_index)); // handler-index |
DCHECK(l_continuation.pos() > 0 && Smi::IsValid(l_continuation.pos())); |
__ li(a1, Operand(Smi::FromInt(l_continuation.pos()))); |
__ sd(a1, FieldMemOperand(a0, JSGeneratorObject::kContinuationOffset)); |
@@ -2215,7 +2212,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) { |
EmitReturnSequence(); |
__ mov(a0, v0); |
__ bind(&l_resume); // received in a0 |
- ExitTryBlock(expr->index()); |
+ ExitTryBlock(handler_index); |
// receiver = iter; f = 'next'; arg = received; |
__ bind(&l_next); |