-
Notifications
You must be signed in to change notification settings - Fork 5k
Replace CORCOMPILE_FIXUP_BLOB_KIND with ReadyToRunFixupKind #115854
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
base: main
Are you sure you want to change the base?
Conversation
Co-authored-by: jkotas <[email protected]>
@copilot You have missed replacing the usage of this enum in LoadDynamicInfoEntry method. Could you please fix that? |
…de in LoadDynamicInfoEntry Co-authored-by: jkotas <[email protected]>
I've fixed the missed replacement in the LoadDynamicInfoEntry method. The changes replace ENCODE_MODULE_OVERRIDE with ReadyToRunFixupKind::ModuleOverride in the implementation. See commit 02688ff. |
Co-authored-by: jkotas <[email protected]>
This comment was marked as spam.
This comment was marked as spam.
src/coreclr/vm/prestub.cpp
Outdated
// case READYTORUN_FIXUP_VirtualEntry_DefToken: | ||
// case READYTORUN_FIXUP_VirtualEntry_RefToken: | ||
// case READYTORUN_FIXUP_VirtualEntry_Slot: |
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.
Should these be removed?
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.
Removed the commented out case statements as suggested. See commit daf6dae.
src/coreclr/vm/prestub.cpp
Outdated
@@ -3107,11 +3107,11 @@ PCODE DynamicHelperFixup(TransitionBlock * pTransitionBlock, TADDR * pCell, DWOR | |||
BYTE kind = *pBlob++; |
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.
Would it make sense to just cast/type this here?
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've updated the code to cast kind
to ReadyToRunFixupKind and also applied appropriate casting in the second line where we clear the ModuleOverride flag. This makes the type usage consistent with the enum we're now using. See commit daf6dae.
Co-authored-by: AaronRobinsonMSFT <[email protected]>
Co-authored-by: AaronRobinsonMSFT <[email protected]>
src/coreclr/vm/genericdict.cpp
Outdated
} | ||
|
||
switch ((CORCOMPILE_FIXUP_BLOB_KIND) signatureKind) | ||
switch ((ReadyToRunFixupKind) signatureKind) |
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.
@copilot Move (ReadyToRunFixupKind)
cast to signatureKind
declaration like in the other change
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've moved the ReadyToRunFixupKind cast to the signatureKind variable declaration as requested and also added appropriate casting when clearing the ModuleOverride flag. See commit 539b621.
Co-authored-by: jkotas <[email protected]>
Co-authored-by: jkotas <[email protected]>
Removes the redundant
CORCOMPILE_FIXUP_BLOB_KIND
enum and replaces all its uses with the equivalentReadyToRunFixupKind
enum.CORCOMPILE_FIXUP_BLOB_KIND
was a left-over from fragile NGen.Fixes #115853.