-
Notifications
You must be signed in to change notification settings - Fork 13.3k
Add regression test for nested replacement ranges in cfg_eval #139286
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.
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
Open
reez12g
wants to merge
1
commit into
rust-lang:master
Choose a base branch
from
reez12g:add-regression-test-132727
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+65
−0
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
65 changes: 65 additions & 0 deletions
65
tests/ui/conditional-compilation/nested-replacement-ranges-regression.rs
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
// Regression test for #132727 | ||
// | ||
// This ensures we correctly handle nested replacement ranges in cfg_eval. | ||
// PR #129346 included a code simplification in collect_tokens that | ||
// caused a regression with nested cfg attributes, which was reverted in #132587. | ||
|
||
//@ check-pass | ||
|
||
#![feature(cfg_eval)] | ||
#![feature(stmt_expr_attributes)] | ||
|
||
fn nested_cfg_attributes() -> u32 { | ||
// This test reproduces the core issue: nested cfg replacement ranges | ||
// The outer #[cfg_eval] processes the inner #[cfg] attribute, | ||
// creating a nested replacement range situation | ||
#[cfg_eval] #[cfg(not(FALSE))] 0 | ||
} | ||
|
||
// Another test case with more complex nesting | ||
fn multi_level_nesting() -> u32 { | ||
let result = { | ||
#[cfg_eval] | ||
{ | ||
#[cfg(not(FALSE))] | ||
{ | ||
#[cfg(not(FALSE))] | ||
42 | ||
} | ||
} | ||
}; | ||
result | ||
} | ||
|
||
// Test for overlapping nested cfg attributes with different conditions | ||
fn overlapping_cfg_attributes() -> u32 { | ||
// This tests a more complex case where the cfg attributes have different conditions | ||
// and are deeply nested, which could potentially trigger issues with replacement ranges | ||
#[cfg_eval] | ||
{ | ||
#[cfg(any(not(FALSE), FALSE))] | ||
{ | ||
#[cfg(all(not(FALSE), not(FALSE)))] | ||
{ | ||
#[cfg(not(FALSE))] | ||
100 | ||
} | ||
} | ||
} | ||
} | ||
|
||
// Test for the interaction between cfg_eval and cfg_attr | ||
fn cfg_eval_with_cfg_attr() -> u32 { | ||
// This tests the interaction between cfg_eval and cfg_attr, which was | ||
// one of the main issues addressed in the regression fix | ||
#[cfg_eval] | ||
#[cfg_attr(not(FALSE), cfg_attr(not(FALSE), cfg(not(FALSE))))] | ||
200 | ||
} | ||
|
||
fn main() { | ||
assert_eq!(nested_cfg_attributes(), 0); | ||
assert_eq!(multi_level_nesting(), 42); | ||
assert_eq!(overlapping_cfg_attributes(), 100); | ||
assert_eq!(cfg_eval_with_cfg_attr(), 200); | ||
} |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is just me having a very first glance at this PR and at surrounding context, I'll give this a proper review some other time:
I'm surprised that this test leads to errors (2× "removing an expression is not supported in this position") in nightly-2024-08-15 which is a few nightlies before PR #128725 (which intro'ed the ICE reported in #129166 (e.g., nightly-2024-09-08)). Shouldn't it pass in that version to be a proper regression test instead of erroring as in ightly-2024-09-09?