Skip to content

Add missing THUMB_BRANCH24 and ARM64_BRANCH26 to Relocation.GetSize #128170

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

Merged
jtschuster merged 6 commits into from
May 19, 2026
+9 −1
Merged

Add missing THUMB_BRANCH24 and ARM64_BRANCH26 to Relocation.GetSize #128170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ba5224b
Add missing THUMB_BRANCH24 and ARM64_BRANCH26 to Relocation.GetSize
jtschuster May 13, 2026
073d88b
Merge branch 'main' into fix/relocation-getsize-arm
jtschuster May 15, 2026
a0b82dd
Handle ARM branch relocs in composite R2R
jtschuster May 13, 2026
75193ac
Narrow PE branch relocation handling
jtschuster May 18, 2026
8562d89
Avoid out-of-range ARM branches in composite R2R
jtschuster May 18, 2026
88ee57f
Remove broad ARM relocation hint workaround
jtschuster May 19, 2026
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
2 changes: 2 additions & 0 deletions src/coreclr/tools/Common/Compiler/DependencyAnalysis/Relocation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,8 @@ public static int GetSize(RelocType relocType)
RelocType.IMAGE_REL_BASED_ARM64_PAGEOFFSET_12L => 4,
RelocType.IMAGE_REL_BASED_THUMB_MOV32 => 8,
RelocType.IMAGE_REL_BASED_THUMB_MOV32_PCREL => 8,
RelocType.IMAGE_REL_BASED_THUMB_BRANCH24 => 4,
RelocType.IMAGE_REL_BASED_ARM64_BRANCH26 => 4,
Comment thread
jtschuster marked this conversation as resolved.
RelocType.IMAGE_REL_BASED_LOONGARCH64_PC => 8,
RelocType.IMAGE_REL_BASED_LOONGARCH64_JIR => 8,
RelocType.IMAGE_REL_BASED_RISCV64_CALL_PLT => 8,
Expand Down
8 changes: 7 additions & 1 deletion src/coreclr/tools/Common/Compiler/ObjectWriter/PEObjectWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,14 +904,20 @@ private unsafe void ResolveRelocations(int sectionIndex, List<SymbolicRelocation
case RelocType.IMAGE_REL_BASED_HIGHLOW:
// Write the ImageBase-relative value to be relocated at load time.
Relocation.WriteValue(reloc.Type, pData, symbolImageOffset + imageBase + addend);
break;
break;
case RelocType.IMAGE_REL_BASED_ADDR32NB:
Relocation.WriteValue(reloc.Type, pData, symbolImageOffset + addend);
break;
case RelocType.IMAGE_REL_BASED_REL32:
case RelocType.IMAGE_REL_BASED_RELPTR32:
Relocation.WriteValue(reloc.Type, pData, symbolImageOffset - (relocOffset + relocLength) + addend);
break;
case RelocType.IMAGE_REL_BASED_THUMB_BRANCH24:
Relocation.WriteValue(reloc.Type, pData, (long)(symbolImageOffset & ~1u) - (long)(relocOffset + relocLength) + addend);
break;
case RelocType.IMAGE_REL_BASED_ARM64_BRANCH26:
Relocation.WriteValue(reloc.Type, pData, (long)symbolImageOffset - (long)relocOffset + addend);
break;
Comment thread
jtschuster marked this conversation as resolved.
case RelocType.IMAGE_REL_FILE_ABSOLUTE:
long fileOffset = _sections[definedSymbol.SectionIndex].Header.PointerToRawData + definedSymbol.Value;
Relocation.WriteValue(reloc.Type, pData, fileOffset + addend);
Expand Down
Loading