Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delete now-unnecessary TR_Removed*Guard guard kinds #18624

Merged
merged 1 commit into from
Dec 27, 2023
+1 −17
Merged

Delete now-unnecessary TR_Removed*Guard guard kinds #18624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions runtime/compiler/codegen/J9CodeGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion runtime/compiler/net/CommunicationStream.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 0 additions & 4 deletions runtime/compiler/optimizer/EscapeAnalysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down Expand Up @@ -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
{
Expand Down