| Index: src/full-codegen/arm/full-codegen-arm.cc
|
| diff --git a/src/full-codegen/arm/full-codegen-arm.cc b/src/full-codegen/arm/full-codegen-arm.cc
|
| index 0fd25f0d9a6dff90860cd361aa155d77247916d3..3b0d77b0d8c4db03c1bdbe0831e2e31ee3e96ec1 100644
|
| --- a/src/full-codegen/arm/full-codegen-arm.cc
|
| +++ b/src/full-codegen/arm/full-codegen-arm.cc
|
| @@ -293,40 +293,38 @@ void FullCodeGenerator::Generate() {
|
| __ CallRuntime(Runtime::kTraceEnter);
|
| }
|
|
|
| - // Visit the declarations and body unless there is an illegal
|
| - // redeclaration.
|
| - if (scope()->HasIllegalRedeclaration()) {
|
| - EmitIllegalRedeclaration();
|
| - } else {
|
| - PrepareForBailoutForId(BailoutId::FunctionEntry(), NO_REGISTERS);
|
| - { Comment cmnt(masm_, "[ Declarations");
|
| - VisitDeclarations(scope()->declarations());
|
| - }
|
| + // Visit the declarations and body.
|
| + PrepareForBailoutForId(BailoutId::FunctionEntry(), NO_REGISTERS);
|
| + {
|
| + Comment cmnt(masm_, "[ Declarations");
|
| + VisitDeclarations(scope()->declarations());
|
| + }
|
|
|
| - // Assert that the declarations do not use ICs. Otherwise the debugger
|
| - // won't be able to redirect a PC at an IC to the correct IC in newly
|
| - // recompiled code.
|
| - DCHECK_EQ(0, ic_total_count_);
|
| -
|
| - { Comment cmnt(masm_, "[ Stack check");
|
| - PrepareForBailoutForId(BailoutId::Declarations(), NO_REGISTERS);
|
| - Label ok;
|
| - __ LoadRoot(ip, Heap::kStackLimitRootIndex);
|
| - __ cmp(sp, Operand(ip));
|
| - __ b(hs, &ok);
|
| - Handle<Code> stack_check = isolate()->builtins()->StackCheck();
|
| - PredictableCodeSizeScope predictable(masm_);
|
| - predictable.ExpectSize(
|
| - masm_->CallSize(stack_check, RelocInfo::CODE_TARGET));
|
| - __ Call(stack_check, RelocInfo::CODE_TARGET);
|
| - __ bind(&ok);
|
| - }
|
| + // Assert that the declarations do not use ICs. Otherwise the debugger
|
| + // won't be able to redirect a PC at an IC to the correct IC in newly
|
| + // recompiled code.
|
| + DCHECK_EQ(0, ic_total_count_);
|
| +
|
| + {
|
| + Comment cmnt(masm_, "[ Stack check");
|
| + PrepareForBailoutForId(BailoutId::Declarations(), NO_REGISTERS);
|
| + Label ok;
|
| + __ LoadRoot(ip, Heap::kStackLimitRootIndex);
|
| + __ cmp(sp, Operand(ip));
|
| + __ b(hs, &ok);
|
| + Handle<Code> stack_check = isolate()->builtins()->StackCheck();
|
| + PredictableCodeSizeScope predictable(masm_);
|
| + predictable.ExpectSize(
|
| + masm_->CallSize(stack_check, RelocInfo::CODE_TARGET));
|
| + __ Call(stack_check, RelocInfo::CODE_TARGET);
|
| + __ bind(&ok);
|
| + }
|
|
|
| - { Comment cmnt(masm_, "[ Body");
|
| - DCHECK(loop_depth() == 0);
|
| - VisitStatements(literal()->body());
|
| - DCHECK(loop_depth() == 0);
|
| - }
|
| + {
|
| + Comment cmnt(masm_, "[ Body");
|
| + DCHECK(loop_depth() == 0);
|
| + VisitStatements(literal()->body());
|
| + DCHECK(loop_depth() == 0);
|
| }
|
|
|
| // Always emit a 'return undefined' in case control fell off the end of
|
|
|