Simplified 'return' handling in the instruction selector.

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/code-factory.h"
 #include "src/compiler/pipeline.h"
 #include "src/compiler/raw-machine-assembler.h"
 #include "src/compiler/scheduler.h"
 
 namespace v8 {
@@ skipping 83 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) {
-  schedule()->AddReturn(CurrentBlock(), value);
+  Node* ret = NewNode(common()->Return(), value);
+  schedule()->AddReturn(CurrentBlock(), ret);
   current_block_ = NULL;
 }
 
 
 Node* RawMachineAssembler::CallFunctionStub0(Node* function, Node* receiver,
                                              Node* context, Node* frame_state,
                                              CallFunctionFlags flags) {
   Callable callable = CodeFactory::CallFunction(isolate(), 0, flags);
   CallDescriptor* desc = Linkage::GetStubCallDescriptor(
       isolate(), zone(), callable.descriptor(), 1,
@@ skipping 61 matching lines @@
 }
 
 
 Node* RawMachineAssembler::MakeNode(const Operator* op, int input_count,
                                     Node** inputs, bool incomplete) {
   DCHECK(ScheduleValid());
   DCHECK(current_block_ != NULL);
   Node* node = graph()->NewNode(op, input_count, inputs, incomplete);
   BasicBlock* block = op->opcode() == IrOpcode::kParameter ? schedule()->start()
                                                            : CurrentBlock();
-  schedule()->AddNode(block, node);
+  if (op->opcode() != IrOpcode::kReturn) {
+    schedule()->AddNode(block, node);
+  }
   return node;
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8