Implement SMIR generic parameter instantiation #115532

oli-obk · 2023-09-04T15:21:42Z

Also demonstrates the use of it with a test.

This required a few smaller changes that may conflict with @ericmarkmartin work, but should be easy to resolve any conflicts on my end if their stuff lands first.

rustbot · 2023-09-04T15:21:52Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @petrochenkov (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

@rustbot author: the review is finished, PR author should check the comments and take action accordingly
@rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

rustbot · 2023-09-04T15:21:54Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino

compiler/rustc_smir/src/rustc_smir/mod.rs

compiler/rustc_smir/src/stable_mir/mod.rs

compiler/rustc_smir/src/stable_mir/fold.rs

petrochenkov · 2023-09-05T06:06:19Z

r? @compiler-errors

compiler-errors · 2023-09-05T17:03:35Z

@bors r+

bors · 2023-09-05T17:03:37Z

📌 Commit c1e449c has been approved by compiler-errors

It is now in the queue for this repository.

…rors Implement SMIR generic parameter instantiation Also demonstrates the use of it with a test. This required a few smaller changes that may conflict with `@ericmarkmartin` work, but should be easy to resolve any conflicts on my end if their stuff lands first.

…iaskrgr Rollup of 3 pull requests Successful merges: - rust-lang#114794 (clarify safety documentation of ptr::swap and ptr::copy) - rust-lang#115397 (Add support to return value in StableMIR interface and not crash due to compilation error) - rust-lang#115559 (implied bounds: do not ICE on unconstrained region vars) Failed merges: - rust-lang#115532 (Implement SMIR generic parameter instantiation) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2023-09-05T22:06:28Z

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

…t constants

oli-obk · 2023-09-06T08:28:29Z

@bors r=compiler-errors

bors · 2023-09-06T08:28:31Z

📌 Commit 0f4ff52 has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2023-09-06T09:50:16Z

⌛ Testing commit 0f4ff52 with merge c1d80ba...

bors · 2023-09-06T11:48:36Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing c1d80ba to master...

rust-timer · 2023-09-06T16:09:57Z

Finished benchmarking commit (c1d80ba): 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)	-	-	0
Improvements ✅ (secondary)	-2.5%	[-2.5%, -2.5%]	1
All ❌✅ (primary)	-	-	0

Cycles

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

Binary size

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

Bootstrap: 627.653s -> 627.8s (0.02%)
Artifact size: 317.81 MiB -> 317.88 MiB (0.02%)

spastorino · 2023-09-12T14:23:45Z

compiler/rustc_smir/src/rustc_smir/mod.rs

@@ -103,8 +103,13 @@ impl<'tcx> Context for Tables<'tcx> {
    }

    fn ty_kind(&mut self, ty: crate::stable_mir::ty::Ty) -> TyKind {
-        let ty = self.types[ty.0];
-        ty.stable(self)
+        self.types[ty.0].clone().stable(self)


why do we need this clone now?

It's just a Ty<'tcx>, so we should probably copy it.

The reason we need it is that stable takes self by mutable reference, while we immutably borrow from self via the index operations

Actually I got this wrong. We need to clone the TyKind in case it comes out of a MaybeStable::Stable entry of self.types. Sometimes SMIR creates its own types, and they get interned that way.

spastorino · 2023-09-12T14:39:24Z

tests/ui-fulldeps/stable-mir/crate-info.rs

+                                    ) => {}
+                                    stable_mir::ty::TyKind::RigidTy(
+                                        stable_mir::ty::RigidTy::Tuple(_),
+                                    ) => {}


Wouldn't be better to assert as way to show what are we trying to prove? :)

yea, but that was harder to do 😆

rustbot assigned petrochenkov Sep 4, 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 4, 2023

compiler-errors reviewed Sep 5, 2023

View reviewed changes

compiler/rustc_smir/src/rustc_smir/mod.rs Outdated Show resolved Hide resolved

compiler/rustc_smir/src/stable_mir/mod.rs Outdated Show resolved Hide resolved

compiler/rustc_smir/src/stable_mir/fold.rs Show resolved Hide resolved

rustbot assigned compiler-errors and unassigned petrochenkov Sep 5, 2023

oli-obk force-pushed the smir_folder branch from 3c51997 to c1e449c Compare September 5, 2023 07:24

compiler-errors approved these changes Sep 5, 2023

View reviewed changes

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 5, 2023

Dylan-DPC mentioned this pull request Sep 5, 2023

Rollup of 5 pull requests #115573

Closed

matthiaskrgr mentioned this pull request Sep 5, 2023

Rollup of 3 pull requests #115579

Merged

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 5, 2023

oli-obk added 7 commits September 6, 2023 08:15

Add type folder to SMIR

b43e3b9

Fail to test argument instantiation since we don't have types for mos…

7f009e5

…t constants

Also use Const in SMIR instead of just ConstantKind

a370f1b

Add types to all constants

627fa80

Deopaquify ParamConst

98d26d9

Allow fetching the SMIR body of FnDefs

202fbed

Implement and test monomorphization

0f4ff52

oli-obk force-pushed the smir_folder branch from c1e449c to 0f4ff52 Compare September 6, 2023 08:16

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 6, 2023

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

bors merged commit c1d80ba into rust-lang:master Sep 6, 2023
12 checks passed

rustbot added this to the 1.74.0 milestone Sep 6, 2023

spastorino reviewed Sep 12, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement SMIR generic parameter instantiation #115532

Implement SMIR generic parameter instantiation #115532

oli-obk commented Sep 4, 2023

rustbot commented Sep 4, 2023

rustbot commented Sep 4, 2023

petrochenkov commented Sep 5, 2023

compiler-errors commented Sep 5, 2023

bors commented Sep 5, 2023

bors commented Sep 5, 2023

oli-obk commented Sep 6, 2023

bors commented Sep 6, 2023

bors commented Sep 6, 2023

bors commented Sep 6, 2023

rust-timer commented Sep 6, 2023

spastorino Sep 12, 2023

oli-obk Sep 12, 2023

oli-obk Sep 13, 2023

spastorino Sep 12, 2023

oli-obk Sep 13, 2023

Implement SMIR generic parameter instantiation #115532

Implement SMIR generic parameter instantiation #115532

Conversation

oli-obk commented Sep 4, 2023

rustbot commented Sep 4, 2023

rustbot commented Sep 4, 2023

petrochenkov commented Sep 5, 2023

compiler-errors commented Sep 5, 2023

bors commented Sep 5, 2023

bors commented Sep 5, 2023

oli-obk commented Sep 6, 2023

bors commented Sep 6, 2023

bors commented Sep 6, 2023

bors commented Sep 6, 2023

rust-timer commented Sep 6, 2023

Overall result: no relevant changes - no action needed

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