subst -> instantiate #116144

lcnr · 2023-09-25T13:48:27Z

continues #110793, there are still quite a few uses of subst and substitute, but changing them all in the same PR was a bit too much, so I've stopped here for now.

rustbot · 2023-09-25T13:48:35Z

r? @petrochenkov

(rustbot has picked a reviewer for you, use r? to override)

rustbot · 2023-09-25T13:48:39Z

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

lcnr · 2023-09-25T13:51:32Z

r? @oli-obk

compiler-errors · 2023-09-25T13:52:50Z

compiler/rustc_borrowck/src/diagnostics/region_name.rs

@@ -619,7 +619,7 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
                    // programs, so we need to use delay_span_bug here. See #82126.
                    self.infcx.tcx.sess.delay_span_bug(
                        hir_arg.span(),
-                        format!("unmatched subst and hir arg: found {kind:?} vs {hir_arg:?}"),
+                        format!("unmatched arg and hir arg: found {kind:?} vs {hir_arg:?}"),


"arg and hir arg" -- maybe "generic param and hir arg"?

well, it is a ty::GenericArg and a hir generic arg, the ty generic arg could be something like 3 which is not a param 🤔 the comment is somewhat :/ rn though

compiler-errors · 2023-09-25T13:54:24Z

compiler/rustc_hir_analysis/src/astconv/bounds.rs

@@ -427,7 +427,7 @@ impl<'tcx> dyn AstConv<'tcx> + '_ {
            let bound_vars = tcx.late_bound_vars(binding.hir_id);
            ty::Binder::bind_with_vars(subst_output, bound_vars)
        } else {
-            // Include substitutions for generic parameters of associated types
+            // Include instantiations of the generic parameters of associated types


I feel like this comment doesn't make sense.

RalfJung · 2023-09-25T13:56:12Z

compiler/rustc_const_eval/src/interpret/eval_context.rs

@@ -569,7 +569,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
    ) -> Result<T, ErrorHandled> {
        frame
            .instance
-            .try_subst_mir_and_normalize_erasing_regions(
+            .try_instantiate_mir_and_normalize_erasing_regions(


FWIW I found the previous term much clearer (it's a generic function and we are substituting in concrete values)... but I guess that ship has sailed so it probably makes sense to make this consistent.

The function this is in is called subst_from_frame_and_normalize_erasing_regions. So do you suggest that should be renamed to instantiate_from_frame_and_normalize_erasing_regions or so?

The function this is in is called subst_from_frame_and_normalize_erasing_regions. So do you suggest that should be renamed to instantiate_from_frame_and_normalize_erasing_regions or so?

yeah, it does feel a bit verbose though 😅 🤷

rustbot · 2023-09-26T07:38:05Z

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

oli-obk · 2023-09-26T07:50:28Z

@bors r+

bors · 2023-09-26T07:50:30Z

📌 Commit 3c52a3e has been approved by oli-obk

It is now in the queue for this repository.

subst -> instantiate continues rust-lang#110793, there are still quite a few uses of `subst` and `substitute`, but changing them all in the same PR was a bit too much, so I've stopped here for now.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#116099 (Add regression test for issue rust-lang#79865) - rust-lang#116102 (Correct codegen of `ConstValue::Indirect` scalar and scalar pair) - rust-lang#116131 (Rename `cold_path` to `outline`) - rust-lang#116144 (subst -> instantiate) - rust-lang#116151 (Fix typo in rustdoc unstable features doc) - rust-lang#116153 (Update books) - rust-lang#116162 (Gate and validate `#[rustc_safe_intrinsic]`) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2023-09-26T21:32:47Z

⌛ Testing commit 3c52a3e with merge 5ae769f...

bors · 2023-09-26T23:26:46Z

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 5ae769f to master...

bors · 2023-09-26T23:26:46Z

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 5ae769f to master...

rust-timer · 2023-09-27T03:13:35Z

Finished benchmarking commit (5ae769f): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	2.5%	[2.4%, 2.6%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 633.132s -> 631.857s (-0.20%)
Artifact size: 317.17 MiB -> 317.04 MiB (-0.04%)

subst -> instantiate continues rust-lang#110793, there are still quite a few uses of `subst` and `substitute`, but changing them all in the same PR was a bit too much, so I've stopped here for now.

rustbot assigned petrochenkov Sep 25, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 25, 2023

rustbot assigned oli-obk and unassigned petrochenkov Sep 25, 2023

compiler-errors reviewed Sep 25, 2023

View reviewed changes

RalfJung reviewed Sep 25, 2023

View reviewed changes

subst -> instantiate

3c52a3e

lcnr force-pushed the subst-less branch from bbdeddf to 3c52a3e Compare September 26, 2023 07:38

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 26, 2023

matthiaskrgr mentioned this pull request Sep 26, 2023

Rollup of 7 pull requests #116168

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 26, 2023

bors merged commit 5ae769f into rust-lang:master Sep 26, 2023
11 checks passed

rustbot added this to the 1.74.0 milestone Sep 26, 2023

This was referenced Sep 26, 2023

Implement jump threading MIR opt #107009

Merged

Remove -Zfuel. #115293

Open

lcnr deleted the subst-less branch September 28, 2023 11:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

subst -> instantiate #116144

subst -> instantiate #116144

lcnr commented Sep 25, 2023

rustbot commented Sep 25, 2023

rustbot commented Sep 25, 2023

lcnr commented Sep 25, 2023

compiler-errors Sep 25, 2023

lcnr Sep 26, 2023

compiler-errors Sep 25, 2023

RalfJung Sep 25, 2023

lcnr Sep 26, 2023

rustbot commented Sep 26, 2023

oli-obk commented Sep 26, 2023

bors commented Sep 26, 2023

bors commented Sep 26, 2023

bors commented Sep 26, 2023

bors commented Sep 26, 2023

rust-timer commented Sep 27, 2023

subst -> instantiate #116144

subst -> instantiate #116144

Conversation

lcnr commented Sep 25, 2023

rustbot commented Sep 25, 2023

rustbot commented Sep 25, 2023

lcnr commented Sep 25, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rustbot commented Sep 26, 2023

oli-obk commented Sep 26, 2023

bors commented Sep 26, 2023

bors commented Sep 26, 2023

bors commented Sep 26, 2023

bors commented Sep 26, 2023

rust-timer commented Sep 27, 2023

Overall result: no relevant changes - no action needed