Move `rustllvm` into `compiler/rustc_llvm` #74787

petrochenkov · 2020-07-26T17:48:00Z

The rustllvm directory is not self-contained, it contains C++ code built by a build script of the rustc_llvm crate which is then linked into that crate.
So it makes sense to make rustllvm a part of rustc_llvm and move it into its directory.
I replaced rustllvm with more obvious llvm-wrapper as the subdirectory name, but something like llvm-adapter would work as well, other suggestions are welcome.

To make things more confusing, the Rust side of FFI functions defined in rustllvm can be found in rustc_codegen_llvm rather than in rustc_llvm. Perhaps they need to be moved as well, but this PR doesn't do that.

The presence of multiple LLVM-related directories in src (llvm-project, rustllvm, librustc_llvm, librustc_codegen_llvm and their predecessors) historically confused me and made me wonder about their purpose.
With this PR we will have LLVM itself (llvm-project), a FFI crate (rustc_llvm, kind of llvm-sys) and a codegen backend crate using LLVM through the FFI crate (rustc_codegen_llvm).

rust-highfive · 2020-07-26T17:48:03Z

r? @lcnr

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

petrochenkov · 2020-07-26T17:49:59Z

cc interested parties @cuviper @nikic @bjorn3 @eddyb @mark-i-m (I could forget someone else)

lcnr · 2020-07-26T20:42:44Z

🤷 There aren't any obvious problems here but it's not up to me to decide if this change should be made.

r? @cuviper

cuviper · 2020-07-27T20:36:27Z

The rustllvm directory is not self-contained, it contains C++ code built by a build script of the rustc_llvm crate which is then linked into that crate.
So it makes sense to make rustllvm a part of rustc_llvm and move it into its directory.
I replaced rustllvm with more obvious llvm-wrapper as the subdirectory name, but something like llvm-adapter would work as well, other suggestions are welcome.

This all sounds good to me.

To make things more confusing, the Rust side of FFI functions defined in rustllvm can be found in librustc_codegen_llvm rather than in rustc_llvm. Perhaps they need to be moved as well, but this PR doesn't do that.

I think we could even move all of the FFI declarations to rustc_llvm, not just the LLVMRust* stuff -- as you said, this crate already acts like an llvm-sys kind of crate. Maybe even the whole rustc_codegen_llvm::llvm module should move.

If this is merged, then the merge should probably be done after the compiler part of rust-lang/compiler-team#316 to avoid moving things around twice.

I'm personally not too worried about that, as this seems like a simple enough move that git's tracking should work, but it's ok if you want to wait and do it with the compiler move or soon after.

We should also remember to update the config in highfive.

petrochenkov · 2020-07-28T18:57:49Z

Blocked on #74862.

bors · 2020-07-29T22:43:44Z

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

matklad · 2020-08-30T18:04:45Z

a FFI crate (librustc_llvm, kind of llvm-sys

Shall we perhaps just rename it to llvm-sys?

mark-i-m · 2020-08-30T18:36:44Z

Yes, I agree the naming between librustc_llvm, rustllvm, and llvm-project are not particularly clear...

mark-i-m · 2020-08-30T18:37:25Z

Also, this is no longer blocked, I think.

@rustbot modify labels: +S-waiting-on-author -S-blocked

petrochenkov · 2020-09-02T20:59:29Z

Rebased.
src/librustc_llvm is also moved to compiler/rustc_llvm consistently with #74862.

It's not renamed to llvm-sys to keep naming scheme consistent with all other rustc crates.

rustc_codegen_llvm::llvm is not yet moved to rustc_llvm because it's somewhat intertwined with the rest of rustc_codegen_llvm, so untangling them would better be done in a separate PR.

petrochenkov · 2020-09-02T21:05:16Z

It's not renamed to llvm-sys to keep naming scheme consistent with all other rustc crates.

It could be renamed from rustc_llvm to rustc_llvm_ffi for clarity though.

bors · 2020-09-04T16:38:41Z

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

cuviper

Need to pick up the #75655 change, then r=me.

petrochenkov · 2020-09-09T20:22:31Z

@bors r=cuviper

bors · 2020-09-09T20:22:33Z

📌 Commit 10d3f8a has been approved by cuviper

bors · 2020-09-10T02:24:39Z

⌛ Testing commit 10d3f8a with merge 6744b6415ee1b69b4a5ea618632557446fba6004...

Move `rustllvm` into `compiler/rustc_llvm` The `rustllvm` directory is not self-contained, it contains C++ code built by a build script of the `rustc_llvm` crate which is then linked into that crate. So it makes sense to make `rustllvm` a part of `rustc_llvm` and move it into its directory. I replaced `rustllvm` with more obvious `llvm-wrapper` as the subdirectory name, but something like `llvm-adapter` would work as well, other suggestions are welcome. To make things more confusing, the Rust side of FFI functions defined in `rustllvm` can be found in `rustc_codegen_llvm` rather than in `rustc_llvm`. Perhaps they need to be moved as well, but this PR doesn't do that. The presence of multiple LLVM-related directories in `src` (`llvm-project`, `rustllvm`, `librustc_llvm`, `librustc_codegen_llvm` and their predecessors) historically confused me and made me wonder about their purpose. With this PR we will have LLVM itself (`llvm-project`), a FFI crate (`rustc_llvm`, kind of `llvm-sys`) and a codegen backend crate using LLVM through the FFI crate (`rustc_codegen_llvm`).

tmandry · 2020-09-10T03:09:04Z

Rolled up
@bors retry

bors · 2020-09-10T03:43:41Z

⌛ Testing commit 10d3f8a with merge 92a4fcb95c9c085e579bfeb938a1d490b115483d...

tmandry · 2020-09-10T04:03:17Z

Rolled up again
@bors retry

Rollup of 7 pull requests Successful merges: - rust-lang#74787 (Move `rustllvm` into `compiler/rustc_llvm`) - rust-lang#76458 (Add drain_filter method to HashMap and HashSet) - rust-lang#76472 (rustbuild: don't set PYTHON_EXECUTABLE and WITH_POLLY cmake vars since they are no longer supported by llvm) - rust-lang#76497 (Use intra-doc links in `core::ptr`) - rust-lang#76500 (Add -Zgraphviz_dark_mode and monospace font fix) - rust-lang#76543 (Document btree's unwrap_unchecked) - rust-lang#76556 (Revert rust-lang#76285) Failed merges: r? `@ghost`

bors · 2020-09-10T05:52:59Z

⌛ Testing commit 10d3f8a with merge a1894e4...

`src/rustllvm` moved to `compiler/rustc_llvm` in rust-lang/rust#74787

`src/rustllvm` and `src/librustc_llvm` moved to `compiler/rustc_llvm` in rust-lang/rust#74787.

rust-highfive assigned lcnr Jul 26, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 26, 2020

rust-highfive assigned cuviper and unassigned lcnr Jul 26, 2020

petrochenkov mentioned this pull request Jul 28, 2020

Move almost all compiler crates to compiler/ #74862

Merged

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Aug 30, 2020

petrochenkov force-pushed the rustllvm branch from bc6c1d5 to 41970e6 Compare September 2, 2020 20:52

petrochenkov changed the title ~~[WIP] Move rustllvm into librustc_llvm~~ Move rustllvm into compiler/rustc_llvm Sep 2, 2020

petrochenkov added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 2, 2020

cuviper approved these changes Sep 9, 2020

View reviewed changes

Move rustllvm into rustc_llvm

10d3f8a

petrochenkov force-pushed the rustllvm branch from 41970e6 to 10d3f8a Compare September 9, 2020 20:22

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 9, 2020

tmandry mentioned this pull request Sep 10, 2020

Rollup of 7 pull requests #76557

Closed

tmandry mentioned this pull request Sep 10, 2020

Rollup of 7 pull requests #76558

Merged

bors merged commit f09372a into rust-lang:master Sep 10, 2020

rustbot added this to the 1.48.0 milestone Sep 10, 2020

cuviper added a commit to cuviper/highfive that referenced this pull request Sep 10, 2020

Update rust.json for compiler/rustc_llvm

f48bce3

`src/rustllvm` moved to `compiler/rustc_llvm` in rust-lang/rust#74787

cuviper added a commit to cuviper/highfive that referenced this pull request Sep 10, 2020

Update rust.json for compiler/rustc_llvm

f6d5453

`src/rustllvm` and `src/librustc_llvm` moved to `compiler/rustc_llvm` in rust-lang/rust#74787.

cuviper added a commit to cuviper/highfive that referenced this pull request Sep 10, 2020

Update rust.json for compiler/rustc_llvm

b88da5c

`src/rustllvm` and `src/librustc_llvm` moved to `compiler/rustc_llvm` in rust-lang/rust#74787.

cuviper mentioned this pull request Sep 10, 2020

Update rust.json for compiler/rustc_llvm rust-lang/highfive#288

Merged

LeSeulArtichaut mentioned this pull request Jan 24, 2021

Update links to librustc_llvm and rustllvm rust-lang/rustc-dev-guide#1039

Merged

petrochenkov deleted the rustllvm branch February 22, 2025 18:32

Move rustllvm into compiler/rustc_llvm #74787

Move rustllvm into compiler/rustc_llvm #74787

Uh oh!

Conversation

petrochenkov commented Jul 26, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Jul 26, 2020

Uh oh!

petrochenkov commented Jul 26, 2020

Uh oh!

lcnr commented Jul 26, 2020

Uh oh!

cuviper commented Jul 27, 2020

Uh oh!

petrochenkov commented Jul 28, 2020

Uh oh!

bors commented Jul 29, 2020

Uh oh!

matklad commented Aug 30, 2020

Uh oh!

mark-i-m commented Aug 30, 2020

Uh oh!

mark-i-m commented Aug 30, 2020

Uh oh!

petrochenkov commented Sep 2, 2020

Uh oh!

petrochenkov commented Sep 2, 2020

Uh oh!

bors commented Sep 4, 2020

Uh oh!

cuviper left a comment

Choose a reason for hiding this comment

Uh oh!

petrochenkov commented Sep 9, 2020

Uh oh!

bors commented Sep 9, 2020

Uh oh!

bors commented Sep 10, 2020

Uh oh!

tmandry commented Sep 10, 2020

Uh oh!

bors commented Sep 10, 2020

Uh oh!

tmandry commented Sep 10, 2020

Uh oh!

bors commented Sep 10, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Move `rustllvm` into `compiler/rustc_llvm` #74787

Move `rustllvm` into `compiler/rustc_llvm` #74787

petrochenkov commented Jul 26, 2020 •

edited

Loading