Split librustc::{traits,infer} to a separate crate rustc_infer #67953

cjgillot · 2020-01-06T22:39:22Z

This is still very much work in progress.
Three functions are between dimensions (at the end of rustc::traits), waiting for some dependency breaking scheme.
Please tell me if the approach seems sound, and how you would like to split this PR up.

The formatting is deliberately off, to ease rebasing.

cc #65031

cjgillot · 2020-01-07T12:21:26Z

Once #67797 is merged, the resolve_instance query will be movable to a downstream crate. When that is done and #67780 is merged, this PR will be ready.

@Centril

Minimize dependencies on trait and infer inside librustc Split from #67953 All commits should pass check on their own. r? @Centril

rust-highfive · 2020-01-07T21:52:03Z

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.

2020-01-07T21:28:13.0465822Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-01-07T21:28:13.0549482Z ##[command]git config gc.auto 0
2020-01-07T21:28:13.0627284Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-01-07T21:28:13.0686062Z ##[command]git config --get-all http.proxy
2020-01-07T21:28:13.0831017Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/67953/merge:refs/remotes/pull/67953/merge
---
2020-01-07T21:37:48.4269745Z configure: build.locked-deps    := True
2020-01-07T21:37:48.4269792Z configure: llvm.ccache          := sccache
2020-01-07T21:37:48.4270006Z configure: build.cargo-native-static := True
2020-01-07T21:37:48.4270230Z configure: dist.missing-tools   := True
2020-01-07T21:37:48.4270496Z configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
2020-01-07T21:37:48.4270607Z configure: writing `config.toml` in current directory
2020-01-07T21:37:48.4270650Z configure: 
2020-01-07T21:37:48.4270867Z configure: run `python /checkout/x.py --help`
2020-01-07T21:37:48.4271129Z configure: 
---
2020-01-07T21:42:26.8802246Z 
2020-01-07T21:42:26.8868390Z error: could not compile `rustc_infer`.
2020-01-07T21:42:26.8868804Z warning: build failed, waiting for other jobs to finish...
2020-01-07T21:42:28.1497172Z error: build failed
2020-01-07T21:42:28.1593299Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "-Zconfig-profile" "--target" "i686-pc-windows-gnu" "-Zbinary-dep-depinfo" "-j" "2" "--release" "--locked" "--color" "always" "--features" " llvm" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json-render-diagnostics"
2020-01-07T21:42:28.1594301Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu
2020-01-07T21:42:28.1594392Z Build completed unsuccessfully in 0:03:08
2020-01-07T21:42:28.1632261Z == clock drift check ==
2020-01-07T21:42:28.1644394Z   local time: Tue Jan  7 21:42:28 UTC 2020
2020-01-07T21:42:28.1644394Z   local time: Tue Jan  7 21:42:28 UTC 2020
2020-01-07T21:42:28.3257950Z   network time: Tue, 07 Jan 2020 21:42:28 GMT
2020-01-07T21:42:28.3259041Z == end clock drift check ==
2020-01-07T21:42:29.0788166Z 
2020-01-07T21:42:29.0896282Z ##[error]Bash exited with code '1'.
2020-01-07T21:42:29.0930116Z ##[section]Starting: Checkout
2020-01-07T21:42:29.0932238Z ==============================================================================
2020-01-07T21:42:29.0932295Z Task         : Get sources
2020-01-07T21:42:29.0932362Z 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)

rust-highfive · 2020-01-08T08:59:24Z

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.

2020-01-08T08:32:03.4336844Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-01-08T08:32:03.4439409Z ##[command]git config gc.auto 0
2020-01-08T08:32:03.4501733Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-01-08T08:32:03.4559485Z ##[command]git config --get-all http.proxy
2020-01-08T08:32:03.4686107Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/67953/merge:refs/remotes/pull/67953/merge
---
2020-01-08T08:40:56.8844388Z configure: build.locked-deps    := True
2020-01-08T08:40:56.8844452Z configure: llvm.ccache          := sccache
2020-01-08T08:40:56.8844650Z configure: build.cargo-native-static := True
2020-01-08T08:40:56.8844841Z configure: dist.missing-tools   := True
2020-01-08T08:40:56.8845092Z configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
2020-01-08T08:40:56.8845187Z configure: writing `config.toml` in current directory
2020-01-08T08:40:56.8845245Z configure: 
2020-01-08T08:40:56.8845468Z configure: run `python /checkout/x.py --help`
2020-01-08T08:40:56.8845513Z configure: 
---
2020-01-08T08:45:10.2078966Z 
2020-01-08T08:45:10.2134805Z error: could not compile `rustc_infer`.
2020-01-08T08:45:10.2135110Z warning: build failed, waiting for other jobs to finish...
2020-01-08T08:45:11.4125358Z error: build failed
2020-01-08T08:45:11.4148725Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "check" "-Zconfig-profile" "--target" "i686-pc-windows-gnu" "-Zbinary-dep-depinfo" "-j" "2" "--release" "--locked" "--color" "always" "--features" " llvm" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json-render-diagnostics"
2020-01-08T08:45:11.4191284Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu
2020-01-08T08:45:11.4191431Z Build completed unsuccessfully in 0:02:47
2020-01-08T08:45:11.4242627Z == clock drift check ==
2020-01-08T08:45:11.4242707Z   local time: Wed Jan  8 08:45:11 UTC 2020
2020-01-08T08:45:11.4242707Z   local time: Wed Jan  8 08:45:11 UTC 2020
2020-01-08T08:45:11.5723667Z   network time: Wed, 08 Jan 2020 08:45:11 GMT
2020-01-08T08:45:11.5729432Z == end clock drift check ==
2020-01-08T08:45:12.2410426Z 
2020-01-08T08:45:12.2507829Z ##[error]Bash exited with code '1'.
2020-01-08T08:45:12.2677653Z ##[section]Starting: Checkout
2020-01-08T08:45:12.2680288Z ==============================================================================
2020-01-08T08:45:12.2680567Z Task         : Get sources
2020-01-08T08:45:12.2680613Z 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)

rust-highfive · 2020-01-08T09:45:08Z

The job x86_64-gnu-llvm-7 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.

2020-01-08T09:19:36.7144124Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-01-08T09:19:36.7229492Z ##[command]git config gc.auto 0
2020-01-08T09:19:36.7286044Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-01-08T09:19:36.7337708Z ##[command]git config --get-all http.proxy
2020-01-08T09:19:36.7478781Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/67953/merge:refs/remotes/pull/67953/merge
---
2020-01-08T09:44:55.6117821Z Assembling stage1 compiler (x86_64-unknown-linux-gnu)
2020-01-08T09:44:55.6136473Z Building stage1 std artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2020-01-08T09:44:55.9805317Z    Compiling cc v1.0.49
2020-01-08T09:44:55.9807278Z    Compiling core v0.0.0 (/checkout/src/libcore)
2020-01-08T09:45:00.8239503Z thread 'rustc' panicked at 'not implemented', src/librustc/traits/mod.rs:779:5
2020-01-08T09:45:00.8241044Z 
2020-01-08T09:45:00.8241602Z error: internal compiler error: unexpected panic
2020-01-08T09:45:00.8241692Z 
2020-01-08T09:45:00.8241807Z note: the compiler unexpectedly panicked. this is a bug.
2020-01-08T09:45:00.8241807Z note: the compiler unexpectedly panicked. this is a bug.
2020-01-08T09:45:00.8241888Z 
2020-01-08T09:45:00.8242569Z note: we would appreciate a bug report: ***/blob/master/CONTRIBUTING.md#bug-reports
2020-01-08T09:45:00.8242612Z 
2020-01-08T09:45:00.8242951Z note: rustc 1.42.0-nightly (80066bcb4 2020-01-08) running on x86_64-unknown-linux-gnu
2020-01-08T09:45:00.8242988Z 
2020-01-08T09:45:00.8243470Z note: compiler flags: -Z external-macro-backtrace -Z binary-dep-depinfo -Z force-unstable-if-unmarked -C opt-level=2 -C codegen-units=1 -C debuginfo=0 -C link-args=-Wl,-rpath,$ORIGIN/../lib -C prefer-dynamic -C llvm-args=-import-instr-limit=10 -C debug-assertions=n --crate-type lib
2020-01-08T09:45:00.8243590Z note: some of the compiler flags provided by cargo are hidden
2020-01-08T09:45:00.8243622Z 
2020-01-08T09:45:00.8678416Z error: could not compile `core`.
2020-01-08T09:45:00.8679194Z warning: build failed, waiting for other jobs to finish...
---
2020-01-08T09:45:01.8525770Z   local time: Wed Jan  8 09:45:01 UTC 2020
2020-01-08T09:45:02.0117512Z   network time: Wed, 08 Jan 2020 09:45:02 GMT
2020-01-08T09:45:02.0121866Z == end clock drift check ==
2020-01-08T09:45:03.2515208Z 
2020-01-08T09:45:03.2611755Z ##[error]Bash exited with code '1'.
2020-01-08T09:45:03.2643896Z ##[section]Starting: Checkout
2020-01-08T09:45:03.2645545Z ==============================================================================
2020-01-08T09:45:03.2645610Z Task         : Get sources
2020-01-08T09:45:03.2645648Z 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 · 2020-01-08T15:28:26Z

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

src/librustc_infer/Cargo.toml

src/librustc_typeck/check/demand.rs

cjgillot · 2020-01-13T12:43:28Z

Pushed a cleaner and rebased version. It contains some other PRs as merge commits. Those ought to be rebased out.

bors · 2020-01-15T04:20:24Z

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

bors · 2020-01-16T21:09:23Z

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

bors · 2020-01-17T12:35:13Z

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

bors · 2020-01-21T03:15:16Z

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

bors · 2020-01-23T03:55:37Z

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

Zoxc · 2020-01-27T14:13:41Z

Nominating for @rust-lang/compiler. This PR mostly moves code around to enable splitting out rustc::traits and rustc::infer to a new crate rustc_infer. Some methods are converted to trait extensions methods, but I think quite a few of those could be made free standing functions. This would help quite a bit towards cutting down the size of librustc and it was done relatively cleanly. I was expecting it to be harder. Just checking in to see if anyone has some concerns about doing this.

bors · 2020-02-17T01:51:03Z

☀️ Test successful - checks-azure
Approved by: Zoxc
Pushing a643ee8 to master...

rust-highfive · 2020-02-17T01:52:19Z

📣 Toolstate changed by #67953!

Tested on commit a643ee8.
Direct link to PR: #67953

💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).

@mcarton

Tested on commit rust-lang/rust@a643ee8. Direct link to PR: <rust-lang/rust#67953> 💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra). 💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).

Rustup to rust-lang/rust#67953 changelog: none

Zoxc · 2020-02-17T14:55:43Z

This seems to have regressed performance a bit: https://perf.rust-lang.org/compare.html?start=5e7af4669f80e5f682141f050193ab679afdb4b1&end=a643ee8d693b8100e6f54f2a01ff7cde05eb65c5&stat=instructions:u

My guess is that something hot doesn't get inlined in type checking anymore.

@nikomatsakis

[WIP] traits/select: use global vs per-infcx caches more uniformly. ~~*Note: this is based on an older `master` to avoid perf interference before #67953 (comment) is resolved.*~~ **EDIT**: sadly not workable due #69294 (comment). So far this PR only has the first couple steps towards making the decision of which cache ("global" vs "per-`InferCtxt`") to use for trait evaluation/selection, only once (at the time of checking the cache). The goal here is to actually make per-`InferCtxt` caches not track `DepNode`s, and maybe even enforce that once `SelectionContext::in_task` is entered, the `InferCtxt` is effectively unused. My assumption is that if you *need* inference variables in your cache key (i.e. `ParamEnv` and/or `PolyTraitPredicate`) to ever end up doing anything "non-global", and you can't get there from a "global cache key" (which would still use `DepNode`s and `in_task` etc.). Perhaps another path forward is to redirect "global cache keys" to a query, but I'm not sure how that would handle cycles (badly?), and it feels like stepping on Chalk's toes. r? @nikomatsakis cc @rust-lang/wg-traits @Zoxc @michaelwoerister

mati865 · 2020-02-22T09:26:42Z

@Zoxc maybe it's worth to open issue so this regression isn't forgotten. Seems like low hanging fruit.

@eddyb

Split librustc::{traits,infer} to their respective crates Followup on #67953. I tried to follow the existing module structures. cc @eddyb r? @Zoxc

@eddyb

Split librustc::{traits,infer} to their respective crates Followup on #67953. I tried to follow the existing module structures. cc @eddyb r? @Zoxc

@eddyb

Split librustc::{traits,infer} to their respective crates Followup on #67953. I tried to follow the existing module structures. cc @eddyb r? @Zoxc

rust-highfive assigned estebank Jan 6, 2020

cjgillot mentioned this pull request Jan 7, 2020

Minimize dependencies on trait and infer inside librustc #67970

Merged

bors added a commit that referenced this pull request Jan 7, 2020

Auto merge of #67970 - cjgillot:inherent, r=Centril

7e393b5

Minimize dependencies on trait and infer inside librustc Split from #67953 All commits should pass check on their own. r? @Centril

cjgillot force-pushed the split_infer branch from a8c2c04 to 898746a Compare January 7, 2020 21:27

cjgillot force-pushed the split_infer branch from 898746a to 2471c40 Compare January 8, 2020 08:31

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jan 8, 2020

Zoxc mentioned this pull request Jan 13, 2020

Query-ify Instance::resolve #67797

Merged

Zoxc reviewed Jan 13, 2020

View reviewed changes

src/librustc_infer/Cargo.toml Outdated Show resolved Hide resolved

Zoxc reviewed Jan 13, 2020

View reviewed changes

src/librustc_typeck/check/demand.rs Outdated Show resolved Hide resolved

cjgillot force-pushed the split_infer branch from afba652 to 9180372 Compare January 13, 2020 12:42

cjgillot force-pushed the split_infer branch from 9180372 to ea767fc Compare January 16, 2020 20:32

cjgillot changed the title ~~[WIP] Split librustc::{traits,infer} to a separate crate rustc_infer~~ Split librustc::{traits,infer} to a separate crate rustc_infer Jan 16, 2020

cjgillot force-pushed the split_infer branch from ea767fc to dad77ae Compare January 16, 2020 21:28

cjgillot force-pushed the split_infer branch from dad77ae to cd492cf Compare January 20, 2020 11:04

cjgillot mentioned this pull request Jan 22, 2020

Move datatypes definitions in specific modules inside rustc::{traits, infer} #68461

Merged

cjgillot force-pushed the split_infer branch from cd492cf to 500f9ab Compare January 22, 2020 16:06

Zoxc added I-nominated T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 27, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 17, 2020

bors merged commit e88500b into rust-lang:master Feb 17, 2020

rust-highfive mentioned this pull request Feb 17, 2020

clippy-driver no longer builds after rust-lang/rust#67953 #69221

Closed

JohnTitor added a commit to JohnTitor/rust-clippy that referenced this pull request Feb 17, 2020

Rustup to rust-lang/rust#67953

4480ec5

bors added a commit to rust-lang/rust-clippy that referenced this pull request Feb 17, 2020

Auto merge of #5182 - JohnTitor:infer, r=matthiaskrgr

da78c31

Rustup to rust-lang/rust#67953 changelog: none

cjgillot deleted the split_infer branch February 17, 2020 07:31

This comment has been minimized.

Sign in to view

eddyb mentioned this pull request Feb 19, 2020

[WIP] traits/select: use global vs per-infcx caches more uniformly. #69294

Closed

bors added a commit that referenced this pull request Mar 13, 2020

Auto merge of #69076 - cjgillot:split_trait, r=matthewjasper

474cd8d

Split librustc::{traits,infer} to their respective crates Followup on #67953. I tried to follow the existing module structures. cc @eddyb r? @Zoxc

bors added a commit that referenced this pull request Mar 13, 2020

Auto merge of #69076 - cjgillot:split_trait, r=matthewjasper

4b12c3e

Split librustc::{traits,infer} to their respective crates Followup on #67953. I tried to follow the existing module structures. cc @eddyb r? @Zoxc

bors added a commit that referenced this pull request Mar 14, 2020

Auto merge of #69076 - cjgillot:split_trait, r=matthewjasper

131772c

Split librustc::{traits,infer} to their respective crates Followup on #67953. I tried to follow the existing module structures. cc @eddyb r? @Zoxc

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Split librustc::{traits,infer} to a separate crate rustc_infer #67953

Split librustc::{traits,infer} to a separate crate rustc_infer #67953

cjgillot commented Jan 6, 2020 •

edited

Loading

cjgillot commented Jan 7, 2020 •

edited

Loading

rust-highfive commented Jan 7, 2020

rust-highfive commented Jan 8, 2020

rust-highfive commented Jan 8, 2020

bors commented Jan 8, 2020

cjgillot commented Jan 13, 2020

bors commented Jan 15, 2020

bors commented Jan 16, 2020

bors commented Jan 17, 2020

bors commented Jan 21, 2020

bors commented Jan 23, 2020

Zoxc commented Jan 27, 2020

bors commented Feb 17, 2020

rust-highfive commented Feb 17, 2020

Zoxc commented Feb 17, 2020

This comment has been minimized.

mati865 commented Feb 22, 2020

Split librustc::{traits,infer} to a separate crate rustc_infer #67953

Split librustc::{traits,infer} to a separate crate rustc_infer #67953

Conversation

cjgillot commented Jan 6, 2020 • edited Loading

cjgillot commented Jan 7, 2020 • edited Loading

rust-highfive commented Jan 7, 2020

rust-highfive commented Jan 8, 2020

rust-highfive commented Jan 8, 2020

bors commented Jan 8, 2020

cjgillot commented Jan 13, 2020

bors commented Jan 15, 2020

bors commented Jan 16, 2020

bors commented Jan 17, 2020

bors commented Jan 21, 2020

bors commented Jan 23, 2020

Zoxc commented Jan 27, 2020

bors commented Feb 17, 2020

rust-highfive commented Feb 17, 2020

Zoxc commented Feb 17, 2020

This comment has been minimized.

mati865 commented Feb 22, 2020

cjgillot commented Jan 6, 2020 •

edited

Loading

cjgillot commented Jan 7, 2020 •

edited

Loading