@@ -4767,8 +4767,7 @@ static TR::Instruction *compareIntsAndBranchForArrayCopyBNDCHK(TR::ARM64Conditio
47674767
47684768 TR_ASSERT_FATAL_WITH_NODE (node, sr, " Must provide an ArrayCopyBNDCHK symref" );
47694769 cg->addSnippet (new (cg->trHeapMemory ()) TR::ARM64HelperCallSnippet (cg, node, snippetLabel, sr));
4770- TR::Instruction *instr
4771- = generateConditionalBranchInstruction (cg, TR::InstOpCode::b_cond, node, snippetLabel, branchCond);
4770+ TR::Instruction *instr = generateConditionalBranchInstruction (cg, node, snippetLabel, branchCond);
47724771
47734772 cg->machine ()->setLinkRegisterKilled (true );
47744773 cg->decReferenceCount (firstChild);
@@ -6010,7 +6009,7 @@ TR::Register *OMR::ARM64::TreeEvaluator::arraysetEvaluator(TR::Node *node, TR::C
60106009 generateMemSrc2Instruction (cg, TR::InstOpCode::vstppreq, node,
60116010 TR::MemoryReference::createWithDisplacement (cg, dstReg, 256 ), vectorValueReg,
60126011 vectorValueReg);
6013- generateConditionalBranchInstruction (cg, TR::InstOpCode::b_cond, node, loopLabel, TR::CC_GT);
6012+ generateConditionalBranchInstruction (cg, node, loopLabel, TR::CC_GT);
60146013 srm->reclaimScratchRegister (countReg);
60156014 }
60166015 int64_t remainingLength = useLoop ? ((length - 32 ) % constLoopLen) : (length - 32 );
@@ -6181,16 +6180,15 @@ TR::Register *OMR::ARM64::TreeEvaluator::arraysetEvaluator(TR::Node *node, TR::C
61816180 generateTrg1Src2Instruction (cg, TR::InstOpCode::addx, node, dstEndReg, dstReg, lengthReg);
61826181 TR::LabelSymbol *lessThan32Label = generateLabelSymbol (cg);
61836182 generateCompareImmInstruction (cg, node, lengthReg, 32 , true );
6184- auto branchToLessThan32LabelInstr
6185- = generateConditionalBranchInstruction (cg, TR::InstOpCode::b_cond, node, lessThan32Label, TR::CC_CC);
6183+ auto branchToLessThan32LabelInstr = generateConditionalBranchInstruction (cg, node, lessThan32Label, TR::CC_CC);
61866184
61876185 generateMemSrc2Instruction (cg, TR::InstOpCode::vstpoffq, node,
61886186 TR::MemoryReference::createWithDisplacement (cg, dstReg, 0 ), vectorValueReg, vectorValueReg);
61896187
61906188 TR::LabelSymbol *lessThanOrEqual96Label = generateLabelSymbol (cg);
61916189 generateCompareImmInstruction (cg, node, lengthReg, 96 , true );
61926190 auto branchToLessThanOrEqual96LabelInstr
6193- = generateConditionalBranchInstruction (cg, TR::InstOpCode::b_cond, node, lessThanOrEqual96Label, TR::CC_LS);
6191+ = generateConditionalBranchInstruction (cg, node, lessThanOrEqual96Label, TR::CC_LS);
61946192 if (debugObj) {
61956193 debugObj->addInstructionComment (branchToLessThan32LabelInstr, " Jumps to lessThan32Label if length < 32." );
61966194 debugObj->addInstructionComment (branchToLessThanOrEqual96LabelInstr,
@@ -6224,8 +6222,7 @@ TR::Register *OMR::ARM64::TreeEvaluator::arraysetEvaluator(TR::Node *node, TR::C
62246222 TR::MemoryReference::createWithDisplacement (cg, dstReg, 32 ), vectorValueReg, vectorValueReg);
62256223 generateMemSrc2Instruction (cg, TR::InstOpCode::vstppreq, node,
62266224 TR::MemoryReference::createWithDisplacement (cg, dstReg, 64 ), vectorValueReg, vectorValueReg);
6227- auto branchBackToMainLoopLabelInstr
6228- = generateConditionalBranchInstruction (cg, TR::InstOpCode::b_cond, node, mainLoopLabel, TR::CC_HI);
6225+ auto branchBackToMainLoopLabelInstr = generateConditionalBranchInstruction (cg, node, mainLoopLabel, TR::CC_HI);
62296226 auto adjustDstRegInstr = generateTrg1Src2Instruction (cg, TR::InstOpCode::addx, node, dstReg, dstReg, lengthReg);
62306227 generateMemSrc2Instruction (cg, TR::InstOpCode::vstpoffq, node,
62316228 TR::MemoryReference::createWithDisplacement (cg, dstReg, 32 ), vectorValueReg, vectorValueReg);
@@ -6301,7 +6298,7 @@ TR::Register *OMR::ARM64::TreeEvaluator::arraysetEvaluator(TR::Node *node, TR::C
63016298 generateMemSrc1Instruction (cg, strOpCode, node,
63026299 TR::MemoryReference::createWithDisplacement (cg, dstReg, elementSize), valueReg);
63036300 auto branchBackToElementLoopLabelInstr
6304- = generateConditionalBranchInstruction (cg, TR::InstOpCode::b_cond, node, elementLoopLabel, TR::CC_HI);
6301+ = generateConditionalBranchInstruction (cg, node, elementLoopLabel, TR::CC_HI);
63056302 if (debugObj) {
63066303 debugObj->addInstructionComment (lessThan16LabelInstr, " lessThan16Label" );
63076304 debugObj->addInstructionComment (elementLoopLabelInstr, " elementLoopLabel" );
@@ -6476,8 +6473,7 @@ static TR::Register *arraycmpEvaluatorHelper(TR::Node *node, TR::CodeGenerator *
64766473 " Compares lengthReg with 0 if src1 and src2 are not the same array. Otherwise, sets EQ flag." );
64776474 }
64786475 }
6479- auto branchToDoneLabelInstr
6480- = generateConditionalBranchInstruction (cg, TR::InstOpCode::b_cond, node, doneLabel, TR::CC_EQ);
6476+ auto branchToDoneLabelInstr = generateConditionalBranchInstruction (cg, node, doneLabel, TR::CC_EQ);
64816477 if (debugObj) {
64826478 debugObj->addInstructionComment (branchToDoneLabelInstr,
64836479 " Done if src1 and src2 are the same array or length is 0." );
@@ -6493,8 +6489,7 @@ static TR::Register *arraycmpEvaluatorHelper(TR::Node *node, TR::CodeGenerator *
64936489 TR::Register *data4Reg = srm->findOrCreateScratchRegister ();
64946490 if (!isLengthGreaterThan15) {
64956491 generateCompareImmInstruction (cg, node, lengthReg, 16 , /* is64bit */ true );
6496- auto branchToLessThan16LabelInstr
6497- = generateConditionalBranchInstruction (cg, TR::InstOpCode::b_cond, node, lessThan16Label, TR::CC_CC);
6492+ auto branchToLessThan16LabelInstr = generateConditionalBranchInstruction (cg, node, lessThan16Label, TR::CC_CC);
64986493 if (debugObj) {
64996494 debugObj->addInstructionComment (branchToLessThan16LabelInstr, " Jumps to lessThan16Label if length < 16." );
65006495 }
@@ -6514,12 +6509,10 @@ static TR::Register *arraycmpEvaluatorHelper(TR::Node *node, TR::CodeGenerator *
65146509 generateCompareInstruction (cg, node, data1Reg, data2Reg, true );
65156510 }
65166511 generateConditionalCompareInstruction (cg, node, data3Reg, data4Reg, 0 , TR::CC_EQ, true );
6517- auto branchToNotEqual16LabelInstr2
6518- = generateConditionalBranchInstruction (cg, TR::InstOpCode::b_cond, node, notEqual16Label, TR::CC_NE);
6512+ auto branchToNotEqual16LabelInstr2 = generateConditionalBranchInstruction (cg, node, notEqual16Label, TR::CC_NE);
65196513 auto subtractLengthInstr
65206514 = generateTrg1Src1ImmInstruction (cg, TR::InstOpCode::subsimmx, node, lengthReg, lengthReg, 16 );
6521- auto branchBacktoLoop16LabelInstr
6522- = generateConditionalBranchInstruction (cg, TR::InstOpCode::b_cond, node, loop16Label, TR::CC_CS);
6515+ auto branchBacktoLoop16LabelInstr = generateConditionalBranchInstruction (cg, node, loop16Label, TR::CC_CS);
65236516 if (debugObj) {
65246517 debugObj->addInstructionComment (loop16LabelInstr, " loop16Label" );
65256518 debugObj->addInstructionComment (branchToNotEqual16LabelInstr2,
@@ -6530,8 +6523,7 @@ static TR::Register *arraycmpEvaluatorHelper(TR::Node *node, TR::CodeGenerator *
65306523 }
65316524 if (isLengthGreaterThan15) {
65326525 generateCompareImmInstruction (cg, node, lengthReg, -16 , true );
6533- auto branchToDoneLabelInstr3
6534- = generateConditionalBranchInstruction (cg, TR::InstOpCode::b_cond, node, done0Label, TR::CC_EQ);
6526+ auto branchToDoneLabelInstr3 = generateConditionalBranchInstruction (cg, node, done0Label, TR::CC_EQ);
65356527 auto adjustSrc1RegInstr
65366528 = generateTrg1Src2Instruction (cg, TR::InstOpCode::addx, node, src1Reg, src1Reg, lengthReg);
65376529 generateTrg1Src2Instruction (cg, TR::InstOpCode::addx, node, src2Reg, src2Reg, lengthReg);
@@ -6615,7 +6607,7 @@ static TR::Register *arraycmpEvaluatorHelper(TR::Node *node, TR::CodeGenerator *
66156607 TR::MemoryReference::createWithDisplacement (cg, src2Reg, 1 ));
66166608 generateConditionalCompareInstruction (cg, node, data1Reg, data2Reg, 0 , TR::CC_HI);
66176609 auto branchBacktoLessThan16LabelInstr
6618- = generateConditionalBranchInstruction (cg, TR::InstOpCode::b_cond, node, lessThan16Label, TR::CC_EQ);
6610+ = generateConditionalBranchInstruction (cg, node, lessThan16Label, TR::CC_EQ);
66196611 if (debugObj) {
66206612 debugObj->addInstructionComment (branchToDone0LabelInstr, " Jumps to done0Label." );
66216613 debugObj->addInstructionComment (lessThan16LabelInstr, " lessThan16Label" );
@@ -6978,20 +6970,20 @@ static void inlinePrimitiveForwardArraycopy(TR::Node *node, TR::Register *srcAdd
69786970
69796971 const int32_t inlineThresholdBytes = 63 ;
69806972 generateCompareImmInstruction (cg, node, lengthReg, inlineThresholdBytes, true );
6981- generateConditionalBranchInstruction (cg, TR::InstOpCode::b_cond, node, oolArraycopyLabel, TR::CC_HI);
6973+ generateConditionalBranchInstruction (cg, node, oolArraycopyLabel, TR::CC_HI);
69826974
69836975 generateTrg1Src2Instruction (cg, TR::InstOpCode::subsx, node, x3ScratchReg, dstAddrReg, srcAddrReg);
69846976
69856977 // Skip if src and dest are the same
69866978 //
6987- generateConditionalBranchInstruction (cg, TR::InstOpCode::b_cond, node, doneLabel, TR::CC_EQ);
6979+ generateConditionalBranchInstruction (cg, node, doneLabel, TR::CC_EQ);
69886980
69896981 if (!node->isForwardArrayCopy ()) {
69906982 // Check for forward arraycopy dynamically if not known. Forward arraycopies should be
69916983 // the more common case and are optimized inline.
69926984 //
69936985 generateCompareInstruction (cg, node, lengthReg, x3ScratchReg, true );
6994- generateConditionalBranchInstruction (cg, TR::InstOpCode::b_cond, node, oolArraycopyLabel, TR::CC_HI);
6986+ generateConditionalBranchInstruction (cg, node, oolArraycopyLabel, TR::CC_HI);
69956987 }
69966988
69976989 // Copy 32 bytes
0 commit comments