Merge revisions 6871, 6981, and 7082 to the 3.0 branch.

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 289 matching lines @@
     ASSERT(predecessors()->length() > 0);
     for (int i = 1; i < predecessors()->length(); i++) {
       HBasicBlock* pred = predecessors()->at(i);
       HValue* top = pred->last_environment()->Top();
       ASSERT(top->IsConstant());
       Object* a = *HConstant::cast(top)->handle();
       Object* b = *cond();
       ASSERT(a == b);
     }
   }
+
+  // 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 2573 matching lines @@
 }
 
 
 void HGraphBuilder::VisitConditional(Conditional* expr) {
   HSubgraph* then_graph = CreateEmptySubgraph();
   HSubgraph* else_graph = CreateEmptySubgraph();
   VISIT_FOR_CONTROL(expr->condition(),
                     then_graph->entry_block(),
                     else_graph->entry_block());
 
+  // Visit the true and false subexpressions in the same AST context as the
+  // whole expression.
   then_graph->entry_block()->SetJoinId(expr->ThenId());
-  ADD_TO_SUBGRAPH(then_graph, expr->then_expression());
+  { SubgraphScope scope(this, then_graph);
+    Visit(expr->then_expression());
+    CHECK_BAILOUT;
+  }
 
   else_graph->entry_block()->SetJoinId(expr->ElseId());
-  ADD_TO_SUBGRAPH(else_graph, expr->else_expression());
+  { SubgraphScope scope(this, else_graph);
+    Visit(expr->else_expression());
+    CHECK_BAILOUT;
+  }
 
-  current_subgraph_->AppendJoin(then_graph, else_graph, expr);
-  ast_context()->ReturnValue(Pop());
+  if (!ast_context()->IsTest()) {
+    subgraph()->AppendJoin(then_graph, else_graph, expr);
+  }
 }
 
 
 void HGraphBuilder::LookupGlobalPropertyCell(Variable* var,
                                              LookupResult* lookup,
                                              bool is_store) {
   if (var->is_this()) {
     BAILOUT("global this reference");
   }
   if (!graph()->info()->has_global_object()) {
@@ skipping 814 matching lines @@
     return false;
   }
 
   HInstruction* result = NULL;
   if (expr->key()->IsPropertyName()) {
     Handle<String> name = expr->key()->AsLiteral()->AsPropertyName();
     if (!name->IsEqualTo(CStrVector("length"))) return false;
     HInstruction* elements = AddInstruction(new HArgumentsElements);
     result = new HArgumentsLength(elements);
   } else {
+    Push(graph()->GetArgumentsObject());
     VisitForValue(expr->key());
     if (HasStackOverflow()) return false;
     HValue* key = Pop();
+    Drop(1);  // Arguments object.
     HInstruction* elements = AddInstruction(new HArgumentsElements);
     HInstruction* length = AddInstruction(new HArgumentsLength(elements));
     AddInstruction(new HBoundsCheck(key, length));
     result = new HAccessArgumentsAt(elements, length, key);
   }
   ast_context()->ReturnInstruction(result, expr->id());
   return true;
 }
 
 
@@ skipping 2171 matching lines @@
     }
   }
 
 #ifdef DEBUG
   if (graph_ != NULL) graph_->Verify();
   if (allocator_ != NULL) allocator_->Verify();
 #endif
 }
 
 } }  // namespace v8::internal