Revert "Make FrameStates recursive (to be used for inlining)."

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 96 matching lines @@
  public:
   explicit TrivialDeoptCodegenTester(HandleAndZoneScope* scope)
       : DeoptCodegenTester(scope,
                            "function foo() { deopt(); return 42; }; foo") {}
 
   void GenerateCode() {
     GenerateCodeFromSchedule(BuildGraphAndSchedule(graph));
   }
 
   Schedule* BuildGraphAndSchedule(Graph* graph) {
+    Isolate* isolate = info.isolate();
     CommonOperatorBuilder common(zone());
 
     // Manually construct a schedule for the function below:
     // function foo() {
     //   deopt();
     // }
 
     MachineType parameter_reps[] = {kMachAnyTagged};
     MachineCallDescriptorBuilder descriptor_builder(kMachAnyTagged, 1,
                                                     parameter_reps);
 
     RawMachineAssembler m(graph, &descriptor_builder);
 
+    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));
+
     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));
 
 
     bailout_id = GetCallBailoutId();
-    Node* parameters = m.NewNode(common.StateValues(1), m.UndefinedConstant());
+    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, kIgnoreOutput), parameters,
-                  locals, stack, m.UndefinedConstant(), m.UndefinedConstant());
+    Node* state_node = m.NewNode(common.FrameState(bailout_id, kIgnoreOutput),
+                                 parameters, locals, stack, undef_node);
 
-    m.CallJS0(deopt_fun_node, m.UndefinedConstant(), state_node);
+    m.CallJS0(deopt_fun_node, undef_node, state_node);
 
-    m.Return(m.UndefinedConstant());
+    m.Return(undef_node);
 
     // Schedule the graph:
     Schedule* schedule = m.Export();
 
     return schedule;
   }
 
   BailoutId GetCallBailoutId() {
     ZoneList<Statement*>* body = info.function()->body();
     for (int i = 0; i < body->length(); i++) {
@@ skipping 58 matching lines @@
   explicit TrivialRuntimeDeoptCodegenTester(HandleAndZoneScope* scope)
       : DeoptCodegenTester(
             scope,
             "function foo() { %DeoptimizeFunction(foo); return 42; }; foo") {}
 
   void GenerateCode() {
     GenerateCodeFromSchedule(BuildGraphAndSchedule(graph));
   }
 
   Schedule* BuildGraphAndSchedule(Graph* graph) {
+    Isolate* isolate = info.isolate();
     CommonOperatorBuilder common(zone());
 
     // Manually construct a schedule for the function below:
     // function foo() {
     //   %DeoptimizeFunction(foo);
     // }
 
     MachineType parameter_reps[] = {kMachAnyTagged};
     MachineCallDescriptorBuilder descriptor_builder(kMachAnyTagged, 2,
                                                     parameter_reps);
 
     RawMachineAssembler m(graph, &descriptor_builder);
 
+    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));
 
     bailout_id = GetCallBailoutId();
-    Node* parameters = m.NewNode(common.StateValues(1), m.UndefinedConstant());
+    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, kIgnoreOutput), parameters,
-                  locals, stack, m.UndefinedConstant(), m.UndefinedConstant());
+    Node* state_node = m.NewNode(common.FrameState(bailout_id, kIgnoreOutput),
+                                 parameters, locals, stack, undef_node);
 
     m.CallRuntime1(Runtime::kDeoptimizeFunction, this_fun_node, state_node);
 
-    m.Return(m.UndefinedConstant());
+    m.Return(undef_node);
 
     // Schedule the graph:
     Schedule* schedule = m.Export();
 
     return schedule;
   }
 
   BailoutId GetCallBailoutId() {
     ZoneList<Statement*>* body = info.function()->body();
     for (int i = 0; i < body->length(); i++) {
@@ skipping 25 matching lines @@
   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