0f90ea9a61
Rollup merge of #105743 - nnethercote:SimplifiedType-cleanups, r=lcnr
...
`SimplifiedType` cleanups
r? `@lcnr`
2022-12-15 22:03:01 +01:00
abfad27fbc
Rollup merge of #105727 - estebank:use-impl-trait, r=oli-obk
...
Tweak output for bare `dyn Trait` in arguments
Fix #35825 .
2022-12-15 22:02:59 +01:00
24e584b991
Rollup merge of #105694 - ouz-a:issue_105689, r=estebank
...
Don't create dummy if val has escaping bounds var
Skips creating/pushing obligations if val has escaping bounds vars.
Fixes #105689
2022-12-15 22:02:59 +01:00
86cedb4062
Rollup merge of #105679 - estebank:suggest-clone, r=compiler-errors
...
Suggest constraining type parameter with `Clone`
Fix #34896 .
2022-12-15 22:02:58 +01:00
622f56065e
Rollup merge of #105674 - estebank:iterator-chains, r=oli-obk
...
Point at method chains on `E0271` errors
Follow up to #105332 . Fix #33941 . CC #9082 .
r? `@oli-obk`
2022-12-15 22:02:58 +01:00
863d1f653a
Rollup merge of #105481 - lqd:mono-stats, r=wesleywiser
...
Start improving monomorphization items stats
As described in [this zulip discussion](https://rust-lang.zulipchat.com/#narrow/stream/247081-t-compiler.2Fperformance/topic/Compile-time.20case-study.3A.20AWS.20crates/near/314560832 ), some stats about monomorphization collection would be interesting to have, in a different form than `-Zprint-mono-items`: to have some visibility into the cost of the mono items, we'd like to know how many are instantiated and what is their estimated size.
That can be a proxy to analyze sources of slow compile times, although in the future, we'd also like to add more realistic stats from the actual backend's lowering.
This PR adds a new `-Z dump-mono-stats` flag which will output some stats in a `{crate_name}.mono-items.md` file (the flag optionally takes an output directory parameter, for easier use within a workspace than printing to stdout).
For example,
```rust
fn compute<T>(collection: Vec<T>) -> usize {
collection.len() + 19 - 0 * 9 - 18 - 1 * 1 // random code to increase the function's size
}
fn main() {
dbg!(compute(vec![0u8, 1, 2]));
dbg!(compute(vec![0u64, 1, 2]));
dbg!(compute(vec!["0", "1", "2", "3"]));
}
```
will output a file with this markdown table (abridged for readability), for a debug build:
| Item | Instantiation count | Estimated Cost Per Instantiation | Total Estimated Cost |
| --- | ---: | ---: | ---: |
| alloc::alloc::box_free | 3 | 122 | 366 |
| std::alloc::Global::alloc_impl | 1 | 284 | 284 |
| alloc::raw_vec::RawVec::<T, A>::current_memory | 3 | 82 | 246 |
| std::ptr::align_offset | 1 | 222 | 222 |
| std::slice::hack::into_vec | 3 | 67 | 201 |
| <std::vec::Vec<T, A> as std::ops::Drop>::drop | 3 | 66 | 198 |
| std::ptr::mut_ptr::<impl *mut T>::is_null | 4 | 47 | 188 |
| main | 1 | 163 | 163 |
| std::ptr::NonNull::<T>::new_unchecked | 4 | 37 | 148 |
...
<details>
<summary>Click for full output</summary>
| Item | Instantiation count | Estimated Cost Per Instantiation | Total Estimated Cost |
| --- | ---: | ---: | ---: |
| alloc::alloc::box_free | 3 | 122 | 366 |
| std::alloc::Global::alloc_impl | 1 | 284 | 284 |
| alloc::raw_vec::RawVec::<T, A>::current_memory | 3 | 82 | 246 |
| std::ptr::align_offset | 1 | 222 | 222 |
| std::slice::hack::into_vec | 3 | 67 | 201 |
| <std::vec::Vec<T, A> as std::ops::Drop>::drop | 3 | 66 | 198 |
| std::ptr::mut_ptr::<impl *mut T>::is_null | 4 | 47 | 188 |
| main | 1 | 163 | 163 |
| std::ptr::NonNull::<T>::new_unchecked | 4 | 37 | 148 |
| std::boxed::Box::<T, A>::into_unique | 3 | 48 | 144 |
| std::boxed::Box::<T, A>::leak | 3 | 39 | 117 |
| std::alloc::Layout::array::inner | 1 | 107 | 107 |
| std::ptr::align_offset::mod_inv | 1 | 103 | 103 |
| std::boxed::Box::<T, A>::into_raw_with_allocator | 3 | 31 | 93 |
| std::fmt::Arguments::<'a>::new_v1 | 1 | 80 | 80 |
| <alloc::raw_vec::RawVec<T, A> as std::ops::Drop>::drop | 3 | 26 | 78 |
| alloc::raw_vec::RawVec::<T, A>::from_raw_parts_in | 3 | 26 | 78 |
| alloc::alloc::exchange_malloc | 1 | 75 | 75 |
| std::ptr::const_ptr::<impl *const T>::is_null | 1 | 75 | 75 |
| std::ptr::const_ptr::<impl *const T>::is_aligned_to | 1 | 64 | 64 |
| compute | 3 | 20 | 60 |
| std::ptr::const_ptr::<impl *const T>::align_offset | 1 | 55 | 55 |
| std::ptr::read | 1 | 52 | 52 |
| <std::alloc::Global as std::alloc::Allocator>::deallocate | 1 | 50 | 50 |
| std::ptr::mut_ptr::<impl *mut T>::guaranteed_eq | 1 | 48 | 48 |
| std::fmt::ArgumentV1::<'a>::new_display | 2 | 22 | 44 |
| std::ptr::Alignment::new_unchecked | 1 | 42 | 42 |
| core::fmt::num::<impl std::fmt::Debug for usize>::fmt | 1 | 40 | 40 |
| std::result::Result::<T, E>::unwrap_unchecked | 1 | 37 | 37 |
| std::cmp::Ord::min | 1 | 32 | 32 |
| std::cmp::impls::<impl std::cmp::Ord for usize>::cmp | 1 | 31 | 31 |
| std::intrinsics::is_aligned_and_not_null | 1 | 27 | 27 |
| std::rt::lang_start | 1 | 27 | 27 |
| std::ptr::NonNull::<T>::new | 1 | 24 | 24 |
| std::fmt::ArgumentV1::<'a>::new_debug | 1 | 22 | 22 |
| std::fmt::Arguments::<'a>::new_v1_formatted | 1 | 19 | 19 |
| std::rt::lang_start::{closure#0} | 1 | 17 | 17 |
| std::sys_common::backtrace::__rust_begin_short_backtrace | 1 | 16 | 16 |
| std::slice::<impl [T]>::into_vec | 3 | 5 | 15 |
| <std::ptr::NonNull<T> as std::convert::From<std::ptr::Unique<T>>>::from | 1 | 14 | 14 |
| <&T as std::fmt::Debug>::fmt | 1 | 12 | 12 |
| <&T as std::fmt::Display>::fmt | 1 | 12 | 12 |
| std::vec::Vec::<T, A>::len | 3 | 2 | 6 |
| <T as std::convert::Into<U>>::into | 1 | 5 | 5 |
| <T as std::convert::From<T>>::from | 1 | 2 | 2 |
| <() as std::process::Termination>::report | 1 | 2 | 2 |
| std::hint::unreachable_unchecked | 1 | 2 | 2 |
| core::fmt::UnsafeArg::new | 1 | 1 | 1 |
</details>
Since we discussed it together, r? `@wesleywiser.`
2022-12-15 22:02:57 +01:00
2492235c32
Consider lifetimes when comparing assoc types in method chain
...
Do not say "Type changed to X here" when the only difference is caused
by lifetimes.
2022-12-15 11:47:40 -08:00
3b938f73f3
Trim paths in E0599
2022-12-15 11:47:40 -08:00
4d4d4786f9
Shorten trimmed display of closures
...
When `with_forced_trimmed_paths` is used, only print filename and start
of the closure's span, to reduce their verbosity.
2022-12-15 11:13:44 -08:00
30ae261c42
Use with_forced_trimmed_paths more
2022-12-15 11:13:44 -08:00
294944dfec
Point at method chains on E0271 errors
2022-12-15 11:13:44 -08:00
e1b340195a
Suggest #[derive(Clone)]
2022-12-15 10:27:05 -08:00
f19488064a
Suggest constraining type parameter with Clone
...
Fix #34896 .
2022-12-15 10:15:41 -08:00
4954a7ef5c
Auto merge of #104616 - RalfJung:ctfe-alignment, r=oli-obk,RalfJung
...
always check alignment during CTFE
We originally disabled alignment checks because they got in the way -- there are some things we do with the interpreter during CTFE which does not correspond to actually running user-written code, but is purely administrative, and we didn't want alignment checks there, so we just disabled them entirely. But with `-Zextra-const-ub-checks` we anyway had to figure out how to disable those alignment checks while doing checks in regular code. So now it is easy to enable CTFE alignment checking by default. Let's see what the perf consequences of that are.
r? `@oli-obk`
2022-12-15 17:04:25 +00:00
2d89027fac
Make the test actually emit the future incompat lint
2022-12-15 16:54:00 +00:00
5a06b1e67c
simplify alignment_check_failed a bit
2022-12-15 16:48:30 +00:00
2b2170384d
Fix docs
2022-12-15 16:48:29 +00:00
b05c790fd6
Reuse the ctfe error emitting logic for the future incompat lint
2022-12-15 16:48:24 +00:00
dec05e9c73
Factor decorate closure out into a method
2022-12-15 16:25:50 +00:00
98dc76a374
Always report alignment failures in future incompat summaries
2022-12-15 16:24:11 +00:00
d9d92ed7da
Move alignment failure error reporting to machine
2022-12-15 16:07:35 +00:00
d66824dbc4
Make alignment checks a future incompat lint
2022-12-15 16:07:28 +00:00
ed71e32e14
Always pass alignment and handle checking lazily
2022-12-15 15:51:43 +00:00
fa83763491
always check alignment during CTFE
2022-12-15 15:36:11 +00:00
984eab57f7
Auto merge of #105746 - matthiaskrgr:rollup-sz3grbv, r=matthiaskrgr
...
Rollup of 11 pull requests
Successful merges:
- #104592 (Ensure async trait impls are async (or otherwise return an opaque type))
- #105623 (Fix `-Z print-type-sizes` for generators with discriminant field ordered first)
- #105627 (Auto traits in `dyn Trait + Auto` are suggestable)
- #105633 (Make `report_projection_error` more `Term` agnostic)
- #105683 (Various cleanups to dest prop)
- #105692 (Add regression test for #104678 )
- #105707 (rustdoc: remove unnecessary CSS `kbd { cursor: default }`)
- #105715 (Do not mention long types in E0599 label)
- #105722 (more clippy::complexity fixes)
- #105724 (rustdoc: remove no-op CSS `.scrape-example .src-line-numbers { margin: 0 }`)
- #105730 (rustdoc: remove no-op CSS `.item-info:before { color }`)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
2022-12-15 14:04:24 +00:00
c0862f30bd
Rollup merge of #105722 - matthiaskrgr:compl2, r=compiler-errors
...
more clippy::complexity fixes
r? ```@compiler-errors```
2022-12-15 12:46:04 +01:00
cb9bcafe0d
Rollup merge of #105715 - estebank:unsatisfied-bounds-label, r=compiler-errors
...
Do not mention long types in E0599 label
The type is already mentioned in the main message and the list of unmet bounds.
2022-12-15 12:46:04 +01:00
6cdc83b64e
Rollup merge of #105683 - JakobDegen:dest-prop-storage, r=tmiasko
...
Various cleanups to dest prop
This makes fixing the issues identified in #105577 easier. A couple changes
- Use an enum with names instead of a bool
- Only call `remove_candidates_if` from one place instead of two. Doing it from two places is far too fragile, since any divergence in the behavior between those callsites is likely to be unsound.
- Remove `is_constant`. Right now we only merge locals, so this doesn't do anything, and the logic would be wrong if it did.
r? `@tmiasko`
2022-12-15 12:46:02 +01:00
78cf8cc02e
Rollup merge of #105633 - compiler-errors:term-agnostic, r=oli-obk
...
Make `report_projection_error` more `Term` agnostic
Fixes #105632
2022-12-15 12:46:01 +01:00
a2c9f2a5e0
Rollup merge of #105627 - compiler-errors:dyn-auto-suggestable, r=davidtwco
...
Auto traits in `dyn Trait + Auto` are suggestable
Not sure why I had made the `IsSuggestableVisitor` have that rule to not consider `dyn Trait + Auto` to be suggestable.
It's possible that this was done because of the fact that we don't print the right parentheses for `&(dyn Trait + Auto)`, but that's a problem with printing these types in general that we probably have tracked somewhere else...
2022-12-15 12:46:01 +01:00
5d24760245
Rollup merge of #105623 - compiler-errors:generator-type-size-fix, r=Nilstrieb
...
Fix `-Z print-type-sizes` for generators with discriminant field ordered first
Fixes #105589
Fixes #105591
2022-12-15 12:46:00 +01:00
c00eac3558
Rollup merge of #104592 - ComputerDruid:async_check, r=compiler-errors
...
Ensure async trait impls are async (or otherwise return an opaque type)
As a workaround for the full `#[refine]` semantics not being implemented
yet, forbit returning a concrete future type like `Box<dyn Future>` or a
manually implemented Future.
`-> impl Future` is still permitted; while that can also cause
accidental refinement, that's behind a different feature gate
(`return_position_impl_trait_in_trait`) and that problem exists
regardless of whether the trait method is async, so will have to be
solved more generally.
Fixes https://github.com/rust-lang/rust/issues/102745
2022-12-15 12:46:00 +01:00
397b66e77b
Auto merge of #105285 - compiler-errors:conflicting-param-env-2, r=estebank
...
Highlight conflicting param-env candidates, again
Un-reverts #98794 (i.e. reverts #99290 ).
The previous time I attempted to land this PR, it was because of an incremental issue (#99233 ). The repro instructions in the issue is no longer manifest the ICE -- I think it's because this ambiguity code was refactored (I think by `@lcnr)` to no longer store the ambiguities in the fulfillment error, but instead recompute them on the fly.
The main motivation for trying to re-land this is that it fixes #105131 by highlighting the root-cause of the issue, which is conflicting param-env candidates:
```
error[E0283]: type annotations needed: cannot satisfy `Self: Gen<'source>`
|
note: multiple `impl`s or `where` clauses satisfying `Self: Gen<'source>` found
--> $DIR/conflicting-bounds.rs:3:1
|
LL | pub trait Gen<'source> {
| ^^^^^^^^^^^^^^^^^^^^^^
...
LL | Self: for<'s> Gen<'s, Output = T>;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: aborting due to previous error
For more information about this error, try `rustc --explain E0283`.
```
Fixes #105131 .
Fixes (again) #98786
2022-12-15 11:11:49 +00:00
d67000e44e
Auto merge of #105713 - bjorn3:sync_cg_clif-2022-12-14, r=bjorn3
...
Sync rustc_codegen_cranelift
This time there are a bunch of bugfixes, some new llvm intrinsic implementations and refactorings to the build system in preparation for running cg_clif tests as part of `./x.py test`.
r? `@ghost`
`@rustbot` label +A-codegen +A-cranelift +T-compiler
2022-12-15 07:23:38 +00:00
a5beb7abb9
Various cleanups to dest prop
2022-12-14 23:11:52 -08:00
a8847df167
Auto merge of #105657 - oli-obk:mk_projection_ty, r=lcnr
...
Guard ProjectionTy creation against passing the wrong number of substs
r? `@lcnr`
2022-12-15 04:21:25 +00:00
5258b655a2
Merge SimplifiedTypeGen<D> into SimplifiedType.
...
`SimplifiedTypeGen<DefId>` is the only instantiation used, so we don't
need the generic parameter.
2022-12-15 15:13:19 +11:00
2a5aabdfc2
Remove SimplifiedTypeGen::map_def.
...
It's unused.
2022-12-15 15:04:09 +11:00
124f19485d
Tweak output for bare dyn Trait in arguments
...
Fix #35825 .
2022-12-14 18:51:55 -08:00
939a3ddf94
Auto merge of #104765 - chenyukang:yukang-fix-104639-lifetime-check, r=oli-obk
...
Find the right lower bound region in the scenario of partial order relations
Fixes #104639
2022-12-15 01:28:16 +00:00
da98ef9a5d
Ensure async trait impls are async (or otherwise return an opaque type)
...
As a workaround for the full `#[refine]` semantics not being implemented
yet, forbit returning a concrete future type like `Box<dyn Future>` or a
manually implemented Future.
`-> impl Future` is still permitted; while that can also cause
accidental refinement, that's behind a different feature gate
(`return_position_impl_trait_in_trait`) and that problem exists
regardless of whether the trait method is async, so will have to be
solved more generally.
Fixes #102745
2022-12-14 16:38:21 -08:00
de59844c98
more clippy::complexity fixes
2022-12-15 00:09:10 +01:00
b720847917
wrap output in BufWriter
2022-12-14 20:17:52 +00:00
7611933e6a
add -Z dump-mono-stats
...
This option will output some stats from the monomorphization collection
pass to a file, to show estimated sizes from each instantiation.
2022-12-14 20:17:52 +00:00
74f4da44a5
add helper to get DefId from MonoItem
2022-12-14 20:17:52 +00:00
2a0d7126e7
Do not mention long types in E0599 label
...
The type is already mentioned in the main message and the list of unmet
bounds.
2022-12-14 11:26:32 -08:00
b70baa4f92
Auto merge of #105703 - matthiaskrgr:rollup-tfpeam2, r=matthiaskrgr
...
Rollup of 7 pull requests
Successful merges:
- #105399 (Use more LFS functions.)
- #105578 (Fix transmutes between pointers in different address spaces (e.g. fn ptrs on AVR))
- #105598 (explain mem::forget(env_lock) in fork/exec)
- #105624 (Fix unsoundness in bootstrap cache code)
- #105630 (Add a test for #92481 )
- #105684 (Improve rustdoc markdown variable naming)
- #105697 (Remove fee1-dead from reviewers)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
2022-12-14 19:14:39 +00:00
b41a483e8a
Fix rustdoc
2022-12-14 18:55:55 +00:00
34d194d41c
Highlight conflicting param-env candidates, again
2022-12-14 18:44:26 +00:00
cfa6a93a36
Auto traits in dyn are suggestable
2022-12-14 18:39:39 +00:00
Matthias Krüger