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.

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

0.39.0: Insert branch around re performing store for awrtbar #17530

Merged
Changes from all commits
Commits
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
13 changes: 2 additions & 11 deletions runtime/compiler/z/codegen/J9TreeEvaluator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7197,19 +7197,10 @@ J9::Z::TreeEvaluator::ArrayStoreCHKEvaluator(TR::Node * node, TR::CodeGenerator

// Store for case where we have a NULL ptr detected at runtime and
// branches around the wrtbar
//
// For the non-NULL case we chose to simply exec the ST twice as this is
// cheaper than branching around the a single ST inst.
//

if (!sourceChild->isNonNull() && (doWrtBar || doCrdMrk))
{
// As we could hit a gc when doing the gencon wrtbar, we have to not
// re-do the ST. We must branch around the second store.
//
if (doWrtBar)
{
generateS390BranchInstruction(cg, TR::InstOpCode::BRC, TR::InstOpCode::COND_BRC, node, cFlowRegionEnd);
}
generateS390BranchInstruction(cg, TR::InstOpCode::BRC, TR::InstOpCode::COND_BRC, node, cFlowRegionEnd);

generateS390LabelInstruction(cg, TR::InstOpCode::label, node, simpleStoreLabel);

Expand Down