Skip to content

Commit 96489e7

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#127452
Rollup merge of rust-lang#127452 - fee1-dead-contrib:fx-intrinsic-counting, r=fmease Fix intrinsic const parameter counting with `effects` r? project-const-traits
2 parents 9af6fee + 4f54193 commit 96489e7

File tree

7 files changed

+126
-31
lines changed

7 files changed

+126
-31
lines changed

‎compiler/rustc_hir_analysis/src/check/intrinsic.rs

+12-6
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,20 @@ fn equate_intrinsic_type<'tcx>(
2626
n_cts: usize,
2727
sig: ty::PolyFnSig<'tcx>,
2828
) {
29-
let (own_counts, span) = match tcx.hir_node_by_def_id(def_id) {
29+
let (generics, span) = match tcx.hir_node_by_def_id(def_id) {
3030
hir::Node::Item(hir::Item { kind: hir::ItemKind::Fn(_, generics, _), .. })
3131
| hir::Node::ForeignItem(hir::ForeignItem {
3232
kind: hir::ForeignItemKind::Fn(.., generics, _),
3333
..
34-
}) => {
35-
let own_counts = tcx.generics_of(def_id).own_counts();
36-
(own_counts, generics.span)
37-
}
34+
}) => (tcx.generics_of(def_id), generics.span),
3835
_ => {
3936
struct_span_code_err!(tcx.dcx(), span, E0622, "intrinsic must be a function")
4037
.with_span_label(span, "expected a function")
4138
.emit();
4239
return;
4340
}
4441
};
42+
let own_counts = generics.own_counts();
4543

4644
let gen_count_ok = |found: usize, expected: usize, descr: &str| -> bool {
4745
if found != expected {
@@ -57,9 +55,17 @@ fn equate_intrinsic_type<'tcx>(
5755
}
5856
};
5957

58+
// the host effect param should be invisible as it shouldn't matter
59+
// whether effects is enabled for the intrinsic provider crate.
60+
let consts_count = if generics.host_effect_index.is_some() {
61+
own_counts.consts - 1
62+
} else {
63+
own_counts.consts
64+
};
65+
6066
if gen_count_ok(own_counts.lifetimes, n_lts, "lifetime")
6167
&& gen_count_ok(own_counts.types, n_tps, "type")
62-
&& gen_count_ok(own_counts.consts, n_cts, "const")
68+
&& gen_count_ok(consts_count, n_cts, "const")
6369
{
6470
let _ = check_function_signature(
6571
tcx,

‎tests/ui/intrinsics/not-overridden.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Check that intrinsics that do not get overridden, but are marked as such,
22
//! cause an error instead of silently invoking the body.
3-
#![feature(rustc_attrs/* , effects*/)] // FIXME(effects)
3+
#![feature(rustc_attrs)]
44
//@ build-fail
55
//@ failure-status:101
66
//@ normalize-stderr-test ".*note: .*\n\n" -> ""

‎tests/ui/intrinsics/safe-intrinsic-mismatch.effects.stderr

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
error: using `#![feature(effects)]` without enabling next trait solver globally
2+
|
3+
= note: the next trait solver must be enabled globally for the effects feature to work correctly
4+
= help: use `-Znext-solver` to enable
5+
6+
error: intrinsic safety mismatch between list of intrinsics within the compiler and core library intrinsics for intrinsic `size_of`
7+
--> $DIR/safe-intrinsic-mismatch.rs:11:5
8+
|
9+
LL | fn size_of<T>() -> usize;
10+
| ^^^^^^^^^^^^^^^^^^^^^^^^
11+
12+
error: intrinsic safety mismatch between list of intrinsics within the compiler and core library intrinsics for intrinsic `size_of`
13+
--> $DIR/safe-intrinsic-mismatch.rs:11:5
14+
|
15+
LL | fn size_of<T>() -> usize;
16+
| ^^^^^^^^^^^^^^^^^^^^^^^^
17+
|
18+
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
19+
20+
error: intrinsic safety mismatch between list of intrinsics within the compiler and core library intrinsics for intrinsic `assume`
21+
--> $DIR/safe-intrinsic-mismatch.rs:16:1
22+
|
23+
LL | const fn assume(_b: bool) {}
24+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
25+
26+
error[E0308]: intrinsic has wrong type
27+
--> $DIR/safe-intrinsic-mismatch.rs:16:16
28+
|
29+
LL | const fn assume(_b: bool) {}
30+
| ^ expected unsafe fn, found safe fn
31+
|
32+
= note: expected signature `unsafe fn(_)`
33+
found signature `fn(_)`
34+
35+
error: intrinsic safety mismatch between list of intrinsics within the compiler and core library intrinsics for intrinsic `const_deallocate`
36+
--> $DIR/safe-intrinsic-mismatch.rs:20:1
37+
|
38+
LL | const fn const_deallocate(_ptr: *mut u8, _size: usize, _align: usize) {}
39+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
40+
41+
error[E0308]: intrinsic has wrong type
42+
--> $DIR/safe-intrinsic-mismatch.rs:20:26
43+
|
44+
LL | const fn const_deallocate(_ptr: *mut u8, _size: usize, _align: usize) {}
45+
| ^ expected unsafe fn, found safe fn
46+
|
47+
= note: expected signature `unsafe fn(_, _, _)`
48+
found signature `fn(_, _, _)`
49+
50+
error: aborting due to 7 previous errors
51+
52+
For more information about this error, try `rustc --explain E0308`.

‎tests/ui/intrinsics/safe-intrinsic-mismatch.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
//@ revisions: stock effects
12
#![feature(intrinsics)]
23
#![feature(rustc_attrs)]
3-
// FIXME(effects) do this with revisions #![feature(effects)]
4+
// as effects insert a const generic param to const intrinsics,
5+
// check here that it doesn't report a const param mismatch either
6+
// enabling or disabling effects.
7+
#![cfg_attr(effects, feature(effects))]
8+
#![allow(incomplete_features)]
49

510
extern "rust-intrinsic" {
611
fn size_of<T>() -> usize; //~ ERROR intrinsic safety mismatch

‎tests/ui/intrinsics/safe-intrinsic-mismatch.stderr ‎tests/ui/intrinsics/safe-intrinsic-mismatch.stock.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
error: intrinsic safety mismatch between list of intrinsics within the compiler and core library intrinsics for intrinsic `size_of`
2-
--> $DIR/safe-intrinsic-mismatch.rs:6:5
2+
--> $DIR/safe-intrinsic-mismatch.rs:11:5
33
|
44
LL | fn size_of<T>() -> usize;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^
66

77
error: intrinsic safety mismatch between list of intrinsics within the compiler and core library intrinsics for intrinsic `size_of`
8-
--> $DIR/safe-intrinsic-mismatch.rs:6:5
8+
--> $DIR/safe-intrinsic-mismatch.rs:11:5
99
|
1010
LL | fn size_of<T>() -> usize;
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^
1212
|
1313
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
1414

1515
error: intrinsic safety mismatch between list of intrinsics within the compiler and core library intrinsics for intrinsic `assume`
16-
--> $DIR/safe-intrinsic-mismatch.rs:11:1
16+
--> $DIR/safe-intrinsic-mismatch.rs:16:1
1717
|
1818
LL | const fn assume(_b: bool) {}
1919
| ^^^^^^^^^^^^^^^^^^^^^^^^^
2020

2121
error[E0308]: intrinsic has wrong type
22-
--> $DIR/safe-intrinsic-mismatch.rs:11:16
22+
--> $DIR/safe-intrinsic-mismatch.rs:16:16
2323
|
2424
LL | const fn assume(_b: bool) {}
2525
| ^ expected unsafe fn, found safe fn
@@ -28,13 +28,13 @@ LL | const fn assume(_b: bool) {}
2828
found signature `fn(_)`
2929

3030
error: intrinsic safety mismatch between list of intrinsics within the compiler and core library intrinsics for intrinsic `const_deallocate`
31-
--> $DIR/safe-intrinsic-mismatch.rs:15:1
31+
--> $DIR/safe-intrinsic-mismatch.rs:20:1
3232
|
3333
LL | const fn const_deallocate(_ptr: *mut u8, _size: usize, _align: usize) {}
3434
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3535

3636
error[E0308]: intrinsic has wrong type
37-
--> $DIR/safe-intrinsic-mismatch.rs:15:26
37+
--> $DIR/safe-intrinsic-mismatch.rs:20:26
3838
|
3939
LL | const fn const_deallocate(_ptr: *mut u8, _size: usize, _align: usize) {}
4040
| ^ expected unsafe fn, found safe fn

‎tests/ui/rfcs/rfc-2632-const-trait-impl/effects/minicore.rs

+39-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
//@ known-bug: #110395
2+
//@ failure-status: 101
3+
//@ normalize-stderr-test ".*note: .*\n\n" -> ""
4+
//@ normalize-stderr-test "thread 'rustc' panicked.*:\n.*\n" -> ""
5+
//@ rustc-env:RUST_BACKTRACE=0
26
// FIXME(effects) check-pass
3-
// FIXME(effects) fix intrinsics const parameter counting
7+
//@ compile-flags: -Znext-solver
48

59
#![crate_type = "lib"]
610
#![feature(no_core, lang_items, unboxed_closures, auto_traits, intrinsics, rustc_attrs, staged_api)]
7-
#![feature(fundamental)]
11+
#![feature(fundamental, marker_trait_attr)]
812
#![feature(const_trait_impl, effects, const_mut_refs)]
9-
#![allow(internal_features)]
13+
#![allow(internal_features, incomplete_features)]
1014
#![no_std]
1115
#![no_core]
1216
#![stable(feature = "minicore", since = "1.0.0")]
@@ -532,3 +536,35 @@ fn test_const_eval_select() {
532536

533537
const_eval_select((), const_fn, rt_fn);
534538
}
539+
540+
mod effects {
541+
use super::Sized;
542+
543+
#[lang = "EffectsNoRuntime"]
544+
pub struct NoRuntime;
545+
#[lang = "EffectsMaybe"]
546+
pub struct Maybe;
547+
#[lang = "EffectsRuntime"]
548+
pub struct Runtime;
549+
550+
#[lang = "EffectsCompat"]
551+
pub trait Compat<#[rustc_runtime] const RUNTIME: bool> {}
552+
553+
impl Compat<false> for NoRuntime {}
554+
impl Compat<true> for Runtime {}
555+
impl<#[rustc_runtime] const RUNTIME: bool> Compat<RUNTIME> for Maybe {}
556+
557+
#[lang = "EffectsTyCompat"]
558+
#[marker]
559+
pub trait TyCompat<T: ?Sized> {}
560+
561+
impl<T: ?Sized> TyCompat<T> for T {}
562+
impl<T: ?Sized> TyCompat<T> for Maybe {}
563+
impl<T: ?Sized> TyCompat<Maybe> for T {}
564+
565+
#[lang = "EffectsIntersection"]
566+
pub trait Intersection {
567+
#[lang = "EffectsIntersectionOutput"]
568+
type Output: ?Sized;
569+
}
570+
}

‎tests/ui/rfcs/rfc-2632-const-trait-impl/effects/minicore.stderr

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
warning: the feature `effects` is incomplete and may not be safe to use and/or cause compiler crashes
2-
--> $DIR/minicore.rs:8:30
3-
|
4-
LL | #![feature(const_trait_impl, effects, const_mut_refs)]
5-
| ^^^^^^^
6-
|
7-
= note: see issue #102090 <https://github.com/rust-lang/rust/issues/102090> for more information
8-
= note: `#[warn(incomplete_features)]` on by default
1+
error: the compiler unexpectedly panicked. this is a bug.
92

10-
error: requires `EffectsCompat` lang_item
11-
--> $DIR/minicore.rs:455:9
12-
|
13-
LL | impl<T: Clone> Clone for RefCell<T> {
14-
| ^^^^^
3+
query stack during panic:
4+
#0 [check_well_formed] checking that `<impl at $DIR/minicore.rs:459:1: 459:36>` is well-formed
5+
#1 [check_mod_type_wf] checking that types are well-formed in top-level module
6+
end of query stack
157

16-
error: aborting due to 1 previous error; 1 warning emitted
8+
error: the compiler unexpectedly panicked. this is a bug.
179

10+
query stack during panic:
11+
#0 [check_well_formed] checking that `drop` is well-formed
12+
#1 [check_mod_type_wf] checking that types are well-formed in top-level module
13+
end of query stack

0 commit comments

Comments
 (0)