Skip to content
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

Update LLVM submodule #56948

Merged
merged 1 commit into from
Dec 19, 2018
Merged

Update LLVM submodule #56948

merged 1 commit into from
Dec 19, 2018

Conversation

jethrogb
Copy link
Contributor

@jethrogb jethrogb commented Dec 18, 2018

This includes rust-lang/llvm#133

Fixes #56942

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 18, 2018
@nikic
Copy link
Contributor

nikic commented Dec 18, 2018

Once the PR on the LLVM repo is merged, the reference here should be updated to the merge commit, otherwise the used commit may be garbage collected down the line.

@jethrogb
Copy link
Contributor Author

the used commit may be garbage collected down the line

Why? The commit history will look something like this

o   (new merge commit)
|\
| o f4728ed8
|/ 
o   95185c8c
|
…

@nikic
Copy link
Contributor

nikic commented Dec 18, 2018

You're right, I guess the problem can only occur if the PR ends up not being merged.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 18, 2018

📌 Commit 15ea63b has been approved by nikic

@bors 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 Dec 18, 2018
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Dec 19, 2018
bors added a commit that referenced this pull request Dec 19, 2018
Rollup of 15 pull requests

Successful merges:

 - #56363 (Defactored Bytes::read)
 - #56663 (Remove lifetime from Resolver)
 - #56689 (add a lint group for lints emitted by rustdoc)
 - #56772 (fix issue 54153 by not testing issue-18804 on Windows nor OS X.)
 - #56820 (format-related tweaks)
 - #56881 (Implement Eq, PartialEq and Hash for atomic::Ordering)
 - #56907 (Fix grammar in compiler error for array iterators)
 - #56908 (rustc: Don't ICE on usage of two new target features)
 - #56910 (Do not point at delim spans for complete correct blocks)
 - #56913 (Enable stack probes for UEFI images)
 - #56918 (Profiler: simplify total_duration, improve readability)
 - #56931 (Update release notes for Rust 1.31.1)
 - #56947 (Add targets thumbv7neon-linux-androideabi and thumbv7neon-unknown-linux-gnueabihf)
 - #56948 (Update LLVM submodule)
 - #56959 (Fix mobile menu rendering collision with tooltip.)

Failed merges:

 - #56914 (Ignore ui/target-feature-gate on sparc, sparc64, powerpc, powerpc64 and powerpc64le)

r? @ghost
@bors bors merged commit 15ea63b into rust-lang:master Dec 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants