Make `tcx.mk_const` more permissive wrt `kind` argument (`impl Into`) #105012

WaffleLapkin · 2022-11-28T12:41:44Z

r? @oli-obk you've asked for this >:)

compiler/rustc_middle/src/ty/consts.rs

bors · 2022-11-28T17:23:38Z

☔ The latest upstream changes (presumably #105008) made this pull request unmergeable. Please resolve the merge conflicts.

- Accept `impl Into` - Implement `From<>` for `ConstKind` Note: this adds a dependency on `derive_more` (MIT license). It allows to derive a lot of traits (like `From` here) that would be otherwise tedious to implement.

... `tcx.mk_const` can now be used instead

`mk_const(ty::ConstKind::X(...), ty)` can now be simplified to `mk_cosnt(..., ty)`. I searched with the following regex: \mk_const\([\n\s]*(ty::)?ConstKind\ I've left `ty::ConstKind::{Bound, Error}` as-is, they seem clearer this way.

...it's just `mk_const` but without the sparcles

oli-obk · 2022-11-28T17:50:51Z

@bors try @rust-timer queue

bors · 2022-11-28T17:51:02Z

⌛ Trying commit b44817f with merge 82877d5eeacaaf632388af232976d23d529ca7c2...

oli-obk · 2022-11-28T17:51:14Z

@bors delegate+

r=me with perf clean and the review comment addressed

bors · 2022-11-28T17:51:17Z

✌️ @WaffleLapkin can now approve this pull request

oli-obk · 2022-11-28T17:51:22Z

@bors p=1 bitrotty

oli-obk · 2022-11-28T22:50:21Z

@rust-timer build 82877d5eeacaaf632388af232976d23d529ca7c2

rust-timer · 2022-11-29T09:34:40Z

Finished benchmarking commit (82877d5eeacaaf632388af232976d23d529ca7c2): comparison URL.

Overall result: ❌ regressions - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	0.9%	[0.8%, 1.0%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

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)	6.2%	[5.0%, 7.4%]	2
Improvements ✅ (primary)	-2.7%	[-2.7%, -2.7%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.7%	[-2.7%, -2.7%]	1

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.5%, 2.5%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

WaffleLapkin · 2022-11-29T10:18:02Z

regressions
no action needed

??

Also, the regression itself looks super weird...

oli-obk · 2022-11-29T10:28:59Z

--------------------------------------------------------------------------------
Ir         
--------------------------------------------------------------------------------
57,155,936  PROGRAM TOTALS

--------------------------------------------------------------------------------
Ir           file:function
--------------------------------------------------------------------------------
 58,696,222  ???:<rustc_middle::ty::subst::GenericArg as rustc_middle::ty::fold::TypeFoldable>::try_fold_with::<rustc_infer::infer::resolve::OpportunisticVarResolver>
-49,549,818  ???:<&rustc_middle::ty::list::List<rustc_middle::ty::subst::GenericArg> as rustc_middle::ty::fold::TypeFoldable>::try_fold_with::<rustc_infer::infer::resolve::OpportunisticVarResolver>
 33,374,397  ???:<rustc_middle::ty::Ty as rustc_middle::ty::fold::TypeSuperFoldable>::super_fold_with::<rustc_infer::infer::resolve::OpportunisticVarResolver>
-32,572,741  ???:rustc_middle::ty::util::fold_list::<rustc_infer::infer::freshen::TypeFreshener, rustc_middle::ty::Ty, <&rustc_middle::ty::list::List<rustc_middle::ty::Ty> as rustc_middle::ty::fold::TypeFoldable>::try_fold_with<rustc_infer::infer::freshen::TypeFreshener>::{closure
 30,287,775  ???:<rustc_middle::ty::Ty as rustc_middle::ty::fold::TypeSuperFoldable>::super_fold_with::<rustc_infer::infer::freshen::TypeFreshener>
 12,076,808  ???:<rustc_infer::infer::ShallowResolver as rustc_middle::ty::fold::TypeFolder>::fold_ty
  5,009,264  ???:<rustc_middle::ty::Ty as rustc_middle::ty::fold::TypeFoldable>::try_fold_with::<rustc_infer::infer::freshen::TypeFreshener>
  3,392,061  ???:<&rustc_middle::ty::list::List<rustc_middle::ty::subst::GenericArg> as rustc_middle::ty::fold::TypeFoldable>::try_fold_with::<rustc_middle::ty::fold::RegionFolder>
 -2,596,008  ???:<rustc_middle::ty::context::TyCtxt>::intern_substs
 -2,105,899  ???:<rustc_middle::ty::Ty as rustc_middle::ty::fold::TypeFoldable>::try_fold_with::<rustc_middle::ty::fold::RegionFolder>

Looks like something in inference var resolving regressed.

oli-obk · 2022-11-29T10:34:57Z

@bors r+ looking at the graph of the wg-grammar benchmark this seems to be within the regular ups and downs of that benchmark

bors · 2022-11-29T10:34:59Z

📌 Commit a44eb3c has been approved by oli-obk

It is now in the queue for this repository.

bors · 2022-11-29T13:28:48Z

⌛ Testing commit a44eb3c with merge e0098a5...

bors · 2022-11-29T16:26:33Z

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

rust-timer · 2022-11-30T00:23:58Z

Finished benchmarking commit (e0098a5): 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)

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)	-	-	0
Improvements ✅ (primary)	-1.7%	[-2.8%, -0.6%]	2
Improvements ✅ (secondary)	-3.4%	[-3.4%, -3.4%]	1
All ❌✅ (primary)	-1.7%	[-2.8%, -0.6%]	2

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)	9.0%	[9.0%, 9.0%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.4%	[-2.4%, -2.4%]	1
All ❌✅ (primary)	9.0%	[9.0%, 9.0%]	1

Make `tcx.mk_const` more permissive wrt `kind` argument (`impl Into`) r? `@oli-obk` you've asked for this >:)

rustbot assigned oli-obk Nov 28, 2022

This comment has been minimized.

Sign in to view

rustbot added the A-testsuite Area: The testsuite used to check the correctness of rustc label Nov 28, 2022

oli-obk requested changes Nov 28, 2022

View reviewed changes

compiler/rustc_middle/src/ty/consts.rs Outdated Show resolved Hide resolved

WaffleLapkin added 5 commits November 28, 2022 17:27

Make tcx.mk_const more permissive wrt kind argument

e20e506

- Accept `impl Into` - Implement `From<>` for `ConstKind` Note: this adds a dependency on `derive_more` (MIT license). It allows to derive a lot of traits (like `From` here) that would be otherwise tedious to implement.

Remove tcx.mk_const_var

7087d9b

... `tcx.mk_const` can now be used instead

Simplify calls to tcx.mk_const

26b87bf

`mk_const(ty::ConstKind::X(...), ty)` can now be simplified to `mk_cosnt(..., ty)`. I searched with the following regex: \mk_const\([\n\s]*(ty::)?ConstKind\ I've left `ty::ConstKind::{Bound, Error}` as-is, they seem clearer this way.

Remove Const::from_value

f4d00fe

...it's just `mk_const` but without the sparcles

Permit deps (scarry)

b44817f

rust-cloud-vms bot force-pushed the into branch from e74fdb4 to b44817f Compare November 28, 2022 17:28

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Nov 28, 2022

Remove Const::from_scalar_int

a44eb3c

This comment has been minimized.

Sign in to view

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Nov 29, 2022

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 Nov 29, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 29, 2022

bors merged commit e0098a5 into rust-lang:master Nov 29, 2022

rustbot added this to the 1.67.0 milestone Nov 29, 2022

bors mentioned this pull request Nov 29, 2022

#![custom_mir]: Various improvements #104975

Merged

Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023

Auto merge of rust-lang#105012 - WaffleLapkin:into, r=oli-obk

5537c54

Make `tcx.mk_const` more permissive wrt `kind` argument (`impl Into`) r? `@oli-obk` you've asked for this >:)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make `tcx.mk_const` more permissive wrt `kind` argument (`impl Into`) #105012

Make `tcx.mk_const` more permissive wrt `kind` argument (`impl Into`) #105012

WaffleLapkin commented Nov 28, 2022

This comment has been minimized.

bors commented Nov 28, 2022

oli-obk commented Nov 28, 2022

This comment has been minimized.

bors commented Nov 28, 2022

oli-obk commented Nov 28, 2022

bors commented Nov 28, 2022

oli-obk commented Nov 28, 2022

oli-obk commented Nov 28, 2022

This comment has been minimized.

rust-timer commented Nov 29, 2022

WaffleLapkin commented Nov 29, 2022

oli-obk commented Nov 29, 2022 •

edited

Loading

oli-obk commented Nov 29, 2022

bors commented Nov 29, 2022

bors commented Nov 29, 2022

bors commented Nov 29, 2022

rust-timer commented Nov 30, 2022

Make tcx.mk_const more permissive wrt kind argument (impl Into) #105012

Make tcx.mk_const more permissive wrt kind argument (impl Into) #105012

Conversation

WaffleLapkin commented Nov 28, 2022

This comment has been minimized.

bors commented Nov 28, 2022

oli-obk commented Nov 28, 2022

This comment has been minimized.

bors commented Nov 28, 2022

oli-obk commented Nov 28, 2022

bors commented Nov 28, 2022

oli-obk commented Nov 28, 2022

oli-obk commented Nov 28, 2022

This comment has been minimized.

rust-timer commented Nov 29, 2022

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

WaffleLapkin commented Nov 29, 2022

oli-obk commented Nov 29, 2022 • edited Loading

oli-obk commented Nov 29, 2022

bors commented Nov 29, 2022

bors commented Nov 29, 2022

bors commented Nov 29, 2022

rust-timer commented Nov 30, 2022

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Make `tcx.mk_const` more permissive wrt `kind` argument (`impl Into`) #105012

Make `tcx.mk_const` more permissive wrt `kind` argument (`impl Into`) #105012

oli-obk commented Nov 29, 2022 •

edited

Loading