| Index: src/arm/lithium-arm.cc
|
| diff --git a/src/arm/lithium-arm.cc b/src/arm/lithium-arm.cc
|
| index 0dda5bdaa1416fae1802f457cfa91a533bb18c47..d37bfec008a8aba22655fa2a194b52821310d2af 100644
|
| --- a/src/arm/lithium-arm.cc
|
| +++ b/src/arm/lithium-arm.cc
|
| @@ -620,7 +620,7 @@ LInstruction* LChunkBuilder::MarkAsCall(LInstruction* instr,
|
| ASSERT(hinstr->next()->IsSimulate());
|
| HSimulate* sim = HSimulate::cast(hinstr->next());
|
| ASSERT(instruction_pending_deoptimization_environment_ == NULL);
|
| - ASSERT(pending_deoptimization_ast_id_ == AstNode::kNoNumber);
|
| + ASSERT(pending_deoptimization_ast_id_.IsNone());
|
| instruction_pending_deoptimization_environment_ = instr;
|
| pending_deoptimization_ast_id_ = sim->ast_id();
|
| }
|
| @@ -854,8 +854,8 @@ LEnvironment* LChunkBuilder::CreateEnvironment(
|
|
|
| LEnvironment* outer =
|
| CreateEnvironment(hydrogen_env->outer(), argument_index_accumulator);
|
| - int ast_id = hydrogen_env->ast_id();
|
| - ASSERT(ast_id != AstNode::kNoNumber ||
|
| + BailoutId ast_id = hydrogen_env->ast_id();
|
| + ASSERT(!ast_id.IsNone() ||
|
| hydrogen_env->frame_type() != JS_FUNCTION);
|
| int value_count = hydrogen_env->length();
|
| LEnvironment* result = new(zone()) LEnvironment(
|
| @@ -2194,7 +2194,7 @@ LInstruction* LChunkBuilder::DoSimulate(HSimulate* instr) {
|
| instruction_pending_deoptimization_environment_->
|
| SetDeferredLazyDeoptimizationEnvironment(result->environment());
|
| instruction_pending_deoptimization_environment_ = NULL;
|
| - pending_deoptimization_ast_id_ = AstNode::kNoNumber;
|
| + pending_deoptimization_ast_id_ = BailoutId::None();
|
| return result;
|
| }
|
|
|
|
|