Skip to content

Rollup of 8 pull requests #110295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Apr 13, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2c66c8f
Fix diff option conflict in UI test
chenyukang Mar 11, 2023
1178c49
Check for body owner fallibly
compiler-errors Apr 11, 2023
229b0a0
Make rust-intrinsic ABI unwindable
nbdd0121 Apr 12, 2023
5c9b371
Bless tests
nbdd0121 Apr 12, 2023
9e0e4c3
Added diagnostic for pin! macro in addition to Box::pin if Unpin isn'…
ndrewxie Apr 12, 2023
1e2f0d2
automatically update the LLVM submodule
KittyBorgX Apr 13, 2023
03cf0e9
refactor: emit "unused assoc fn" in lexical order
Ezrashaw Apr 12, 2023
731c6dc
Document catch_fn in r#try cannot unwind
nbdd0121 Apr 12, 2023
c41dcac
dead-code-lint: de-dup multiple unused assoc fns
Ezrashaw Apr 13, 2023
b07a470
Add regression test
nbdd0121 Apr 12, 2023
39e23ef
impl reviewer feedback
Ezrashaw Apr 13, 2023
2bafc0f
bless the single test
Ezrashaw Apr 13, 2023
4061eb5
Only emit alignment checks if we have a panic_impl
saethlin Apr 13, 2023
09a8791
Implement `Copy` for `LocationDetail`
WaffleLapkin Apr 13, 2023
d146211
Rollup merge of #109036 - chenyukang:yukang/fix-testcase, r=jyn514
matthiaskrgr Apr 13, 2023
232eb69
Rollup merge of #110193 - compiler-errors:body-owner-issue, r=WaffleL…
matthiaskrgr Apr 13, 2023
e85ecbb
Rollup merge of #110233 - nbdd0121:intrinsic, r=tmiasko
matthiaskrgr Apr 13, 2023
e413c2e
Rollup merge of #110259 - ndrewxie:issue-109964-fix-gitstuff, r=cjgillot
matthiaskrgr Apr 13, 2023
e86de74
Rollup merge of #110265 - KittyBorgX:master, r=ozkanonur
matthiaskrgr Apr 13, 2023
759d4e8
Rollup merge of #110277 - Ezrashaw:combine-assoc-fns-dlint, r=lcnr
matthiaskrgr Apr 13, 2023
c140e25
Rollup merge of #110283 - saethlin:check-panics-before-alignment, r=b…
matthiaskrgr Apr 13, 2023
46c6301
Rollup merge of #110291 - WaffleLapkin:copy_location_detail, r=oli-obk
matthiaskrgr Apr 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
automatically update the LLVM submodule
  • Loading branch information
KittyBorgX committed Apr 13, 2023
commit 1e2f0d2469c2038784e4394b80b7c18be843b3d3
2 changes: 2 additions & 0 deletions src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -895,6 +895,8 @@ impl Step for Src {

/// Creates the `rust-src` installer component
fn run(self, builder: &Builder<'_>) -> GeneratedTarball {
builder.update_submodule(&Path::new("src/llvm-project"));

let tarball = Tarball::new_targetless(builder, "rust-src");

// A lot of tools expect the rust-src component to be entirely in this directory, so if you
Expand Down
4 changes: 4 additions & 0 deletions src/bootstrap/llvm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1087,6 +1087,8 @@ impl Step for CrtBeginEnd {

/// Build crtbegin.o/crtend.o for musl target.
fn run(self, builder: &Builder<'_>) -> Self::Output {
builder.update_submodule(&Path::new("src/llvm-project"));

let out_dir = builder.native_dir(self.target).join("crt");

if builder.config.dry_run() {
Expand Down Expand Up @@ -1153,6 +1155,8 @@ impl Step for Libunwind {

/// Build linunwind.a
fn run(self, builder: &Builder<'_>) -> Self::Output {
builder.update_submodule(&Path::new("src/llvm-project"));

if builder.config.dry_run() {
return PathBuf::new();
}
Expand Down