| Index: src/hydrogen-environment-liveness.cc
|
| diff --git a/src/hydrogen-environment-liveness.cc b/src/hydrogen-environment-liveness.cc
|
| index a72dfda01ae56eb8084ae3d8e03fdd112b689bec..8e9018fb4e2633f8e5e5d3f6c6f1919a63b324a6 100644
|
| --- a/src/hydrogen-environment-liveness.cc
|
| +++ b/src/hydrogen-environment-liveness.cc
|
| @@ -22,7 +22,7 @@ HEnvironmentLivenessAnalysisPhase::HEnvironmentLivenessAnalysisPhase(
|
| collect_markers_(true),
|
| last_simulate_(NULL),
|
| went_live_since_last_simulate_(maximum_environment_size_, zone()) {
|
| - ASSERT(maximum_environment_size_ > 0);
|
| + DCHECK(maximum_environment_size_ > 0);
|
| for (int i = 0; i < block_count_; ++i) {
|
| live_at_block_start_.Add(
|
| new(zone()) BitVector(maximum_environment_size_, zone()), zone());
|
| @@ -61,7 +61,7 @@ void HEnvironmentLivenessAnalysisPhase::ZapEnvironmentSlotsInSuccessors(
|
| }
|
| HSimulate* simulate = first_simulate_.at(successor_id);
|
| if (simulate == NULL) continue;
|
| - ASSERT(VerifyClosures(simulate->closure(),
|
| + DCHECK(VerifyClosures(simulate->closure(),
|
| block->last_environment()->closure()));
|
| ZapEnvironmentSlot(i, simulate);
|
| }
|
| @@ -74,7 +74,7 @@ void HEnvironmentLivenessAnalysisPhase::ZapEnvironmentSlotsForInstruction(
|
| if (!marker->CheckFlag(HValue::kEndsLiveRange)) return;
|
| HSimulate* simulate = marker->next_simulate();
|
| if (simulate != NULL) {
|
| - ASSERT(VerifyClosures(simulate->closure(), marker->closure()));
|
| + DCHECK(VerifyClosures(simulate->closure(), marker->closure()));
|
| ZapEnvironmentSlot(marker->index(), simulate);
|
| }
|
| }
|
| @@ -109,7 +109,7 @@ void HEnvironmentLivenessAnalysisPhase::UpdateLivenessAtInstruction(
|
| if (marker->kind() == HEnvironmentMarker::LOOKUP) {
|
| live->Add(index);
|
| } else {
|
| - ASSERT(marker->kind() == HEnvironmentMarker::BIND);
|
| + DCHECK(marker->kind() == HEnvironmentMarker::BIND);
|
| live->Remove(index);
|
| went_live_since_last_simulate_.Add(index);
|
| }
|
| @@ -124,10 +124,10 @@ void HEnvironmentLivenessAnalysisPhase::UpdateLivenessAtInstruction(
|
| live->Clear();
|
| last_simulate_ = NULL;
|
|
|
| - // The following ASSERTs guard the assumption used in case
|
| + // The following DCHECKs guard the assumption used in case
|
| // kEnterInlined below:
|
| - ASSERT(instr->next()->IsSimulate());
|
| - ASSERT(instr->next()->next()->IsGoto());
|
| + DCHECK(instr->next()->IsSimulate());
|
| + DCHECK(instr->next()->next()->IsGoto());
|
|
|
| break;
|
| case HValue::kEnterInlined: {
|
| @@ -135,7 +135,7 @@ void HEnvironmentLivenessAnalysisPhase::UpdateLivenessAtInstruction(
|
| // target block. Here we make use of the fact that the end of an
|
| // inline sequence always looks like this: HLeaveInlined, HSimulate,
|
| // HGoto (to return_target block), with no environment lookups in
|
| - // between (see ASSERTs above).
|
| + // between (see DCHECKs above).
|
| HEnterInlined* enter = HEnterInlined::cast(instr);
|
| live->Clear();
|
| for (int i = 0; i < enter->return_targets()->length(); ++i) {
|
| @@ -156,7 +156,7 @@ void HEnvironmentLivenessAnalysisPhase::UpdateLivenessAtInstruction(
|
|
|
|
|
| void HEnvironmentLivenessAnalysisPhase::Run() {
|
| - ASSERT(maximum_environment_size_ > 0);
|
| + DCHECK(maximum_environment_size_ > 0);
|
|
|
| // Main iteration. Compute liveness of environment slots, and store it
|
| // for each block until it doesn't change any more. For efficiency, visit
|
|
|