rustc: add `Span`s to `inferred_outlives_of` predicates. #65541

eddyb · 2019-10-18T01:57:13Z

This would simplify #59789, and I suspect it has some potential in diagnostics (although we don't seem to use the predicate Spans much atm).

eddyb · 2019-10-18T02:02:09Z

@bors try

rustc: add `Span`s to `inferred_outlives_of` predicates. *Based on #65535.* This would simplify #59789, and I suspect it has some potential in diagnostics (although we don't seem to use the predicate `Span`s much atm).

bors · 2019-10-18T02:02:23Z

⌛ Trying commit 8dced11 with merge 0fc2031...

eddyb · 2019-10-18T02:49:38Z

cc @michaelwoerister @nikomatsakis This is post-#59953 / pre-#59789, you may want to take a look.

eddyb · 2019-10-18T02:52:45Z

@bors rollup=never (may cause perf regressions)

bors · 2019-10-18T05:03:56Z

☀️ Try build successful - checks-azure
Build commit: 0fc2031 (0fc20313c717a5cc3751db334f6e36a9566c48d5)

eddyb · 2019-10-18T07:52:03Z

@rust-timer build 0fc2031

rust-timer · 2019-10-18T07:52:05Z

Queued 0fc2031 with parent fa0f7d0, future comparison URL.

nikomatsakis

r=me modulo fixmes, perf

src/librustc_typeck/outlives/mod.rs

rust-timer · 2019-10-18T15:54:41Z

Finished benchmarking try commit 0fc2031, comparison URL.

eddyb · 2019-10-19T01:24:39Z

@bors try

bors · 2019-10-19T01:24:49Z

⌛ Trying commit 2e387e2 with merge c9b528f...

rustc: add `Span`s to `inferred_outlives_of` predicates. *Based on #65535.* This would simplify #59789, and I suspect it has some potential in diagnostics (although we don't seem to use the predicate `Span`s much atm).

bors · 2019-10-19T04:09:01Z

☀️ Try build successful - checks-azure
Build commit: c9b528f (c9b528fdd42d4e28fcdbcce20b7cd068f4aa2448)

eddyb · 2019-10-19T06:22:59Z

@rust-timer build c9b528f

rust-timer · 2019-10-19T06:23:01Z

Queued c9b528f with parent 518deda, future comparison URL.

rust-timer · 2019-10-19T14:28:39Z

Finished benchmarking try commit c9b528f, comparison URL.

eddyb · 2019-10-19T16:15:36Z

src/librustc_metadata/encoder.rs

+        // it's not local to the crate the Span is found in.
+        if self.source_file_cache.is_imported() {
+            return TAG_INVALID_SPAN.encode(self)
+        }


cc @petrochenkov I had to add this because decoding assumes Spans are always from each crate's own files, not some transitive dependency.

I wonder if this should be an assert instead - I could enforce that the Spans computed for inferred_outlives_of are always from the definition of the type, not some other type (which is how the last commit in this PR triggered the problem).

davidtwco · 2019-10-23T21:17:54Z

r? @nikomatsakis (already left a review)

nikomatsakis · 2019-10-25T19:14:48Z

@bors r+

bors · 2019-10-25T19:14:49Z

📌 Commit 1ca8da4 has been approved by nikomatsakis

bors · 2019-10-26T04:11:09Z

⌛ Testing commit 1ca8da4 with merge e37348e245cd7314c1edb733bd9af6ffd267e610...

rust-highfive · 2019-10-26T04:14:31Z

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-10-26T04:14:04.5584938Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-10-26T04:14:04.5585316Z  See the log for details (C:\ProgramData\chocolatey\logs\chocolatey.log).
2019-10-26T04:14:04.5589116Z 
2019-10-26T04:14:04.5602542Z Failures
2019-10-26T04:14:04.5602862Z  - msys2 (exited 1) - msys2 not installed. An error occurred during installation:
2019-10-26T04:14:04.5603126Z  The remote server returned an error: (503) Server Unavailable. Service Unavailable
2019-10-26T04:14:04.5617639Z Enjoy using Chocolatey? Explore more amazing features to take your
2019-10-26T04:14:04.5617823Z experience to the next level at
2019-10-26T04:14:04.5618001Z  https://chocolatey.org/compare
2019-10-26T04:14:05.0272762Z 
2019-10-26T04:14:05.0272762Z 
2019-10-26T04:14:05.0351241Z ##[error]Bash exited with code '1'.
2019-10-26T04:14:05.0540548Z ##[section]Starting: Upload CPU usage statistics
2019-10-26T04:14:05.0650305Z ==============================================================================
2019-10-26T04:14:05.0650411Z Task         : Bash
2019-10-26T04:14:05.0650488Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-10-26T04:14:05.3419689Z ========================== Starting Command Output ===========================
2019-10-26T04:14:05.3428074Z [command]"C:\Program Files\Git\bin\bash.exe" --noprofile --norc /d/a/_temp/1d371b5c-a6a6-484c-a73b-dc07bef31627.sh
2019-10-26T04:14:05.3875543Z /d/a/_temp/1d371b5c-a6a6-484c-a73b-dc07bef31627.sh: line 1: aws: command not found
2019-10-26T04:14:05.3904153Z 
2019-10-26T04:14:05.3929290Z ##[error]Bash exited with code '127'.
2019-10-26T04:14:05.3998150Z ##[section]Starting: Checkout
2019-10-26T04:14:05.4091391Z ==============================================================================
2019-10-26T04:14:05.4091484Z Task         : Get sources
2019-10-26T04:14:05.4091749Z 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-10-26T04:14:39Z

💔 Test failed - checks-azure

eddyb · 2019-10-26T07:53:39Z

@bors retry (spurious network error)

…nikomatsakis rustc: add `Span`s to `inferred_outlives_of` predicates. This would simplify rust-lang#59789, and I suspect it has some potential in diagnostics (although we don't seem to use the predicate `Span`s much atm).

bors · 2019-10-27T12:58:15Z

⌛ Testing commit 1ca8da4 with merge 0f677c6...

rustc: add `Span`s to `inferred_outlives_of` predicates. This would simplify #59789, and I suspect it has some potential in diagnostics (although we don't seem to use the predicate `Span`s much atm).

bors · 2019-10-27T16:15:35Z

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

rust-highfive assigned davidtwco Oct 18, 2019

eddyb mentioned this pull request Oct 18, 2019

Revert two unapproved changes to rustc_typeck. #59789

Merged

nikomatsakis approved these changes Oct 18, 2019

View reviewed changes

src/librustc_typeck/outlives/mod.rs Outdated Show resolved Hide resolved

src/librustc_typeck/outlives/mod.rs Outdated Show resolved Hide resolved

eddyb force-pushed the spanned-inferred-outlives branch from 2e387e2 to f93d9d4 Compare October 19, 2019 11:28

eddyb commented Oct 19, 2019

View reviewed changes

JohnTitor added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 20, 2019

rust-highfive assigned nikomatsakis and unassigned davidtwco Oct 23, 2019

eddyb added 2 commits October 24, 2019 20:06

rustc: add Spans to inferred_outlives_of predicates.

93cac9c

rustc_typeck: compute better spans for inferred_outlives.

1ca8da4

eddyb force-pushed the spanned-inferred-outlives branch from f93d9d4 to 1ca8da4 Compare October 24, 2019 17:06

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 25, 2019

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 26, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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 the merged-by-bors This PR was explicitly merged by bors. label Oct 27, 2019

bors merged commit 1ca8da4 into rust-lang:master Oct 27, 2019

eddyb deleted the spanned-inferred-outlives branch October 27, 2019 19:07

Mark-Simulacrum mentioned this pull request Nov 2, 2019

Compile hangs endlessly in LLVM in await-heavy code when ThinLTO is enabled #66036

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rustc: add `Span`s to `inferred_outlives_of` predicates. #65541

rustc: add `Span`s to `inferred_outlives_of` predicates. #65541

eddyb commented Oct 18, 2019 •

edited

Loading

eddyb commented Oct 18, 2019

bors commented Oct 18, 2019

eddyb commented Oct 18, 2019

eddyb commented Oct 18, 2019

bors commented Oct 18, 2019

eddyb commented Oct 18, 2019

rust-timer commented Oct 18, 2019

nikomatsakis left a comment

rust-timer commented Oct 18, 2019

eddyb commented Oct 19, 2019

bors commented Oct 19, 2019

bors commented Oct 19, 2019

eddyb commented Oct 19, 2019

rust-timer commented Oct 19, 2019

rust-timer commented Oct 19, 2019

eddyb Oct 19, 2019

davidtwco commented Oct 23, 2019

nikomatsakis commented Oct 25, 2019

bors commented Oct 25, 2019

bors commented Oct 26, 2019

rust-highfive commented Oct 26, 2019

bors commented Oct 26, 2019

eddyb commented Oct 26, 2019

bors commented Oct 27, 2019

bors commented Oct 27, 2019

rustc: add Spans to inferred_outlives_of predicates. #65541

rustc: add Spans to inferred_outlives_of predicates. #65541

Conversation

eddyb commented Oct 18, 2019 • edited Loading

eddyb commented Oct 18, 2019

bors commented Oct 18, 2019

eddyb commented Oct 18, 2019

eddyb commented Oct 18, 2019

bors commented Oct 18, 2019

eddyb commented Oct 18, 2019

rust-timer commented Oct 18, 2019

nikomatsakis left a comment

Choose a reason for hiding this comment

rust-timer commented Oct 18, 2019

eddyb commented Oct 19, 2019

bors commented Oct 19, 2019

bors commented Oct 19, 2019

eddyb commented Oct 19, 2019

rust-timer commented Oct 19, 2019

rust-timer commented Oct 19, 2019

eddyb Oct 19, 2019

Choose a reason for hiding this comment

davidtwco commented Oct 23, 2019

nikomatsakis commented Oct 25, 2019

bors commented Oct 25, 2019

bors commented Oct 26, 2019

rust-highfive commented Oct 26, 2019

bors commented Oct 26, 2019

eddyb commented Oct 26, 2019

bors commented Oct 27, 2019

bors commented Oct 27, 2019

rustc: add `Span`s to `inferred_outlives_of` predicates. #65541

rustc: add `Span`s to `inferred_outlives_of` predicates. #65541

eddyb commented Oct 18, 2019 •

edited

Loading