[turbofan] Rename context stack as part of the environment for OSR.

src/compiler/osr.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.h"
 #include "src/compiler/all-nodes.h"
 #include "src/compiler/common-operator.h"
 #include "src/compiler/control-reducer.h"
 #include "src/compiler/frame.h"
 #include "src/compiler/graph.h"
@@ skipping 30 matching lines @@
   ZoneVector<NodeVector*> copies(tmp_zone);
   for (LoopTree::Loop* loop = osr_loop->parent(); loop; loop = loop->parent()) {
     void* stuff = tmp_zone->New(sizeof(NodeVector));
     NodeVector* mapping =
         new (stuff) NodeVector(original_count, sentinel, tmp_zone);
     copies.push_back(mapping);
 
     // Prepare the mapping for OSR values and the OSR loop entry.
     mapping->at(osr_normal_entry->id()) = dead;
     mapping->at(osr_loop_entry->id()) = dead;
-    // Don't duplicate the OSR values.
-    for (Node* use : osr_loop_entry->uses()) {
-      if (use->opcode() == IrOpcode::kOsrValue) mapping->at(use->id()) = use;
-    }
 
     // The outer loops are dead in this copy.
     for (LoopTree::Loop* outer = loop->parent(); outer;
          outer = outer->parent()) {
       for (Node* node : loop_tree->HeaderNodes(outer)) {
         mapping->at(node->id()) = dead;
       }
     }
 
     // Copy all nodes.
     for (size_t i = 0; i < all.live.size(); i++) {
       Node* orig = all.live[i];
       Node* copy = mapping->at(orig->id());
       if (copy != sentinel) {
         // Mapping already exists.
         continue;
       }
-      if (orig->InputCount() == 0) {
-        // No need to copy leaf nodes.
+      if (orig->InputCount() == 0 || orig->opcode() == IrOpcode::kParameter ||
+          orig->opcode() == IrOpcode::kOsrValue) {
+        // No need to copy leaf nodes or parameters.
         mapping->at(orig->id()) = orig;
         continue;
       }
 
       // Copy the node.
       tmp_inputs.clear();
       for (Node* input : orig->inputs()) {
         tmp_inputs.push_back(mapping->at(input->id()));
       }
       copy = graph->NewNode(orig->op(), orig->InputCount(), &tmp_inputs[0]);
@@ skipping 145 matching lines @@
   // the first spill slots.
   frame->ReserveSpillSlots(UnoptimizedFrameSlots());
   // The frame needs to be adjusted by the number of unoptimized frame slots.
   frame->SetOsrStackSlotCount(static_cast<int>(UnoptimizedFrameSlots()));
 }
 
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8