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.

Sign up for GitHub

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

Jump to bottom

JIT: Make sure static ctor flag check uses a volatile load #105832

Merged
merged 3 commits into from
Aug 4, 2024
Merged

JIT: Make sure static ctor flag check uses a volatile load #105832

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6392292
JIT: Make sure static ctor flag check uses a volatile load
jakobbotsch Aug 1, 2024
c81e50b
Nit
jakobbotsch Aug 1, 2024
ee9f88b
Set GTF_ORDER_SIDEEFF
jakobbotsch Aug 2, 2024
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
4 changes: 3 additions & 1 deletion src/coreclr/jit/helperexpansion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1417,7 +1417,7 @@ bool Compiler::fgExpandStaticInitForCall(BasicBlock** pBlock, Statement* stmt, G

// Don't fold ADD(CNS1, CNS2) here since the result won't be reloc-friendly for AOT
GenTree* offsetNode = gtNewOperNode(GT_ADD, TYP_I_IMPL, baseAddr, gtNewIconNode(isInitOffset));
isInitedActualValueNode = gtNewIndir(TYP_I_IMPL, offsetNode, GTF_IND_NONFAULTING);
isInitedActualValueNode = gtNewIndir(TYP_I_IMPL, offsetNode, GTF_IND_NONFAULTING | GTF_IND_VOLATILE);

// 0 means "initialized" on NativeAOT
isInitedExpectedValue = gtNewIconNode(0, TYP_I_IMPL);
Expand All @@ -1427,6 +1427,8 @@ bool Compiler::fgExpandStaticInitForCall(BasicBlock** pBlock, Statement* stmt, G
assert(isInitOffset == 0);

isInitedActualValueNode = gtNewIndOfIconHandleNode(TYP_INT, (size_t)flagAddr.addr, GTF_ICON_GLOBAL_PTR, false);
isInitedActualValueNode->gtFlags |= GTF_IND_VOLATILE;
isInitedActualValueNode->SetHasOrderingSideEffect();

// Check ClassInitFlags::INITIALIZED_FLAG bit
isInitedActualValueNode = gtNewOperNode(GT_AND, TYP_INT, isInitedActualValueNode, gtNewIconNode(1));
Expand Down
Loading