Skip reloc handling for IMAGE_REL_BASED_DIR64 if already handled #105522
Conversation
|
@dotnet/jit-contrib |
|
Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch |
|
/azp run runtime-coreclr superpmi-diffs |
|
Azure Pipelines could not run because the pipeline triggers exclude this branch/path. |
| if (IsSpmiTarget64Bit()) | ||
| { | ||
| if (relocType == IMAGE_REL_BASED_DIR64) | ||
| if (!wasRelocHandled && (relocType == IMAGE_REL_BASED_DIR64)) |
There was a problem hiding this comment.
I might be missing something here, but if relocType == IMAGE_REL_BASED_DIR64, shouldn't wasRelocHandled always be false? I don't see this reloc type handled in any of the above switch statements, and those are the only places where wasRelocHandled can be set to true.
There was a problem hiding this comment.
yes, that's because IMAGE_REL_BASED_DIR64 and IMAGE_REL_ARM64_SECREL_HIGH12A share the same enum value 0x9. IMAGE_REL_BASED_DIR64 is used in xarch, while IMAGE_REL_ARM64_SECREL_HIGH12A is for arm64. So yes, wasRelocHandled will mostly be false, except for arm64/IMAGE_REL_ARM64_SECREL_HIGH12A in which case we should not handle it here. If we do, it just overwrites the codestream leading to "decoding failures". Ideally, this handling should be just for SPMI_TARGET_ARCHITECTURE_X86 and SPMI_TARGET_ARCHITECTURE_AMD64, but I was not sure if there was any historic reason to do so. Wanted to do minimal change to address the underlying issue for arm64.
See the discussion in #104282 (comment).
There was a problem hiding this comment.
Got it, thank you for explaining this!
Resolves #104584 and resolves #104441