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.

Sign up for GitHub

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

Jump to bottom

Rollup of 12 pull requests #81625

Merged
merged 90 commits into from
Feb 1, 2021
Merged

Rollup of 12 pull requests #81625

merged 90 commits into from
Feb 1, 2021

Conversation

jonas-schievink
Copy link
Contributor

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

bjorn3 and others added 30 commits December 27, 2020 10:30
@bjorn3
Merge commit 'dbee13661efa269cb4cd57bb4c6b99a19732b484' into sync_cg_…
77f74ed 
…clif-2020-12-27
@bjorn3
Merge branch 'sync_from_rust'
50a6a84
@bjorn3
Rustup to rustc 1.51.0-nightly (44e3daf 2020-12-31)
2c41a69
@bjorn3
Remove code that was moved from the backend to rustc_incremental
1a1cdac
@bjorn3
Disable timings by default for cargo.sh
3ea8915 
Fixes #1121
@osa1
codegen_cranelift: Fix redundant semicolon warn
ea73caa
@bjorn3
Update Cranelift
c34e165
@bjorn3
Update dependencies
1952b1f
@bjorn3
Clear domtree after cg_clif optimizations
cfedad1
@LeSeulArtichaut
Use ty::{IntTy,UintTy,FloatTy} in rustc
c3d7dc9
@bjorn3
Rustup to rustc 1.51.0-nightly (a4cbb44 2021-01-20)
c0aefeb
@bjorn3
Disable new failing libcore tests
7f60301
@bjorn3
Fix indirectly linking to libstd.so with the JIT
9bf5cb4
@bjorn3
Update Cranelift
a19ef67 
This implements everything in the new backend necessary for usage with cg_clif
@bjorn3
Add a feature flag to switch between oldbe and newbe
173ec34
@bjorn3
Test both oldbe and newbe on CI
da4aa92
@bjorn3
Merge pull request #1127 from bjorn3/newbe
500faf2 
Support building with the new Cranelift backends
@bjorn3
Fix rust-analyzer pref name
2ced8c0
@bjorn3
Default to Cranelift newBE
ae6daf7
@RalfJung
clean up some const error reporting around promoteds
d6eb4f5
@camelid
Improve rustc_mir_build::matches docs
496836a 
- Fix typos
- Add more information
- General cleanup
@bjorn3
Start using ArgAbi
d39b441
@bjorn3
Split abi adjustments out
6170fc6
@bjorn3
Rustup to rustc 1.51.0-nightly (1d0d76f 2021-01-24)
ff33042
@bjorn3
Replace all uses of PassMode with ArgAbi
de713a8
@bjorn3
Misc cleanups
2b58d8c
@bjorn3
Split symbol name and signature calculation
4555737
@bjorn3
[WIP] Use FnAbi everywhere instead of our own abi calculations
fc595f1
@bjorn3
Replace EmptySinglePair with SmallVec
d263447
@bjorn3
Remove vararg support check
aa23f86 
This check wasn't very useful and removing it simplifies the code.
c410-f3r and others added 15 commits January 31, 2021 19:46
@c410-f3r
Move some tests to more reasonable directories
2bb4a69
@camelid
Update outdated comment
8b52cdc 
The highest-priority item is the *first* in the list, not the last.
See [this code][1] for more.

[this code]: https://github.com/rust-lang/rust/blob/0e63af5da3400ace48a0345117980473fd21ad73/compiler/rustc_mir_build/src/build/matches/mod.rs#L1334-L1335
@bjorn3
Merge commit 'd556c56f792756dd7cfec742b9f2e07612dc10f4' into sync_cg_…
2785533 
…clif-2021-02-01
@jonas-schievink
Rollup merge of #78641 - the8472:buffered-copy, r=sfackler
a7a6f01 
Let io::copy reuse BufWriter buffers

This optimization will allow users to implicitly set the buffer size for io::copy by wrapping the writer into a `BufWriter` if the default block size is insufficient, which should fix #49921

Due to min_specialization limitations this approach only works with `BufWriter` but not for `BufReader<R>` since `R` is unconstrained and thus the necessary specialization on `R: Read` is not always applicable. Once specialization becomes more powerful this optimization could be extended to look at the reader and writer side and use whichever buffer is larger.
@jonas-schievink
Rollup merge of #79291 - JulianKnodt:ce_priv, r=petrochenkov
21d0e9b 
Add error message for private fn

Attempts to add a more detailed error when a `const_evaluatable` fn from another scope is used inside of a scope which cannot access it.

r? ````@lcnr````
@jonas-schievink
Rollup merge of #81364 - camelid:improve-build-matches-docs, r=varkor
ab74346 
Improve `rustc_mir_build::matches` docs

- Fix typos
- Add more information
- General cleanup
@jonas-schievink
Rollup merge of #81387 - c410-f3r:tests-tests-tests, r=petrochenkov
c99ec7f 
Move some tests to more reasonable directories - 3

cc #73494
r? ````@petrochenkov````

https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-56202.rs <sup>https://github.com/rust-lang/rust/issues/56202</sup>: traits 1.008
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-69841.rs <sup>https://github.com/rust-lang/rust/issues/69841</sup>: for-loop-while 1.014
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-10763.rs <sup>https://github.com/rust-lang/rust/issues/10763</sup>: extern 1.016
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-50599.rs <sup>https://github.com/rust-lang/rust/issues/50599</sup>: resolve 1.018
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-6128.rs <sup>https://github.com/rust-lang/rust/issues/6128</sup>: traits 1.043
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-20616-8.rs <sup>https://github.com/rust-lang/rust/issues/20616</sup>: parser 1.045
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-46553.rs <sup>https://github.com/rust-lang/rust/issues/46553</sup>: consts 1.081
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-33140-hack-boundaries.rs <sup>https://github.com/rust-lang/rust/issues/33140</sup>: traits 1.101
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-25826.rs <sup>https://github.com/rust-lang/rust/issues/25826</sup>: consts 1.108
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-56488.rs <sup>https://github.com/rust-lang/rust/issues/56488</sup>: traits 1.110
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-58856-1.rs <sup>https://github.com/rust-lang/rust/issues/58856</sup>: parser 1.133
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-57819.rs <sup>https://github.com/rust-lang/rust/issues/57819</sup>: parser 1.138
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-54348.rs <sup>https://github.com/rust-lang/rust/issues/54348</sup>: consts 1.155
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-14309.rs <sup>https://github.com/rust-lang/rust/issues/14309</sup>: lint 1.160
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-4446.rs <sup>https://github.com/rust-lang/rust/issues/4446</sup>: threads-sendsync 1.203
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-53675-a-test-called-panic.rs <sup>https://github.com/rust-lang/rust/issues/53675</sup>: test-attrs 1.211
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-40231-2.rs <sup>https://github.com/rust-lang/rust/issues/40231</sup>: consts 1.213
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-22037.rs <sup>https://github.com/rust-lang/rust/issues/22037</sup>: associated-types 1.214
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-59029-2.rs <sup>https://github.com/rust-lang/rust/issues/59029</sup>: traits 1.219
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-18425.rs <sup>https://github.com/rust-lang/rust/issues/18425</sup>: consts 1.237
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-6157.rs <sup>https://github.com/rust-lang/rust/issues/6157</sup>: regions 1.238
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-33819.rs <sup>https://github.com/rust-lang/rust/issues/33819</sup>: borrowck 1.280
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-3683.rs <sup>https://github.com/rust-lang/rust/issues/3683</sup>: traits 1.283
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-8709.rs <sup>https://github.com/rust-lang/rust/issues/8709</sup>: macros 1.291
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-20616-9.rs <sup>https://github.com/rust-lang/rust/issues/20616</sup>: parser 1.293
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-64732.rs <sup>https://github.com/rust-lang/rust/issues/64732</sup>: parser 1.296
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-18655.rs <sup>https://github.com/rust-lang/rust/issues/18655</sup>: associated-types 1.305
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-32947.rs <sup>https://github.com/rust-lang/rust/issues/32947</sup>: simd 1.322
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-57198.rs <sup>https://github.com/rust-lang/rust/issues/57198</sup>: parser 1.342
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-10764-rpass.rs <sup>https://github.com/rust-lang/rust/issues/10764</sup>: extern 1.392
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-73541-2.rs <sup>https://github.com/rust-lang/rust/issues/73541</sup>: async-await 1.422
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-7970b.rs <sup>https://github.com/rust-lang/rust/issues/7970</sup>: parser 1.439
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-57684.rs <sup>https://github.com/rust-lang/rust/issues/57684</sup>: parser 1.512
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-33264.rs <sup>https://github.com/rust-lang/rust/issues/33264</sup>: llvm-asm 1.523
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-65284-suggest-generic-trait-bound.rs <sup>https://github.com/rust-lang/rust/issues/65284</sup>: suggestions 1.647
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-17458.rs <sup>https://github.com/rust-lang/rust/issues/17458</sup>: consts 1.711
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-56762.rs <sup>https://github.com/rust-lang/rust/issues/56762</sup>: consts 1.787
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-2216.rs <sup>https://github.com/rust-lang/rust/issues/2216</sup>: for-loop-while 1.856
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.rs <sup>https://github.com/rust-lang/rust/issues/45696</sup>: nll 2.009
https://github.com/rust-lang/rust/blob/master/src/test/ui/issues/issue-46036.rs <sup>https://github.com/rust-lang/rust/issues/46036</sup>: nll 2.059

````@petrochenkov```` Can you put a place holder (like `N/A`) for tests without GitHub issues? It is a lot easier to parse fixed sized rows.
@jonas-schievink
Rollup merge of #81463 - matsujika:nll-ensure-c-case, r=varkor
9e8753e 
Rename NLL* to Nll* accordingly to C-CASE

Given [C-CASE](https://rust-lang.github.io/api-guidelines/naming.html#casing-conforms-to-rfc-430-c-case), `NLLRegionVariableOrigin` and `NLL` are encouraged to be `NllRegionVariableOrigin` and `Nll` respectively.
@jonas-schievink
Rollup merge of #81504 - matsujika:suggestion-field-access, r=estebank
853cfd4 
Suggest accessing field when appropriate

Fix #81222

r? ``@estebank``
@jonas-schievink
Rollup merge of #81529 - estebank:case_lints, r=davidtwco
39ea347 
Fix invalid camel case suggestion involving unicode idents

Follow up to #77805.
@jonas-schievink
Rollup merge of #81536 - tgnottingham:time-passes-rss, r=oli-obk
82b00ec 
Indicate both start and end of pass RSS in time-passes output

Previously, only the end of pass RSS was indicated. This could easily
lead one to believe that the change in RSS from one pass to the next was
attributable to the second pass, when in fact it occurred between the
end of the first pass and the start of the second.

Also, improve alignment of columns.

Sample of output:

```
time:   0.739; rss:   607MB ->   637MB	item_types_checking
time:   8.429; rss:   637MB ->   775MB	item_bodies_checking
time:  11.063; rss:   470MB ->   775MB	type_check_crate
time:   0.232; rss:   775MB ->   777MB	match_checking
time:   0.139; rss:   777MB ->   779MB	liveness_and_intrinsic_checking
time:   0.372; rss:   775MB ->   779MB	misc_checking_2
time:   8.188; rss:   779MB ->  1019MB	MIR_borrow_checking
time:   0.062; rss:  1019MB ->  1021MB	MIR_effect_checking
```
@jonas-schievink
Rollup merge of #81592 - GuillaumeGomez:rustdoc-ui-fixes, r=Nemo157
ccc5a85 
Rustdoc UI fixes

The first commit fixes this bug (I couldn't figure out why we were setting the width manually and it works as expected without so...):

![Screenshot from 2021-01-31 12-58-46](https://user-images.githubusercontent.com/3050060/106384371-d56a7700-63ca-11eb-9e04-c06b40c2ab5e.png)

The second commit fixes a small bug. On tablets or computer with very little width, the search section goes "over" the search input, making it impossible to click on the search input:

![Screenshot from 2021-01-31 13-22-37](https://user-images.githubusercontent.com/3050060/106384413-021e8e80-63cb-11eb-8321-391a1f8a4c7e.png)

The third and last commit fixes two bugs that you can see in this screenshot:

![Screenshot from 2021-01-31 13-41-05](https://user-images.githubusercontent.com/3050060/106384424-0cd92380-63cb-11eb-82de-76218286c3fb.png)

The wheel is going over the search input and the search tab is going under the search results text. The bug was fixed by simply switching to "mobile mode" at a bigger width:

![Screenshot from 2021-01-31 13-49-50](https://user-images.githubusercontent.com/3050060/106384466-4447d000-63cb-11eb-9330-a7cd29403905.png)

cc ```@pickfire```
r? ```@Nemo157```
@jonas-schievink
Rollup merge of #81594 - bjorn3:avoid_building_llvm_for_dwp, r=sanxiyn
52907cc 
Avoid building LLVM just for llvm-dwp

When the LLVM backend is disabled, the llvm-project submodule is not checked out by default. This breaks the bootstrap test for cg_clif. As cg_clif doesn't support split debuginfo anyway llvm-dwp is not necessary. Other backends would likely not want to build LLVM just for llvm-dwp either.

Fixes https://github.com/bjorn3/rustc_codegen_cranelift/issues/1119
@jonas-schievink
Rollup merge of #81598 - sivadeilra:windows_dll_imports_fix_x86, r=m-…
2622227 
…ou-se

Fix calling convention for CRT startup

My PR #81478 used the wrong calling convention for a set of
functions that are called by the CRT. These functions need to use
`extern "C"`.

This would only affect x86, which is the only target (that I know of)
that has multiple calling conventions.

```@bors``` r? ```@m-ou-se```
@jonas-schievink
Rollup merge of #81618 - bjorn3:sync_cg_clif-2021-02-01, r=bjorn3
b3339ab 
Sync rustc_codegen_cranelift

The highlight of this sync are abi compatibility with cg_llvm allowing mixing of cg_clif and cg_llvm compiled crates and switching to the x64 cranelift backend based on the new backend framework.

r? ``@ghost``

``@rustbot`` label +A-codegen +A-cranelift +T-compiler
@rustbot rustbot added the rollup A PR which is a rollup label Feb 1, 2021
@jonas-schievink
Copy link
Contributor Author

@bors r+ rollup=never p=12

@bors
Copy link
Contributor

bors commented Feb 1, 2021

📌 Commit b3339ab has been approved by jonas-schievink

@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 Feb 1, 2021
@bors
Copy link
Contributor

bors commented Feb 1, 2021

⌛ Testing commit b3339ab with merge 02b85d7...

@bors
Copy link
Contributor

bors commented Feb 1, 2021

☀️ Test successful - checks-actions
Approved by: jonas-schievink
Pushing 02b85d7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 1, 2021
@bors bors merged commit 02b85d7 into rust-lang:master Feb 1, 2021
@rustbot rustbot added this to the 1.51.0 milestone Feb 1, 2021
@jonas-schievink jonas-schievink deleted the rollup-mshpp2n branch February 1, 2021 19:25
This was referenced Feb 1, 2021
Merged
Merged
Merged
Merged
@Mark-Simulacrum
Copy link
Member

This caused some relatively small differences (some positive, some negative, though on the whole negative) on a number of benchmarks. It is unclear what the cause in this rollup is though, and as the differences are on stress tests rather than real-world code for the most part, I will skip detailed investigation/bisection within the rollup.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
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
Milestone
1.51.0
Development

Successfully merging this pull request may close these issues.