Uh oh!
There was an error while loading. Please reload this page.
Remove redundant #if/#else blocks with identical branches - #128486
Merged
Conversation
Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/4e26e478-6f8d-42ca-a563-adc903ab26b1 Co-authored-by: MihaZupan <25307628+MihaZupan@users.noreply.github.com>
… scan Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/abc711bb-259e-4871-960a-8a5ed83e7953 Co-authored-by: MihaZupan <25307628+MihaZupan@users.noreply.github.com>
Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/ff8d691f-d260-4520-a062-5bd91f801581 Co-authored-by: MihaZupan <25307628+MihaZupan@users.noreply.github.com>
Copilotcreated this pull request from a session on behalf of MihaZupanMay 22, 2026 14:17 View session
MihaZupan
marked this pull request as ready for review
May 22, 2026 14:19
MihaZupan
approved these changes
May 22, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This PR removes a set of redundant preprocessor conditionals where the #if and #else branches were identical, leaving a single unconditional definition / statement. The changes are purely mechanical and should not alter runtime behavior, but reduce clutter and simplify future maintenance.
Changes:
- Removed identical
#if/#elsebranches around constants / typedefs / argument checks across CoreCLR, Mono, CoreLib, and JIT perf tests. - Kept the remaining meaningful conditional compilation blocks (e.g., the
#if NETindex validation split inCollectionHelpers).
Reviewed changes
Copilot reviewed 13 out of 13 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| src/tests/JIT/Performance/CodeQuality/Bytemark/ByteMark.cs | Removes redundant #if DEBUG around an identical constant value. |
| src/mono/mono/mini/mini-x86.h | Collapses an identical #ifdef TARGET_WIN32 macro block for FP register definitions. |
| src/mono/mono/metadata/handle.c | Removes an identical #ifdef __cplusplus around a global const pointer definition. |
| src/libraries/System.Private.CoreLib/src/System/Resources/RuntimeResourceSet.cs | Removes redundant #if RESOURCES_EXTENSIONS around an identical null-check. |
| src/libraries/System.Private.CoreLib/src/System/Resources/ResourceReader.cs | Removes redundant #if RESOURCES_EXTENSIONS around an identical null-check in the Stream ctor. |
| src/libraries/System.Private.CoreLib/src/System/Collections/ObjectModel/CollectionHelpers.cs | Removes redundant #if NET around an identical null-check; keeps meaningful #if NET for range validation. |
| src/coreclr/vm/riscv64/asmconstants.h | Removes redundant _DEBUG conditional around an identical offset define under FEATURE_INTERPRETER. |
| src/coreclr/vm/codeman.h | Removes redundant TARGET_64BIT conditional where the constant was identical. |
| src/coreclr/jit/lsrabuild.cpp | Removes redundant TARGET_AMD64 conditional where the expression was identical. |
| src/coreclr/jit/lsra.cpp | Removes redundant TARGET_AMD64 conditional where the assignments were identical. |
| src/coreclr/gc/gc.cpp | Removes redundant SERVER_GC conditional where CLR_SIZE was identical. |
| src/coreclr/debug/inc/dbgipcevents.h | Removes redundant RIGHT_SIDE_COMPILE conditional where the typedef was identical. |
| src/coreclr/debug/ee/rcthread.cpp | Removes redundant TARGET_X86 conditional around an identical contract precondition. |
lewing
approved these changes
May 22, 2026
MihaZupan
enabled auto-merge (squash)
May 22, 2026 15:09
tannergooding
approved these changes
May 22, 2026
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
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
I asked copilot to look for more patterns of #128464