From 33ea39c7d20740901eb94eeee963c2f831fdb44b Mon Sep 17 00:00:00 2001
From: Devin Papineau <devin@ajdmp.ca>
Date: Fri, 8 Dec 2023 12:06:58 -0500
Subject: [PATCH] Delete now-unnecessary TR_Removed*Guard guard kinds

AOT now takes care of generating the TR_Inlined*Method relocations for
inlined methods without corresponding guards, so we can remove guards
without creating stand-ins.
---
 runtime/compiler/codegen/J9CodeGenerator.cpp  | 12 ------------
 runtime/compiler/net/CommunicationStream.hpp  |  2 +-
 runtime/compiler/optimizer/EscapeAnalysis.cpp |  4 ----
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/runtime/compiler/codegen/J9CodeGenerator.cpp b/runtime/compiler/codegen/J9CodeGenerator.cpp
index bbd17b0c2a8..ea17fa1da7f 100644
--- a/runtime/compiler/codegen/J9CodeGenerator.cpp
+++ b/runtime/compiler/codegen/J9CodeGenerator.cpp
@@ -2666,17 +2666,10 @@ static TR_ExternalRelocationTargetKind getReloKindFromGuardSite(TR::CodeGenerato
       case TR_NonoverriddenGuard:
          type = TR_InlinedVirtualMethodWithNopGuard;
          break;
-      case TR_RemovedNonoverriddenGuard:
-         type = TR_InlinedVirtualMethod;
-         break;
 
       case TR_InterfaceGuard:
          type = TR_InlinedInterfaceMethodWithNopGuard;
          break;
-      case TR_RemovedInterfaceGuard:
-         traceMsg(cg->comp(), "TR_RemovedInterfaceMethod\n");
-         type = TR_InlinedInterfaceMethod;
-         break;
 
       case TR_AbstractGuard:
          type = TR_InlinedAbstractMethodWithNopGuard;
@@ -2708,11 +2701,6 @@ static TR_ExternalRelocationTargetKind getReloKindFromGuardSite(TR::CodeGenerato
                               site, site->getGuard(), site->getGuard()->getCallNode());
          break;
 
-      case TR_RemovedProfiledGuard:
-         traceMsg(cg->comp(), "TR_ProfiledInlinedMethodRelocation\n");
-         type = TR_ProfiledInlinedMethodRelocation;
-         break;
-
       case TR_ProfiledGuard:
          if (site->getGuard()->getTestType() == TR_MethodTest)
             {
diff --git a/runtime/compiler/net/CommunicationStream.hpp b/runtime/compiler/net/CommunicationStream.hpp
index 40cdc322c38..0e1930b2d88 100644
--- a/runtime/compiler/net/CommunicationStream.hpp
+++ b/runtime/compiler/net/CommunicationStream.hpp
@@ -118,7 +118,7 @@ class CommunicationStream
    // likely to lose an increment when merging/rebasing/etc.
    //
    static const uint8_t MAJOR_NUMBER = 1;
-   static const uint16_t MINOR_NUMBER = 53; // ID: 7dZlozupV5RwUvR62RqE
+   static const uint16_t MINOR_NUMBER = 54; // ID: s1vXKnpdqqsBmQnhpK+e
    static const uint8_t PATCH_NUMBER = 0;
    static uint32_t CONFIGURATION_FLAGS;
 
diff --git a/runtime/compiler/optimizer/EscapeAnalysis.cpp b/runtime/compiler/optimizer/EscapeAnalysis.cpp
index eaef21efdd2..1491e2889f5 100644
--- a/runtime/compiler/optimizer/EscapeAnalysis.cpp
+++ b/runtime/compiler/optimizer/EscapeAnalysis.cpp
@@ -103,8 +103,6 @@
 
 #define LOCAL_OBJECTS_COLLECTABLE 1
 
-extern void createGuardSiteForRemovedGuard(TR::Compilation *comp, TR::Node* ifNode);
-
 static bool blockIsInLoop(TR::Block *block)
    {
    for (TR_Structure *s = block->getStructureOf()->getParent(); s; s = s->getParent())
@@ -5901,8 +5899,6 @@ bool TR_EscapeAnalysis::fixupNode(TR::Node *node, TR::Node *parent, TR::NodeChec
       if (firstValue == secondValue)
          {
          compareValue = 0;
-
-         createGuardSiteForRemovedGuard(comp(), node);
          }
       else
          {