Remove slow assert from VM.

runtime/vm/flow_graph.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/flow_graph.h"
 
-#include "vm/assert.h"
 #include "vm/bit_vector.h"
 #include "vm/flow_graph_builder.h"
 #include "vm/intermediate_language.h"
 #include "vm/longjump.h"
 #include "vm/growable_array.h"
 
 namespace dart {
 
 DECLARE_FLAG(bool, trace_optimization);
+DECLARE_FLAG(bool, verify_compiler);
 
 FlowGraph::FlowGraph(const FlowGraphBuilder& builder,
                      GraphEntryInstr* graph_entry,
                      intptr_t max_block_id)
   : parent_(),
     assigned_vars_(),
     current_ssa_temp_index_(0),
     max_block_id_(max_block_id),
     parsed_function_(builder.parsed_function()),
     num_copied_params_(builder.num_copied_params()),
@@ skipping 91 matching lines @@
   return true;  // Return true so we can ASSERT the reset code.
 }
 
 
 static void ValidateUseListsInInstruction(Instruction* instr) {
   ASSERT(instr != NULL);
   ASSERT(!instr->IsJoinEntry());
   for (intptr_t i = 0; i < instr->InputCount(); ++i) {
     Value* use = instr->InputAt(i);
     ASSERT(use->use_index() == i);
-    SLOW_ASSERT(1 == MembershipCount(use, use->definition()->input_use_list()));
+    ASSERT(!FLAG_verify_compiler ||
+           (1 == MembershipCount(use, use->definition()->input_use_list())));

[srdjan, 2012/10/09 16:28:52]

Would it make sense to do verification in release mode as well (if flag is set)?

[zerny-google, 2012/10/10 07:44:54]

We could, but currently all of the verification code is wrapped in an #ifdef
DEBUG condition. Since verification is really is for development debugging I
think this is a reasonable thing to do.

   }
   if (instr->env() != NULL) {
     intptr_t use_index = 0;
     for (Environment::DeepIterator it(instr->env()); !it.Done(); it.Advance()) {
       Value* use = it.CurrentValue();
       ASSERT(use->use_index() == use_index++);
-      SLOW_ASSERT(1 == MembershipCount(use, use->definition()->env_use_list()));
+      ASSERT(!FLAG_verify_compiler ||
+             (1 == MembershipCount(use, use->definition()->env_use_list())));
     }
   }
   Definition* defn = instr->AsDefinition();
   if (defn != NULL) {
     for (Value* use = defn->input_use_list();
          use != NULL;
          use = use->next_use()) {
       ASSERT(defn == use->definition());
       ASSERT(use == use->instruction()->InputAt(use->use_index()));
     }
@@ skipping 42 matching lines @@
 }
 
 
 static void RecordInputUses(Instruction* instr) {
   ASSERT(instr != NULL);
   for (intptr_t i = 0; i < instr->InputCount(); ++i) {
     Value* use = instr->InputAt(i);
     ASSERT(use->instruction() == NULL);
     ASSERT(use->use_index() == -1);
     ASSERT(use->next_use() == NULL);
-    SLOW_ASSERT(0 == MembershipCount(use, use->definition()->input_use_list()));
+    DEBUG_ASSERT(!FLAG_verify_compiler ||

[srdjan, 2012/10/09 16:28:52]

Why DEBUG_ASSERT instead of ASSERT? All identifiers are defined in release mode
as well, aren't they? (Also for some of changes below).

[zerny-google, 2012/10/10 07:44:54]

No, the verification code (including MembershipCount) is only inclued in debug
mode.

+        (0 == MembershipCount(use, use->definition()->input_use_list())));
     use->set_instruction(instr);
     use->set_use_index(i);
     use->AddToInputUseList();
   }
 }
 
 
 static void RecordEnvUses(Instruction* instr) {
   ASSERT(instr != NULL);
   if (instr->env() == NULL) return;
   intptr_t use_index = 0;
   for (Environment::DeepIterator it(instr->env()); !it.Done(); it.Advance()) {
     Value* use = it.CurrentValue();
     ASSERT(use->instruction() == NULL);
     ASSERT(use->use_index() == -1);
     ASSERT(use->next_use() == NULL);
-    SLOW_ASSERT(0 == MembershipCount(use, use->definition()->env_use_list()));
+    DEBUG_ASSERT(!FLAG_verify_compiler ||
+        (0 == MembershipCount(use, use->definition()->env_use_list())));
     use->set_instruction(instr);
     use->set_use_index(use_index++);
     use->AddToEnvUseList();
   }
 }
 
 
 static void ComputeUseListsRecursive(BlockEntryInstr* block) {
   // Clear phi definitions.
   JoinEntryInstr* join = block->AsJoinEntry();
@@ skipping 22 matching lines @@
     intptr_t pred_index = join->IndexOfPredecessor(block);
     ASSERT(pred_index >= 0);
     if (join->phis() != NULL) {
       for (intptr_t i = 0; i < join->phis()->length(); ++i) {
         PhiInstr* phi = (*join->phis())[i];
         if (phi == NULL) continue;
         Value* use = phi->InputAt(pred_index);
         ASSERT(use->instruction() == NULL);
         ASSERT(use->use_index() == -1);
         ASSERT(use->next_use() == NULL);
-        SLOW_ASSERT(0 == MembershipCount(use,
-                                         use->definition()->input_use_list()));
+        DEBUG_ASSERT(!FLAG_verify_compiler ||
+            (0 == MembershipCount(use, use->definition()->input_use_list())));
         use->set_instruction(phi);
         use->set_use_index(pred_index);
         use->AddToInputUseList();
       }
     }
   }
 }
 
 
 void FlowGraph::ComputeUseLists() {
   DEBUG_ASSERT(ResetUseLists());
   // Clear initial definitions.
   for (intptr_t i = 0; i < graph_entry_->initial_definitions()->length(); ++i) {
     ClearUseLists((*graph_entry_->initial_definitions())[i]);
   }
   ComputeUseListsRecursive(graph_entry_);
-  SLOW_ASSERT(ValidateUseLists());
+  DEBUG_ASSERT(!FLAG_verify_compiler || ValidateUseLists());
 }
 
 
 void FlowGraph::ComputeSSA(intptr_t next_virtual_register_number) {
   current_ssa_temp_index_ = next_virtual_register_number;
   GrowableArray<BitVector*> dominance_frontier;
   ComputeDominators(&dominance_frontier);
   InsertPhis(preorder_, assigned_vars_, dominance_frontier);
   GrowableArray<PhiInstr*> live_phis;
   // Rename uses to reference inserted phis where appropriate.
@@ skipping 617 matching lines @@
          !it.Done();
          it.Advance()) {
       ++size;
     }
   }
   return size;
 }
 
 
 }  // namespace dart