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 11 pull requests #77630

Merged
merged 28 commits into from
Oct 7, 2020
Merged

Rollup of 11 pull requests #77630

merged 28 commits into from
Oct 7, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

RalfJung and others added 28 commits October 5, 2020 09:12
This didn't have an effect in most cases, and is not trivially sound.
Let it bake at `mir-opt-level=2` for a while.
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
Sometimes, a backend may need to emit warnings, errors, or otherwise
need to know the span of the current item in a basic block. So, add a
set_span method to give the backend that information.
Add some docs to rustdoc::clean::inline and def_id functions

Split from rust-lang#76571 .
…n514

Fix suggestions for x.py setup

rust-lang#76631 introduced a new `setup` command to x.py

By default the command prompts for a profile to use:

```
Welcome to the Rust project! What do you want to do with x.py?
a) Contribute to the standard library
b) Contribute to the compiler
c) Contribute to the compiler, and also modify LLVM or codegen
d) Install Rust from source
```

and then displays command suggestions, depending on which profile was chosen. However [the mapping between chosen profile](https://github.com/rust-lang/rust/blob/9cba260df0f1c67ea3690035cd5611a7465a1560/src/bootstrap/setup.rs#L75-L85) and [suggestion](https://github.com/rust-lang/rust/blob/9cba260df0f1c67ea3690035cd5611a7465a1560/src/bootstrap/setup.rs#L42-L47) isn't exact, leading to suggestions not being shown if the user presses `c` or `d`. (because "c" is translated to "llvm" and "d" to "maintainer", but suggestions trigger for "codegen" and "user" respectively)

A more thorough refactor would stop using "strings-as-type" to make sure this kind of error doesn't happen, but it may be overkill for that kind of "script" program?

Tagging the setup command author: @jyn514
Update to chalk 0.31

Gonna assign @nikomatsakis to the review here, but since he is pretty busy recently, if anyone else wants to review this, that would be much appreciated.

r? @nikomatsakis
…morse

inliner: use caller param_env

We used the callee param env instead of the caller param env by accident in rust-lang#77430, this PR fixes that and caches it in the `Inliner` struct.

fixes rust-lang#77564

r? @ecstatic-morse
…ise-branch, r=wesleywiser

Move `EarlyOtherwiseBranch` to mir-opt-level 2

cc rust-lang#75119

This didn't have an [effect in most cases](https://perf.rust-lang.org/compare.html?start=81e02708f1f4760244756548981277d5199baa9a&end=2e0edc0f28c5647141bedba02e7a222d3a5dc9c3&stat=instructions:u), and is not trivially sound. Let it bake at `mir-opt-level=2` for a while.

Also, this missed the cutoff for beta, so we'll have to backport this.
r? @wesleywiser
…nkov

Fix rustc_def_path to show the full path and not the trimmed one

Follow-up fix for rust-lang#73996.
Let backends access span information

Sometimes, a backend may need to emit warnings, errors, or otherwise need to know the span of the current item in a basic block. So, add a `set_span` method to give the backend that information.

The `set_source_location` method already partially does this, however, it's disabled when debug info is disabled. There needs to be a way to unconditionally provide the span.
Add c as a shorthand check alternative for new options rust-lang#77603

There is a missing "c" that is a shorthand for "check" in newly added match arm for handling check-specific options.
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=11

@bors
Copy link
Contributor

bors commented Oct 6, 2020

📌 Commit f600154 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 Oct 6, 2020
@bors
Copy link
Contributor

bors commented Oct 6, 2020

⌛ Testing commit f600154 with merge 59dafb8...

@bors
Copy link
Contributor

bors commented Oct 7, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Dylan-DPC
Pushing 59dafb8 to master...

@rust-log-analyzer
Copy link
Collaborator

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

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 @rust-lang/infra. (Feature Requests)

@Mark-Simulacrum
Copy link
Member

There seems to be a win on the match stress test and to a lesser extent the deeply-nested benchmark in this PR (https://perf.rust-lang.org/compare.html?start=98edd1fbf8a68977a2a7c1312eb1ebff80515a92&end=59dafb876e125c49fca93820c5ef22da3fcb8644&stat=instructions:u). @rust-lang/wg-mir-opt, I see #77582 in this PR which feels like it could be related, do you think that's the case? Otherwise there's quite a few PRs in this rollup which look like they could be related.

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. 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.