Skip to content
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

Jump to bottom

Only apply addlDelta for IMAGE_REL_BASED_REL32 relocs #79627

Closed
wants to merge 2 commits into from
Closed

Only apply addlDelta for IMAGE_REL_BASED_REL32 relocs #79627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db36fc7
Only apply addlDelta for IMAGE_REL_BASED_REL32 relocs
BruceForstall Dec 13, 2022
fdc71c8
Re-enable test
BruceForstall Dec 13, 2022
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
8 changes: 6 additions & 2 deletions src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3752,10 +3752,14 @@ private void recordRelocation(void* location, void* locationRW, void* target, us
break;
}

relocDelta += addlDelta;

TargetArchitecture targetArchitecture = _compilation.TypeSystemContext.Target.Architecture;
RelocType relocType = GetRelocType(targetArchitecture, fRelocType);

if (relocType == RelocType.IMAGE_REL_BASED_REL32)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make more sense for the JIT to pass addlDelta as zero?

One can imagine cases where addlDelta can be useful for other relocation types as well. They may not exist today, but they can show up in future.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe? That's what #79467 does. I don't have a strong opinion either way.

I was interested to learn when I investigated that ngen ignored addlDelta except for REL32, and I'm generally wary of ways in which the crossgen2 implementation of the JIT/EE interface diverges from the ngen implementation.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think #79467 is a better fix.

I would not use ngen or .NET Framework as a gold standard for JIT/EE interface implementation. The JIT/EE interface contract in .NET Framework had a lot of things in it that did not make sense and it was a lot of friction to fix them.

{
relocDelta += addlDelta;
}

// relocDelta is stored as the value
Relocation.WriteValue(relocType, location, relocDelta);

Expand Down
3 changes: 0 additions & 3 deletions src/tests/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,6 @@
<ExcludeList Include="$(XunitTestBinBase)/Regressions/coreclr/GitHub_34094/Test34094/*">
<Issue>https://github.com/dotnet/runtime/issues/57458</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/Runtime_31615/Runtime_31615/*">
<Issue>https://github.com/dotnet/runtime/issues/79170</Issue>
</ExcludeList>
</ItemGroup>

<!-- Windows arm32 specific excludes -->
Expand Down