Fix most remaining Polonius test differences #64749

matthewjasper · 2019-09-24T21:11:31Z

This fixes most of the Polonius test differences and also avoids overflow in issue-38591.rs.

bors · 2019-09-30T17:28:45Z

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

nikomatsakis

r=me with nit addressed in some way

src/librustc_mir/borrow_check/nll/type_check/liveness/trace.rs

This fixes some test differences and also avoids overflow in issue-38591.rs.

matthewjasper · 2019-10-02T21:23:57Z

@bors r=nikomatsakis

bors · 2019-10-02T21:23:58Z

📌 Commit 2180c24 has been approved by nikomatsakis

bors · 2019-10-02T22:35:55Z

⌛ Testing commit 2180c24 with merge ef73235fd519d3420eb3e6c06b6d51867d36050b...

@nikomatsakis

…atsakis Fix most remaining Polonius test differences This fixes most of the Polonius test differences and also avoids overflow in issue-38591.rs. r? @nikomatsakis

Manishearth · 2019-10-02T22:40:21Z

@bors force

Manishearth · 2019-10-02T22:40:27Z

@bors retry

bors · 2019-10-02T23:49:10Z

⌛ Testing commit 2180c24 with merge 7cd00f4485f8edcc8553ca9cf9c023575f0fe3e1...

rust-highfive · 2019-10-02T23:52:28Z

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-02T23:50:06.0840546Z Version      : 1.0.0
2019-10-02T23:50:06.0840644Z Author       : Microsoft
2019-10-02T23:50:06.0840711Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2019-10-02T23:50:06.0840826Z ==============================================================================
2019-10-02T23:50:06.5013192Z System.NullReferenceException: Object reference not set to an instance of an object.
2019-10-02T23:50:06.5014792Z    at Newtonsoft.Json.JsonReader.get_Path()
2019-10-02T23:50:06.5016014Z    at Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent)
2019-10-02T23:50:06.5017101Z    at Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType)
2019-10-02T23:50:06.5017610Z    at Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings)
2019-10-02T23:50:06.5017893Z    at Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings)
2019-10-02T23:50:06.5018153Z    at Agent.PluginHost.Program.Main(String[] args)
2019-10-02T23:50:06.5300003Z ##[error]Exit code 1 returned from process: file name '/home/vsts/agents/2.158.0/bin/Agent.PluginHost', arguments 'task "Agent.Plugins.Repository.CheckoutTask, Agent.Plugins"'.
2019-10-02T23:50:06.5748686Z ##[section]Starting: Upload CPU usage statistics
2019-10-02T23:50:06.5751779Z ==============================================================================
2019-10-02T23:50:06.5751859Z Task         : Bash
2019-10-02T23:50:06.5751929Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-10-02T23:50:06.7172498Z aws s3 cp --acl public-read cpu-usage.csv s3://$DEPLOY_BUCKET/rustc-builds/$BUILD_SOURCEVERSION/cpu-$CI_JOB_NAME.csv
2019-10-02T23:50:06.7194249Z ========================== Starting Command Output ===========================
2019-10-02T23:50:06.7217431Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/39a33c5e-bc43-4692-b5dc-d87366e7d299.sh
2019-10-02T23:50:10.4129418Z 
2019-10-02T23:50:10.4131251Z The user-provided path cpu-usage.csv does not exist.
2019-10-02T23:50:10.4568255Z ##[error]Bash exited with code '255'.
2019-10-02T23:50:10.4581390Z ##[section]Starting: Checkout
2019-10-02T23:50:10.4583104Z ==============================================================================
2019-10-02T23:50:10.4583237Z Task         : Get sources
2019-10-02T23:50:10.4583304Z 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-02T23:52:39Z

💔 Test failed - checks-azure

matthewjasper · 2019-10-03T06:52:39Z

@bors retry

@nikomatsakis

…atsakis Fix most remaining Polonius test differences This fixes most of the Polonius test differences and also avoids overflow in issue-38591.rs. r? @nikomatsakis

@nikomatsakis

…atsakis Fix most remaining Polonius test differences This fixes most of the Polonius test differences and also avoids overflow in issue-38591.rs. r? @nikomatsakis

@ghost

Rollup of 5 pull requests Successful merges: - #64690 (proc_macro API: Expose `macro_rules` hygiene) - #64749 (Fix most remaining Polonius test differences) - #64938 (Avoid ICE on ReFree region on where clause) - #64999 (extract expected return type for async fn generators) - #65037 (`#[track_caller]` feature gate (RFC 2091)) Failed merges: r? @ghost

@nikomatsakis

…atsakis Fix most remaining Polonius test differences This fixes most of the Polonius test differences and also avoids overflow in issue-38591.rs. r? @nikomatsakis

@ghost

Rollup of 5 pull requests Successful merges: - #64749 (Fix most remaining Polonius test differences) - #64817 (Replace ClosureSubsts with SubstsRef) - #64874 (Simplify ExprUseVisitor) - #65026 (metadata: Some crate loading cleanup) - #65073 (Remove `borrowck_graphviz_postflow` from test) Failed merges: r? @ghost

bors · 2019-10-04T11:20:20Z

⌛ Testing commit 2180c24 with merge 9e35a28...

…g, r=oli-obk Revert propagation of drop-live information from Polonius rust-lang#64749 introduced a flow of drop-use data from Polonius to `LivenessResults::add_extra_drop_facts()`, which makes `LivenessResults` agree with Polonius on liveness in the presence of free regions that may be dropped. Later changes accidentally removed this flow. This PR restores it.

Rollup merge of rust-lang#125652 - amandasystems:you-dropped-something, r=oli-obk Revert propagation of drop-live information from Polonius rust-lang#64749 introduced a flow of drop-use data from Polonius to `LivenessResults::add_extra_drop_facts()`, which makes `LivenessResults` agree with Polonius on liveness in the presence of free regions that may be dropped. Later changes accidentally removed this flow. This PR restores it.

rust-highfive assigned nikomatsakis Sep 24, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 24, 2019

This comment has been minimized.

Sign in to view

matthewjasper changed the title ~~Fix most remaining Polonius~~ Fix most remaining Polonius test differences Sep 25, 2019

Dylan-DPC-zz added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 25, 2019

matthewjasper force-pushed the liveness-opt branch from 4a1bc88 to cded2aa Compare September 25, 2019 21:06

This comment has been minimized.

Sign in to view

matthewjasper force-pushed the liveness-opt branch 2 times, most recently from a7c0bee to ce8beec Compare September 26, 2019 17:57

lqd added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 27, 2019

matthewjasper force-pushed the liveness-opt branch from ce8beec to 9b9b7f1 Compare September 30, 2019 18:49

nikomatsakis requested changes Oct 1, 2019

View reviewed changes

src/librustc_mir/borrow_check/nll/type_check/liveness/trace.rs Outdated Show resolved Hide resolved

nikomatsakis added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 1, 2019

matthewjasper added 2 commits October 2, 2019 20:39

Calculate liveness for the same locals with and without -Zpolonius

08a60ac

This fixes some test differences and also avoids overflow in issue-38591.rs.

Make lifetimes in constants live at the point of use

2180c24

matthewjasper force-pushed the liveness-opt branch from 9b9b7f1 to 2180c24 Compare October 2, 2019 19:40

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 2, 2019

Manishearth mentioned this pull request Oct 2, 2019

Rollup of 7 pull requests #65027

Closed

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 2, 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 3, 2019

Centril mentioned this pull request Oct 3, 2019

Rollup of 4 pull requests #65050

Closed

Centril mentioned this pull request Oct 3, 2019

Rollup of 5 pull requests #65053

Closed

Centril mentioned this pull request Oct 4, 2019

Rollup of 5 pull requests #65087

Merged

bors merged commit 2180c24 into rust-lang:master Oct 4, 2019

matthewjasper deleted the liveness-opt branch October 4, 2019 12:04

amandasystems mentioned this pull request May 28, 2024

Revert propagation of drop-live information from Polonius #125652

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix most remaining Polonius test differences #64749

Fix most remaining Polonius test differences #64749

matthewjasper commented Sep 24, 2019

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors commented Sep 30, 2019

nikomatsakis left a comment

matthewjasper commented Oct 2, 2019

bors commented Oct 2, 2019

bors commented Oct 2, 2019

Manishearth commented Oct 2, 2019

Manishearth commented Oct 2, 2019

bors commented Oct 2, 2019

rust-highfive commented Oct 2, 2019

bors commented Oct 2, 2019

matthewjasper commented Oct 3, 2019

bors commented Oct 4, 2019

Fix most remaining Polonius test differences #64749

Fix most remaining Polonius test differences #64749

Conversation

matthewjasper commented Sep 24, 2019

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors commented Sep 30, 2019

nikomatsakis left a comment

Choose a reason for hiding this comment

matthewjasper commented Oct 2, 2019

bors commented Oct 2, 2019

bors commented Oct 2, 2019

Manishearth commented Oct 2, 2019

Manishearth commented Oct 2, 2019

bors commented Oct 2, 2019

rust-highfive commented Oct 2, 2019

bors commented Oct 2, 2019

matthewjasper commented Oct 3, 2019

bors commented Oct 4, 2019