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.

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

Remove eval_always from upvars. #90580

Merged
merged 1 commit into from
Nov 25, 2021
Merged

Remove eval_always from upvars. #90580

merged 1 commit into from
Nov 25, 2021

Conversation

cjgillot
Copy link
Contributor

@cjgillot cjgillot commented Nov 4, 2021

Split off #86056
r? @ghost

@cjgillot
Copy link
Contributor Author

cjgillot commented Nov 4, 2021

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Nov 4, 2021
@bors
Copy link
Contributor

bors commented Nov 4, 2021

⌛ Trying commit 04f011f with merge 796a165526fe64e10911120021887580be2e8731...

@bors
Copy link
Contributor

bors commented Nov 4, 2021

☀️ Try build successful - checks-actions
Build commit: 796a165526fe64e10911120021887580be2e8731 (796a165526fe64e10911120021887580be2e8731)

@rust-timer
Copy link
Collaborator

Queued 796a165526fe64e10911120021887580be2e8731 with parent 4961b10, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (796a165526fe64e10911120021887580be2e8731): comparison url.

Summary: This change led to moderate relevant improvements 🎉 in compiler performance.

  • Moderate improvement in instruction counts (up to -0.4% on incr-unchanged builds of many-assoc-items)

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR led to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Nov 5, 2021
@camelid camelid 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 Nov 9, 2021
@apiraino apiraino added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Nov 11, 2021
@cjgillot cjgillot 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 Nov 21, 2021
@Aaron1011
Copy link
Member

LGTM. Let's do another perf run to make sure that nothing has changed since this was opened.

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Nov 22, 2021
@bors
Copy link
Contributor

bors commented Nov 22, 2021

⌛ Trying commit 04f011f with merge d3ded1aef71b39954ec4b4fc7cfbfb2218d2bf82...

@bors
Copy link
Contributor

bors commented Nov 22, 2021

☀️ Try build successful - checks-actions
Build commit: d3ded1aef71b39954ec4b4fc7cfbfb2218d2bf82 (d3ded1aef71b39954ec4b4fc7cfbfb2218d2bf82)

@rust-timer
Copy link
Collaborator

Queued d3ded1aef71b39954ec4b4fc7cfbfb2218d2bf82 with parent 883a241, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (d3ded1aef71b39954ec4b4fc7cfbfb2218d2bf82): comparison url.

Summary: This change led to moderate relevant improvements 🎉 in compiler performance.

  • Moderate improvement in instruction counts (up to -0.4% on incr-unchanged builds of many-assoc-items)

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR led to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Nov 22, 2021
@Aaron1011
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Nov 22, 2021

📌 Commit 04f011f has been approved by Aaron1011

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 22, 2021
@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 Nov 22, 2021
@bors
Copy link
Contributor

bors commented Nov 24, 2021

⌛ Testing commit 04f011f with merge b4b291a760dafc020b28e61ef835fe1d7ee5478f...

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
......... (50/53)
...        (53/53)


/checkout/src/test/rustdoc-gui/toggle-click-deadspace.goml toggle-click-deadspace... FAILED
[ERROR] (line 8) Error: Evaluation failed: assert didn't fail: for command `assert-attribute-false: (".impl-items .rustdoc-toggle", {"open": ""})`



command did not execute successfully: "/node-v14.4.0-linux-x64/bin/node" "/checkout/src/tools/rustdoc-gui/tester.js" "--jobs" "16" "--doc-folder" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-gui/doc" "--tests-folder" "/checkout/src/test/rustdoc-gui"


Build completed unsuccessfully in 0:00:19

@bors
Copy link
Contributor

bors commented Nov 24, 2021

💔 Test failed - checks-actions

@bors 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 Nov 24, 2021
@Aaron1011
Copy link
Member

@bors retry

@bors 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 Nov 24, 2021
@bors
Copy link
Contributor

bors commented Nov 24, 2021

⌛ Testing commit 04f011f with merge f5e758494b90eb33bff1759ddd9cc062d260348c...

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-msvc-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
    
    --- stdout
    
    running 6 tests
    test C:\Users\RUNNER~1\AppData\Local\Temp\mdbook-z0drDB\rust-2021/disjoint-capture-in-closures.md - Disjoint_capture_in_closures::Details (line 19) ... ignored
    test C:\Users\RUNNER~1\AppData\Local\Temp\mdbook-z0drDB\rust-2021/disjoint-capture-in-closures.md - Disjoint_capture_in_closures::Migration::Wild_Card_Patterns (line 68) ... ok
    test C:\Users\RUNNER~1\AppData\Local\Temp\mdbook-z0drDB\rust-2021/disjoint-capture-in-closures.md - Disjoint_capture_in_closures::Migration::Drop_Order (line 89) ... ok
    test C:\Users\RUNNER~1\AppData\Local\Temp\mdbook-z0drDB\rust-2021/disjoint-capture-in-closures.md - Disjoint_capture_in_closures::Migration::Drop_Order (line 102) ... ok
    test C:\Users\RUNNER~1\AppData\Local\Temp\mdbook-z0drDB\rust-2021/disjoint-capture-in-closures.md - Disjoint_capture_in_closures::Migration (line 51) ... ok
    test C:\Users\RUNNER~1\AppData\Local\Temp\mdbook-z0drDB\rust-2021/disjoint-capture-in-closures.md - Disjoint_capture_in_closures::Migration::Trait_implementations (line 150) ... FAILED
    failures:
    
    
    ---- C:\Users\RUNNER~1\AppData\Local\Temp\mdbook-z0drDB\rust-2021/disjoint-capture-in-closures.md - Disjoint_capture_in_closures::Migration::Trait_implementations (line 150) stdout ----
    Test executable failed (exit code -1073740791).
    
    failures:
    failures:
        C:\Users\RUNNER~1\AppData\Local\Temp\mdbook-z0drDB\rust-2021/disjoint-capture-in-closures.md - Disjoint_capture_in_closures::Migration::Trait_implementations (line 150)
    test result: FAILED. 4 passed; 1 failed; 1 ignored; 0 measured; 0 filtered out; finished in 2.19s
    
    
    --- stderr
---
Verifying status of rls...
Verifying status of miri...
Verifying status of embedded-book...
Cloning into 'rust-toolstate'...
error: Tool `edition-guide` has regressed from test-pass to test-fail during beta week.
{"rustbook":"test-fail","book":"test-pass","nomicon":"test-pass","rust-by-example":"test-pass","rls":"test-pass","edition-guide":"test-fail","reference":"test-pass","embedded-book":"test-pass","miri":"test-pass","cargo-miri":"test-fail"}Build completed unsuccessfully in 0:00:02

@bors
Copy link
Contributor

bors commented Nov 24, 2021

💔 Test failed - checks-actions

@bors 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 Nov 24, 2021
@Aaron1011
Copy link
Member

@bors retry

@bors 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 Nov 25, 2021
@bors
Copy link
Contributor

bors commented Nov 25, 2021

⌛ Testing commit 04f011f with merge dd549dc...

@bors
Copy link
Contributor

bors commented Nov 25, 2021

☀️ Test successful - checks-actions
Approved by: Aaron1011
Pushing dd549dc to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 25, 2021
@bors bors merged commit dd549dc into rust-lang:master Nov 25, 2021
@rustbot rustbot added this to the 1.58.0 milestone Nov 25, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (dd549dc): comparison url.

Summary: This change led to small relevant improvements 🎉 in compiler performance.

  • Small improvement in instruction counts (up to -0.7% on incr-unchanged builds of style-servo)

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@cjgillot cjgillot deleted the no-ee-upvar branch November 26, 2021 22:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants