Skip to content

Commit d3e71fd

Browse files
borsbors
committed
Auto merge of rust-lang#134716 - Zalathar:rollup-1h4q8cc, r=Zalathar
Rollup of 5 pull requests Successful merges: - rust-lang#134638 (Fix effect predicates from item bounds in old solver) - rust-lang#134662 (Fix safety docs for `dyn Any + Send {+ Sync}`) - rust-lang#134689 (core: fix const ptr::swap_nonoverlapping when there are pointers at odd offsets) - rust-lang#134699 (Belay new reviews for workingjubilee) - rust-lang#134701 (Correctly note item kind in `NonConstFunctionCall` error message) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f334342 + 772b95e commit d3e71fd

File tree

104 files changed

+427
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+427
-232
lines changed

‎compiler/rustc_const_eval/messages.ftl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ const_eval_non_const_fmt_macro_call =
253253
cannot call non-const formatting macro in {const_eval_const_context}s
254254
255255
const_eval_non_const_fn_call =
256-
cannot call non-const fn `{$def_path_str}` in {const_eval_const_context}s
256+
cannot call non-const {$def_descr} `{$def_path_str}` in {const_eval_const_context}s
257257
258258
const_eval_non_const_impl =
259259
impl defined here, but it is not `const`

‎compiler/rustc_const_eval/src/check_consts/ops.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@ impl<'tcx> NonConstOp<'tcx> for FnCallNonConst<'tcx> {
304304
}
305305
_ => ccx.dcx().create_err(errors::NonConstFnCall {
306306
span,
307+
def_descr: ccx.tcx.def_descr(callee),
307308
def_path_str: ccx.tcx.def_path_str_with_args(callee, args),
308309
kind: ccx.const_kind(),
309310
}),

‎compiler/rustc_const_eval/src/errors.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ pub(crate) struct NonConstFnCall {
192192
#[primary_span]
193193
pub span: Span,
194194
pub def_path_str: String,
195+
pub def_descr: &'static str,
195196
pub kind: ConstContext,
196197
}
197198

‎compiler/rustc_error_codes/src/error_codes/E0015.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ fn create_some() -> Option<u8> {
77
Some(1)
88
}
99
10-
// error: cannot call non-const fn `create_some` in constants
10+
// error: cannot call non-const function `create_some` in constants
1111
const FOO: Option<u8> = create_some();
1212
```
1313

‎compiler/rustc_trait_selection/src/traits/effects.rs‎

Lines changed: 137 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
use rustc_hir as hir;
2-
use rustc_infer::infer::{BoundRegionConversionTime, DefineOpaqueTypes, InferCtxt};
2+
use rustc_infer::infer::{BoundRegionConversionTime, DefineOpaqueTypes};
33
use rustc_infer::traits::{ImplSource, Obligation, PredicateObligation};
44
use rustc_middle::span_bug;
55
use rustc_middle::ty::fast_reject::DeepRejectCtxt;
66
use rustc_middle::ty::{self, TypingMode};
7+
use rustc_type_ir::elaborate::elaborate;
78
use rustc_type_ir::solve::NoSolution;
8-
use thin_vec::ThinVec;
9+
use thin_vec::{ThinVec, thin_vec};
910

1011
use super::SelectionContext;
12+
use super::normalize::normalize_with_depth_to;
1113

1214
pub type HostEffectObligation<'tcx> = Obligation<'tcx, ty::HostEffectPredicate<'tcx>>;
1315

@@ -38,6 +40,12 @@ pub fn evaluate_host_effect_obligation<'tcx>(
3840
Err(EvaluationFailure::NoSolution) => {}
3941
}
4042

43+
match evaluate_host_effect_from_item_bounds(selcx, obligation) {
44+
Ok(result) => return Ok(result),
45+
Err(EvaluationFailure::Ambiguous) => return Err(EvaluationFailure::Ambiguous),
46+
Err(EvaluationFailure::NoSolution) => {}
47+
}
48+
4149
match evaluate_host_effect_from_selection_candiate(selcx, obligation) {
4250
Ok(result) => return Ok(result),
4351
Err(EvaluationFailure::Ambiguous) => return Err(EvaluationFailure::Ambiguous),
@@ -48,24 +56,45 @@ pub fn evaluate_host_effect_obligation<'tcx>(
4856
}
4957

5058
fn match_candidate<'tcx>(
51-
infcx: &InferCtxt<'tcx>,
59+
selcx: &mut SelectionContext<'_, 'tcx>,
5260
obligation: &HostEffectObligation<'tcx>,
5361
candidate: ty::Binder<'tcx, ty::HostEffectPredicate<'tcx>>,
62+
candidate_is_unnormalized: bool,
63+
more_nested: impl FnOnce(&mut SelectionContext<'_, 'tcx>, &mut ThinVec<PredicateObligation<'tcx>>),
5464
) -> Result<ThinVec<PredicateObligation<'tcx>>, NoSolution> {
5565
if !candidate.skip_binder().constness.satisfies(obligation.predicate.constness) {
5666
return Err(NoSolution);
5767
}
5868

59-
let candidate = infcx.instantiate_binder_with_fresh_vars(
69+
let mut candidate = selcx.infcx.instantiate_binder_with_fresh_vars(
6070
obligation.cause.span,
6171
BoundRegionConversionTime::HigherRankedType,
6272
candidate,
6373
);
6474

65-
let mut nested = infcx
66-
.at(&obligation.cause, obligation.param_env)
67-
.eq(DefineOpaqueTypes::Yes, obligation.predicate.trait_ref, candidate.trait_ref)?
68-
.into_obligations();
75+
let mut nested = thin_vec![];
76+
77+
// Unlike param-env bounds, item bounds may not be normalized.
78+
if candidate_is_unnormalized {
79+
candidate = normalize_with_depth_to(
80+
selcx,
81+
obligation.param_env,
82+
obligation.cause.clone(),
83+
obligation.recursion_depth,
84+
candidate,
85+
&mut nested,
86+
);
87+
}
88+
89+
nested.extend(
90+
selcx
91+
.infcx
92+
.at(&obligation.cause, obligation.param_env)
93+
.eq(DefineOpaqueTypes::Yes, obligation.predicate.trait_ref, candidate.trait_ref)?
94+
.into_obligations(),
95+
);
96+
97+
more_nested(selcx, &mut nested);
6998

7099
for nested in &mut nested {
71100
nested.set_depth_from_parent(obligation.recursion_depth);
@@ -82,36 +111,116 @@ fn evaluate_host_effect_from_bounds<'tcx>(
82111
let drcx = DeepRejectCtxt::relate_rigid_rigid(selcx.tcx());
83112
let mut candidate = None;
84113

85-
for predicate in obligation.param_env.caller_bounds() {
86-
let bound_predicate = predicate.kind();
87-
if let ty::ClauseKind::HostEffect(data) = predicate.kind().skip_binder() {
88-
let data = bound_predicate.rebind(data);
89-
if data.skip_binder().trait_ref.def_id != obligation.predicate.trait_ref.def_id {
90-
continue;
114+
for clause in obligation.param_env.caller_bounds() {
115+
let bound_clause = clause.kind();
116+
let ty::ClauseKind::HostEffect(data) = bound_clause.skip_binder() else {
117+
continue;
118+
};
119+
let data = bound_clause.rebind(data);
120+
if data.skip_binder().trait_ref.def_id != obligation.predicate.trait_ref.def_id {
121+
continue;
122+
}
123+
124+
if !drcx
125+
.args_may_unify(obligation.predicate.trait_ref.args, data.skip_binder().trait_ref.args)
126+
{
127+
continue;
128+
}
129+
130+
let is_match =
131+
infcx.probe(|_| match_candidate(selcx, obligation, data, false, |_, _| {}).is_ok());
132+
133+
if is_match {
134+
if candidate.is_some() {
135+
return Err(EvaluationFailure::Ambiguous);
136+
} else {
137+
candidate = Some(data);
91138
}
139+
}
140+
}
92141

93-
if !drcx.args_may_unify(
94-
obligation.predicate.trait_ref.args,
95-
data.skip_binder().trait_ref.args,
142+
if let Some(data) = candidate {
143+
Ok(match_candidate(selcx, obligation, data, false, |_, _| {})
144+
.expect("candidate matched before, so it should match again"))
145+
} else {
146+
Err(EvaluationFailure::NoSolution)
147+
}
148+
}
149+
150+
fn evaluate_host_effect_from_item_bounds<'tcx>(
151+
selcx: &mut SelectionContext<'_, 'tcx>,
152+
obligation: &HostEffectObligation<'tcx>,
153+
) -> Result<ThinVec<PredicateObligation<'tcx>>, EvaluationFailure> {
154+
let infcx = selcx.infcx;
155+
let tcx = infcx.tcx;
156+
let drcx = DeepRejectCtxt::relate_rigid_rigid(selcx.tcx());
157+
let mut candidate = None;
158+
159+
let mut consider_ty = obligation.predicate.self_ty();
160+
while let ty::Alias(kind @ (ty::Projection | ty::Opaque), alias_ty) = *consider_ty.kind() {
161+
if tcx.is_conditionally_const(alias_ty.def_id) {
162+
for clause in elaborate(
163+
tcx,
164+
tcx.explicit_implied_const_bounds(alias_ty.def_id)
165+
.iter_instantiated_copied(tcx, alias_ty.args)
166+
.map(|(trait_ref, _)| {
167+
trait_ref.to_host_effect_clause(tcx, obligation.predicate.constness)
168+
}),
96169
) {
97-
continue;
98-
}
170+
let bound_clause = clause.kind();
171+
let ty::ClauseKind::HostEffect(data) = bound_clause.skip_binder() else {
172+
unreachable!("should not elaborate non-HostEffect from HostEffect")
173+
};
174+
let data = bound_clause.rebind(data);
175+
if data.skip_binder().trait_ref.def_id != obligation.predicate.trait_ref.def_id {
176+
continue;
177+
}
99178

100-
let is_match = infcx.probe(|_| match_candidate(infcx, obligation, data).is_ok());
179+
if !drcx.args_may_unify(
180+
obligation.predicate.trait_ref.args,
181+
data.skip_binder().trait_ref.args,
182+
) {
183+
continue;
184+
}
101185

102-
if is_match {
103-
if candidate.is_some() {
104-
return Err(EvaluationFailure::Ambiguous);
105-
} else {
106-
candidate = Some(data);
186+
let is_match = infcx
187+
.probe(|_| match_candidate(selcx, obligation, data, true, |_, _| {}).is_ok());
188+
189+
if is_match {
190+
if candidate.is_some() {
191+
return Err(EvaluationFailure::Ambiguous);
192+
} else {
193+
candidate = Some((data, alias_ty));
194+
}
107195
}
108196
}
109197
}
198+
199+
if kind != ty::Projection {
200+
break;
201+
}
202+
203+
consider_ty = alias_ty.self_ty();
110204
}
111205

112-
if let Some(data) = candidate {
113-
Ok(match_candidate(infcx, obligation, data)
114-
.expect("candidate matched before, so it should match again"))
206+
if let Some((data, alias_ty)) = candidate {
207+
Ok(match_candidate(selcx, obligation, data, true, |selcx, nested| {
208+
// An alias bound only holds if we also check the const conditions
209+
// of the alias, so we need to register those, too.
210+
let const_conditions = normalize_with_depth_to(
211+
selcx,
212+
obligation.param_env,
213+
obligation.cause.clone(),
214+
obligation.recursion_depth,
215+
tcx.const_conditions(alias_ty.def_id).instantiate(tcx, alias_ty.args),
216+
nested,
217+
);
218+
nested.extend(const_conditions.into_iter().map(|(trait_ref, _)| {
219+
obligation
220+
.with(tcx, trait_ref.to_host_effect_clause(tcx, obligation.predicate.constness))
221+
}));
222+
})
223+
.expect("candidate matched before, so it should match again"))
115224
} else {
116225
Err(EvaluationFailure::NoSolution)
117226
}

‎library/core/src/any.rs‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,8 @@ impl dyn Any + Send {
423423
///
424424
/// # Safety
425425
///
426-
/// Same as the method on the type `dyn Any`.
426+
/// The contained value must be of type `T`. Calling this method
427+
/// with the incorrect type is *undefined behavior*.
427428
#[unstable(feature = "downcast_unchecked", issue = "90850")]
428429
#[inline]
429430
pub unsafe fn downcast_ref_unchecked<T: Any>(&self) -> &T {
@@ -451,7 +452,8 @@ impl dyn Any + Send {
451452
///
452453
/// # Safety
453454
///
454-
/// Same as the method on the type `dyn Any`.
455+
/// The contained value must be of type `T`. Calling this method
456+
/// with the incorrect type is *undefined behavior*.
455457
#[unstable(feature = "downcast_unchecked", issue = "90850")]
456458
#[inline]
457459
pub unsafe fn downcast_mut_unchecked<T: Any>(&mut self) -> &mut T {
@@ -552,6 +554,10 @@ impl dyn Any + Send + Sync {
552554
/// assert_eq!(*x.downcast_ref_unchecked::<usize>(), 1);
553555
/// }
554556
/// ```
557+
/// # Safety
558+
///
559+
/// The contained value must be of type `T`. Calling this method
560+
/// with the incorrect type is *undefined behavior*.
555561
#[unstable(feature = "downcast_unchecked", issue = "90850")]
556562
#[inline]
557563
pub unsafe fn downcast_ref_unchecked<T: Any>(&self) -> &T {
@@ -576,6 +582,10 @@ impl dyn Any + Send + Sync {
576582
///
577583
/// assert_eq!(*x.downcast_ref::<usize>().unwrap(), 2);
578584
/// ```
585+
/// # Safety
586+
///
587+
/// The contained value must be of type `T`. Calling this method
588+
/// with the incorrect type is *undefined behavior*.
579589
#[unstable(feature = "downcast_unchecked", issue = "90850")]
580590
#[inline]
581591
pub unsafe fn downcast_mut_unchecked<T: Any>(&mut self) -> &mut T {

‎library/core/src/intrinsics/mod.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3795,15 +3795,15 @@ where
37953795
/// See [`const_eval_select()`] for the rules and requirements around that intrinsic.
37963796
pub(crate) macro const_eval_select {
37973797
(
3798-
@capture { $($arg:ident : $ty:ty = $val:expr),* $(,)? } $( -> $ret:ty )? :
3798+
@capture$([$($binders:tt)*])? { $($arg:ident : $ty:ty = $val:expr),* $(,)? } $( -> $ret:ty )? :
37993799
if const
38003800
$(#[$compiletime_attr:meta])* $compiletime:block
38013801
else
38023802
$(#[$runtime_attr:meta])* $runtime:block
38033803
) => {
38043804
// Use the `noinline` arm, after adding explicit `inline` attributes
38053805
$crate::intrinsics::const_eval_select!(
3806-
@capture { $($arg : $ty = $val),* } $(-> $ret)? :
3806+
@capture$([$($binders)*])? { $($arg : $ty = $val),* } $(-> $ret)? :
38073807
#[noinline]
38083808
if const
38093809
#[inline] // prevent codegen on this function
@@ -3817,20 +3817,20 @@ pub(crate) macro const_eval_select {
38173817
},
38183818
// With a leading #[noinline], we don't add inline attributes
38193819
(
3820-
@capture { $($arg:ident : $ty:ty = $val:expr),* $(,)? } $( -> $ret:ty )? :
3820+
@capture$([$($binders:tt)*])? { $($arg:ident : $ty:ty = $val:expr),* $(,)? } $( -> $ret:ty )? :
38213821
#[noinline]
38223822
if const
38233823
$(#[$compiletime_attr:meta])* $compiletime:block
38243824
else
38253825
$(#[$runtime_attr:meta])* $runtime:block
38263826
) => {{
38273827
$(#[$runtime_attr])*
3828-
fn runtime($($arg: $ty),*) $( -> $ret )? {
3828+
fn runtime$(<$($binders)*>)?($($arg: $ty),*) $( -> $ret )? {
38293829
$runtime
38303830
}
38313831

38323832
$(#[$compiletime_attr])*
3833-
const fn compiletime($($arg: $ty),*) $( -> $ret )? {
3833+
const fn compiletime$(<$($binders)*>)?($($arg: $ty),*) $( -> $ret )? {
38343834
// Don't warn if one of the arguments is unused.
38353835
$(let _ = $arg;)*
38363836

@@ -3842,14 +3842,14 @@ pub(crate) macro const_eval_select {
38423842
// We support leaving away the `val` expressions for *all* arguments
38433843
// (but not for *some* arguments, that's too tricky).
38443844
(
3845-
@capture { $($arg:ident : $ty:ty),* $(,)? } $( -> $ret:ty )? :
3845+
@capture$([$($binders:tt)*])? { $($arg:ident : $ty:ty),* $(,)? } $( -> $ret:ty )? :
38463846
if const
38473847
$(#[$compiletime_attr:meta])* $compiletime:block
38483848
else
38493849
$(#[$runtime_attr:meta])* $runtime:block
38503850
) => {
38513851
$crate::intrinsics::const_eval_select!(
3852-
@capture { $($arg : $ty = $arg),* } $(-> $ret)? :
3852+
@capture$([$($binders)*])? { $($arg : $ty = $arg),* } $(-> $ret)? :
38533853
if const
38543854
$(#[$compiletime_attr])* $compiletime
38553855
else

0 commit comments

Comments
 (0)