Avoid having `rustc_smir` depend on `rustc_interface` or `rustc_driver` #116837

oli-obk · 2023-10-17T08:08:00Z

This is done by moving all the logic into a macro that performs the entire "run" operation in one go.

This makes #116806 obsolete

as a follow up we should make the macro usable without manually having to write

#[macro_use]
extern crate rustc_smir;
extern crate stable_mir;
extern crate rustc_driver;
extern crate rustc_interface;
use rustc_smir::rustc_internal;

in every crate that uses the macro.

r? @spastorino

rustbot · 2023-10-17T08:08:11Z

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, @ouz-a

bors · 2023-10-17T21:43:36Z

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

spastorino · 2023-10-18T20:00:11Z

@bors r rollup

bors · 2023-10-18T20:00:13Z

📌 Commit e8857d0 has been approved by spastorino

It is now in the queue for this repository.

Avoid having `rustc_smir` depend on `rustc_interface` or `rustc_driver` This is done by moving all the logic into a macro that performs the entire "run" operation in one go. This makes rust-lang#116806 obsolete as a follow up we should make the macro usable without manually having to write ```rust #[macro_use] extern crate rustc_smir; extern crate stable_mir; extern crate rustc_driver; extern crate rustc_interface; use rustc_smir::rustc_internal; ``` in every crate that uses the macro. r? `@spastorino`

Avoid having `rustc_smir` depend on `rustc_interface` or `rustc_driver` This is done by moving all the logic into a macro that performs the entire "run" operation in one go. This makes rust-lang#116806 obsolete as a follow up we should make the macro usable without manually having to write ```rust #[macro_use] extern crate rustc_smir; extern crate stable_mir; extern crate rustc_driver; extern crate rustc_interface; use rustc_smir::rustc_internal; ``` in every crate that uses the macro. r? ``@spastorino``

…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#116493 (Bump `COINDUCTIVE_OVERLAP_IN_COHERENCE` to deny warn in deps) - rust-lang#116837 (Avoid having `rustc_smir` depend on `rustc_interface` or `rustc_driver`) - rust-lang#116883 (Change my name in mailmap) - rust-lang#116896 (Only check in a single place if a pass is enabled.) r? `@ghost` `@rustbot` modify labels: rollup

Avoid having `rustc_smir` depend on `rustc_interface` or `rustc_driver` This is done by moving all the logic into a macro that performs the entire "run" operation in one go. This makes rust-lang#116806 obsolete as a follow up we should make the macro usable without manually having to write ```rust #[macro_use] extern crate rustc_smir; extern crate stable_mir; extern crate rustc_driver; extern crate rustc_interface; use rustc_smir::rustc_internal; ``` in every crate that uses the macro. r? ```@spastorino```

…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#116837 (Avoid having `rustc_smir` depend on `rustc_interface` or `rustc_driver`) - rust-lang#116896 (Only check in a single place if a pass is enabled.) - rust-lang#116906 (Use v0.0.0 in compiler crates) - rust-lang#116921 (fix(bootstrap) info message show correct path now) r? `@ghost` `@rustbot` modify labels: rollup

matthiaskrgr · 2023-10-19T11:25:49Z

@bors r-
#116934 (comment)

ouz-a · 2023-10-20T09:27:48Z

Can we try this again ?

oli-obk · 2023-10-20T09:40:12Z

This is not a random failure I think. I have no clue what is going on, but looks like somehow the 32 bit mingw target has trouble linking to various rustc_* dependencies now that we don't depend on rustc_driver anymore (even though rustc_driver is used by the tests). I'm ignoring 32 bit hosts for now

@bors r rollup=never

bors · 2023-10-20T09:40:14Z

📌 Commit a2ca259 has been approved by oli-obk

It is now in the queue for this repository.

bors · 2023-10-21T00:51:50Z

⌛ Testing commit 87accdb with merge 0f656bc...

Avoid having `rustc_smir` depend on `rustc_interface` or `rustc_driver` This is done by moving all the logic into a macro that performs the entire "run" operation in one go. This makes rust-lang#116806 obsolete as a follow up we should make the macro usable without manually having to write ```rust #[macro_use] extern crate rustc_smir; extern crate stable_mir; extern crate rustc_driver; extern crate rustc_interface; use rustc_smir::rustc_internal; ``` in every crate that uses the macro. r? `@spastorino`

bors · 2023-10-21T01:58:40Z

💔 Test failed - checks-actions

oli-obk · 2023-10-21T07:42:35Z

@bors retry disk failure

bors · 2023-10-21T11:57:31Z

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

oli-obk · 2023-10-23T10:05:10Z

@bors r=spastorino

bors · 2023-10-23T10:05:13Z

📌 Commit 3cc26c6 has been approved by spastorino

It is now in the queue for this repository.

bors · 2023-10-23T13:57:22Z

⌛ Testing commit 3cc26c6 with merge 858a42b...

bors · 2023-10-23T16:03:40Z

☀️ Test successful - checks-actions
Approved by: spastorino
Pushing 858a42b to master...

rust-timer · 2023-10-23T17:58:23Z

Finished benchmarking commit (858a42b): 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)	2.5%	[2.5%, 2.5%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
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: missing data
Artifact size: 304.30 MiB -> 304.33 MiB (0.01%)

rustbot assigned spastorino Oct 17, 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 Oct 17, 2023

oli-obk force-pushed the smir_run_macro branch from ba03619 to 42ebcdc Compare October 18, 2023 08:26

This comment has been minimized.

Sign in to view

oli-obk force-pushed the smir_run_macro branch from 42ebcdc to cb0faae Compare October 18, 2023 08:32

This comment has been minimized.

Sign in to view

ouz-a mentioned this pull request Oct 18, 2023

Move rustc_smir to driver #116806

Closed

oli-obk force-pushed the smir_run_macro branch from cb0faae to e8857d0 Compare October 18, 2023 09:40

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 Oct 18, 2023

matthiaskrgr mentioned this pull request Oct 18, 2023

Rollup of 5 pull requests #116901

Closed

matthiaskrgr mentioned this pull request Oct 18, 2023

Rollup of 4 pull requests #116902

Closed

matthiaskrgr mentioned this pull request Oct 19, 2023

Rollup of 4 pull requests #116934

Closed

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 Oct 19, 2023

bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 20, 2023

oli-obk mentioned this pull request Oct 20, 2023

SMIR: Expose Tables to users #116999

Closed

This comment has been minimized.

Sign in to view

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

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 Oct 21, 2023

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 Oct 21, 2023

oli-obk added 2 commits October 23, 2023 09:48

Avoid having rustc_smir depend on rustc_interface or rustc_driver

4a5fecb

Try to work around 32 bit mingw issues

3cc26c6

oli-obk force-pushed the smir_run_macro branch from 87accdb to 3cc26c6 Compare October 23, 2023 10:05

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 Oct 23, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 23, 2023

bors merged commit 858a42b into rust-lang:master Oct 23, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 23, 2023

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

matthiaskrgr mentioned this pull request Apr 16, 2024

ICE: node HirId ... cannot be placed in TypeckResults with hir_owner DefId... #124022

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Avoid having `rustc_smir` depend on `rustc_interface` or `rustc_driver` #116837

Avoid having `rustc_smir` depend on `rustc_interface` or `rustc_driver` #116837

oli-obk commented Oct 17, 2023 •

edited

Loading

rustbot commented Oct 17, 2023

bors commented Oct 17, 2023

This comment has been minimized.

This comment has been minimized.

spastorino commented Oct 18, 2023

bors commented Oct 18, 2023

matthiaskrgr commented Oct 19, 2023

ouz-a commented Oct 20, 2023

oli-obk commented Oct 20, 2023

bors commented Oct 20, 2023

bors commented Oct 21, 2023

This comment has been minimized.

bors commented Oct 21, 2023

oli-obk commented Oct 21, 2023

bors commented Oct 21, 2023

oli-obk commented Oct 23, 2023

bors commented Oct 23, 2023

bors commented Oct 23, 2023

bors commented Oct 23, 2023

rust-timer commented Oct 23, 2023

Avoid having rustc_smir depend on rustc_interface or rustc_driver #116837

Avoid having rustc_smir depend on rustc_interface or rustc_driver #116837

Conversation

oli-obk commented Oct 17, 2023 • edited Loading

rustbot commented Oct 17, 2023

bors commented Oct 17, 2023

This comment has been minimized.

This comment has been minimized.

spastorino commented Oct 18, 2023

bors commented Oct 18, 2023

matthiaskrgr commented Oct 19, 2023

ouz-a commented Oct 20, 2023

oli-obk commented Oct 20, 2023

bors commented Oct 20, 2023

bors commented Oct 21, 2023

This comment has been minimized.

bors commented Oct 21, 2023

oli-obk commented Oct 21, 2023

bors commented Oct 21, 2023

oli-obk commented Oct 23, 2023

bors commented Oct 23, 2023

bors commented Oct 23, 2023

bors commented Oct 23, 2023

rust-timer commented Oct 23, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Avoid having `rustc_smir` depend on `rustc_interface` or `rustc_driver` #116837

Avoid having `rustc_smir` depend on `rustc_interface` or `rustc_driver` #116837

oli-obk commented Oct 17, 2023 •

edited

Loading