Merge arguments branch to bleeding merge.

src/full-codegen.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 423 matching lines @@
 
 void FullCodeGenerator::StackValueContext::Plug(Register reg) const {
   __ push(reg);
 }
 
 
 void FullCodeGenerator::TestContext::Plug(Register reg) const {
   // For simplicity we always test the accumulator register.
   __ Move(result_register(), reg);
   codegen()->PrepareForBailoutBeforeSplit(TOS_REG, false, NULL, NULL);
-  codegen()->DoTest(this);
+  codegen()->DoTest(true_label_, false_label_, fall_through_);
 }
 
 
 void FullCodeGenerator::EffectContext::PlugTOS() const {
   __ Drop(1);
 }
 
 
 void FullCodeGenerator::AccumulatorValueContext::PlugTOS() const {
   __ pop(result_register());
 }
 
 
 void FullCodeGenerator::StackValueContext::PlugTOS() const {
 }
 
 
 void FullCodeGenerator::TestContext::PlugTOS() const {
   // For simplicity we always test the accumulator register.
   __ pop(result_register());
   codegen()->PrepareForBailoutBeforeSplit(TOS_REG, false, NULL, NULL);
-  codegen()->DoTest(this);
+  codegen()->DoTest(true_label_, false_label_, fall_through_);
 }
 
 
 void FullCodeGenerator::EffectContext::PrepareTest(
     Label* materialize_true,
     Label* materialize_false,
     Label** if_true,
     Label** if_false,
     Label** fall_through) const {
   // In an effect context, the true and the false case branch to the
@@ skipping 29 matching lines @@
     Label* materialize_false,
     Label** if_true,
     Label** if_false,
     Label** fall_through) const {
   *if_true = true_label_;
   *if_false = false_label_;
   *fall_through = fall_through_;
 }
 
 
-void FullCodeGenerator::DoTest(const TestContext* context) {
-  DoTest(context->condition(),
-         context->true_label(),
-         context->false_label(),
-         context->fall_through());
-}
-
-
 void FullCodeGenerator::VisitDeclarations(
     ZoneList<Declaration*>* declarations) {
   int length = declarations->length();
   int globals = 0;
   for (int i = 0; i < length; i++) {
     Declaration* decl = declarations->at(i);
     Variable* var = decl->proxy()->var();
     Slot* slot = var->AsSlot();
 
     // If it was not possible to allocate the variable at compile
@@ skipping 201 matching lines @@
     ForwardBailoutToChild(expr);
 
   } else if (context()->IsAccumulatorValue()) {
     VisitForAccumulatorValue(left);
     // We want the value in the accumulator for the test, and on the stack in
     // case we need it.
     __ push(result_register());
     Label discard, restore;
     PrepareForBailoutBeforeSplit(TOS_REG, false, NULL, NULL);
     if (is_logical_and) {
-      DoTest(left, &discard, &restore, &restore);
+      DoTest(&discard, &restore, &restore);
     } else {
-      DoTest(left, &restore, &discard, &restore);
+      DoTest(&restore, &discard, &restore);
     }
     __ bind(&restore);
     __ pop(result_register());
     __ jmp(&done);
     __ bind(&discard);
     __ Drop(1);
     PrepareForBailoutForId(right_id, NO_REGISTERS);
 
   } else if (context()->IsStackValue()) {
     VisitForAccumulatorValue(left);
     // We want the value in the accumulator for the test, and on the stack in
     // case we need it.
     __ push(result_register());
     Label discard;
     PrepareForBailoutBeforeSplit(TOS_REG, false, NULL, NULL);
     if (is_logical_and) {
-      DoTest(left, &discard, &done, &discard);
+      DoTest(&discard, &done, &discard);
     } else {
-      DoTest(left, &done, &discard, &discard);
+      DoTest(&done, &discard, &discard);
     }
     __ bind(&discard);
     __ Drop(1);
     PrepareForBailoutForId(right_id, NO_REGISTERS);
 
   } else {
     ASSERT(context()->IsEffect());
     Label eval_right;
     if (is_logical_and) {
       VisitForControl(left, &eval_right, &done, &eval_right);
@@ skipping 323 matching lines @@
   // that scope again afterwards.
 
   Label try_handler_setup, catch_entry, done;
   __ Call(&try_handler_setup);
   // Try handler code, exception in result register.
 
   // Extend the context before executing the catch block.
   { Comment cmnt(masm_, "[ Extend catch context");
     __ Push(stmt->name());
     __ push(result_register());
-    __ CallRuntime(Runtime::kPushCatchContext, 2);
+    __ CallRuntime(Runtime::kCreateCatchExtensionObject, 2);
+    __ push(result_register());
+    __ CallRuntime(Runtime::kPushCatchContext, 1);
     StoreToFrameField(StandardFrameConstants::kContextOffset,
                       context_register());
   }
 
   Visit(stmt->catch_block());
   __ jmp(&done);
 
   // Try block code. Sets up the exception handler chain.
   __ bind(&try_handler_setup);
   {
@@ skipping 166 matching lines @@
   __ Drop(stack_depth);
   __ PopTryHandler();
   return 0;
 }
 
 
 #undef __
 
 
 } }  // namespace v8::internal