Revert "Eliminatable CheckMaps replaced with if(true) or if(false)."

src/hydrogen-check-elimination.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 114 matching lines @@
       // TODO(titzer): keep the check if this block dominates the successor?
       new_entry->object_ = old_entry->object_;
       new_entry->check_ = NULL;
       new_entry->maps_ = old_entry->maps_->Copy(phase_->zone());
     }
     copy->cursor_ = cursor_;
     copy->size_ = size_;
 
     // Branch-sensitive analysis for certain comparisons may add more facts
     // to the state for the successor on the true branch.
-    HBasicBlock* pred_block = succ->predecessors()->at(0);
-    HControlInstruction* end = pred_block->end();
-    if (succ->predecessors()->length() == 1 && end->SuccessorAt(0) == succ &&
-        pred_block->IsReachable()) {
+    HControlInstruction* end = succ->predecessors()->at(0)->end();
+    if (succ->predecessors()->length() == 1 && end->SuccessorAt(0) == succ) {
       if (end->IsCompareMap()) {
         // Learn on the true branch of if(CompareMap(x)).
         HCompareMap* cmp = HCompareMap::cast(end);
         HValue* object = cmp->value()->ActualValue();
         HCheckTableEntry* entry = copy->Find(object);
         if (entry == NULL) {
           copy->Insert(object, cmp->map());
         } else {
           MapSet list = new(phase_->zone()) UniqueSet<Map>();
           list->Add(cmp->map(), phase_->zone());
@@ skipping 157 matching lines @@
       Insert(object, MapConstant(instr->value()));
     } else {
       // If the instruction changes maps, it should be handled above.
       CHECK(!instr->CheckGVNFlag(kChangesMaps));
     }
   }
 
   void ReduceCompareMap(HCompareMap* instr) {
     MapSet maps = FindMaps(instr->value()->ActualValue());
     if (maps == NULL) return;
-
-    TRACE(("CompareMap for #%d at B%d ",
-        instr->value()->ActualValue()->id(), instr->block()->block_id()));
-
     if (maps->Contains(instr->map())) {
       if (maps->size() == 1) {
+        // TODO(titzer): replace with goto true branch
         INC_STAT(compares_true_);
-
-        TRACE(("replaced with goto B%d (true target)\n",
-               instr->SuccessorAt(0)->block_id()));
-
-        instr->block()->ReplaceControlWithGotoSuccessor(0);
-      } else {
-        TRACE(("can't be replaced with goto: ambiguous set of maps\n"));
       }
     } else {
+      // TODO(titzer): replace with goto false branch
       INC_STAT(compares_false_);
-      TRACE(("replaced with goto B%d (false target)\n",
-             instr->SuccessorAt(1)->block_id()));
-
-      instr->block()->ReplaceControlWithGotoSuccessor(1);
     }
   }
 
   void ReduceTransitionElementsKind(HTransitionElementsKind* instr) {
     MapSet maps = FindMaps(instr->object()->ActualValue());
     // Can only learn more about an object that already has a known set of maps.
     if (maps == NULL) return;
     if (maps->Contains(instr->original_map())) {
       // If the object has the original map, it will be transitioned.
       maps->Remove(instr->original_map());
@@ skipping 220 matching lines @@
   PRINT_STAT(removed_cho);
   PRINT_STAT(narrowed);
   PRINT_STAT(loads);
   PRINT_STAT(empty);
   PRINT_STAT(compares_true);
   PRINT_STAT(compares_false);
   PRINT_STAT(transitions);
 }
 
 } }  // namespace v8::internal