[turbofan] Rip out the unused OsrGuard node.

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/osr.h"
 #include "src/ast/scopes.h"
 #include "src/compilation-info.h"
 #include "src/compiler/all-nodes.h"
 #include "src/compiler/common-operator-reducer.h"
 #include "src/compiler/common-operator.h"
@@ skipping 76 matching lines @@
 
     // Copy all nodes.
     for (size_t i = 0; i < all.reachable.size(); i++) {
       Node* orig = all.reachable[i];
       Node* copy = mapping->at(orig->id());
       if (copy != sentinel) {
         // Mapping already exists.
         continue;
       }
       if (orig->InputCount() == 0 || orig->opcode() == IrOpcode::kParameter ||
-          orig->opcode() == IrOpcode::kOsrValue ||
-          orig->opcode() == IrOpcode::kOsrGuard) {
+          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()));
       }
@@ skipping 138 matching lines @@
     }
   }
 
   if (FLAG_trace_turbo_graph) {  // Simple textual RPO.
     OFStream os(stdout);
     os << "-- Graph after OSR duplication -- " << std::endl;
     os << AsRPO(*graph);
   }
 }
 
-void SetTypeForOsrValue(Node* osr_value, Node* loop,
-                        CommonOperatorBuilder* common) {
-  Node* osr_guard = nullptr;
-  for (Node* use : osr_value->uses()) {
-    if (use->opcode() == IrOpcode::kOsrGuard) {
-      DCHECK_EQ(use->InputAt(0), osr_value);
-      osr_guard = use;
-      break;
-    }
-  }
-
-  NodeProperties::ChangeOp(osr_guard, common->OsrGuard(OsrGuardType::kAny));
-}
-
 }  // namespace
 
 void OsrHelper::Deconstruct(JSGraph* jsgraph, CommonOperatorBuilder* common,
                             Zone* tmp_zone) {
   Graph* graph = jsgraph->graph();
   Node* osr_normal_entry = nullptr;
   Node* osr_loop_entry = nullptr;
   Node* osr_loop = nullptr;
 
   for (Node* node : graph->start()->uses()) {
     if (node->opcode() == IrOpcode::kOsrLoopEntry) {
       osr_loop_entry = node;  // found the OSR loop entry
     } else if (node->opcode() == IrOpcode::kOsrNormalEntry) {
       osr_normal_entry = node;
     }
   }
 
   CHECK_NOT_NULL(osr_normal_entry);  // Should have found the OSR normal entry.
   CHECK_NOT_NULL(osr_loop_entry);    // Should have found the OSR loop entry.
 
   for (Node* use : osr_loop_entry->uses()) {
     if (use->opcode() == IrOpcode::kLoop) {
       CHECK(!osr_loop);             // should be only one OSR loop.
       osr_loop = use;               // found the OSR loop.
     }
   }
 
   CHECK(osr_loop);  // Should have found the OSR loop.
 
-  for (Node* use : osr_loop_entry->uses()) {
-    if (use->opcode() == IrOpcode::kOsrValue) {
-      SetTypeForOsrValue(use, osr_loop, common);
-    }
-  }
-
   // Analyze the graph to determine how deeply nested the OSR loop is.
   LoopTree* loop_tree = LoopFinder::BuildLoopTree(graph, tmp_zone);
 
   Node* dead = jsgraph->Dead();
   LoopTree::Loop* loop = loop_tree->ContainingLoop(osr_loop);
   if (loop->depth() > 0) {
     PeelOuterLoopsForOsr(graph, common, tmp_zone, dead, loop_tree, loop,
                          osr_normal_entry, osr_loop_entry);
   }
 
@@ skipping 36 matching lines @@
 
 void OsrHelper::SetupFrame(Frame* frame) {
   // The optimized frame will subsume the unoptimized frame. Do so by reserving
   // the first spill slots.
   frame->ReserveSpillSlots(UnoptimizedFrameSlots());
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8