Revert "Allow control intructions to have side effects."

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 776 matching lines @@
       }
     } else {
       // If the following assert fires, you may have forgotten an
       // AddInstruction.
       ASSERT(other_block->Dominates(cur_block));
     }
   }
 
   // Verify that instructions that may have side-effects are followed
   // by a simulate instruction.
-  if (HasObservableSideEffects() && !IsOsrEntry() && !IsControlInstruction()) {
+  if (HasObservableSideEffects() && !IsOsrEntry()) {
     ASSERT(next()->IsSimulate());
   }
 
   // Verify that instructions that can be eliminated by GVN have overridden
   // HValue::DataEquals.  The default implementation is UNREACHABLE.  We
   // don't actually care whether DataEquals returns true or false here.
   if (CheckFlag(kUseGVN)) DataEquals(this);
 
   // Verify that all uses are in the graph.
   for (HUseIterator use = uses(); !use.Done(); use.Advance()) {
@@ skipping 196 matching lines @@
   stream->Add(" goto (");
   bool first_block = true;
   for (HSuccessorIterator it(this); !it.Done(); it.Advance()) {
     stream->Add(first_block ? "B%d" : ", B%d", it.Current()->block_id());
     first_block = false;
   }
   stream->Add(")");
 }
 
 
-#ifdef DEBUG
-void HControlInstruction::Verify() {
-  HInstruction::Verify();
-  if (!HasObservableSideEffects()) return;
-  for (HSuccessorIterator it(this); !it.Done(); it.Advance()) {
-    // For ControlInstructions we need to verify that the successors all start
-    // with a Simulate.
-    HInstruction* first = it.Current()->first()->next();
-    ASSERT(first->IsSimulate() ||
-           (first->IsLeaveInlined() && first->next()->IsSimulate()));
-  }
-}
-#endif
-
-
 void HUnaryControlInstruction::PrintDataTo(StringStream* stream) {
   value()->PrintNameTo(stream);
   HControlInstruction::PrintDataTo(stream);
 }
 
 
 void HReturn::PrintDataTo(StringStream* stream) {
   value()->PrintNameTo(stream);
   stream->Add(" (pop ");
   parameter_count()->PrintNameTo(stream);
@@ skipping 1792 matching lines @@
     case EXTERNAL_SHORT_ELEMENTS:
       return new(zone) Range(-32768, 32767);
     case EXTERNAL_UNSIGNED_SHORT_ELEMENTS:
       return new(zone) Range(0, 65535);
     default:
       return HValue::InferRange(zone);
   }
 }
 
 
-void HCompareGenericAndBranch::PrintDataTo(StringStream* stream) {
+void HCompareGeneric::PrintDataTo(StringStream* stream) {
   stream->Add(Token::Name(token()));
   stream->Add(" ");
-  left()->PrintNameTo(stream);
-  stream->Add(" ");
-  right()->PrintNameTo(stream);
-  if (CheckFlag(kCanOverflow)) stream->Add(" !");
-  if (CheckFlag(kBailoutOnMinusZero)) stream->Add(" -0?");
+  HBinaryOperation::PrintDataTo(stream);
 }
 
 
 void HStringCompareAndBranch::PrintDataTo(StringStream* stream) {
   stream->Add(Token::Name(token()));
   stream->Add(" ");
   HControlInstruction::PrintDataTo(stream);
 }
 
 
@@ skipping 1383 matching lines @@
       break;
     case kExternalMemory:
       stream->Add("[external-memory]");
       break;
   }
 
   stream->Add("@%d", offset());
 }
 
 } }  // namespace v8::internal