Skip to content

Commit a8ea161

Browse files
hzongarohzongaro
authored
Merge pull request #20521 from a7ehuo/techdebt-cleanup-opcode-update-code
Clean up references to old opcodes
2 parents edccce1 + dca50bf commit a8ea161

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

‎runtime/compiler/optimizer/IdiomTransformations.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1390,12 +1390,12 @@ checkByteToChar(TR::Compilation *comp, TR::Node *iorNode, TR::Node *&inputNode,
13901390
// if index is i then inputNode = bloadi child of imul
13911391
// else fail
13921392
//
1393-
TR::Node *ibloadNode = imulNode->getFirstChild()->skipConversions();
1393+
TR::Node *bloadiNode = imulNode->getFirstChild()->skipConversions();
13941394
bool plusOne = false;
13951395
bool matchPattern = false;
1396-
if (ibloadNode->getOpCodeValue() == TR::bloadi)
1396+
if (bloadiNode->getOpCodeValue() == TR::bloadi)
13971397
{
1398-
TR::Node *subNode = ibloadNode->getFirstChild()->getSecondChild();
1398+
TR::Node *subNode = bloadiNode->getFirstChild()->getSecondChild();
13991399
int32_t hdrSize = TR::Compiler->om.contiguousArrayHeaderSizeInBytes() + 1;
14001400
if (subNode->getOpCode().isSub() &&
14011401
subNode->getSecondChild()->getOpCode().isLoadConst())
@@ -1425,7 +1425,7 @@ checkByteToChar(TR::Compilation *comp, TR::Node *iorNode, TR::Node *&inputNode,
14251425
{
14261426
if (!plusOne)
14271427
{
1428-
inputNode = ibloadNode->getFirstChild();
1428+
inputNode = bloadiNode->getFirstChild();
14291429
return true;
14301430
}
14311431
else
@@ -5947,13 +5947,13 @@ CISCTransform2ArrayCopySub(TR_CISCTransformer *trans, TR::Node *indexRepNode, TR
59475947
return false;
59485948
}
59495949

5950-
TR::Node *optionalIistore = NULL;
5950+
TR::Node *optionalIstorei = NULL;
59515951
if (P->getImportantNode(4))
59525952
{
5953-
TR_CISCNode *optionalCISCIistore = trans->getP2TInLoopIfSingle(P->getImportantNode(4));
5954-
if (!optionalCISCIistore)
5953+
TR_CISCNode *optionalCISCIstorei = trans->getP2TInLoopIfSingle(P->getImportantNode(4));
5954+
if (!optionalCISCIstorei)
59555955
return false;
5956-
optionalIistore = optionalCISCIistore->getHeadOfTrNode()->duplicateTree();
5956+
optionalIstorei = optionalCISCIstorei->getHeadOfTrNode()->duplicateTree();
59575957
}
59585958

59595959
TR::Node * exitVarNode = createLoad(exitVarRepNode);
@@ -6112,11 +6112,11 @@ CISCTransform2ArrayCopySub(TR_CISCTransformer *trans, TR::Node *indexRepNode, TR
61126112
block->append(theOtherVarUpdateTreeTop);
61136113
}
61146114

6115-
if (optionalIistore)
6115+
if (optionalIstorei)
61166116
{
61176117
TR_ASSERT(theOtherVarUpdateNode != NULL, "error!");
6118-
optionalIistore->setAndIncChild(1, theOtherVarUpdateNode->getChild(0));
6119-
block->append(TR::TreeTop::create(comp, optionalIistore));
6118+
optionalIstorei->setAndIncChild(1, theOtherVarUpdateNode->getChild(0));
6119+
block->append(TR::TreeTop::create(comp, optionalIstorei));
61206120
}
61216121

61226122
trans->insertAfterNodes(block);

‎runtime/compiler/optimizer/SequentialStoreSimplifier.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1982,7 +1982,7 @@ static TR::TreeTop* generateArraycopyFromSequentialStores(TR::Compilation* comp,
19821982
return treeTop;
19831983
}
19841984

1985-
static TR::TreeTop* generateArraycopyFromSequentialLoadsDEPRECATED(TR::Compilation* comp, TR::TreeTop* currentTreeTop, TR::Node* ibloadNode)
1985+
static TR::TreeTop* generateArraycopyFromSequentialLoadsDEPRECATED(TR::Compilation* comp, TR::TreeTop* currentTreeTop, TR::Node* bloadiNode)
19861986
{
19871987

19881988
static const char * disableSeqLoadOpt = feGetEnv("TR_DisableSeqLoadOpt");
@@ -2000,7 +2000,7 @@ static TR::TreeTop* generateArraycopyFromSequentialLoadsDEPRECATED(TR::Compilati
20002000
TR::Node* rootNode;
20012001

20022002
//checking the number of bytes
2003-
while ( !((currentNode->getFirstChild() == ibloadNode) && (currentNode->getOpCodeValue() == TR::bu2i)) )
2003+
while ( !((currentNode->getFirstChild() == bloadiNode) && (currentNode->getOpCodeValue() == TR::bu2i)) )
20042004
{
20052005
if ( (currentNode->getOpCodeValue() == TR::iadd) || (currentNode->getOpCodeValue() == TR::ior))
20062006
{
@@ -2039,7 +2039,7 @@ static TR::TreeTop* generateArraycopyFromSequentialLoadsDEPRECATED(TR::Compilati
20392039

20402040
// Need to make sure these loads are not under spine checks.
20412041
//
2042-
if (comp->requiresSpineChecks() && ibloadNode->getReferenceCount() > 1)
2042+
if (comp->requiresSpineChecks() && bloadiNode->getReferenceCount() > 1)
20432043
{
20442044
TR::TreeTop *tt = currentTreeTop;
20452045
TR::TreeTop *lastTreeTop = currentTreeTop->getEnclosingBlock()->startOfExtendedBlock()->getFirstRealTreeTop()->getPrevTreeTop();
@@ -2054,7 +2054,7 @@ static TR::TreeTop* generateArraycopyFromSequentialLoadsDEPRECATED(TR::Compilati
20542054
node = node->getFirstChild();
20552055
while (node->getOpCode().isConversion())
20562056
node = node->getFirstChild();
2057-
if (node == ibloadNode)
2057+
if (node == bloadiNode)
20582058
{
20592059
dumpOptDetails(comp, " Sequential Load to spine checked array not reducible\n");
20602060
return currentTreeTop;

‎runtime/compiler/z/codegen/J9CodeGenerator.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -547,9 +547,9 @@ J9::Z::CodeGenerator::lowerTreeIfNeeded(
547547

548548
// J9, Z
549549
//
550-
if (comp->target().cpu.isZ() && node->getOpCodeValue() == TR::aloadi && node->isUnneededIALoad())
550+
if (comp->target().cpu.isZ() && node->getOpCodeValue() == TR::aloadi && node->isUnneededAloadi())
551551
{
552-
ListIterator<TR_Pair<TR::Node, int32_t> > listIter(&_ialoadUnneeded);
552+
ListIterator<TR_Pair<TR::Node, int32_t> > listIter(&_aloadiUnneeded);
553553
TR_Pair<TR::Node, int32_t> *ptr;
554554
uintptr_t temp;
555555
int32_t updatedTemp;
@@ -559,7 +559,7 @@ J9::Z::CodeGenerator::lowerTreeIfNeeded(
559559
updatedTemp = (int32_t) temp;
560560
if (ptr->getKey() == node && temp != node->getReferenceCount())
561561
{
562-
node->setUnneededIALoad(false);
562+
node->setUnneededAloadi(false);
563563
break;
564564
}
565565
}

‎runtime/compiler/z/codegen/J9MemoryReference.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ J9::Z::MemoryReference::createUnresolvedDataSnippet(TR::Node * node, TR::CodeGen
275275
}
276276

277277
TR::UnresolvedDataSnippet *
278-
J9::Z::MemoryReference::createUnresolvedDataSnippetForiaload(TR::Node * node, TR::CodeGenerator * cg, TR::SymbolReference * symRef, TR::Register * tempReg, bool & isStore)
278+
J9::Z::MemoryReference::createUnresolvedDataSnippetForAloadi(TR::Node * node, TR::CodeGenerator * cg, TR::SymbolReference * symRef, TR::Register * tempReg, bool & isStore)
279279
{
280280
// Have to catch the case where, on first glance, a putstatic looks
281281
// like a 'read' since the unresolved ref is on the aloadi, not the

‎runtime/compiler/z/codegen/J9MemoryReference.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class OMR_EXTENSIBLE MemoryReference : public OMR::MemoryReferenceConnector
9494
static bool typeNeedsAlignment(TR::Node *node);
9595

9696
TR::UnresolvedDataSnippet * createUnresolvedDataSnippet(TR::Node * node, TR::CodeGenerator * cg, TR::SymbolReference * symRef, TR::Register * tempReg, bool isStore);
97-
TR::UnresolvedDataSnippet * createUnresolvedDataSnippetForiaload(TR::Node * node, TR::CodeGenerator * cg, TR::SymbolReference * symRef, TR::Register * tempReg, bool & isStore);
97+
TR::UnresolvedDataSnippet * createUnresolvedDataSnippetForAloadi(TR::Node * node, TR::CodeGenerator * cg, TR::SymbolReference * symRef, TR::Register * tempReg, bool & isStore);
9898
void createUnresolvedSnippetWithNodeRegister(TR::Node * node, TR::CodeGenerator * cg, TR::SymbolReference * symRef, TR::Register *& writableLiteralPoolRegister);
9999
void createUnresolvedDataSnippetForBaseNode(TR::CodeGenerator * cg, TR::Register * writableLiteralPoolRegister);
100100

‎runtime/compiler/z/codegen/J9TreeEvaluator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7649,7 +7649,7 @@ J9::Z::TreeEvaluator::evaluateNULLCHKWithPossibleResolve(TR::Node * node, bool n
76497649

76507650
// determine if an explicit check is needed
76517651
if (cg->getSupportsImplicitNullChecks()
7652-
&& !firstChild->isUnneededIALoad())
7652+
&& !firstChild->isUnneededAloadi())
76537653
{
76547654
if (opCode.isLoadVar()
76557655
|| (cg->comp()->target().is64Bit() && opCode.getOpCodeValue()==TR::l2i)

0 commit comments

Comments
 (0)