Index: src/ppc/full-codegen-ppc.cc |
diff --git a/src/ppc/full-codegen-ppc.cc b/src/ppc/full-codegen-ppc.cc |
index f6931f9e4dd687a414a27e7e01a3e8c293a770f5..db7c40150e964261852d4c7e19e6e21152b343a9 100644 |
--- a/src/ppc/full-codegen-ppc.cc |
+++ b/src/ppc/full-codegen-ppc.cc |
@@ -102,10 +102,6 @@ class JumpPatchSite BASE_EMBEDDED { |
// frames-ppc.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()); |
@@ -2164,7 +2160,8 @@ void FullCodeGenerator::VisitYield(Yield* expr) { |
// re-boxing. |
__ bind(&l_try); |
__ pop(r3); // result |
- EnterTryBlock(expr->index(), &l_catch); |
+ int handler_index = NewHandlerTableEntry(); |
+ EnterTryBlock(handler_index, &l_catch); |
const int try_block_size = TryCatch::kElementCount * kPointerSize; |
__ push(r3); // result |
__ b(&l_suspend); |
@@ -2174,7 +2171,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) { |
const int generator_object_depth = kPointerSize + try_block_size; |
__ LoadP(r3, MemOperand(sp, generator_object_depth)); |
__ push(r3); // 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())); |
__ LoadSmiLiteral(r4, Smi::FromInt(l_continuation.pos())); |
__ StoreP(r4, FieldMemOperand(r3, JSGeneratorObject::kContinuationOffset), |
@@ -2188,7 +2185,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) { |
__ pop(r3); // result |
EmitReturnSequence(); |
__ bind(&l_resume); // received in r3 |
- ExitTryBlock(expr->index()); |
+ ExitTryBlock(handler_index); |
// receiver = iter; f = 'next'; arg = received; |
__ bind(&l_next); |