Remove LintBuffer from Session #65835

Mark-Simulacrum · 2019-10-25T23:34:57Z

This moves the LintBuffer from Session into the Resolver, where it is used until lowering is done and then consumed by early lint passes. This also happily removes the failure mode of buffering lints too late where it would have previously lead to ICEs; it is statically no longer possible to do so.

I suspect that with a bit more work a similar move could be done for the lint buffer inside ParseSess, but this PR doesn't touch it (in part to keep itself small).

The last commit is the "interesting" commit -- the ones before it don't work (though they compile) as they sort of prepare the various crates for the lint buffer to be passed in rather than accessed through Session.

Mark-Simulacrum · 2019-10-25T23:36:33Z

I plan to prepare some similar documentation to what I'm working on now in rust-lang/rustc-guide#476 once this lands -- we don't have a lot that talks about lint buffering today, but I've gained a decent understanding of why we need it in working on this so can write that up.

nikomatsakis

Looks good to me! I left one small suggestion to add a helper method. r=me with that suggestion.

src/librustc_interface/util.rs

src/librustc_interface/passes.rs

src/librustc_resolve/lib.rs

Fixed.

Mark-Simulacrum · 2019-10-26T13:25:59Z

@bors r=nikomatsakis

bors · 2019-10-26T13:26:01Z

📌 Commit a44126a has been approved by nikomatsakis


        Rollup merge of rust-lang#65835 - Mark-Simulacrum:lockless-lintbuffer…

…, r=nikomatsakis Remove LintBuffer from Session This moves the `LintBuffer` from `Session` into the `Resolver`, where it is used until lowering is done and then consumed by early lint passes. This also happily removes the failure mode of buffering lints too late where it would have previously lead to ICEs; it is statically no longer possible to do so. I suspect that with a bit more work a similar move could be done for the lint buffer inside `ParseSess`, but this PR doesn't touch it (in part to keep itself small). The last commit is the "interesting" commit -- the ones before it don't work (though they compile) as they sort of prepare the various crates for the lint buffer to be passed in rather than accessed through Session.


        Auto merge of #65854 - Centril:rollup-4peu0hs, r=Centril

@ghost

Rollup of 7 pull requests Successful merges: - #65288 (Point at associated type for some obligations) - #65541 (rustc: add `Span`s to `inferred_outlives_of` predicates.) - #65738 (Coherence should allow fundamental types to impl traits when they are local) - #65777 (Don't ICE for completely unexpandable `impl Trait` types) - #65830 (Use ident.span instead of def_span in dead-code pass) - #65834 (Remove lint callback from driver) - #65835 (Remove LintBuffer from Session) Failed merges: r? @ghost

Centril · 2019-10-27T15:45:28Z

Possibly caused failure in #65854 (comment), @bors rollup=never

bors · 2019-10-27T19:43:22Z

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

Mark-Simulacrum · 2019-10-28T12:28:56Z

@bors r=nikomatsakis rollup=never

I can't reproduce the rollup failure locally so I suspect/hope it is #65830 that is responsible (that seems more likely than this PR, personally, given the small number of errors, and being limited to dead code, though that PR doesn't look immediately at fault either.

bors · 2019-10-28T12:28:58Z

📌 Commit bdcaedf has been approved by nikomatsakis

bors · 2019-11-04T02:20:58Z

⌛️ Testing commit bdcaedf with merge d9d421e...


        Auto merge of #65835 - Mark-Simulacrum:lockless-lintbuffer, r=nikomat…

…sakis Remove LintBuffer from Session This moves the `LintBuffer` from `Session` into the `Resolver`, where it is used until lowering is done and then consumed by early lint passes. This also happily removes the failure mode of buffering lints too late where it would have previously lead to ICEs; it is statically no longer possible to do so. I suspect that with a bit more work a similar move could be done for the lint buffer inside `ParseSess`, but this PR doesn't touch it (in part to keep itself small). The last commit is the "interesting" commit -- the ones before it don't work (though they compile) as they sort of prepare the various crates for the lint buffer to be passed in rather than accessed through Session.

rust-highfive · 2019-11-04T02:30:26Z

The job mingw-check of 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.

2019-11-04T02:29:54.6616073Z     Checking rustc_resolve v0.0.0 (/checkout/src/librustc_resolve)
2019-11-04T02:29:55.9373034Z error[E0599]: no method named `buffer_lint` found for type `&'b rustc::session::Session` in the current scope
2019-11-04T02:29:55.9376629Z    --> src/librustc_resolve/resolve_imports.rs:982:36
2019-11-04T02:29:55.9378510Z     |
2019-11-04T02:29:55.9379015Z 982 |                     self.r.session.buffer_lint(UNUSED_IMPORTS, directive.id, directive.span, msg);
2019-11-04T02:29:55.9379651Z     |                                    ^^^^^^^^^^^ method not found in `&'b rustc::session::Session`
2019-11-04T02:29:56.0025618Z error: aborting due to previous error
2019-11-04T02:29:56.0026642Z 
2019-11-04T02:29:56.0035113Z For more information about this error, try `rustc --explain E0599`.
2019-11-04T02:29:56.0214828Z error: could not compile `rustc_resolve`.
---
2019-11-04T02:30:07.1722273Z   local time: Mon Nov  4 02:30:07 UTC 2019
2019-11-04T02:30:07.3091555Z   network time: Mon, 04 Nov 2019 02:30:07 GMT
2019-11-04T02:30:07.3094644Z == end clock drift check ==
2019-11-04T02:30:08.5654743Z 
2019-11-04T02:30:08.5751144Z ##[error]Bash exited with code '1'.
2019-11-04T02:30:08.5781169Z ##[section]Starting: Checkout
2019-11-04T02:30:08.5783032Z ==============================================================================
2019-11-04T02:30:08.5783131Z Task         : Get sources
2019-11-04T02:30:08.5783219Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 @TimNN. (Feature Requests)

bors · 2019-11-04T02:30:41Z

💔 Test failed - checks-azure


        Remove unused get_any method


        Only permit taking buffered lints inside lint internals


        Migrate resolver over to internal lint buffer


        Utilize Resolver lint buffer during HIR lowering


        Move crate type checking later

This allows us to directly pass in a lint buffer


        Delete lint buffer from Session

Mark-Simulacrum · 2019-11-04T02:59:25Z

@bors r=nikomatsakis

bors · 2019-11-04T02:59:26Z

📌 Commit c68df7c has been approved by nikomatsakis

bors · 2019-11-04T09:00:45Z

⌛️ Testing commit c68df7c with merge ab6e478...


        Auto merge of #65835 - Mark-Simulacrum:lockless-lintbuffer, r=nikomat…

…sakis Remove LintBuffer from Session This moves the `LintBuffer` from `Session` into the `Resolver`, where it is used until lowering is done and then consumed by early lint passes. This also happily removes the failure mode of buffering lints too late where it would have previously lead to ICEs; it is statically no longer possible to do so. I suspect that with a bit more work a similar move could be done for the lint buffer inside `ParseSess`, but this PR doesn't touch it (in part to keep itself small). The last commit is the "interesting" commit -- the ones before it don't work (though they compile) as they sort of prepare the various crates for the lint buffer to be passed in rather than accessed through Session.

bors · 2019-11-04T12:15:54Z

☀️ Test successful - checks-azure
Approved by: nikomatsakis
Pushing ab6e478 to master...

rust-highfive assigned nikomatsakis Oct 25, 2019

rust-highfive added the S-waiting-on-review label Oct 25, 2019

nikomatsakis reviewed Oct 26, 2019

View changes

src/librustc_interface/util.rs Outdated Show resolved Hide resolved

src/librustc_interface/util.rs Outdated Show resolved Hide resolved

petrochenkov self-assigned this Oct 26, 2019

petrochenkov reviewed Oct 26, 2019

View changes

src/librustc_interface/passes.rs Outdated Show resolved Hide resolved

src/librustc_resolve/lib.rs Outdated Show resolved Hide resolved

petrochenkov removed their assignment Oct 26, 2019

Mark-Simulacrum force-pushed the Mark-Simulacrum:lockless-lintbuffer branch from 1ab8dc8 to a44126a Oct 26, 2019

bors added S-waiting-on-bors and removed S-waiting-on-review labels Oct 26, 2019

Centril mentioned this pull request Oct 26, 2019

Rollup of 6 pull requests #65851

Closed

Centril mentioned this pull request Oct 26, 2019

Rollup of 7 pull requests #65854

Closed

bors added S-waiting-on-author and removed S-waiting-on-bors labels Oct 27, 2019

Mark-Simulacrum force-pushed the Mark-Simulacrum:lockless-lintbuffer branch from a44126a to bdcaedf Oct 28, 2019

bors added S-waiting-on-bors and removed S-waiting-on-author labels Oct 28, 2019

bors added S-waiting-on-review and removed S-waiting-on-bors labels Nov 4, 2019

Mark-Simulacrum added 6 commits Oct 25, 2019

Remove unused get_any method

f530156

Only permit taking buffered lints inside lint internals

1bd6b48

Migrate resolver over to internal lint buffer

bb0c930

Utilize Resolver lint buffer during HIR lowering

ea1ff8c

Move crate type checking later

c0fdddc

This allows us to directly pass in a lint buffer

Delete lint buffer from Session

Loading status checks…

c68df7c

Mark-Simulacrum force-pushed the Mark-Simulacrum:lockless-lintbuffer branch from bdcaedf to c68df7c Nov 4, 2019

bors added S-waiting-on-bors and removed S-waiting-on-review labels Nov 4, 2019

bors added the merged-by-bors label Nov 4, 2019

This was referenced Nov 4, 2019

Remove `PartialEq` and `Eq` from the `SpecialDerives`. #65892

Merged

Move next node ID to Resolver #66072

Merged

rust-lang/rust

Remove LintBuffer from Session #65835

Remove LintBuffer from Session #65835

Mark-Simulacrum commented Oct 25, 2019 •

edited

This comment has been minimized.

Mark-Simulacrum commented Oct 25, 2019

nikomatsakis left a comment

This comment has been minimized.

Mark-Simulacrum commented Oct 26, 2019

This comment has been minimized.

bors commented Oct 26, 2019

This comment has been minimized.

Centril commented Oct 27, 2019

This comment has been minimized.

bors commented Oct 27, 2019

This comment has been minimized.

Mark-Simulacrum commented Oct 28, 2019

This comment has been minimized.

bors commented Oct 28, 2019

This comment has been minimized.

bors commented Nov 4, 2019

This comment has been minimized.

rust-highfive commented Nov 4, 2019

This comment has been minimized.

bors commented Nov 4, 2019

This comment has been minimized.

Mark-Simulacrum commented Nov 4, 2019

This comment has been minimized.

bors commented Nov 4, 2019

This comment has been minimized.

bors commented Nov 4, 2019

This comment has been minimized.

bors commented Nov 4, 2019

rust-lang/rust

Join GitHub today

Remove LintBuffer from Session #65835

Conversation

Mark-Simulacrum commented Oct 25, 2019 • edited

This comment has been minimized.

Mark-Simulacrum commented Oct 25, 2019

nikomatsakis left a comment

This comment has been minimized.

Mark-Simulacrum commented Oct 26, 2019

This comment has been minimized.

bors commented Oct 26, 2019

This comment has been minimized.

Centril commented Oct 27, 2019

This comment has been minimized.

bors commented Oct 27, 2019

This comment has been minimized.

Mark-Simulacrum commented Oct 28, 2019

This comment has been minimized.

bors commented Oct 28, 2019

This comment has been minimized.

bors commented Nov 4, 2019

This comment has been minimized.

rust-highfive commented Nov 4, 2019

This comment has been minimized.

bors commented Nov 4, 2019

This comment has been minimized.

Mark-Simulacrum commented Nov 4, 2019

This comment has been minimized.

bors commented Nov 4, 2019

This comment has been minimized.

bors commented Nov 4, 2019

This comment has been minimized.

bors commented Nov 4, 2019

Mark-Simulacrum commented Oct 25, 2019 •

edited