Fix runtime build when tiered compilation is disabled #119355
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Pull Request Overview
This PR fixes runtime build errors that occur when tiered compilation is disabled by properly wrapping tiered compilation-related code with FEATURE_TIERED_COMPILATION guards. The changes ensure that code referencing tiered compilation stubs and data structures is only compiled when the feature is enabled.
Key Changes
- Added conditional compilation guards around call counting stub definitions and references
- Fixed incorrect feature flags for on-stack replacement code sections
- Protected tiered compilation ETW event tracing code
Reviewed Changes
Copilot reviewed 17 out of 17 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/coreclr/vm/riscv64/asmhelpers.S | Fixed feature guards for patchpoint stubs |
| src/coreclr/vm/riscv64/asmconstants.h | Added guards around call counting stub constants |
| src/coreclr/vm/loongarch64/thunktemplates.S | Protected call counting stub template |
| src/coreclr/vm/loongarch64/asmhelpers.S | Fixed feature guards for patchpoint stubs |
| src/coreclr/vm/loongarch64/asmconstants.h | Added guards around call counting stub constants |
| src/coreclr/vm/i386/thunktemplates.S | Protected call counting stub template |
| src/coreclr/vm/i386/asmconstants.h | Added guards around call counting stub constants |
| src/coreclr/vm/eventtrace.cpp | Protected tiered compilation ETW events |
| src/coreclr/vm/arm64/thunktemplates.S | Protected call counting stub templates |
| src/coreclr/vm/arm64/asmhelpers.S | Fixed feature guards for patchpoint stubs |
| src/coreclr/vm/arm64/asmconstants.h | Added guards around call counting stub constants |
| src/coreclr/vm/arm/asmconstants.h | Added guards around call counting stub constants |
| src/coreclr/vm/amd64/thunktemplates.S | Protected call counting stub template |
| src/coreclr/vm/amd64/asmconstants.h | Added guards around call counting stub constants |
| src/coreclr/inc/vptr_list.h | Protected call counting stub manager declaration |
| src/coreclr/inc/dacvars.h | Protected call counting stub manager DAC variable |
| src/coreclr/debug/daccess/dacdbiimpl.cpp | Fixed assignment to boolean pointer |
|
Tagging subscribers to this area: @mangod9 |
|
/azp run runtime-extra-platforms |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run runtime-extra-platforms |
This comment was marked as outdated.
This comment was marked as outdated.
|
/azp run runtime-extra-platforms |
|
Azure Pipelines successfully started running 1 pipeline(s). |
This was referenced Sep 5, 2025
Open
Co-authored-by: Aaron Robinson <[email protected]>
Co-authored-by: Aaron Robinson <[email protected]>
Co-authored-by: Aaron Robinson <[email protected]>
Co-authored-by: Aaron Robinson <[email protected]>
Co-authored-by: Aaron Robinson <[email protected]>
Co-authored-by: Aaron Robinson <[email protected]>
Co-authored-by: Aaron Robinson <[email protected]>
Co-authored-by: Aaron Robinson <[email protected]>
Co-authored-by: Aaron Robinson <[email protected]>
|
/azp run runtime-extra-platforms |
|
Azure Pipelines successfully started running 1 pipeline(s). |
jkotas
reviewed
Sep 22, 2025
jkotas
approved these changes
Sep 22, 2025
AaronRobinsonMSFT
approved these changes
Sep 22, 2025
There was a problem hiding this comment.
LGTM. I'd like to see #119355 (comment) applied before merge.
…tlarmilos/runtime into improvement/clr-interp-build-features
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR ensures that tiered compilation–related logic is compiled only when FEATURE_TIERED_COMPILATION is enabled. Several components like DAC variables, vtable pointer lists, assembly constants, thunk templates, and event tracing unconditionally referenced these stubs. On builds without tiered compilation, this resulted in runtime build errors.
This change fixes CoreCLR builds for Apple mobile.