-
Notifications
You must be signed in to change notification settings - Fork 720
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.
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
Update BCDCHK uncommoning for off-heap #20302
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -62,17 +62,44 @@ UncommonBCDCHKAddressNode::perform() | |
{ | ||
TR::Node* pdOpNode = node->getFirstChild(); | ||
TR::Node* oldAddressNode = node->getSecondChild(); | ||
TR_ASSERT(pdOpNode && oldAddressNode, "Unexpected null PD opNode or address node under BCDCHK"); | ||
TR_ASSERT(oldAddressNode->getNumChildren() == 2, "Expecting 2 children under address node of BCDCHK."); | ||
TR_ASSERT_FATAL_WITH_NODE(node, pdOpNode && oldAddressNode, "Unexpected null PD opNode or address node under BCDCHK"); | ||
|
||
TR::ILOpCodes addressOp = oldAddressNode->getOpCodeValue(); | ||
TR_ASSERT((addressOp == TR::aladd || addressOp == TR::aiadd), "Unexpected addressNode opcode"); | ||
TR_ASSERT_FATAL_WITH_NODE(node, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Would it make sense to have the expected tree structure comment moved here before the ASSERT to highlight what you are checking here? |
||
oldAddressNode->isDataAddrPointer() && oldAddressNode->getNumChildren() == 1 | ||
|| ((addressOp == TR::aladd || addressOp == TR::aiadd) && oldAddressNode->getNumChildren() == 2), | ||
"Expecting either a dataAddrPointer node with 1 child or a aladd/aiadd with 2 children under address node of BCDCHK."); | ||
|
||
if(oldAddressNode->getReferenceCount() > 1) | ||
{ | ||
TR::Node* newAddressNode = TR::Node::create(node, addressOp, 2, | ||
oldAddressNode->getFirstChild(), | ||
oldAddressNode->getSecondChild()); | ||
TR::Node* newAddressNode = NULL; | ||
if (oldAddressNode->getOpCodeValue() == TR::aloadi) | ||
{ | ||
/* Expected tree structure (probably just loading first array element because offset is 0) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you elaborate why probably? |
||
* aloadi <contiguousArrayDataAddrFieldSymbol> | ||
* load array_object | ||
*/ | ||
newAddressNode = TR::TransformUtil::generateArrayElementAddressTrees(comp(), oldAddressNode->getFirstChild()); | ||
} | ||
else | ||
{ | ||
/* Expected tree structures | ||
* 1. non off-heap mode | ||
* aladd/aiadd | ||
* load array_object | ||
* array_element_offset | ||
* | ||
* 2. off-heap enabled | ||
* aladd/aiadd | ||
* aloadi <contiguousArrayDataAddrFieldSymbol> | ||
* load array_object | ||
* array_element_offset | ||
*/ | ||
newAddressNode = TR::Node::create(node, addressOp, 2, | ||
oldAddressNode->getFirstChild(), | ||
oldAddressNode->getSecondChild()); | ||
} | ||
|
||
node->setAndIncChild(1, newAddressNode); | ||
oldAddressNode->decReferenceCount(); | ||
traceMsg(comp(), "%sReplacing node %s [%p] with [%p]\n", | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I understand that this is the old code, but if the intention of this assert is that both
oldAddressNode
andpdOpNode
should be non null, then we should explicitly check that.