Skip to content

[beta] Backport unstabilization of extended varargs abi support #136934

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

Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
c09561c
update version placeholders
pietroalbini Jan 6, 2025
3bc7fca
update channel to beta
pietroalbini Jan 6, 2025
031ad72
Pass objcopy args for stripping on OSX
Noratrieb Jan 2, 2025
3d6fdff
rustfmt: drop nightly-gating of the `--style-edition` flag registration
jieyouxu Jan 7, 2025
fc252e9
Revert "fix missing rustfmt for apple darwin"
pietroalbini Jan 8, 2025
b2ab974
Revert "fix missing rustfmt and clippy for msi"
pietroalbini Jan 8, 2025
e30eeff
Auto merge of #135163 - pietroalbini:pa-beta, r=pietroalbini
bors Jan 8, 2025
9e57baf
bump stage0 to 1.84.0
cuviper Jan 10, 2025
4475508
run borrowck tests on BIDs and emit tail-expr-drop-order lints for
dingxiangfei2009 Dec 4, 2024
e398428
apply suggestions on fn name
dingxiangfei2009 Dec 19, 2024
61c0bcf
remove an extraneous comment
dingxiangfei2009 Dec 19, 2024
273873a
Don't create cycles by normalizing opaques defined in the body we're …
compiler-errors Jan 5, 2025
1b8413e
Don't do AccessDepth::Drop for types with no drop impl
compiler-errors Jan 5, 2025
18d3153
Try to explain borrow for tail expr temporary drop order change in 2024
compiler-errors Jan 6, 2025
ce4e43f
Bless test UI changes in backport
cuviper Jan 11, 2025
fe9b975
Auto merge of #135351 - cuviper:beta-next, r=cuviper
bors Jan 11, 2025
402eeff
[beta] TRPL: incorporate all backward-compatible Edition changes
chriskrycho Jan 14, 2025
f836dc2
Mark rustbook as an external tool
ehuss Jan 13, 2025
5904ea4
Backport rust-lang/rust-analyzer#18760: internal: Workaround salsa cy…
Veykril Jan 16, 2025
8a7dc21
do not in-place-iterate over flatmap/flatten
the8472 Jan 4, 2025
ae37d1c
add regression test for unsound Flatten/FlatMap specialization
the8472 Jan 4, 2025
e126c8d
Make sure to mark IMPL_TRAIT_REDUNDANT_CAPTURES as Allow in edition 2024
compiler-errors Jan 13, 2025
1c85981
Update to LLVM 19.1.7
nikic Jan 14, 2025
d0d224d
Auto merge of #135508 - chriskrycho:trpl-edition-updates, r=ehuss
bors Jan 17, 2025
752fecf
Auto merge of #135609 - cuviper:beta-next, r=cuviper
bors Jan 17, 2025
4416507
Auto merge of #135575 - Veykril:push-ynurtulswkpo, r=Mark-Simulacrum
bors Jan 20, 2025
a41d236
Always force non-trimming of path in `unreachable_patterns` lint
estebank Jan 9, 2025
eb03c32
Add logic to override profile for non git sources
tanvincible Jan 13, 2025
f379706
resolve symlinks of LLVM tool binaries before copying them
onur-ozkan Jan 16, 2025
953a1a0
avoid running the overlap check twice
lcnr Jan 15, 2025
e35db42
add cache to `AmbiguityCausesVisitor`
lcnr Jan 17, 2025
f6aed49
add test
lcnr Jan 17, 2025
4595e11
When LLVM's location discriminator value limit is exceeded, emit loca…
khuey Jan 17, 2025
e92addf
make it possible to use ci-rustc on tarball sources
onur-ozkan Jan 19, 2025
5f5e70b
Remove test panic from File::open
ChrisDenton Jan 21, 2025
f05d305
Only assert the `Parser` size on specific arches
cuviper Jan 22, 2025
ee2ff9d
[beta] TRPL: more backward-compatible Edition changes
chriskrycho Jan 21, 2025
130f951
[beta] TRPL: integrate edits to Chapter 17
chriskrycho Jan 21, 2025
14445aa
Auto merge of #136017 - cuviper:beta-next, r=cuviper
bors Jan 26, 2025
ee94112
Rollup merge of #135852 - lukas-code:asyncfn-prelude-core, r=compiler…
matthiaskrgr Jan 30, 2025
2fa9d47
Disable some incorrect rust-analyzer diagnostics on beta
Veykril Jan 29, 2025
fdc22dc
Rollup merge of #136312 - compiler-errors:overflow_delimited_expr-202…
jhpratt Jan 31, 2025
b5a02ff
Update edition-guide
ehuss Feb 1, 2025
cfe3de2
Fix core AsyncFn stability attribute
ehuss Feb 1, 2025
0277061
Auto merge of #136391 - ehuss:rust-1.85-beta-backports, r=ehuss
bors Feb 1, 2025
887965d
Ensure that we don't try to access fields on a non-struct pattern typ…
estebank Jan 7, 2025
e98d524
Add check for missing fields in enum variant pattern
estebank Jan 8, 2025
f264675
modify test to side-step platform-dependent stderr output
estebank Jan 8, 2025
13c3f9b
Do not include GCC source code in source tarballs
Kobzol Jan 17, 2025
7302b30
Revert "Auto merge of #134330 - scottmcm:no-more-rvalue-len, r=matthe…
lqd Jan 18, 2025
c6063d4
Revert "Rollup merge of #134371 - scottmcm:fix-134352, r=oli-obk"
lqd Jan 18, 2025
197b416
Revert "Auto merge of #133734 - scottmcm:lower-indexing-to-ptrmetadat…
lqd Jan 18, 2025
9405480
add tests for issue 135671
lqd Jan 18, 2025
741fa9e
ensure sufficient stack in tail call check
lqd Jan 31, 2025
01283c4
ensure sufficient stack in unsafety check
lqd Jan 31, 2025
bf24cad
Enable kernel sanitizers for aarch64-unknown-none-softfloat
workingjubilee Jan 22, 2025
3821385
Auto merge of #136650 - cuviper:beta-next, r=cuviper
bors Feb 6, 2025
74c0e61
Revert "Stabilize `extended_varargs_abi_support`"
workingjubilee Feb 12, 2025
File filter

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
resolve symlinks of LLVM tool binaries before copying them
There is a chance that these tools are being installed from an external LLVM
and we have no control over them. If any of these tools use symlinks, they will
fail during tarball distribution. This change makes copying process to resolve
symlinks just before placing them into the destination path.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
(cherry picked from commit cde58dd)
  • Loading branch information
onur-ozkan authored and cuviper committed Jan 23, 2025
commit f3797062a3fd5df98fd236073b17278c3d9f03c2
8 changes: 7 additions & 1 deletion src/bootstrap/src/core/build_steps/compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1790,7 +1790,13 @@ impl Step for Assemble {
// When using `download-ci-llvm`, some of the tools
// may not exist, so skip trying to copy them.
if src_path.exists() {
builder.copy_link(&src_path, &libdir_bin.join(&tool_exe));
// There is a chance that these tools are being installed from an external LLVM.
// Use `Builder::resolve_symlink_and_copy` instead of `Builder::copy_link` to ensure
// we are copying the original file not the symlinked path, which causes issues for
// tarball distribution.
//
// See https://github.com/rust-lang/rust/issues/135554.
builder.resolve_symlink_and_copy(&src_path, &libdir_bin.join(&tool_exe));
}
}
}
Expand Down
8 changes: 8 additions & 0 deletions src/bootstrap/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1657,6 +1657,14 @@ Executed at: {executed_at}"#,
paths
}

/// Copies a file from `src` to `dst`.
///
/// If `src` is a symlink, `src` will be resolved to the actual path
/// and copied to `dst` instead of the symlink itself.
pub fn resolve_symlink_and_copy(&self, src: &Path, dst: &Path) {
self.copy_link_internal(src, dst, true);
}

/// Links a file from `src` to `dst`.
/// Attempts to use hard links if possible, falling back to copying.
/// You can neither rely on this being a copy nor it being a link,
Expand Down