Alan Egerton
51e15ac709
Remove erroneous merge conflict
2021-11-27 11:53:00 +00:00
bors
5fd3a5c7c1
Auto merge of #89916 - the8472:advance_by-avoid-err-0, r=dtolnay
...
Fix Iterator::advance_by contract inconsistency
The `advance_by(n)` docs state that in the error case `Err(k)` that k is always less than n.
It also states that `advance_by(0)` may return `Err(0)` to indicate an exhausted iterator.
These statements are inconsistent.
Since only one implementation (Skip) actually made use of that I changed it to return Ok(()) in that case too.
While adding some tests I also found a bug in `Take::advance_back_by`.
2021-11-27 11:31:26 +00:00
Matthias Krüger
073b1208f0
Rollup merge of #91266 - jam1garner:fmt-ptr-fix, r=dtolnay
...
Use non-generic inner function for pointer formatting
Previously, despite the implementation being type-unaware, `fmt::Pointer`'s implementation for `*const T` in monomorphized. This affects:
* `fmt::Debug` for `*const T`
* `fmt::Debug` for `*mut T`
* `fmt::Pointer` for `*const T`
* `fmt::Pointer` for `*mut T`
And since the implementation is non-trivial, this results in a large amount of LLVM bitcode being generated. For example, with a large bindgen project with Debug implementations enabled, it will generate a lot of calls to `fmt::Debug for *const T`, which in turn will perform codegen for a copy of this function for every type.
For example, in a real-world bindgen'd header I've been testing with (4,189,245 lines of bindgen Rust with layout tests disabled) the difference between a slightly old nightly (`rustc 1.58.0-nightly (e249ce6b2
2021-10-30)`) and this PR:
<details>
<summary>Nightly (Click to Expand)</summary>
```
Lines Copies Function name
----- ------ -------------
7256000 (100%) 216544 (100%) (TOTAL)
1815449 (25.0%) 24206 (11.2%) <*const T as core::fmt::Pointer>::fmt
300248 (4.1%) 29579 (13.7%) <&T as core::fmt::Debug>::fmt
290328 (4.0%) 24194 (11.2%) <*mut T as core::fmt::Pointer>::fmt
217746 (3.0%) 24194 (11.2%) <*mut T as core::fmt::Debug>::fmt
123329 (1.7%) 1486 (0.7%) core::fmt::builders::DebugList::entries
72790 (1.0%) 1486 (0.7%) core::slice::iter::Iter<T>::post_inc_start
71313 (1.0%) 1486 (0.7%) core::slice::iter::Iter<T>::new
68329 (0.9%) 1486 (0.7%) <core::slice::iter::Iter<T> as core::iter::traits::iterator::Iterator>::next
38636 (0.5%) 1486 (0.7%) <[T] as core::fmt::Debug>::fmt
26874 (0.4%) 1493 (0.7%) core::array::<impl core::fmt::Debug for [T; N]>::fmt
22290 (0.3%) 1486 (0.7%) core::slice::index::<impl core::ops::index::Index<I> for [T]>::index
19407 (0.3%) 1493 (0.7%) core::array::<impl core::ops::index::Index<I> for [T; N]>::index
19318 (0.3%) 1486 (0.7%) core::slice::<impl [T]>::iter
17832 (0.2%) 1486 (0.7%) core::ptr::const_ptr::<impl *const T>::offset
17832 (0.2%) 1486 (0.7%) core::ptr::mut_ptr::<impl *mut T>::offset
16346 (0.2%) 1486 (0.7%) <core::ops::range::RangeFull as core::slice::index::SliceIndex<[T]>>::index
13374 (0.2%) 1486 (0.7%) <I as core::iter::traits::collect::IntoIterator>::into_iter
13374 (0.2%) 1486 (0.7%) core::ptr::const_ptr::<impl *const T>::add
13371 (0.2%) 1486 (0.7%) core::ptr::const_ptr::<impl *const T>::is_null
13371 (0.2%) 1486 (0.7%) core::ptr::mut_ptr::<impl *mut T>::is_null
11888 (0.2%) 1486 (0.7%) core::slice::<impl [T]>::as_ptr
11879 (0.2%) 1486 (0.7%) core::ptr::non_null::NonNull<T>::new_unchecked
7421 (0.1%) 1486 (0.7%) core::ptr::non_null::NonNull<T>::as_ptr
```
</details>
<details>
<summary>This PR (Click to Expand)</summary>
```
Lines Copies Function name
----- ------ -------------
5684504 (100%) 216542 (100%) (TOTAL)
300248 (5.3%) 29579 (13.7%) <&T as core::fmt::Debug>::fmt
290328 (5.1%) 24194 (11.2%) <*mut T as core::fmt::Pointer>::fmt
266265 (4.7%) 24206 (11.2%) <*const T as core::fmt::Pointer>::fmt
217746 (3.8%) 24194 (11.2%) <*mut T as core::fmt::Debug>::fmt
101039 (1.8%) 1486 (0.7%) core::fmt::builders::DebugList::entries
72790 (1.3%) 1486 (0.7%) core::slice::iter::Iter<T>::post_inc_start
71313 (1.3%) 1486 (0.7%) core::slice::iter::Iter<T>::new
68329 (1.2%) 1486 (0.7%) <core::slice::iter::Iter<T> as core::iter::traits::iterator::Iterator>::next
38636 (0.7%) 1486 (0.7%) <[T] as core::fmt::Debug>::fmt
26874 (0.5%) 1493 (0.7%) core::array::<impl core::fmt::Debug for [T; N]>::fmt
22290 (0.4%) 1486 (0.7%) core::slice::index::<impl core::ops::index::Index<I> for [T]>::index
19407 (0.3%) 1493 (0.7%) core::array::<impl core::ops::index::Index<I> for [T; N]>::index
19318 (0.3%) 1486 (0.7%) core::slice::<impl [T]>::iter
17832 (0.3%) 1486 (0.7%) core::ptr::const_ptr::<impl *const T>::offset
17832 (0.3%) 1486 (0.7%) core::ptr::mut_ptr::<impl *mut T>::offset
16346 (0.3%) 1486 (0.7%) <core::ops::range::RangeFull as core::slice::index::SliceIndex<[T]>>::index
13374 (0.2%) 1486 (0.7%) <I as core::iter::traits::collect::IntoIterator>::into_iter
13374 (0.2%) 1486 (0.7%) core::ptr::const_ptr::<impl *const T>::add
13371 (0.2%) 1486 (0.7%) core::ptr::const_ptr::<impl *const T>::is_null
13371 (0.2%) 1486 (0.7%) core::ptr::mut_ptr::<impl *mut T>::is_null
11888 (0.2%) 1486 (0.7%) core::slice::<impl [T]>::as_ptr
11879 (0.2%) 1486 (0.7%) core::ptr::non_null::NonNull<T>::new_unchecked
7421 (0.1%) 1486 (0.7%) core::ptr::non_null::NonNull<T>::as_ptr
```
</details>
Output generated using `cargo llvm-lines` version 0.4.12.
Summary of differences:
| rustc Version | Total LLVM line count | `*const T as fmt::Pointer` LLVM lines | Compilation Time |
|-|-|-|-|
| `nightly` | 7256000 | 1815449 (25.0% of binary) | 537.014 |
| PR | 5684504 (-21.65%) | 266265 (4.7% of binary) (-85.3% from nightly) | 502.990 |
This results in a pretty noticeable as the majority of rustc's time is spent in either codegen or LLVM, in this case, and is significantly improved by disabling derives for `fmt::Debug`, as it prevents generating all this LLVM IR to be handled.
Here's a run time comparison with nightly on the same codebase (commit 454cc5fb
built from source vs 37c8f25
from my PR built from source):
<details>
<summary>nightly (Click to Expand)</summary>
```
time: 2.370; rss: 56MB -> 1118MB (+1062MB) parse_crate
time: 0.000; rss: 1118MB -> 1118MB ( +0MB) attributes_injection
time: 0.000; rss: 1118MB -> 1118MB ( +0MB) incr_comp_prepare_session_directory
time: 0.000; rss: 1118MB -> 1118MB ( +0MB) incr_comp_garbage_collect_session_directories
time: 0.000; rss: 1120MB -> 1120MB ( +0MB) plugin_loading
time: 0.000; rss: 1120MB -> 1120MB ( +0MB) plugin_registration
time: 0.000; rss: 1120MB -> 1120MB ( +0MB) crate_injection
time: 13.897; rss: 1120MB -> 3147MB (+2027MB) expand_crate
time: 0.002; rss: 3147MB -> 3147MB ( +0MB) check_unused_macros
time: 13.900; rss: 1120MB -> 3147MB (+2027MB) macro_expand_crate
time: 0.002; rss: 3147MB -> 3147MB ( +0MB) maybe_building_test_harness
time: 0.503; rss: 3147MB -> 3147MB ( +0MB) AST_validation
time: 0.000; rss: 3147MB -> 3147MB ( +0MB) maybe_create_a_macro_crate
time: 0.002; rss: 3147MB -> 3147MB ( +0MB) finalize_imports
time: 0.502; rss: 3147MB -> 3153MB ( +6MB) finalize_macro_resolutions
time: 4.478; rss: 3153MB -> 3574MB ( +420MB) late_resolve_crate
time: 0.000; rss: 3574MB -> 3574MB ( +0MB) resolve_main
time: 0.332; rss: 3574MB -> 3574MB ( +0MB) resolve_check_unused
time: 0.000; rss: 3574MB -> 3574MB ( +0MB) resolve_report_errors
time: 0.279; rss: 3574MB -> 3574MB ( +0MB) resolve_postprocess
time: 5.595; rss: 3147MB -> 3574MB ( +427MB) resolve_crate
time: 0.382; rss: 3574MB -> 3574MB ( +0MB) complete_gated_feature_checking
time: 20.526; rss: 1120MB -> 3574MB (+2454MB) configure_and_expand
time: 0.000; rss: 3574MB -> 3574MB ( +0MB) prepare_outputs
time: 0.000; rss: 3574MB -> 3574MB ( +0MB) blocked_on_dep_graph_loading
time: 65.992; rss: 3574MB -> 6317MB (+2743MB) hir_lowering
time: 1.117; rss: 6317MB -> 6323MB ( +6MB) early_lint_checks
time: 1.447; rss: 6323MB -> 6271MB ( -52MB) drop_ast
time: 0.002; rss: 5838MB -> 5838MB ( +0MB) setup_global_ctxt
time: 0.000; rss: 5843MB -> 5843MB ( +0MB) looking_for_entry_point
time: 0.313; rss: 5843MB -> 5844MB ( +1MB) looking_for_derive_registrar
time: 9.652; rss: 5843MB -> 6065MB ( +222MB) misc_checking_1
time: 9.713; rss: 6065MB -> 6769MB ( +704MB) type_collecting
time: 0.665; rss: 6769MB -> 6769MB ( +0MB) impl_wf_inference
time: 0.064; rss: 6769MB -> 6769MB ( +0MB) unsafety_checking
time: 3.095; rss: 6769MB -> 6792MB ( +23MB) coherence_checking
time: 21.282; rss: 6792MB -> 7546MB ( +754MB) wf_checking
time: 5.404; rss: 7546MB -> 7681MB ( +135MB) item_types_checking
time: 79.665; rss: 7681MB -> 8075MB ( +394MB) item_bodies_checking
time: 120.166; rss: 6065MB -> 8081MB (+2016MB) type_check_crate
time: 2.038; rss: 8081MB -> 8085MB ( +4MB) match_checking
time: 1.300; rss: 8085MB -> 8113MB ( +28MB) liveness_and_intrinsic_checking
time: 3.338; rss: 8081MB -> 8113MB ( +32MB) misc_checking_2
time: 68.612; rss: 8113MB -> 9285MB (+1172MB) MIR_borrow_checking
time: 0.622; rss: 9285MB -> 9301MB ( +17MB) MIR_effect_checking
time: 0.000; rss: 9301MB -> 9301MB ( +0MB) layout_testing
time: 4.331; rss: 9383MB -> 9510MB ( +127MB) death_checking
time: 0.032; rss: 9510MB -> 9510MB ( +0MB) unused_lib_feature_checking
time: 4.444; rss: 9510MB -> 9568MB ( +58MB) crate_lints
time: 59.563; rss: 9568MB -> 9576MB ( +8MB) module_lints
time: 64.006; rss: 9510MB -> 9576MB ( +66MB) lint_checking
time: 4.127; rss: 9576MB -> 9639MB ( +62MB) privacy_checking_modules
time: 77.984; rss: 9301MB -> 9639MB ( +337MB) misc_checking_3
time: 0.311; rss: 10357MB -> 10357MB ( +0MB) monomorphization_collector_root_collections
time: 14.051; rss: 10357MB -> 10573MB ( +217MB) monomorphization_collector_graph_walk
time: 1.759; rss: 10573MB -> 10652MB ( +79MB) partition_and_assert_distinct_symbols
time: 28.518; rss: 9639MB -> 10711MB (+1072MB) generate_crate_metadata
time: 0.000; rss: 10711MB -> 10711MB ( +0MB) find_cgu_reuse
time: 63.408; rss: 10711MB -> 12272MB (+1560MB) codegen_to_LLVM_IR
time: 64.916; rss: 10711MB -> 12267MB (+1556MB) codegen_crate
time: 0.000; rss: 12261MB -> 12261MB ( +0MB) assert_dep_graph
time: 0.000; rss: 12261MB -> 12261MB ( +0MB) check_dirty_clean
time: 0.664; rss: 12230MB -> 12210MB ( -20MB) encode_query_results_for(rustc_query_impl::queries::type_of)
time: 2.111; rss: 12210MB -> 12043MB ( -167MB) encode_query_results_for(rustc_query_impl::queries::generics_of)
time: 0.108; rss: 12043MB -> 12057MB ( +14MB) encode_query_results_for(rustc_query_impl::queries::predicates_of)
time: 0.004; rss: 12057MB -> 12059MB ( +2MB) encode_query_results_for(rustc_query_impl::queries::mir_const_qualif)
time: 0.665; rss: 12059MB -> 12121MB ( +62MB) encode_query_results_for(rustc_query_impl::queries::mir_for_ctfe)
time: 16.149; rss: 12121MB -> 12148MB ( +28MB) encode_query_results_for(rustc_query_impl::queries::optimized_mir)
time: 0.000; rss: 12148MB -> 12148MB ( +0MB) encode_query_results_for(rustc_query_impl::queries::covered_file_name)
time: 0.000; rss: 12148MB -> 12148MB ( +0MB) encode_query_results_for(rustc_query_impl::queries::covered_code_regions)
time: 0.010; rss: 12148MB -> 12150MB ( +2MB) encode_query_results_for(rustc_query_impl::queries::promoted_mir)
time: 0.052; rss: 12150MB -> 12155MB ( +4MB) encode_query_results_for(rustc_query_impl::queries::unsafety_check_result)
time: 0.003; rss: 12155MB -> 12156MB ( +1MB) encode_query_results_for(rustc_query_impl::queries::thir_check_unsafety)
time: 11.428; rss: 12156MB -> 11748MB ( -408MB) encode_query_results_for(rustc_query_impl::queries::typeck)
time: 0.000; rss: 11748MB -> 11748MB ( +0MB) encode_query_results_for(rustc_query_impl::queries::diagnostic_only_typeck)
time: 0.094; rss: 11748MB -> 11756MB ( +8MB) encode_query_results_for(rustc_query_impl::queries::used_trait_imports)
time: 0.272; rss: 11756MB -> 11778MB ( +22MB) encode_query_results_for(rustc_query_impl::queries::mir_borrowck)
time: 0.054; rss: 11778MB -> 11778MB ( +0MB) encode_query_results_for(rustc_query_impl::queries::eval_to_allocation_raw)
time: 0.005; rss: 11778MB -> 11779MB ( +1MB) encode_query_results_for(rustc_query_impl::queries::eval_to_const_value_raw)
time: 0.021; rss: 11779MB -> 11784MB ( +5MB) encode_query_results_for(rustc_query_impl::queries::check_match)
time: 0.041; rss: 11784MB -> 11786MB ( +2MB) encode_query_results_for(rustc_query_impl::queries::symbol_name)
time: 0.743; rss: 11786MB -> 11815MB ( +29MB) encode_query_results_for(rustc_query_impl::queries::codegen_fn_attrs)
time: 0.043; rss: 11815MB -> 11816MB ( +1MB) encode_query_results_for(rustc_query_impl::queries::codegen_fulfill_obligation)
time: 0.674; rss: 11816MB -> 11840MB ( +25MB) encode_query_results_for(rustc_query_impl::queries::specialization_graph_of)
time: 0.000; rss: 11840MB -> 11840MB ( +0MB) encode_query_results_for(rustc_query_impl::queries::adt_drop_tys)
time: 0.000; rss: 11840MB -> 11840MB ( +0MB) encode_query_results_for(rustc_query_impl::queries::adt_significant_drop_tys)
time: 0.005; rss: 11840MB -> 11841MB ( +1MB) encode_query_results_for(rustc_query_impl::queries::unused_generic_params)
time: 33.153; rss: 12232MB -> 11841MB ( -390MB) encode_query_results
time: 88.943; rss: 11955MB -> 11783MB ( -173MB) LLVM_passes(crate)
time: 38.854; rss: 12259MB -> 10095MB (-2164MB) incr_comp_serialize_result_cache
time: 39.030; rss: 12261MB -> 10095MB (-2166MB) incr_comp_persist_result_cache
time: 0.000; rss: 10095MB -> 10095MB ( +0MB) incr_comp_persist_dep_graph
time: 39.064; rss: 12257MB -> 10095MB (-2162MB) serialize_dep_graph
time: 19.047; rss: 10095MB -> 10307MB ( +212MB) free_global_ctxt
time: 0.000; rss: 10307MB -> 10307MB ( +0MB) join_worker_thread
time: 0.519; rss: 10307MB -> 10307MB ( +0MB) copy_all_cgu_workproducts_to_incr_comp_cache_dir
time: 0.522; rss: 10307MB -> 10307MB ( +0MB) finish_ongoing_codegen
time: 0.000; rss: 10307MB -> 10307MB ( +0MB) llvm_dump_timing_file
time: 0.002; rss: 10307MB -> 10307MB ( +0MB) serialize_work_products
time: 0.001; rss: 9542MB -> 9542MB ( +0MB) incr_comp_finalize_session_directory
time: 0.000; rss: 9542MB -> 9542MB ( +0MB) link_binary_check_files_are_writeable
time: 7.835; rss: 9542MB -> 9544MB ( +2MB) link_rlib
time: 0.000; rss: 9544MB -> 9544MB ( +0MB) link_binary_remove_temps
time: 7.872; rss: 9542MB -> 9544MB ( +2MB) link_binary
time: 7.944; rss: 9542MB -> 9201MB ( -341MB) link_crate
time: 8.495; rss: 10307MB -> 9201MB (-1106MB) link
time: 537.014; rss: 33MB -> 3715MB (+3682MB) total
```
</details>
<details>
<summary>This PR (Click to Expand)</summary>
```
time: 2.379; rss: 51MB -> 1116MB (+1064MB) parse_crate
time: 0.003; rss: 1116MB -> 1116MB ( +0MB) attributes_injection
time: 0.002; rss: 1116MB -> 1116MB ( +0MB) incr_comp_prepare_session_directory
time: 0.000; rss: 1116MB -> 1116MB ( +0MB) incr_comp_garbage_collect_session_directories
time: 0.000; rss: 1116MB -> 1116MB ( +0MB) plugin_loading
time: 0.000; rss: 1116MB -> 1116MB ( +0MB) plugin_registration
time: 0.003; rss: 1118MB -> 1118MB ( +0MB) crate_injection
time: 13.376; rss: 1118MB -> 3143MB (+2025MB) expand_crate
time: 0.002; rss: 3143MB -> 3143MB ( +0MB) check_unused_macros
time: 13.379; rss: 1118MB -> 3143MB (+2025MB) macro_expand_crate
time: 0.002; rss: 3143MB -> 3143MB ( +0MB) maybe_building_test_harness
time: 0.479; rss: 3143MB -> 3143MB ( +0MB) AST_validation
time: 0.002; rss: 3143MB -> 3143MB ( +0MB) maybe_create_a_macro_crate
time: 0.005; rss: 3143MB -> 3143MB ( +0MB) finalize_imports
time: 0.520; rss: 3143MB -> 3125MB ( -18MB) finalize_macro_resolutions
time: 4.446; rss: 3125MB -> 3577MB ( +453MB) late_resolve_crate
time: 0.000; rss: 3577MB -> 3577MB ( +0MB) resolve_main
time: 0.336; rss: 3577MB -> 3577MB ( +0MB) resolve_check_unused
time: 0.000; rss: 3577MB -> 3577MB ( +0MB) resolve_report_errors
time: 0.295; rss: 3577MB -> 3578MB ( +0MB) resolve_postprocess
time: 5.602; rss: 3143MB -> 3578MB ( +435MB) resolve_crate
time: 0.388; rss: 3578MB -> 3578MB ( +0MB) complete_gated_feature_checking
time: 20.014; rss: 1116MB -> 3578MB (+2462MB) configure_and_expand
time: 0.000; rss: 3578MB -> 3578MB ( +0MB) prepare_outputs
time: 0.000; rss: 3578MB -> 3578MB ( +0MB) blocked_on_dep_graph_loading
time: 64.219; rss: 3578MB -> 6313MB (+2736MB) hir_lowering
time: 1.102; rss: 6313MB -> 6319MB ( +6MB) early_lint_checks
time: 1.426; rss: 6319MB -> 6268MB ( -52MB) drop_ast
time: 0.005; rss: 5834MB -> 5836MB ( +2MB) setup_global_ctxt
time: 0.000; rss: 5838MB -> 5838MB ( +0MB) looking_for_entry_point
time: 0.292; rss: 5838MB -> 5840MB ( +1MB) looking_for_derive_registrar
time: 9.553; rss: 5838MB -> 6060MB ( +222MB) misc_checking_1
time: 9.949; rss: 6060MB -> 6764MB ( +704MB) type_collecting
time: 0.630; rss: 6764MB -> 6764MB ( +0MB) impl_wf_inference
time: 0.060; rss: 6764MB -> 6764MB ( +0MB) unsafety_checking
time: 3.054; rss: 6764MB -> 6787MB ( +23MB) coherence_checking
time: 20.702; rss: 6787MB -> 7533MB ( +746MB) wf_checking
time: 5.194; rss: 7533MB -> 7668MB ( +135MB) item_types_checking
time: 74.677; rss: 7668MB -> 8062MB ( +394MB) item_bodies_checking
time: 114.497; rss: 6060MB -> 8068MB (+2008MB) type_check_crate
time: 1.891; rss: 8068MB -> 8072MB ( +4MB) match_checking
time: 1.292; rss: 8072MB -> 8100MB ( +28MB) liveness_and_intrinsic_checking
time: 3.183; rss: 8068MB -> 8100MB ( +32MB) misc_checking_2
time: 68.845; rss: 8100MB -> 9279MB (+1179MB) MIR_borrow_checking
time: 0.587; rss: 9279MB -> 9295MB ( +17MB) MIR_effect_checking
time: 0.000; rss: 9295MB -> 9295MB ( +0MB) layout_testing
time: 4.443; rss: 9377MB -> 9504MB ( +127MB) death_checking
time: 0.034; rss: 9504MB -> 9504MB ( +0MB) unused_lib_feature_checking
time: 4.409; rss: 9504MB -> 9562MB ( +58MB) crate_lints
time: 56.490; rss: 9562MB -> 9571MB ( +8MB) module_lints
time: 60.900; rss: 9504MB -> 9571MB ( +66MB) lint_checking
time: 4.147; rss: 9571MB -> 9633MB ( +62MB) privacy_checking_modules
time: 75.094; rss: 9295MB -> 9633MB ( +337MB) misc_checking_3
time: 0.315; rss: 10357MB -> 10357MB ( +0MB) monomorphization_collector_root_collections
time: 14.501; rss: 10357MB -> 10571MB ( +215MB) monomorphization_collector_graph_walk
time: 1.763; rss: 10571MB -> 10661MB ( +89MB) partition_and_assert_distinct_symbols
time: 29.035; rss: 9633MB -> 10706MB (+1073MB) generate_crate_metadata
time: 0.000; rss: 10706MB -> 10706MB ( +0MB) find_cgu_reuse
time: 30.913; rss: 10706MB -> 12150MB (+1444MB) codegen_to_LLVM_IR
time: 31.108; rss: 10706MB -> 12150MB (+1444MB) codegen_crate
time: 0.000; rss: 12150MB -> 12150MB ( +0MB) assert_dep_graph
time: 0.000; rss: 12150MB -> 12150MB ( +0MB) check_dirty_clean
time: 0.416; rss: 12152MB -> 12199MB ( +46MB) encode_query_results_for(rustc_query_impl::queries::type_of)
time: 1.259; rss: 12199MB -> 12211MB ( +12MB) encode_query_results_for(rustc_query_impl::queries::generics_of)
time: 0.095; rss: 12211MB -> 12193MB ( -18MB) encode_query_results_for(rustc_query_impl::queries::predicates_of)
time: 0.005; rss: 12193MB -> 12195MB ( +2MB) encode_query_results_for(rustc_query_impl::queries::mir_const_qualif)
time: 0.828; rss: 12195MB -> 12208MB ( +14MB) encode_query_results_for(rustc_query_impl::queries::mir_for_ctfe)
time: 17.880; rss: 12208MB -> 11987MB ( -222MB) encode_query_results_for(rustc_query_impl::queries::optimized_mir)
time: 0.000; rss: 11987MB -> 11987MB ( +0MB) encode_query_results_for(rustc_query_impl::queries::covered_file_name)
time: 0.000; rss: 11987MB -> 11987MB ( +0MB) encode_query_results_for(rustc_query_impl::queries::covered_code_regions)
time: 0.007; rss: 11987MB -> 11988MB ( +1MB) encode_query_results_for(rustc_query_impl::queries::promoted_mir)
time: 0.049; rss: 11988MB -> 11992MB ( +4MB) encode_query_results_for(rustc_query_impl::queries::unsafety_check_result)
time: 0.002; rss: 11992MB -> 11994MB ( +1MB) encode_query_results_for(rustc_query_impl::queries::thir_check_unsafety)
time: 38.049; rss: 11994MB -> 12093MB ( +99MB) encode_query_results_for(rustc_query_impl::queries::typeck)
time: 0.000; rss: 12093MB -> 12093MB ( +0MB) encode_query_results_for(rustc_query_impl::queries::diagnostic_only_typeck)
time: 0.024; rss: 12093MB -> 12095MB ( +2MB) encode_query_results_for(rustc_query_impl::queries::used_trait_imports)
time: 0.372; rss: 12095MB -> 12053MB ( -42MB) encode_query_results_for(rustc_query_impl::queries::mir_borrowck)
time: 0.015; rss: 12053MB -> 12053MB ( +0MB) encode_query_results_for(rustc_query_impl::queries::eval_to_allocation_raw)
time: 0.005; rss: 12053MB -> 12054MB ( +1MB) encode_query_results_for(rustc_query_impl::queries::eval_to_const_value_raw)
time: 0.003; rss: 12054MB -> 12056MB ( +2MB) encode_query_results_for(rustc_query_impl::queries::check_match)
time: 0.037; rss: 12056MB -> 11899MB ( -157MB) encode_query_results_for(rustc_query_impl::queries::symbol_name)
time: 0.667; rss: 11899MB -> 11708MB ( -191MB) encode_query_results_for(rustc_query_impl::queries::codegen_fn_attrs)
time: 0.045; rss: 11708MB -> 11709MB ( +1MB) encode_query_results_for(rustc_query_impl::queries::codegen_fulfill_obligation)
time: 0.295; rss: 11709MB -> 11734MB ( +25MB) encode_query_results_for(rustc_query_impl::queries::specialization_graph_of)
time: 0.000; rss: 11734MB -> 11734MB ( +0MB) encode_query_results_for(rustc_query_impl::queries::adt_drop_tys)
time: 0.000; rss: 11734MB -> 11734MB ( +0MB) encode_query_results_for(rustc_query_impl::queries::adt_significant_drop_tys)
time: 0.005; rss: 11734MB -> 11734MB ( +1MB) encode_query_results_for(rustc_query_impl::queries::unused_generic_params)
time: 60.063; rss: 12152MB -> 11734MB ( -418MB) encode_query_results
time: 76.745; rss: 12007MB -> 11699MB ( -308MB) LLVM_passes(crate)
time: 61.634; rss: 12150MB -> 10557MB (-1593MB) incr_comp_serialize_result_cache
time: 61.637; rss: 12150MB -> 10557MB (-1593MB) incr_comp_persist_result_cache
time: 0.001; rss: 10557MB -> 10557MB ( +0MB) incr_comp_persist_dep_graph
time: 61.641; rss: 12150MB -> 10557MB (-1593MB) serialize_dep_graph
time: 15.601; rss: 10557MB -> 10242MB ( -315MB) free_global_ctxt
time: 0.000; rss: 10242MB -> 10242MB ( +0MB) join_worker_thread
time: 0.368; rss: 10242MB -> 10242MB ( +0MB) copy_all_cgu_workproducts_to_incr_comp_cache_dir
time: 0.375; rss: 10242MB -> 10242MB ( +0MB) finish_ongoing_codegen
time: 0.000; rss: 10242MB -> 10242MB ( +0MB) llvm_dump_timing_file
time: 0.002; rss: 10242MB -> 10242MB ( +0MB) serialize_work_products
time: 0.001; rss: 9668MB -> 9668MB ( +0MB) incr_comp_finalize_session_directory
time: 0.000; rss: 9668MB -> 9668MB ( +0MB) link_binary_check_files_are_writeable
time: 1.469; rss: 9668MB -> 9671MB ( +3MB) link_rlib
time: 0.000; rss: 9671MB -> 9671MB ( +0MB) link_binary_remove_temps
time: 1.506; rss: 9668MB -> 9671MB ( +3MB) link_binary
time: 1.622; rss: 9668MB -> 9329MB ( -339MB) link_crate
time: 2.037; rss: 10242MB -> 9329MB ( -913MB) link
time: 502.990; rss: 32MB -> 5888MB (+5855MB) total
```
</details>
(6.34% decrease in runtime, results are consistent across multiple runs)
2021-11-27 11:46:45 +01:00
Matthias Krüger
7c5bcd548b
Rollup merge of #91208 - estebank:eq-constraint, r=cjgillot
...
Account for incorrect `where T::Assoc = Ty` bound
Provide suggestoin to constrain trait bound for associated type.
Revert incorrect changes to `missing-bounds` test.
Address part of #20041 .
2021-11-27 11:46:44 +01:00
Matthias Krüger
55f8b5f559
Rollup merge of #91062 - jsha:static-file-replace, r=jyn514,GuillaumeGomez
...
rustdoc: Consolidate static-file replacement mechanism
There were a few places in rustdoc where we would take static JS or CSS and rewrite it at doc generation time to insert values. This consolidates all the CSS instances into one CSS file and replaces the JS examples with data- attributes on the rustdoc-vars div.
Demo https://rustdoc.crud.net/jsha/static-file-replace/test_docs/
r? ``@GuillaumeGomez``
2021-11-27 11:46:43 +01:00
Matthias Krüger
8fb58e5ece
Rollup merge of #91057 - the8472:clarify-parallelism-steady-state, r=dtolnay
...
Expand `available_parallelism` docs in anticipation of cgroup quota support
The "fixed" in "fixed steady state limits" means to exclude load-dependent resource prioritization
that would calculate to 100% of capacity on an idle system and less capacity on a loaded system.
Additionally I also exclude "system load" since it would be silly to try to identify
other, perhaps higher priority, processes hogging some CPU cores that aren't explicitly excluded
by masks/quotas/whatever.
2021-11-27 11:46:42 +01:00
Matthias Krüger
43279b2749
Rollup merge of #90995 - the8472:hash-portability, r=dtolnay
...
Document non-guarantees for Hash
Dependence on endianness and type sizes was reported for enum discriminants in #74215 but it is a more general
issue since for example the default implementation of `Hasher::write_usize` uses native endianness.
Additionally the implementations of library types are occasionally changed as their internal fields
change or hashing gets optimized.
## Question
Should this go on the module level documentation instead since it also concerns `Hasher` to some extent and not just `Hash`?
resolves #74215
2021-11-27 11:46:42 +01:00
Matthias Krüger
14ef447d12
Rollup merge of #83791 - the8472:relax-zip-side-effect-guarantee, r=dtolnay
...
Weaken guarantee around advancing underlying iterators in zip
The current guarantee (introduced in #52279 ) is too strong as it prevents adapters from exploiting knowledge about the iterator length and using counted loops for example because they would stop calling `next()` before it ever returned `None`. Additionally several nested zip iterators already fail to uphold this.
This does not yet remove any of the specialization code that tries (and sometimes fails) to uphold the guarantee for `next()`
because removing it would also affect `next_back()` in more surprising ways.
The intent is to be able to remove for example this branch
36bcf40697/library/core/src/iter/adapters/zip.rs (L234-L243)
or this test
36bcf40697/library/core/tests/iter/adapters/zip.rs (L177-L188)
Solves #82303 by declaring it a non-issue.
2021-11-27 11:46:40 +01:00
bors
0881b3abe4
Auto merge of #90846 - cuviper:weak, r=dtolnay
...
Refactor weak symbols in std::sys::unix
This makes a few changes to the weak symbol macros in `sys::unix`:
- `dlsym!` is added to keep the functionality for runtime `dlsym`
lookups, like for `__pthread_get_minstack@GLIBC_PRIVATE` that we don't
want to show up in ELF symbol tables.
- `weak!` now uses `#[linkage = "extern_weak"]` symbols, so its runtime
behavior is just a simple null check. This is also used by `syscall!`.
- On non-ELF targets (macos/ios) where that linkage is not known to
behave, `weak!` is just an alias to `dlsym!` for the old behavior.
- `raw_syscall!` is added to always call `libc::syscall` on linux and
android, for cases like `clone3` that have no known libc wrapper.
The new `weak!` linkage does mean that you'll get versioned symbols if
you build with a newer glibc, like `WEAK DEFAULT UND statx@GLIBC_2.28`.
This might seem problematic, but old non-weak symbols can tie the build
to new versions too, like `dlsym@GLIBC_2.34` from their recent library
unification. If you build with an old glibc like `dist-x86_64-linux`
does, you'll still get unversioned `WEAK DEFAULT UND statx`, which may
be resolved based on the runtime glibc.
I also found a few functions that don't need to be weak anymore:
- Android can directly use `ftruncate64`, `pread64`, and `pwrite64`, as
these were added in API 12, and our baseline is API 14.
- Linux can directly use `splice`, added way back in glibc 2.5 and
similarly old musl. Android only added it in API 21 though.
2021-11-27 07:58:00 +00:00
Tobias Kortkamp
47474f1055
Add riscv64gc-unknown-freebsd
2021-11-27 07:24:18 +01:00
bors
84826fec95
Auto merge of #91261 - Mark-Simulacrum:next-rel, r=Mark-Simulacrum
...
Bump to 1.59
r? `@Mark-Simulacrum`
2021-11-27 03:45:36 +00:00
Scott McMurray
50619f568a
Demonstration test for #91161
2021-11-26 19:27:40 -08:00
Scott McMurray
b215a32af3
Small mir-opt refactor
...
Hopefully-non-controversial changes from some not-ready-yet work that I'd figured I'd submit on their own.
2021-11-26 18:18:14 -08:00
bors
bbad745a68
Auto merge of #91269 - matthiaskrgr:rollup-jh8i8eh, r=matthiaskrgr
...
Rollup of 7 pull requests
Successful merges:
- #90611 (Fix another ICE in rustdoc scrape_examples)
- #91197 (rustdoc: Rename `Type::ResolvedPath` to `Type::Path` and don't re-export it)
- #91223 (Fix headings indent)
- #91240 (Saner formatting for UTF8_CHAR_WIDTH table)
- #91248 (Bump compiler-builtins to 0.1.53)
- #91252 (Fix bug where submodules wouldn't be updated when running x.py from a subdirectory)
- #91259 (Remove `--display-doctest-warnings`)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
2021-11-27 00:42:30 +00:00
Noah Lev
5fcae0a05d
Deny warnings in rustdoc non-UI tests
...
These warnings were silently ignored since they did not appear in a
`.stderr` file and did not fail the test. With this change, warnings in
tests are denied, causing the tests to fail if they have warnings.
I will fix all the warnings that are now test failures next.
2021-11-26 15:12:12 -08:00
Badel2
0da3a0f56e
Fix ICE #91268 by checking that the snippet ends with a )
2021-11-26 23:57:21 +01:00
Fabian Keller
243cec7a0b
Update README.md
2021-11-26 16:47:45 -06:00
Fabian Wolff
b38a54049e
Print a suggestion when comparing references to primitive types in constant functions
2021-11-26 23:10:46 +01:00
Matthew Jasper
2a83c11d4d
Handle placeholder regions in NLL type outlive constraints
2021-11-26 22:06:08 +00:00
Alexander Ronald Altman
b2dac7124b
Uncomment AVX512 byte vector conversions
...
Resolves my comment in #197 , at least for now; #187 is pending but since these are already here, just commented, it seemed to make sense to me to re-enable them anyway.
2021-11-26 13:48:52 -08:00
Matthias Krüger
092477d8c9
Rollup merge of #91259 - jyn514:doctest-warnings, r=GuillaumeGomez
...
Remove `--display-doctest-warnings`
`--display-doctest-warnings` can be replicated in full with other existing features, there's no
need to have a separate option for it. This removes the option and documents the combination of other features to replicate it.
This also fixes a bug where `--test-args=--show-output` had no effect.
cc `@ollie27,` https://github.com/rust-lang/rust/pull/73314#issuecomment-668317262
Fixes https://github.com/rust-lang/rust/issues/41574
r? `@GuillaumeGomez`
2021-11-26 22:41:44 +01:00
Matthias Krüger
404235e039
Rollup merge of #91252 - jyn514:relative-dir, r=Mark-Simulacrum
...
Fix bug where submodules wouldn't be updated when running x.py from a subdirectory
Previously, it would concatenate the relative path to the current
subdirectory, which looked at the wrong folder.
I tested this by checking out `1.56.1`, changing the current directory
to `src/`, and running `../x.py build`.
Fixes https://github.com/rust-lang/rust/issues/90481 (cc `@pnkfelix).`
r? `@Mark-Simulacrum`
2021-11-26 22:41:43 +01:00
Matthias Krüger
a92f867bf1
Rollup merge of #91248 - alessandrod:compiler-builtins-bump-bpf, r=Mark-Simulacrum
...
Bump compiler-builtins to 0.1.53
Fixes a LLVM crash with the bpf targets, see https://github.com/rust-lang/compiler-builtins/pull/440
2021-11-26 22:41:42 +01:00
Matthias Krüger
3bdf5fbbd8
Rollup merge of #91240 - dtolnay:utf8width, r=Mark-Simulacrum
...
Saner formatting for UTF8_CHAR_WIDTH table
The way these lines were currently wrapped definitely does not look like someone's intentional formatting. It's likely they got disfigured by rustfmt at some point.
This commit rearranges it to a rustfmt-compatible formatting that I find easier to read.
2021-11-26 22:41:41 +01:00
Matthias Krüger
330a558e42
Rollup merge of #91223 - GuillaumeGomez:headings-indent, r=jsha
...
Fix headings indent
Fixes #91200 .
Screenshots with the fix:
![Screenshot from 2021-11-25 15-32-35](https://user-images.githubusercontent.com/3050060/143462481-f7e9ea13-72d5-46fe-90e0-9527e74599e3.png )
![Screenshot from 2021-11-25 15-32-49](https://user-images.githubusercontent.com/3050060/143462485-c010716a-0276-421b-a777-afff19c81c96.png )
If the first element of a top docblock is a heading, we still need to keep the indent, but only on this one (I added a test to check it). We need it because otherwise the anchor will go over the `[-]` toggle.
cc `@camelid`
r? `@jsha`
2021-11-26 22:41:40 +01:00
Matthias Krüger
fcbbdaf209
Rollup merge of #91197 - camelid:rename-resolvedpath, r=GuillaumeGomez,jyn514
...
rustdoc: Rename `Type::ResolvedPath` to `Type::Path` and don't re-export it
The new name is shorter, simpler, and consistent with `hir::Ty`. It can't be
re-exported since the name would conflict with the `clean::Path` struct. But
usually enum variants are referred to using their qualified names in Rust anyway
(and parts of rustdoc already do that with `clean::Type`), so this is also more
consistent with the language.
r? `@GuillaumeGomez`
cc `@jyn514`
2021-11-26 22:41:39 +01:00
Matthias Krüger
10743f0f68
Rollup merge of #90611 - fee1-dead:rustdoc-ice-fix, r=jyn514,willcrichton
...
Fix another ICE in rustdoc scrape_examples
This has occurred to me when documenting a crate with the arguments. Not sure what could have caused it.
r? `@willcrichton`
2021-11-26 22:41:39 +01:00
bors
ccce98535b
Auto merge of #91246 - nnethercote:faster-layout-array, r=dtolnay
...
Faster `Layout::array`
`Layout::array` is called (indirectly) by `Vec::push()`, which is typically instantiated many times, and so making it smaller can help with compile times because less LLVM IR is generated.
r? `@ghost`
2021-11-26 21:35:53 +00:00
Joshua Nelson
7e4bf4bfc6
Remove --display-doctest-warnings
...
This can be replicated in full with other existing features, there's no
need to have a separate option for it.
This also fixes a bug where `--test-args=--show-output` had no effect,
and updates the documentation.
2021-11-26 16:18:16 -05:00
David Tolnay
c6810a569f
Clarify safety comment on using i to index into self.source
2021-11-26 12:57:36 -08:00
Noah Lev
79c718f1d5
Rename Type::ResolvedPath
to Type::Path
...
At last! The new name is shorter, simpler, and consistent with
`hir::Ty`.
2021-11-26 12:40:27 -08:00
Josh Stone
4c3699f01a
Add 1.57.0 release notes
2021-11-26 15:18:39 -05:00
Guillaume Gomez
23427567b2
Update test for anchors and headings position
2021-11-26 21:03:45 +01:00
Guillaume Gomez
20eda22cbf
Update the first heading indent rule so it is only applied on the first heading of the top doc block
2021-11-26 21:03:45 +01:00
Mark Rousskov
f54cb85702
Bump to 1.59
2021-11-26 14:53:55 -05:00
jam1garner
37c8f254ed
Use non-generic inner function for pointer formatting
2021-11-26 13:59:57 -05:00
Deadbeef
9c14d828ba
Reduce the ICE
2021-11-27 01:33:07 +08:00
bors
6d246f0c8d
Auto merge of #91253 - matthiaskrgr:rollup-dnlcjmr, r=matthiaskrgr
...
Rollup of 4 pull requests
Successful merges:
- #91169 (Change cg_ssa's get_param to borrow the builder mutably)
- #91176 (If the thread does not get the lock in the short term, yield the CPU)
- #91212 (Fix ICE due to out-of-bounds statement index when reporting borrowck error)
- #91225 (Fix invalid scrollbar display on source code page)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
2021-11-26 16:30:42 +00:00
Deadbeef
85c20698d4
Add ICE test
2021-11-27 00:26:22 +08:00
Deadbeef
c86da9b7b2
Add trace statements
2021-11-27 00:26:21 +08:00
Deadbeef
2d3d6bc5a2
Fix another ICE in rustdoc scrape_examples
2021-11-27 00:26:18 +08:00
Matthias Krüger
a9710deebc
Rollup merge of #91225 - GuillaumeGomez:source-page-scrollbar, r=jsha
...
Fix invalid scrollbar display on source code page
Fixes bug introduced in #90983 :
![Screenshot from 2021-11-25 17-01-08](https://user-images.githubusercontent.com/3050060/143473753-c2e7c43c-ce3f-474d-9d2a-922e63189c51.png )
![Screenshot from 2021-11-25 17-07-08](https://user-images.githubusercontent.com/3050060/143473757-eecaaf2b-f4f0-49e0-a159-ab485e3f7122.png )
To fix it, I simply unset the `overflow-y` on the source code page so it's not displayed anymore.
r? ``@jsha``
2021-11-26 16:02:27 +01:00
Matthias Krüger
13c60669cc
Rollup merge of #91212 - compiler-errors:issue91206, r=oli-obk
...
Fix ICE due to out-of-bounds statement index when reporting borrowck error
Replace an `[index]` with a `.get` when `statement_index` points to a basic-block terminator (and is therefore out-of-bounds in the statements list).
Fixes #91206
Cc ``@camsteffen``
r? ``@oli-obk``
2021-11-26 16:02:26 +01:00
Matthias Krüger
fdc305d58d
Rollup merge of #91176 - hermitcore:spin, r=kennytm
...
If the thread does not get the lock in the short term, yield the CPU
Reduces on [RustyHermit](https://github.com/hermitcore/rusty-hermit ) the amount of wasted processor cycles
2021-11-26 16:02:24 +01:00
Matthias Krüger
324b4bcb3c
Rollup merge of #91169 - RDambrosio016:master, r=bjorn3
...
Change cg_ssa's get_param to borrow the builder mutably
This is a small change to make `get_param` more flexible for codegens that may need to modify things when retrieving function parameters.
This will currently only be used by [rustc_codegen_nvvm](https://github.com/Rust-GPU/Rust-CUDA ) (my own project), but may be useful to more codegens in the future.
This is needed because cg_nvvm needs to remap certain types to libnvvm-friendly types, such as `i128` -> `<2 x i64>`. Because cg_ssa does not give mutable access to the builder, i resorted to using a mutex:
```rs
fn get_param(&self, index: usize) -> Self::Value {
let val = llvm::get_param(self.llfn(), index as c_uint);
trace!("Get param `{:?}`", val);
unsafe {
let llfnty = LLVMRustGetFunctionType(self.llfn());
let map = self.remapped_integer_args.borrow();
if let Some((_, key)) = map.get(llfnty) {
if let Some((_, new_ty)) = key.iter().find(|t| t.0 == index) {
trace!("Casting irregular param {:?} to {:?}", val, new_ty);
return transmute_llval(
*self.llbuilder.lock().unwrap(),
&self.cx,
val,
*new_ty,
);
}
}
val
}
}
```
However, i predict this is pretty bad for performance, considering how much builders are called during codegen, so i would greatly appreciate having a more flexible API for this.
2021-11-26 16:02:23 +01:00
Joshua Nelson
6e0e220804
Fix bug where submodules wouldn't be updated when running x.py from a subdirectory
...
Previously, it would concatenate the relative path to the current
subdirectory, which looked at the wrong folder.
I tested this by checking out `1.56.1`, changing the current directory
to `src/`, and running `../x.py build`.
2021-11-26 09:56:01 -05:00
Alex Macleod
d346ec94fe
Add async/const fn tests for needless-late-init
...
+nits
2021-11-26 14:27:53 +00:00
Oli Scherer
18694126b1
Perform Sync check on static items in wf-check instead of during const checks
2021-11-26 14:22:45 +00:00
Lucas Kent
df3e7a28f7
Refactor EmitterWriter::emit_suggestion_default
2021-11-27 01:13:37 +11:00
bors
454cc5fb86
Auto merge of #91164 - Badel2:usefulness-stack-overflow, r=davidtwco
...
Fix stack overflow in `usefulness.rs`
Fix #88747
Applied the suggestion from `@nbdd0121,` not sure if this has any drawbacks. The first call to `ensure_sufficient_stack` is not needed to fix the test case, but I added it to be safe.
2021-11-26 13:42:35 +00:00