Replace CORCOMPILE_FIXUP_BLOB_KIND with ReadyToRunFixupKind #115854
Conversation
dotnet-policy-service
bot
added
the
linkable-framework
jkotas
added
area-ReadyToRun-coreclr
and removed
linkable-framework
dotnet-policy-service
bot
added
the
linkable-framework
Co-authored-by: jkotas <6668460+jkotas@users.noreply.github.com>
Copilot
AI
changed the title
|
@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 <6668460+jkotas@users.noreply.github.com>
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 <6668460+jkotas@users.noreply.github.com>
This comment was marked as spam.
This comment was marked as spam.
jkotas
removed
the
linkable-framework
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.
Should these be removed?
There was a problem hiding this comment.
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.
Would it make sense to just cast/type this here?
There was a problem hiding this comment.
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 <30635565+AaronRobinsonMSFT@users.noreply.github.com>
src/coreclr/vm/genericdict.cpp
Outdated
| } | ||
|
|
||
| switch ((CORCOMPILE_FIXUP_BLOB_KIND) signatureKind) | ||
| switch ((ReadyToRunFixupKind) signatureKind) |
There was a problem hiding this comment.
@copilot Move (ReadyToRunFixupKind) cast to signatureKind declaration like in the other change
There was a problem hiding this comment.
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 <6668460+jkotas@users.noreply.github.com>
Co-authored-by: jkotas <6668460+jkotas@users.noreply.github.com>
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
There was a problem hiding this comment.
@jkotas I don't see anything here obviously wrong. Most of it looks like simple pattern replacement.
|
Do we want to run the outerloop or crossgen2 legs? |
|
/azp run runtime-coreclr crossgen2 outerloop |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/ba-g known android timeout |
Removes the redundant
CORCOMPILE_FIXUP_BLOB_KINDenum and replaces all its uses with the equivalentReadyToRunFixupKindenum.CORCOMPILE_FIXUP_BLOB_KINDwas a left-over from fragile NGen.Fixes #115853.