Fix a stack-height mismatch during deoptimization.

src/hydrogen.cc

 // Copyright 2011 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 284 matching lines @@
   UNREACHABLE();
   return -1;
 }
 
 
 #ifdef DEBUG
 void HBasicBlock::Verify() {
   // Check that every block is finished.
   ASSERT(IsFinished());
   ASSERT(block_id() >= 0);
+
+  // Check that the incoming edges are in edge split form.
+  if (predecessors_.length() > 1) {
+    for (int i = 0; i < predecessors_.length(); ++i) {
+      ASSERT(predecessors_[i]->end()->SecondSuccessor() == NULL);
+    }
+  }
 }
 #endif
 
 
 void HLoopInformation::RegisterBackEdge(HBasicBlock* block) {
   this->back_edges_.Add(block);
   AddBlock(block);
 }
 
 
@@ skipping 2505 matching lines @@
 }
 
 
 void HGraphBuilder::VisitConditional(Conditional* expr) {
   HBasicBlock* cond_true = graph()->CreateBasicBlock();
   HBasicBlock* cond_false = graph()->CreateBasicBlock();
   VISIT_FOR_CONTROL(expr->condition(), cond_true, cond_false);
   cond_true->SetJoinId(expr->ThenId());
   cond_false->SetJoinId(expr->ElseId());
 
-  // TOOD(kmillikin): Visit the subexpressions in the same AST context as
-  // the whole expression.
+  // Visit the true and false subexpressions in the same AST context as the
+  // whole expression.
   set_current_block(cond_true);
-  VISIT_FOR_VALUE(expr->then_expression());
+  Visit(expr->then_expression());
+  CHECK_BAILOUT;
   HBasicBlock* other = current_block();
 
   set_current_block(cond_false);
-  VISIT_FOR_VALUE(expr->else_expression());
+  Visit(expr->else_expression());
+  CHECK_BAILOUT;
 
-  HBasicBlock* join = CreateJoin(other, current_block(), expr->id());
-  set_current_block(join);
-  ast_context()->ReturnValue(Pop());
+  if (!ast_context()->IsTest()) {
+    HBasicBlock* join = CreateJoin(other, current_block(), expr->id());
+    set_current_block(join);
+    if (!ast_context()->IsEffect()) ast_context()->ReturnValue(Pop());
+  }
 }
 
 
 void HGraphBuilder::LookupGlobalPropertyCell(Variable* var,
                                              LookupResult* lookup,
                                              bool is_store) {
   if (var->is_this()) {
     BAILOUT("global this reference");
   }
   if (!info()->has_global_object()) {
@@ skipping 3087 matching lines @@
     }
   }
 
 #ifdef DEBUG
   if (graph_ != NULL) graph_->Verify();
   if (allocator_ != NULL) allocator_->Verify();
 #endif
 }
 
 } }  // namespace v8::internal