Skip to content

Commit 9b95397

Browse files
borsbors
committed
Auto merge of #115901 - Mark-Simulacrum:beta-backport, r=Mark-Simulacrum
[beta] backport This PR backports: - #115785: Only suggest turbofish in patterns if we may recover - #115527: Don't require `Drop` for `[PhantomData<T>; N]` where `N` and `T` are generic, if `T` requires `Drop` - #115389: fix(resolve): update def if binding is warning ambiguity - #115215: Remove assert that checks type equality r? `@Mark-Simulacrum`
2 parents ea99593 + 028f340 commit 9b95397

File tree

9 files changed

+122
-11
lines changed

9 files changed

+122
-11
lines changed

‎compiler/rustc_codegen_ssa/src/mir/locals.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use rustc_index::IndexVec;
77
use rustc_middle::mir;
88
use rustc_middle::ty::print::with_no_trimmed_paths;
99
use std::ops::{Index, IndexMut};
10-
1110
pub(super) struct Locals<'tcx, V> {
1211
values: IndexVec<mir::Local, LocalRef<'tcx, V>>,
1312
}
@@ -36,17 +35,18 @@ impl<'tcx, V> Locals<'tcx, V> {
3635
impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
3736
pub(super) fn initialize_locals(&mut self, values: Vec<LocalRef<'tcx, Bx::Value>>) {
3837
assert!(self.locals.values.is_empty());
39-
38+
// FIXME(#115215): After #115025 get's merged this might not be necessary
4039
for (local, value) in values.into_iter().enumerate() {
4140
match value {
4241
LocalRef::Place(_) | LocalRef::UnsizedPlace(_) | LocalRef::PendingOperand => (),
4342
LocalRef::Operand(op) => {
4443
let local = mir::Local::from_usize(local);
4544
let expected_ty = self.monomorphize(self.mir.local_decls[local].ty);
46-
assert_eq!(expected_ty, op.layout.ty, "unexpected initial operand type");
45+
if expected_ty != op.layout.ty {
46+
warn!("Unexpected initial operand type. See the issues/114858");
47+
}
4748
}
4849
}
49-
5050
self.locals.values.push(value);
5151
}
5252
}

‎compiler/rustc_parse/src/parser/pat.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,8 @@ impl<'a> Parser<'a> {
830830
) -> PResult<'a, PatKind> {
831831
let ident = self.parse_ident()?;
832832

833-
if !matches!(syntax_loc, Some(PatternLocation::FunctionParameter))
833+
if self.may_recover()
834+
&& !matches!(syntax_loc, Some(PatternLocation::FunctionParameter))
834835
&& self.check_noexpect(&token::Lt)
835836
&& self.look_ahead(1, |t| t.can_begin_type())
836837
{

‎compiler/rustc_resolve/src/effective_visibilities.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,14 @@ impl<'r, 'a, 'tcx> EffectiveVisibilitiesVisitor<'r, 'a, 'tcx> {
128128
// If the binding is ambiguous, put the root ambiguity binding and all reexports
129129
// leading to it into the table. They are used by the `ambiguous_glob_reexports`
130130
// lint. For all bindings added to the table this way `is_ambiguity` returns true.
131+
let is_ambiguity =
132+
|binding: NameBinding<'a>, warn: bool| binding.ambiguity.is_some() && !warn;
131133
let mut parent_id = ParentId::Def(module_id);
134+
let mut warn_ambiguity = binding.warn_ambiguity;
132135
while let NameBindingKind::Import { binding: nested_binding, .. } = binding.kind {
133136
self.update_import(binding, parent_id);
134137

135-
if binding.ambiguity.is_some() {
138+
if is_ambiguity(binding, warn_ambiguity) {
136139
// Stop at the root ambiguity, further bindings in the chain should not
137140
// be reexported because the root ambiguity blocks any access to them.
138141
// (Those further bindings are most likely not ambiguities themselves.)
@@ -141,9 +144,9 @@ impl<'r, 'a, 'tcx> EffectiveVisibilitiesVisitor<'r, 'a, 'tcx> {
141144

142145
parent_id = ParentId::Import(binding);
143146
binding = nested_binding;
147+
warn_ambiguity |= nested_binding.warn_ambiguity;
144148
}
145-
146-
if binding.ambiguity.is_none()
149+
if !is_ambiguity(binding, warn_ambiguity)
147150
&& let Some(def_id) = binding.res().opt_def_id().and_then(|id| id.as_local()) {
148151
self.update_def(def_id, binding.vis.expect_local(), parent_id);
149152
}

‎compiler/rustc_ty_utils/src/needs_drop.rs

+22-2
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,32 @@ fn needs_drop_raw<'tcx>(tcx: TyCtxt<'tcx>, query: ty::ParamEnvAnd<'tcx, Ty<'tcx>
1919
// needs drop.
2020
let adt_has_dtor =
2121
|adt_def: ty::AdtDef<'tcx>| adt_def.destructor(tcx).map(|_| DtorType::Significant);
22-
let res =
23-
drop_tys_helper(tcx, query.value, query.param_env, adt_has_dtor, false).next().is_some();
22+
let res = drop_tys_helper(tcx, query.value, query.param_env, adt_has_dtor, false)
23+
.filter(filter_array_elements(tcx, query.param_env))
24+
.next()
25+
.is_some();
2426

2527
debug!("needs_drop_raw({:?}) = {:?}", query, res);
2628
res
2729
}
2830

31+
/// HACK: in order to not mistakenly assume that `[PhantomData<T>; N]` requires drop glue
32+
/// we check the element type for drop glue. The correct fix would be looking at the
33+
/// entirety of the code around `needs_drop_components` and this file and come up with
34+
/// logic that is easier to follow while not repeating any checks that may thus diverge.
35+
fn filter_array_elements<'tcx>(
36+
tcx: TyCtxt<'tcx>,
37+
param_env: ty::ParamEnv<'tcx>,
38+
) -> impl Fn(&Result<Ty<'tcx>, AlwaysRequiresDrop>) -> bool {
39+
move |ty| match ty {
40+
Ok(ty) => match *ty.kind() {
41+
ty::Array(elem, _) => tcx.needs_drop_raw(param_env.and(elem)),
42+
_ => true,
43+
},
44+
Err(AlwaysRequiresDrop) => true,
45+
}
46+
}
47+
2948
fn has_significant_drop_raw<'tcx>(
3049
tcx: TyCtxt<'tcx>,
3150
query: ty::ParamEnvAnd<'tcx, Ty<'tcx>>,
@@ -37,6 +56,7 @@ fn has_significant_drop_raw<'tcx>(
3756
adt_consider_insignificant_dtor(tcx),
3857
true,
3958
)
59+
.filter(filter_array_elements(tcx, query.param_env))
4060
.next()
4161
.is_some();
4262
debug!("has_significant_drop_raw({:?}) = {:?}", query, res);

‎tests/ui/codegen/subtyping-enforces-type-equality.rs

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// ignore-pass
2+
// build-pass
3+
// edition:2021
4+
use std::future::Future;
5+
use std::pin::Pin;
6+
7+
type BoxFuture<T> = Pin<Box<dyn Future<Output = T>>>;
8+
9+
fn main() {
10+
let _ = wrapper_call(handler);
11+
}
12+
13+
async fn wrapper_call(handler: impl Handler) {
14+
handler.call().await;
15+
}
16+
async fn handler() {
17+
f(&()).await;
18+
}
19+
async fn f<'a>(db: impl Acquire<'a>) {
20+
db.acquire().await;
21+
}
22+
23+
trait Handler {
24+
type Future: Future;
25+
fn call(self) -> Self::Future;
26+
}
27+
28+
impl<Fut, F> Handler for F
29+
where
30+
F: Fn() -> Fut,
31+
Fut: Future,
32+
{
33+
type Future = Fut;
34+
fn call(self) -> Self::Future {
35+
loop {}
36+
}
37+
}
38+
39+
trait Acquire<'a> {
40+
type Connection;
41+
fn acquire(self) -> BoxFuture<Self::Connection>;
42+
}
43+
impl<'a> Acquire<'a> for &'a () {
44+
type Connection = Self;
45+
fn acquire(self) -> BoxFuture<Self> {
46+
loop {}
47+
}
48+
}

‎tests/ui/codegen/subtyping-enforces-type-equality.stderr

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
WARN rustc_codegen_ssa::mir::locals Unexpected initial operand type. See the issues/114858

‎tests/ui/consts/drop-maybe_uninit.rs

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// build-pass
2+
3+
pub const fn f<T, const N: usize>(_: [std::mem::MaybeUninit<T>; N]) {}
4+
5+
pub struct Blubb<T>(*const T);
6+
7+
pub const fn g<T, const N: usize>(_: [Blubb<T>; N]) {}
8+
9+
pub struct Blorb<const N: usize>([String; N]);
10+
11+
pub const fn h(_: Blorb<0>) {}
12+
13+
pub struct Wrap(Blorb<0>);
14+
15+
pub const fn i(_: Wrap) {}
16+
17+
fn main() {}

‎tests/ui/imports/ambiguous-4.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// check-pass
1+
// build-pass
22
// aux-build: ../ambiguous-4-extern.rs
33

44
extern crate ambiguous_4_extern;

‎tests/ui/parser/issues/issue-115780-pat-lt-bracket-in-macro-call.rs

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Regression test for issue #115780.
2+
// Ensure that we don't emit a parse error for the token sequence `Ident "<" Ty` in pattern position
3+
// if we are inside a macro call since it can be valid input for a subsequent macro rule.
4+
// See also #103534.
5+
6+
// check-pass
7+
8+
macro_rules! mdo {
9+
($p: pat =<< $e: expr ; $( $t: tt )*) => {
10+
$e.and_then(|$p| mdo! { $( $t )* })
11+
};
12+
(ret<$ty: ty> $e: expr;) => { Some::<$ty>($e) };
13+
}
14+
15+
fn main() {
16+
mdo! {
17+
x_val =<< Some(0);
18+
y_val =<< Some(1);
19+
ret<(i32, i32)> (x_val, y_val);
20+
};
21+
}

0 commit comments

Comments
 (0)