Removal of the deoptimization block from Turbofan

test/cctest/compiler/test-codegen-deopt.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 #include "test/cctest/cctest.h"
 
 #include "src/compiler/code-generator.h"
 #include "src/compiler/common-operator.h"
 #include "src/compiler/graph.h"
@@ skipping 122 matching lines @@
     PrintableUnique<Object> undef_constant =
         PrintableUnique<Object>::CreateUninitialized(zone(), undef_object);
     Node* undef_node = m.NewNode(common.HeapConstant(undef_constant));
 
     Handle<JSFunction> deopt_function =
         NewFunction("function deopt() { %DeoptimizeFunction(foo); }; deopt");
     PrintableUnique<Object> deopt_fun_constant =
         PrintableUnique<Object>::CreateUninitialized(zone(), deopt_function);
     Node* deopt_fun_node = m.NewNode(common.HeapConstant(deopt_fun_constant));
 
-    MLabel deopt, cont;
-    Node* call = m.CallJS0(deopt_fun_node, undef_node, &cont, &deopt);
-
-    m.Bind(&cont);
-    m.NewNode(common.Continuation(), call);
-    m.Return(undef_node);
-
-    m.Bind(&deopt);
-    m.NewNode(common.LazyDeoptimization(), call);
 
     bailout_id = GetCallBailoutId();
     Node* parameters = m.NewNode(common.StateValues(1), undef_node);
     Node* locals = m.NewNode(common.StateValues(0));
     Node* stack = m.NewNode(common.StateValues(0));
 
-    Node* state_node =
-        m.NewNode(common.FrameState(bailout_id), parameters, locals, stack);
-    m.Deoptimize(state_node);
+    Node* state_node = m.NewNode(common.FrameState(bailout_id, IGNORE_OUTPUT),
+                                 parameters, locals, stack, undef_node);
+
+    m.CallJS0(deopt_fun_node, undef_node, state_node);
+
+    m.Return(undef_node);
 
     // Schedule the graph:
     Schedule* schedule = m.Export();
 
-    cont_block = cont.block();
-    deopt_block = deopt.block();
-
     return schedule;
   }
 
   BailoutId GetCallBailoutId() {
     ZoneList<Statement*>* body = info.function()->body();
     for (int i = 0; i < body->length(); i++) {
       if (body->at(i)->IsExpressionStatement() &&
           body->at(i)->AsExpressionStatement()->expression()->IsCall()) {
         return body->at(i)->AsExpressionStatement()->expression()->id();
       }
     }
     CHECK(false);
     return BailoutId(-1);
   }
-
-  BasicBlock* cont_block;
-  BasicBlock* deopt_block;
 };
 
 
 TEST(TurboTrivialDeoptCodegen) {
   HandleAndZoneScope scope;
   InitializedHandleScope handles;
 
   FLAG_allow_natives_syntax = true;
   FLAG_turbo_deoptimization = true;
 
   TrivialDeoptCodegenTester t(&scope);
   t.GenerateCode();
 
   DeoptimizationInputData* data =
       DeoptimizationInputData::cast(t.result_code->deoptimization_data());
 
-  Label* cont_label = t.code->GetLabel(t.cont_block);
-  Label* deopt_label = t.code->GetLabel(t.deopt_block);
-
-  // Check the safepoint - it should contain an entry for the call
-  // with the right deoptimization address.
-  SafepointEntry entry = t.result_code->GetSafepointEntry(
-      t.result_code->instruction_start() + cont_label->pos());
-  CHECK(entry.is_valid());
-  CHECK_EQ(deopt_label->pos(), entry.deoptimization_pc());
+  // TODO(jarin) Find a way to test the safepoint.
 
   // Check that we deoptimize to the right AST id.
   CHECK_EQ(1, data->DeoptCount());
   CHECK_EQ(t.bailout_id.ToInt(), data->AstId(0).ToInt());
 }
 
 
 TEST(TurboTrivialDeoptCodegenAndRun) {
   HandleAndZoneScope scope;
   InitializedHandleScope handles;
@@ skipping 47 matching lines @@
     Handle<Object> undef_object =
         Handle<Object>(isolate->heap()->undefined_value(), isolate);
     PrintableUnique<Object> undef_constant =
         PrintableUnique<Object>::CreateUninitialized(zone(), undef_object);
     Node* undef_node = m.NewNode(common.HeapConstant(undef_constant));
 
     PrintableUnique<Object> this_fun_constant =
         PrintableUnique<Object>::CreateUninitialized(zone(), function);
     Node* this_fun_node = m.NewNode(common.HeapConstant(this_fun_constant));
 
-    MLabel deopt, cont;
-    Node* call = m.CallRuntime1(Runtime::kDeoptimizeFunction, this_fun_node,
-                                &cont, &deopt);
-
-    m.Bind(&cont);
-    m.NewNode(common.Continuation(), call);
-    m.Return(undef_node);
-
-    m.Bind(&deopt);
-    m.NewNode(common.LazyDeoptimization(), call);
-
     bailout_id = GetCallBailoutId();
     Node* parameters = m.NewNode(common.StateValues(1), undef_node);
     Node* locals = m.NewNode(common.StateValues(0));
     Node* stack = m.NewNode(common.StateValues(0));
 
-    Node* state_node =
-        m.NewNode(common.FrameState(bailout_id), parameters, locals, stack);
-    m.Deoptimize(state_node);
+    Node* state_node = m.NewNode(common.FrameState(bailout_id, IGNORE_OUTPUT),
+                                 parameters, locals, stack, undef_node);
+
+    m.CallRuntime1(Runtime::kDeoptimizeFunction, this_fun_node, state_node);
+
+    m.Return(undef_node);
 
     // Schedule the graph:
     Schedule* schedule = m.Export();
 
-    cont_block = cont.block();
-    deopt_block = deopt.block();
-
     return schedule;
   }
 
   BailoutId GetCallBailoutId() {
     ZoneList<Statement*>* body = info.function()->body();
     for (int i = 0; i < body->length(); i++) {
       if (body->at(i)->IsExpressionStatement() &&
           body->at(i)->AsExpressionStatement()->expression()->IsCallRuntime()) {
         return body->at(i)->AsExpressionStatement()->expression()->id();
       }
     }
     CHECK(false);
     return BailoutId(-1);
   }
-
-  BasicBlock* cont_block;
-  BasicBlock* deopt_block;
 };
 
 
 TEST(TurboTrivialRuntimeDeoptCodegenAndRun) {
   HandleAndZoneScope scope;
   InitializedHandleScope handles;
 
   FLAG_allow_natives_syntax = true;
   FLAG_turbo_deoptimization = true;
 
   TrivialRuntimeDeoptCodegenTester t(&scope);
   t.GenerateCode();
 
   t.function->ReplaceCode(*t.result_code);
   t.info.context()->native_context()->AddOptimizedCode(*t.result_code);
 
   Isolate* isolate = scope.main_isolate();
   Handle<Object> result;
   bool has_pending_exception =
       !Execution::Call(isolate, t.function,
                        isolate->factory()->undefined_value(), 0, NULL,
                        false).ToHandle(&result);
   CHECK(!has_pending_exception);
   CHECK(result->SameValue(Smi::FromInt(42)));
 }
 
 #endif