Skip to content

Commit 6718723

Browse files
Rollup merge of rust-lang#97431 - compiler-errors:issue-97413, r=oli-obk
don't do `Sized` and other return type checks on RPIT's real type Fixes an ICE where we're doing `Sized` check against the RPIT's real type, instead of against the opaque type. This differs from what we're doing in MIR typeck, which causes ICE rust-lang#97226. This regressed in rust-lang#96516 -- this adjusts that fix to be a bit more conservative. That PR was backported and thus the ICE is also present in stable. Not sure if it's worth to beta and/or stable backport, probably not the latter but I could believe the former. r? `@oli-obk` cc: another attempt to fix this ICE rust-lang#97413. I believe this PR addresses the root cause.
2 parents 12ba87b + 126ef8e commit 6718723

File tree

3 files changed

+24
-7
lines changed

3 files changed

+24
-7
lines changed

compiler/rustc_typeck/src/check/check.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,6 @@ pub(super) fn check_fn<'a, 'tcx>(
105105
DUMMY_SP,
106106
param_env,
107107
));
108-
// HACK(oli-obk): we rewrite the declared return type, too, so that we don't end up inferring all
109-
// unconstrained RPIT to have `()` as their hidden type. This would happen because further down we
110-
// compare the ret_coercion with declared_ret_ty, and anything uninferred would be inferred to the
111-
// opaque type itself. That again would cause writeback to assume we have a recursive call site
112-
// and do the sadly stabilized fallback to `()`.
113-
let declared_ret_ty = ret_ty;
114108
fcx.ret_coercion = Some(RefCell::new(CoerceMany::new(ret_ty)));
115109
fcx.ret_type_span = Some(decl.output.span());
116110

@@ -254,7 +248,12 @@ pub(super) fn check_fn<'a, 'tcx>(
254248
fcx.next_ty_var(TypeVariableOrigin { kind: TypeVariableOriginKind::DynReturnFn, span });
255249
debug!("actual_return_ty replaced with {:?}", actual_return_ty);
256250
}
257-
fcx.demand_suptype(span, declared_ret_ty, actual_return_ty);
251+
252+
// HACK(oli-obk, compiler-errors): We should be comparing this against
253+
// `declared_ret_ty`, but then anything uninferred would be inferred to
254+
// the opaque type itself. That again would cause writeback to assume
255+
// we have a recursive call site and do the sadly stabilized fallback to `()`.
256+
fcx.demand_suptype(span, ret_ty, actual_return_ty);
258257

259258
// Check that a function marked as `#[panic_handler]` has signature `fn(&PanicInfo) -> !`
260259
if let Some(panic_impl_did) = tcx.lang_items().panic_impl()
+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
fn foo() -> impl ?Sized {
2+
//~^ ERROR the size for values of type `impl ?Sized` cannot be known at compilation time
3+
()
4+
}
5+
6+
fn main() {}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
error[E0277]: the size for values of type `impl ?Sized` cannot be known at compilation time
2+
--> $DIR/rpit-not-sized.rs:1:13
3+
|
4+
LL | fn foo() -> impl ?Sized {
5+
| ^^^^^^^^^^^ doesn't have a size known at compile-time
6+
|
7+
= help: the trait `Sized` is not implemented for `impl ?Sized`
8+
= note: the return type of a function must have a statically known size
9+
10+
error: aborting due to previous error
11+
12+
For more information about this error, try `rustc --explain E0277`.

0 commit comments

Comments
 (0)