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

Rollup of 6 pull requests #71264

Merged
merged 16 commits into from
Apr 18, 2020
Merged

Rollup of 6 pull requests #71264

merged 16 commits into from
Apr 18, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

petrochenkov and others added 16 commits April 12, 2020 21:04
The `FnAbi` now knows if the function is allowed to unwind. If a
function isn't allowed to unwind, we can use a `call` instead of an
`invoke`.

This resolves an issue when calling LLVM intrinsics which cannot unwind
LLVM will generate an error if you attempt to invoke them so we need to
ignore cleanup blocks in codegen and generate a call instead.
Use `call` instead of `invoke` for functions that cannot unwind

The `FnAbi` now knows if the function is allowed to unwind. If a
function isn't allowed to unwind, we can use a `call` instead of an
`invoke`.

This resolves an issue when calling LLVM intrinsics which cannot unwind
LLVM will generate an error if you attempt to invoke them so we need to
ignore cleanup blocks in codegen and generate a call instead.

Fixes rust-lang#69911

r? @eddyb
cc @rust-lang/wg-ffi-unwind
…mulacrum

rustbuild: Remove stage 0 LLD flavor workaround for MSVC
big-O notation: parenthesis for function calls, explicit multiplication

I saw `O(n m log n)` in the docs and found that really hard to parse. In particular, I don't think we should use blank space as syntax for *both* multiplication and function calls, that is just confusing.

This PR makes both multiplication and function calls explicit using Rust-like syntax. If you prefer, I can also leave one of them implicit, but I believe explicit is better here.

While I was at it I also added backticks consistently.
Miri: fix typo

r? @oli-obk at least I think this should be "without", right?
Account for use of `try!()` in 2018 edition and guide users in the right direction

fixes rust-lang#71155
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Apr 17, 2020

📌 Commit 4b9eeca has been approved by Dylan-DPC

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 17, 2020
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Apr 17, 2020
@bors
Copy link
Contributor

bors commented Apr 17, 2020

⌛ Testing commit 4b9eeca with merge cff9a75...

@bors
Copy link
Contributor

bors commented Apr 18, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing cff9a75 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 18, 2020
@bors bors merged commit cff9a75 into rust-lang:master Apr 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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.

7 participants