Add method to convert internal to stable constructs #117010

celinval · 2023-10-21T06:15:45Z

This is an alternative implementation to #116999. I believe we can still improve the logic a bit here, but I wanted to see which direction we should go first.

In this implementation, the API is simpler and we keep Tables somewhat private. The definition is still public though, since we have to expose the Stable trait. However, there's a cost of keeping another thread-local and using Rc, but I'm hoping it will be a small cost.

r? @oli-obk
r? @spastorino

rustbot · 2023-10-21T06:15:54Z

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino, @ouz-a

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.

bors · 2023-10-21T12:03:21Z

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

Note: We do not expect to provide internalizing methods for all StableMIR constructs. They exist only to help migrating efforts to allow users to mix StableMIR and internal constructs.

compiler/rustc_smir/src/rustc_internal/mod.rs

oli-obk · 2023-10-24T06:55:37Z

@bors r+ rollup

bors · 2023-10-24T06:55:39Z

📌 Commit ae86f59 has been approved by oli-obk

It is now in the queue for this repository.

Add method to convert internal to stable constructs This is an alternative implementation to rust-lang#116999. I believe we can still improve the logic a bit here, but I wanted to see which direction we should go first. In this implementation, the API is simpler and we keep Tables somewhat private. The definition is still public though, since we have to expose the Stable trait. However, there's a cost of keeping another thread-local and using `Rc`, but I'm hoping it will be a small cost. r? `@oli-obk` r? `@spastorino`

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#116094 (Introduce `-C instrument-coverage=branch` to gate branch coverage) - rust-lang#116396 (Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs`) - rust-lang#116792 (Avoid unnecessary renumbering during borrowck) - rust-lang#116943 (Add target features for LoongArch) - rust-lang#117010 (Add method to convert internal to stable constructs) - rust-lang#117029 (Add FileCheck annotations to MIR-opt inlining tests ) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#116094 (Introduce `-C instrument-coverage=branch` to gate branch coverage) - rust-lang#116396 (Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs`) - rust-lang#116714 (Derive `Ord`, `PartialOrd` and `Hash` for `SocketAddr*`) - rust-lang#116792 (Avoid unnecessary renumbering during borrowck) - rust-lang#116841 (Suggest unwrap/expect for let binding type mismatch) - rust-lang#116943 (Add target features for LoongArch) - rust-lang#117010 (Add method to convert internal to stable constructs) - rust-lang#117127 (Remove `#[allow(incomplete_features)]` from RPITIT/AFIT tests) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#117010 - celinval:smir-internal, r=oli-obk Add method to convert internal to stable constructs This is an alternative implementation to rust-lang#116999. I believe we can still improve the logic a bit here, but I wanted to see which direction we should go first. In this implementation, the API is simpler and we keep Tables somewhat private. The definition is still public though, since we have to expose the Stable trait. However, there's a cost of keeping another thread-local and using `Rc`, but I'm hoping it will be a small cost. r? ``@oli-obk`` r? ``@spastorino``

rustbot assigned oli-obk Oct 21, 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 21, 2023

celinval added 2 commits October 23, 2023 12:01

Add method to convert internal to stable constructs

66a554b

Add internal() method counterpart to stable()

f613b26

Note: We do not expect to provide internalizing methods for all StableMIR constructs. They exist only to help migrating efforts to allow users to mix StableMIR and internal constructs.

celinval force-pushed the smir-internal branch from 0c42219 to f613b26 Compare October 23, 2023 19:21

Remove unsafe and Rc

421631a

oli-obk reviewed Oct 23, 2023

View reviewed changes

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

Add test and remove double ref

ae86f59

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

matthiaskrgr mentioned this pull request Oct 24, 2023

Rollup of 6 pull requests #117125

Closed

matthiaskrgr mentioned this pull request Oct 24, 2023

Rollup of 8 pull requests #117135

Merged

bors merged commit f131a0a into rust-lang:master Oct 24, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 24, 2023

oli-obk mentioned this pull request Oct 25, 2023

SMIR: Expose Tables to users #116999

Closed

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

Automated pull from upstream master ferrocene/ferrocene#74

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add method to convert internal to stable constructs #117010

Add method to convert internal to stable constructs #117010

celinval commented Oct 21, 2023

rustbot commented Oct 21, 2023

bors commented Oct 21, 2023

oli-obk commented Oct 24, 2023

bors commented Oct 24, 2023

Add method to convert internal to stable constructs #117010

Add method to convert internal to stable constructs #117010

Conversation

celinval commented Oct 21, 2023

rustbot commented Oct 21, 2023

bors commented Oct 21, 2023

oli-obk commented Oct 24, 2023

bors commented Oct 24, 2023