Index: src/x64/full-codegen-x64.cc |
diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc |
index 5ed18854dcb91ed695e67a43a81f683f1d8edcdd..f06eaa9384e0215b94118436004bbab583774304 100644 |
--- a/src/x64/full-codegen-x64.cc |
+++ b/src/x64/full-codegen-x64.cc |
@@ -93,10 +93,6 @@ class JumpPatchSite BASE_EMBEDDED { |
// frames-x64.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()); |
@@ -2160,7 +2156,8 @@ void FullCodeGenerator::VisitYield(Yield* expr) { |
// re-boxing. |
__ bind(&l_try); |
__ Pop(rax); // result |
- EnterTryBlock(expr->index(), &l_catch); |
+ int handler_index = NewHandlerTableEntry(); |
+ EnterTryBlock(handler_index, &l_catch); |
const int try_block_size = TryCatch::kElementCount * kPointerSize; |
__ Push(rax); // result |
__ jmp(&l_suspend); |
@@ -2170,7 +2167,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) { |
const int generator_object_depth = kPointerSize + try_block_size; |
__ movp(rax, Operand(rsp, generator_object_depth)); |
__ Push(rax); // 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())); |
__ Move(FieldOperand(rax, JSGeneratorObject::kContinuationOffset), |
Smi::FromInt(l_continuation.pos())); |
@@ -2184,7 +2181,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) { |
__ Pop(rax); // result |
EmitReturnSequence(); |
__ bind(&l_resume); // received in rax |
- ExitTryBlock(expr->index()); |
+ ExitTryBlock(handler_index); |
// receiver = iter; f = 'next'; arg = received; |
__ bind(&l_next); |