[pcshrosbree]

Fixes #136669

ProfToEEInterfaceImpl::GetILToNativeMapping2 looked up the IL code version for reJitId but did not store the result, so it always used the method's default native code version. It now stores the version, and looks for native code only when a version was found. A reJitId that matches no IL version of the method now returns E_INVALIDARG instead of the default version's map. The error comes from the existing null-address check in GetILToNativeMapping3.

GetILToNativeMapping2 also takes the first native code version that has code, as GetNativeCodeStartAddresses does, so that a tier-up compile still in progress does not hide already compiled code. When the default native code version has code, reJitId 0 still returns its map.

The rejit profiler test now checks, after the ReJIT'd target method has run and before the revert:

• for each of the method's ReJIT IDs, the test gets the native code addresses from GetNativeCodeStartAddresses and their maps from GetILToNativeMapping3. The map from GetILToNativeMapping2 must match at least one of those maps;
• ReJIT ID 0 still returns a map, since the default version has code;
• an unknown ReJIT ID returns E_INVALIDARG.

The test runs with tiered compilation disabled, so it does not cover a tier-up compile in progress.

Testing used main at e522423 as the base. Each runtime variant below ran the rejit test 20 times with a linux-x64 Checked runtime and DOTNET_TieredCompilation=0 (the test is optimization-sensitive):

Runtime	Passed	Failure
this change	20/20	none
storing the version, without checking whether one was found	0/20	an unknown ReJIT ID returned S_OK
main	0/20	the map for ReJIT ID 2 did not match the map of any native code body for that version; an unknown ReJIT ID returned S_OK

Note

This change was prepared with AI assistance (Anthropic Claude and OpenAI Codex) under my direction. AI agents ran the builds and tests on my machine. I reviewed the change and the test results before opening it.

[azure-pipelines]

Azure Pipelines:
Successfully started running 3 pipeline(s).
13 pipeline(s) were filtered out due to trigger conditions.
There may be pipelines that require an authorized user to comment /azp run to run.

[dotnet-policy-service]

Tagging subscribers to this area: @steveisok, @tommcdon, @dotnet/dotnet-diag
See info in area-owners.md if you want to be subscribed.

[pcshrosbree]

Thank you for the review and merge!