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

Read Barrier for CompareAndSwapObject #1965

Merged
merged 2 commits into from
May 24, 2018
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
15 changes: 15 additions & 0 deletions runtime/compiler/trj9/z/codegen/J9TreeEvaluator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9747,6 +9747,21 @@ static TR::Register *VMinlineCompareAndSwap(
}
}

if (TR::Compiler->om.shouldGenerateReadBarriersForFieldLoads() && isObj)
{
TR::Register* tempReadBarrier = cg->allocateRegister();

auto guardedLoadMnemonic = usingCompressedPointers ? TR::InstOpCode::LLGFSG : TR::InstOpCode::LGG;

// Compare-And-Swap on object reference, while primarily is a store operation, it is also an implicit read (it
// reads the existing value to be compared with a provided compare value, before the store itself), hence needs
// a read barrier
generateS390IEInstruction(cg, TR::InstOpCode::NIAI, 1, 0, node);
generateRXYInstruction(cg, guardedLoadMnemonic, node, tempReadBarrier, generateS390MemoryReference(*casMemRef, 0, cg));

cg->stopUsingRegister(tempReadBarrier);
}

// Compare and swap
//
generateRSInstruction(cg, casOp, node, oldVReg, newVReg, casMemRef);
Expand Down