Skip to content
New issue

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

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

Already on GitHub? # to your account

Update llvm-project to latest origin/rustc/10.0-2020-05-05 commit #74239

Merged
merged 1 commit into from
Jul 14, 2020

Conversation

AdrianCX
Copy link
Contributor

which includes LVI segfault fix when building fortanix/rust-sgx#267
And a few earlier commits.

@rust-highfive
Copy link
Collaborator

r? @cuviper

(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 Jul 11, 2020
@cuviper
Copy link
Member

cuviper commented Jul 11, 2020

I think this should wait for the submodule update in #74116 to land, since that has others changes included.

@eddyb was waiting for that PR to then pull the wasm-determinism fix, which you've included here too.

@bors
Copy link
Contributor

bors commented Jul 12, 2020

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

@eddyb
Copy link
Member

eddyb commented Jul 12, 2020

@AdrianCX can you rebase? I think we can just approve the PR afterwards.

@AdrianCX
Copy link
Contributor Author

thanks, rebased

@cuviper
Copy link
Member

cuviper commented Jul 12, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 12, 2020

📌 Commit ed587f8 has been approved by cuviper

@bors
Copy link
Contributor

bors commented Jul 12, 2020

🌲 The tree is currently closed for pull requests below priority 20, this pull request will be tested once the tree is reopened

@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 Jul 12, 2020
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 13, 2020
Update llvm-project to latest origin/rustc/10.0-2020-05-05 commit

which includes LVI segfault fix when building fortanix/rust-sgx#267
And a few earlier commits.
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 13, 2020
Update llvm-project to latest origin/rustc/10.0-2020-05-05 commit

which includes LVI segfault fix when building fortanix/rust-sgx#267
And a few earlier commits.
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 13, 2020
Update llvm-project to latest origin/rustc/10.0-2020-05-05 commit

which includes LVI segfault fix when building fortanix/rust-sgx#267
And a few earlier commits.
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 13, 2020
Update llvm-project to latest origin/rustc/10.0-2020-05-05 commit

which includes LVI segfault fix when building fortanix/rust-sgx#267
And a few earlier commits.
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 14, 2020
Update llvm-project to latest origin/rustc/10.0-2020-05-05 commit

which includes LVI segfault fix when building fortanix/rust-sgx#267
And a few earlier commits.
@eddyb
Copy link
Member

eddyb commented Jul 14, 2020

@bors rollup=iffy p=5 (checking if this is the cause of wasm failures, should take only half an hour)

@bors
Copy link
Contributor

bors commented Jul 14, 2020

⌛ Testing commit ed587f8 with merge 45e656cb98d38b2e5b8951b2672c49af4ccffb3c...

Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 14, 2020
Update llvm-project to latest origin/rustc/10.0-2020-05-05 commit

which includes LVI segfault fix when building fortanix/rust-sgx#267
And a few earlier commits.
@Manishearth
Copy link
Member

@bors retry yield p=0

@eddyb
Copy link
Member

eddyb commented Jul 14, 2020

@bors rollup (trying to clear the "iffy", since it did work on wasm)

@eddyb
Copy link
Member

eddyb commented Jul 14, 2020

@bors p=0

Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 14, 2020
Update llvm-project to latest origin/rustc/10.0-2020-05-05 commit

which includes LVI segfault fix when building fortanix/rust-sgx#267
And a few earlier commits.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 14, 2020
…arth

Rollup of 15 pull requests

Successful merges:

 - rust-lang#71237 (Add Ayu theme to rustdoc)
 - rust-lang#73720 (Clean up E0704 error explanation)
 - rust-lang#73866 (Obviate #[allow(improper_ctypes_definitions)])
 - rust-lang#73965 (typeck: check for infer before type impls trait)
 - rust-lang#73986 (add (unchecked) indexing methods to raw (and NonNull) slices)
 - rust-lang#74173 (Detect tuple struct incorrectly used as struct pat)
 - rust-lang#74220 (Refactor Windows `parse_prefix`)
 - rust-lang#74227 (Remove an unwrap in layout computation)
 - rust-lang#74239 (Update llvm-project to latest origin/rustc/10.0-2020-05-05 commit )
 - rust-lang#74257 (don't mark linux kernel module targets as a unix environment)
 - rust-lang#74270 (typeck: report placeholder type error w/out span)
 - rust-lang#74296 (Clarify the description for rfind)
 - rust-lang#74310 (Use `ArrayVec` in `SparseBitSet`.)
 - rust-lang#74316 (Remove unnecessary type hints from Wake internals)
 - rust-lang#74324 (Update Clippy)

Failed merges:

r? @ghost
@bors bors merged commit aa9dc70 into rust-lang:master Jul 14, 2020
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
# for free to join this conversation on GitHub. Already have an account? # 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.

6 participants