-
Notifications
You must be signed in to change notification settings - Fork 5.3k
[release/10.0] Fix token memory ordering issue reading from the MethodDef and FieldDef token tables (#123557) #124110
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
Open
davidwrighton
wants to merge
1
commit into
dotnet:release/10.0
Choose a base branch
from
davidwrighton:backport_123557
base: release/10.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+14
−2
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,13 @@ TYPE LookupMap<TYPE>::GetValueAt(PTR_TADDR pValue, TADDR* pFlags, TADDR supporte | |
| WRAPPER_NO_CONTRACT; | ||
| SUPPORTS_DAC; | ||
| #ifndef DACCESS_COMPILE | ||
| TYPE value = dac_cast<TYPE>(VolatileLoadWithoutBarrier(pValue)); // LookupMap's hold pointers, so we can use a data dependency instead of an explicit barrier here. | ||
| // LookupMap's hold pointers to data which is immutable, so normally we could use a data | ||
| // dependency instead of an explicit barrier here. However, the access pattern between | ||
| // m_TypeDefToMethodTableMap and m_MethodDefToDescMap/m_FieldDefToDescMap is such that a | ||
| // data dependency is not sufficient to ensure that the MethodTable is visible when we | ||
| // access the MethodDesc/FieldDesc. Since those loads are independent, we use | ||
| // VolatileLoad here to ensure proper ordering. | ||
| TYPE value = dac_cast<TYPE>(VolatileLoad(pValue)); | ||
| #else | ||
| TYPE value = dac_cast<TYPE>(*pValue); | ||
| #endif | ||
|
|
@@ -51,7 +57,13 @@ SIZE_T LookupMap<SIZE_T>::GetValueAt(PTR_TADDR pValue, TADDR* pFlags, TADDR supp | |
| { | ||
| WRAPPER_NO_CONTRACT; | ||
|
|
||
| TADDR value = VolatileLoadWithoutBarrier(pValue); // LookupMap's hold pointers, so we can use a data dependency instead of an explicit barrier here. | ||
| // LookupMap's hold pointers to data which is immutable, so normally we could use a data | ||
| // dependency instead of an explicit barrier here. However, the access pattern between | ||
|
Comment on lines
+60
to
+61
|
||
| // m_TypeDefToMethodTableMap and m_MethodDefToDescMap/m_FieldDefToDescMap is such that a | ||
| // data dependency is not sufficient to ensure that the MethodTable is visible when we | ||
| // access the MethodDesc/FieldDesc. Since those loads are independent, we use | ||
| // VolatileLoad here to ensure proper ordering. | ||
| TADDR value = VolatileLoad(pValue); | ||
|
|
||
| if (pFlags) | ||
| *pFlags = value & supportedFlags; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Grammar: “LookupMap's hold …” reads as a possessive and is ungrammatical. Consider rephrasing to “LookupMaps hold …” (or “LookupMap holds …”) to avoid confusion in this explanatory comment.