Bump bootstrap compiler to 1.33 beta #57765
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
Centril
approved these changes
Jan 19, 2019
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Mark-Simulacrum
force-pushed
the
bootstrap-bump
branch
from
142b6bb to
d3c6665
Compare
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
cjgillot
reviewed
Jan 20, 2019
src/libcore/mem.rs
Outdated
| @@ -626,8 +625,6 @@ pub unsafe fn zeroed<T>() -> T { | |||
| #[rustc_deprecated(since = "2.0.0", reason = "use `mem::MaybeUninit::uninitialized` instead")] | |||
| #[stable(feature = "rust1", since = "1.0.0")] | |||
| pub unsafe fn uninitialized<T>() -> T { | |||
| #[cfg(not(stage0))] | |||
| intrinsics::panic_if_uninhabited::<T>(); | |||
There was a problem hiding this comment.
This line should not have been deleted.
|
@bors try Testing LLVM build - I suspect it'll fail based on local testing |
bors
added a commit
that referenced
this pull request
Jan 20, 2019
Bump bootstrap compiler to 1.33 beta r? @alexcrichton or @pietroalbini cc @rust-lang/release
|
☀️ Test successful - checks-travis |
Mark-Simulacrum
force-pushed
the
bootstrap-bump
branch
from
d3c6665 to
ea31a08
Compare
|
@alexcrichton I can't reproduce on Travis, but locally, whenever I try to build this I run into the following (including in the docker containers). I'm hesitant to land this as-is, but haven't yet managed to track down the reason why Travis works but it doesn't locally. I have a few more ideas but thought I'd post here in case you'd seen this before. As far as I can tell, the |
|
@bors try |
|
⌛ Trying commit 26fd045ef8654b0a1888b9b11efe2c919e872e81 with merge 88bdd43be4bb2fee4bfffed750fb12f21d38ced9... |
|
Okay, so https://travis-ci.com/rust-lang/rust/jobs/171725268#L6034 has the error reproduced on Travis. I'm probably off for the night but will try to dig in more tomorrow -- I suspect we'll just want to not have the LD_LIBRARY_PATH set at all during build script execution (or perhaps any run of llvm-config). |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
This was referenced Jan 21, 2019
|
I have confirmed that the problem is that Cargo adds the Unfortunately, Cargo prepends this to the search path so we can't really do anything in rustbuild to override that -- at least as far as I can tell. This behavior was added forever ago in rust-lang/cargo#2891. At this point, I'm honestly somewhat not sure if there's a good solution to this. The One solution is to simply run We could also stop including the I'm going to implement what I see as a "presumably good" variant: never execute llvm_config in build scripts. We don't do this much anyway and so feeding that information through environment variables doesn't seem terrible; it should also solve the problems here. As such this post is primarily a documentation of thought process. |
Mark-Simulacrum
force-pushed
the
bootstrap-bump
branch
from
4653123 to
b569309
Compare
|
This is ready for review; local testing shows that I've resolved the LLVM issue -- see the second commit (b569309f5db6b7ed9d7c7d14d24954590604a1f3 as of this time) and #57765 (comment) for some more rational. |
|
@bors: r+ |
|
📌 Commit b569309f5db6b7ed9d7c7d14d24954590604a1f3 has been approved by |
bors
added
S-waiting-on-bors
|
Good find! |
|
I can take a look. |
bors
added a commit
to rust-lang/cargo
that referenced
this pull request
Jan 27, 2019
Remove deprecated ATOMIC initializers. Required for rust-lang/rust#57765. cc @Mark-Simulacrum
|
@bors r=alexcrichton |
|
📌 Commit b3ddcbcaa4b997d1107c44f3b586ed4b03537542 has been approved by |
bors
added
S-waiting-on-bors
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
@bors r- That was fast to fail. |
bors
added
S-waiting-on-author
Implemented in rust-lang/cargo#6600
Mark-Simulacrum
force-pushed
the
bootstrap-bump
branch
from
b3ddcbc to
cd39cf7
Compare
|
@bors r=alexcrichton Cargo... wants more than I suspected. |
|
📌 Commit cd39cf7 has been approved by |
bors
added
S-waiting-on-bors
Centril
reviewed
Jan 27, 2019
| @@ -15,7 +15,40 @@ macro_rules! dup { | |||
| ((* $($exp:tt)*) $($val:tt)*) => (dup!( ($($exp)*) $($val)* $($val)* )); | |||
| (() $($val:tt)*) => ([$($val),*]) | |||
| } | |||
| static TLS_DESTRUCTOR: [AtomicUsize; TLS_KEYS] = dup!((* * * * * * *) ATOMIC_USIZE_INIT); | |||
| static TLS_DESTRUCTOR: [AtomicUsize; TLS_KEYS] = [ | |||
There was a problem hiding this comment.
Note to self: 😭, we need #49147 yesterday... ;)
bors
added a commit
that referenced
this pull request
Jan 27, 2019
Bump bootstrap compiler to 1.33 beta r? @alexcrichton or @pietroalbini cc @rust-lang/release
|
☀️ Test successful - checks-travis, status-appveyor |
rust-highfive
added a commit
to rust-lang-nursery/rust-toolstate
that referenced
this pull request
Jan 27, 2019
Tested on commit rust-lang/rust@8611577. Direct link to PR: <rust-lang/rust#57765> 💔 miri on windows: test-pass → test-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra). 💔 miri on linux: test-pass → test-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
This was referenced Jan 27, 2019
jethrogb
reviewed
Feb 12, 2019
| AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), | ||
| AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), | ||
| AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), | ||
| AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), |
There was a problem hiding this comment.
@Mark-Simulacrum is there any particular reason you expanded this macro?
There was a problem hiding this comment.
The constant was deprecated so we needed to switch to the function call, and I didn't manage to fix the macro to permit that fast enough so I decided to just expand it.
elebihan
added a commit
to elebihan/buildroot
that referenced
this pull request
Mar 12, 2019
Bump rust to 1.33.0 with the following changes: - drop support for jemalloc - add dependency on host-openssl - add a patch to fix bootstraping with rust 1.33.0 [1] [1] rust-lang/rust#57765
bkuhls
pushed a commit
to bkuhls/buildroot
that referenced
this pull request
Apr 11, 2019
Bump rust to 1.33.0 with the following changes: - drop support for jemalloc - add dependency on host-openssl - add a patch to fix bootstraping with rust 1.33.0 [1] [1] rust-lang/rust#57765 Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
r? @alexcrichton or @pietroalbini
cc @rust-lang/release