Fix panics with #[cfg]'d-out self parameter

This commit is contained in:
Jonas Schievink 2022-04-07 15:47:03 +02:00
parent 8765baaf9d
commit 67495b618b
2 changed files with 26 additions and 0 deletions

View File

@ -56,6 +56,15 @@ impl FunctionData {
if is_varargs {
flags.bits |= FnFlags::IS_VARARGS;
}
if flags.bits & FnFlags::HAS_SELF_PARAM != 0 {
// If there's a self param in the syntax, but it is cfg'd out, remove the flag.
cov_mark::hit!(cfgd_out_self_param);
let param =
func.params.clone().next().expect("fn HAS_SELF_PARAM but no parameters allocated");
if !item_tree.attrs(db, krate, param.into()).is_cfg_enabled(cfg_options) {
flags.bits &= !FnFlags::HAS_SELF_PARAM;
}
}
let legacy_const_generics_indices = item_tree
.attrs(db, krate, ModItem::from(loc.id.value).into())

View File

@ -1488,3 +1488,20 @@ fn test<T: Crash>() {
"#,
);
}
#[test]
fn cfgd_out_self_param() {
cov_mark::check!(cfgd_out_self_param);
check_no_mismatches(
r#"
struct S;
impl S {
fn f(#[cfg(never)] &self) {}
}
fn f(s: S) {
s.f();
}
"#,
);
}