Rollback of r11638, r11636 on trunk branch.

src/hydrogen-instructions.cc

 // Copyright 2012 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 1667 matching lines @@
   stream->Add(".");
   stream->Add(*String::cast(*name())->ToCString());
 }
 
 
 void HLoadKeyedFastElement::PrintDataTo(StringStream* stream) {
   object()->PrintNameTo(stream);
   stream->Add("[");
   key()->PrintNameTo(stream);
   stream->Add("]");
-  if (hole_check_mode_ == PERFORM_HOLE_CHECK) {
-    stream->Add(" check_hole");
-  }
 }
 
 
 bool HLoadKeyedFastElement::RequiresHoleCheck() {
   if (hole_check_mode_ == OMIT_HOLE_CHECK) {
     return false;
   }
 
   for (HUseIterator it(uses()); !it.Done(); it.Advance()) {
     HValue* use = it.value();
@@ skipping 31 matching lines @@
           HForInCacheArray::cast(key_load->object());
 
       if (names_cache->enumerable() == object()) {
         HForInCacheArray* index_cache =
             names_cache->index_cache();
         HCheckMapValue* map_check =
             new(block()->zone()) HCheckMapValue(object(), names_cache->map());
         HInstruction* index = new(block()->zone()) HLoadKeyedFastElement(
             index_cache,
             key_load->key(),
-            OMIT_HOLE_CHECK);
+            HLoadKeyedFastElement::OMIT_HOLE_CHECK);
         HLoadFieldByIndex* load = new(block()->zone()) HLoadFieldByIndex(
             object(), index);
         map_check->InsertBefore(this);
         index->InsertBefore(this);
         load->InsertBefore(this);
         return load;
       }
     }
   }
 
@@ skipping 27 matching lines @@
     case EXTERNAL_FLOAT_ELEMENTS:
       stream->Add("float");
       break;
     case EXTERNAL_DOUBLE_ELEMENTS:
       stream->Add("double");
       break;
     case EXTERNAL_PIXEL_ELEMENTS:
       stream->Add("pixel");
       break;
     case FAST_ELEMENTS:
-    case FAST_SMI_ELEMENTS:
+    case FAST_SMI_ONLY_ELEMENTS:
     case FAST_DOUBLE_ELEMENTS:
-    case FAST_HOLEY_ELEMENTS:
-    case FAST_HOLEY_SMI_ELEMENTS:
-    case FAST_HOLEY_DOUBLE_ELEMENTS:
     case DICTIONARY_ELEMENTS:
     case NON_STRICT_ARGUMENTS_ELEMENTS:
       UNREACHABLE();
       break;
   }
   stream->Add("[");
   key()->PrintNameTo(stream);
   stream->Add("]");
 }
 
@@ skipping 76 matching lines @@
       break;
     case EXTERNAL_FLOAT_ELEMENTS:
       stream->Add("float");
       break;
     case EXTERNAL_DOUBLE_ELEMENTS:
       stream->Add("double");
       break;
     case EXTERNAL_PIXEL_ELEMENTS:
       stream->Add("pixel");
       break;
-    case FAST_SMI_ELEMENTS:
+    case FAST_SMI_ONLY_ELEMENTS:
     case FAST_ELEMENTS:
     case FAST_DOUBLE_ELEMENTS:
-    case FAST_HOLEY_SMI_ELEMENTS:
-    case FAST_HOLEY_ELEMENTS:
-    case FAST_HOLEY_DOUBLE_ELEMENTS:
     case DICTIONARY_ELEMENTS:
     case NON_STRICT_ARGUMENTS_ELEMENTS:
       UNREACHABLE();
       break;
   }
   stream->Add("[");
   key()->PrintNameTo(stream);
   stream->Add("] = ");
   value()->PrintNameTo(stream);
 }
 
 
 void HTransitionElementsKind::PrintDataTo(StringStream* stream) {
   object()->PrintNameTo(stream);
-  ElementsKind from_kind = original_map()->elements_kind();
-  ElementsKind to_kind = transitioned_map()->elements_kind();
-  stream->Add(" %p [%s] -> %p [%s]",
-              *original_map(),
-              ElementsAccessor::ForKind(from_kind)->name(),
-              *transitioned_map(),
-              ElementsAccessor::ForKind(to_kind)->name());
+  stream->Add(" %p -> %p", *original_map(), *transitioned_map());
 }
 
 
 void HLoadGlobalCell::PrintDataTo(StringStream* stream) {
   stream->Add("[%p]", *cell());
   if (!details_.IsDontDelete()) stream->Add(" (deleteable)");
   if (details_.IsReadOnly()) stream->Add(" (read-only)");
 }
 
 
@@ skipping 523 matching lines @@
 
 
 void HCheckPrototypeMaps::Verify() {
   HInstruction::Verify();
   ASSERT(HasNoUses());
 }
 
 #endif
 
 } }  // namespace v8::internal