[Interpreter] Save bytecode offset in interpreter stack frames.

src/compiler/raw-machine-assembler.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/compiler/raw-machine-assembler.h"
 
 #include "src/code-factory.h"
 #include "src/compiler/node-properties.h"
 #include "src/compiler/pipeline.h"
 #include "src/compiler/scheduler.h"
@@ skipping 77 matching lines @@
   BasicBlock* default_block = Use(default_label);
   Node* default_node = graph()->NewNode(common()->IfDefault(), switch_node);
   schedule()->AddNode(default_block, default_node);
   succ_blocks[case_count] = default_block;
   schedule()->AddSwitch(CurrentBlock(), switch_node, succ_blocks, succ_count);
   current_block_ = nullptr;
 }
 
 
 void RawMachineAssembler::Return(Node* value) {
-  Node* ret = MakeNode(common()->Return(), 1, &value);
+  Node* values[] = {value, graph()->start(), graph()->start()};

[titzer, 2015/12/08 16:25:45]

These extra inputs shouldn't be necessary in order to run the schedule verifier.
For the graph verifier, putting in start as the control and effect dependencies
isn't a full solution, unfortunately.

[Michael Starzinger, 2015/12/09 16:35:25]

As discussed offline, this should no longer be needed after you rebase onto
tip-of-tree.

[rmcilroy, 2015/12/09 16:54:45]

Done. PTAL, thanks.

+  Node* ret = MakeNode(common()->Return(), 3, values);
+  NodeProperties::MergeControlToEnd(graph(), common(), ret);
   schedule()->AddReturn(CurrentBlock(), ret);
   current_block_ = nullptr;
 }
 
 
 void RawMachineAssembler::Return(Node* v1, Node* v2) {
-  Node* values[] = {v1, v2};
-  Node* ret = MakeNode(common()->Return(2), 2, values);
+  Node* values[] = {v1, v2, graph()->start(), graph()->start()};
+  Node* ret = MakeNode(common()->Return(2), 4, values);
+  NodeProperties::MergeControlToEnd(graph(), common(), ret);
   schedule()->AddReturn(CurrentBlock(), ret);
   current_block_ = nullptr;
 }
 
 
 void RawMachineAssembler::Return(Node* v1, Node* v2, Node* v3) {
-  Node* values[] = {v1, v2, v3};
-  Node* ret = MakeNode(common()->Return(3), 3, values);
+  Node* values[] = {v1, v2, v3, graph()->start(), graph()->start()};
+  Node* ret = MakeNode(common()->Return(3), 5, values);
+  NodeProperties::MergeControlToEnd(graph(), common(), ret);
   schedule()->AddReturn(CurrentBlock(), ret);
   current_block_ = nullptr;
 }
 
 
 Node* RawMachineAssembler::CallN(CallDescriptor* desc, Node* function,
                                  Node** args) {
   int param_count =
       static_cast<int>(desc->GetMachineSignature()->parameter_count());
   int input_count = param_count + 3;
@@ skipping 265 matching lines @@
 
 RawMachineLabel::RawMachineLabel()
     : block_(NULL), used_(false), bound_(false) {}
 
 
 RawMachineLabel::~RawMachineLabel() { DCHECK(bound_ || !used_); }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8