Skip to content

Conversation

@davidwrighton
Copy link
Member

@davidwrighton davidwrighton commented Dec 17, 2025

  • Rely on resetting the interpreter code pointer to trigger the existing rejit/prestub logic to fill in any gaps we have.

This fixes the rejit test

- Rely on resetting the interpreter code pointer to trigger the existing rejit/prestub logic to fill in any gaps we have.
@dotnet-policy-service
Copy link
Contributor

Tagging subscribers to this area: @BrzVlad, @janvorli, @kg
See info in area-owners.md if you want to be subscribed.

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This pull request enables ReJIT support in the interpreter by adding calls to clear the interpreter code pointer at strategic points in the code versioning and entry point management flow. The changes ensure that when code versions are updated or reset, the interpreter state is properly cleared, allowing the existing rejit/prestub logic to rebuild the interpreter state as needed.

  • Adds ClearInterpreterCodePointer() calls in ResetCodeEntryPoint() and ResetCodeEntryPointForEnC() to clear interpreter state during entry point resets
  • Adds ClearInterpreterCodePointer() in PublishNativeCodeVersion() when setting new native code versions to ensure interpreter state is synchronized with code versioning

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

File Description
src/coreclr/vm/method.cpp Adds interpreter code pointer clearing in two entry point reset methods to support rejit scenarios
src/coreclr/vm/codeversion.cpp Clears interpreter code pointer when publishing new native code versions to ensure proper rejit behavior

#ifdef FEATURE_INTERPRETER
// When we hit the Precode that should fixup any issues with an unset interpreter code pointer. This is notably most important in ReJIT scenarios
pMethod->ClearInterpreterCodePointer();
#endif
Copy link

Copilot AI Dec 17, 2025

Choose a reason for hiding this comment

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

Trailing whitespace detected at the end of this line. According to the repository's code formatting conventions, there should be no trailing whitespace.

Suggested change
#endif
#endif

Copilot uses AI. Check for mistakes.
Comment on lines +1983 to 1987
#ifdef FEATURE_INTERPRETER
// When we hit the Precode that should fixup any issues with an unset interpreter code pointer. This is notably most important in ReJIT scenarios
pMethod->ClearInterpreterCodePointer();
#endif
#ifdef FEATURE_TIERED_COMPILATION
Copy link

Copilot AI Dec 17, 2025

Choose a reason for hiding this comment

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

The indentation of the preprocessor directives is inconsistent with the surrounding code. The '#ifdef' and '#endif' directives should be aligned at column 0 (no indentation), following the standard C/C++ convention and the pattern used elsewhere in this file.

Suggested change
#ifdef FEATURE_INTERPRETER
// When we hit the Precode that should fixup any issues with an unset interpreter code pointer. This is notably most important in ReJIT scenarios
pMethod->ClearInterpreterCodePointer();
#endif
#ifdef FEATURE_TIERED_COMPILATION
#ifdef FEATURE_INTERPRETER
// When we hit the Precode that should fixup any issues with an unset interpreter code pointer. This is notably most important in ReJIT scenarios
pMethod->ClearInterpreterCodePointer();
#endif
#ifdef FEATURE_TIERED_COMPILATION

Copilot uses AI. Check for mistakes.
@BrzVlad
Copy link
Member

BrzVlad commented Dec 18, 2025

Is this resetting of the code pointer for a method the same mechanism that is used also for EnC functionality when debugging. I suspect precodes might also need flushing, but this might already be integrated with the rest of the runtime ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants