From 64d98f8ee037282c35007b64c2649055c56af1db Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:03 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- tests/incremental/issue-42602.rs | 44 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 tests/incremental/issue-42602.rs (limited to 'tests/incremental/issue-42602.rs') diff --git a/tests/incremental/issue-42602.rs b/tests/incremental/issue-42602.rs new file mode 100644 index 000000000..b8d5303fb --- /dev/null +++ b/tests/incremental/issue-42602.rs @@ -0,0 +1,44 @@ +// Regression test for #42602. It used to be that we had +// a dep-graph like +// +// typeck(foo) -> FnOnce -> typeck(bar) +// +// This was fixed by improving the resolution of the `FnOnce` trait +// selection node. + +// revisions:cfail1 cfail2 cfail3 +// compile-flags:-Zquery-dep-graph +// build-pass (FIXME(62277): could be check-pass?) + +#![feature(rustc_attrs)] + +fn main() { + a::foo(); + b::bar(); +} + +mod a { + #[cfg(cfail1)] + pub fn foo() { + let x = vec![1, 2, 3]; + let v = || ::std::mem::drop(x); + v(); + } + + #[cfg(not(cfail1))] + pub fn foo() { + let x = vec![1, 2, 3, 4]; + let v = || ::std::mem::drop(x); + v(); + } +} + +mod b { + #[rustc_clean(cfg="cfail2")] + #[rustc_clean(cfg="cfail3")] + pub fn bar() { + let x = vec![1, 2, 3]; + let v = || ::std::mem::drop(x); + v(); + } +} -- cgit v1.2.3