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

Re-land PR #71840 (Rework MIR drop tree lowering) #77466

Merged
merged 10 commits into from
Oct 5, 2020

Conversation

Aaron1011
Copy link
Member

PR #71840 was reverted in #72989 to fix an LLVM error (#72470). That LLVM error no longer occurs with the recent upgrade to LLVM 11 (#73526), so let's try re-landing this PR.

I've cherry-picked the commits from the original PR (with the exception of the commit blessing test output), making as few modifications as possible. I addressed the rebase fallout in separate commits on top of those.

r? @matthewjasper

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 2, 2020
@Aaron1011
Copy link
Member Author

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion

@bors
Copy link
Contributor

bors commented Oct 2, 2020

⌛ Trying commit 88d7b299d7494e8fa04144620048f90c1bf7fb47 with merge ebcdd716a8c89036fe844c7d6c6630327ed52639...

@matthewjasper
Copy link
Contributor

cc @oli-obk who originally reviewed this.

@rust-log-analyzer
Copy link
Collaborator

The job dist-x86_64-linux 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.
 Documenting rustc_mir_build v0.0.0 (/checkout/compiler/rustc_mir_build)
 Documenting rustc_mir v0.0.0 (/checkout/compiler/rustc_mir)
    Checking rustc_plugin_impl v0.0.0 (/checkout/compiler/rustc_plugin_impl)
 Documenting rustc_plugin_impl v0.0.0 (/checkout/compiler/rustc_plugin_impl)
error: unresolved link to `DropTree::lower_to_mir`
   --> compiler/rustc_mir_build/src/build/scope.rs:226:34
    |
226 | /// A trait that determined how [DropTree::lower_to_mir] creates its blocks and
    |                                  ^^^^^^^^^^^^^^^^^^^^^^ the struct `DropTree` has no field or associated item named `lower_to_mir`
    |
    = note: `-D broken-intra-doc-links` implied by `-D warnings`
error: aborting due to previous error

error: Could not document `rustc_mir_build`.


Caused by:
  process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustdoc --edition=2018 --crate-type lib --crate-name rustc_mir_build compiler/rustc_mir_build/src/lib.rs --target x86_64-unknown-linux-gnu -o /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/doc --error-format=json --json=diagnostic-rendered-ansi -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/release/deps --extern rustc_apfloat=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_apfloat-2bc88092b3516846.rmeta --extern rustc_arena=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_arena-625d4d5a1146aecb.rmeta --extern rustc_ast=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_ast-27ad5e09ebab896d.rmeta --extern rustc_attr=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_attr-9bd7064b478506f7.rmeta --extern rustc_data_structures=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_data_structures-5d3d1912340ee4c7.rmeta --extern rustc_errors=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_errors-94b39b40ea1509ed.rmeta --extern rustc_hir=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_hir-98ac1e26a11e2929.rmeta --extern rustc_index=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_index-78f7d4c857d61346.rmeta --extern rustc_infer=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_infer-6911838c8d953a3d.rmeta --extern rustc_middle=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_middle-19c043e10cf9a45a.rmeta --extern rustc_serialize=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_serialize-ba853f2a3b898296.rmeta --extern rustc_session=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_session-49085084dc014133.rmeta --extern rustc_span=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_span-1ff4578e4d1f53ae.rmeta --extern rustc_target=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_target-54d995fca71a3ae5.rmeta --extern rustc_trait_selection=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_trait_selection-38863b2137c796e8.rmeta --extern smallvec=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/libsmallvec-31c79deb030c1dbf.rmeta --extern tracing=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-rustc/x86_64-unknown-linux-gnu/release/deps/libtracing-62a9fe09301d4da9.rmeta -Dwarnings -Winvalid_codeblock_attributes --crate-version '1.48.0-nightly
  (ebcdd716a
  2020-10-02)' --document-private-items --enable-index-page -Zunstable-options` (exit code: 1)
warning: could not parse code block as Rust code
    --> compiler/rustc_typeck/src/check/expr.rs:1278:9
     |
1278 |       /// ```ignore (diagnostic)
---

error: build failed


command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "doc" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "16" "--release" "--locked" "--color" "always" "--features" "jemalloc llvm max_level_info" "--manifest-path" "/checkout/compiler/rustc/Cargo.toml" "--no-deps" "-p" "rustc_feature" "-p" "rustc_query_system" "-p" "rustc_fs_util" "-p" "rustc_lexer" "-p" "rustc_mir_build" "-p" "rustc_infer" "-p" "rustc_index" "-p" "rustc_incremental" "-p" "rustc_macros" "-p" "rustc_ast_lowering" "-p" "rustc_builtin_macros" "-p" "rustc_parse" "-p" "rustc_middle" "-p" "rustc_errors" "-p" "rustc_traits" "-p" "rustc_ast" "-p" "rustc_symbol_mangling" "-p" "rustc_error_codes" "-p" "rustc_serialize" "-p" "rustc_ty" "-p" "rustc_lint" "-p" "rustc_ast_pretty" "-p" "rustc_save_analysis" "-p" "rustc_passes" "-p" "rustc_arena" "-p" "rustc_resolve" "-p" "rustc_data_structures" "-p" "rustc_hir_pretty" "-p" "rustc_plugin_impl" "-p" "rustc_span" "-p" "rustc_target" "-p" "rustc_ast_passes" "-p" "rustc_metadata" "-p" "rustc_driver" "-p" "rustc_hir" "-p" "rustc_interface" "-p" "rustc_codegen_llvm" "-p" "rustc_graphviz" "-p" "rustc_llvm" "-p" "rustc_expand" "-p" "rustc_mir" "-p" "rustc_apfloat" "-p" "rustc_session" "-p" "rustc_parse_format" "-p" "rustc_typeck" "-p" "rustc_attr" "-p" "rustc_trait_selection" "-p" "rustc_codegen_ssa" "-p" "rustc_privacy"


failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu
Build completed unsuccessfully in 0:23:58
Build completed unsuccessfully in 0:23:58
== clock drift check ==
  local time: Fri Oct  2 21:03:47 UTC 2020
  network time: Fri, 02 Oct 2020 21:03:47 GMT
== end clock drift check ==
##[error]Process completed with exit code 1.
Terminate orphan process: pid (7016) (python)

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 @rust-lang/infra. (Feature Requests)

@bors
Copy link
Contributor

bors commented Oct 2, 2020

💔 Test failed - checks-actions

@bors bors 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 2, 2020
@Aaron1011
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented Oct 2, 2020

⌛ Trying commit eabd931751af6ebca454f26286c9a7288df9085f with merge 90dc169bb6d89043121e001959a263fc83466079...

@bors
Copy link
Contributor

bors commented Oct 2, 2020

☀️ Try build successful - checks-actions, checks-azure
Build commit: 90dc169bb6d89043121e001959a263fc83466079 (90dc169bb6d89043121e001959a263fc83466079)

@rust-timer
Copy link
Collaborator

Queued 90dc169bb6d89043121e001959a263fc83466079 with parent 8876ffc, future comparison URL.

@Aaron1011 Aaron1011 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 Oct 3, 2020
@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (90dc169bb6d89043121e001959a263fc83466079): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never

Copy link
Contributor

@matthewjasper matthewjasper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for reviving this. r=me with comments addressed.

compiler/rustc_mir_build/src/build/scope.rs Outdated Show resolved Hide resolved
compiler/rustc_mir_build/src/build/scope.rs Outdated Show resolved Hide resolved
src/test/ui/issue-72470-llvm-dominate.rs Outdated Show resolved Hide resolved
@Aaron1011
Copy link
Member Author

@bors r=matthewjasper

@bors
Copy link
Contributor

bors commented Oct 3, 2020

📌 Commit 045ef67eef1b32be4ccc664b398c463083f79f64 has been approved by matthewjasper

@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 Oct 3, 2020
@bors
Copy link
Contributor

bors commented Oct 4, 2020

⌛ Testing commit 045ef67eef1b32be4ccc664b398c463083f79f64 with merge 24a29ed9b08920c1f10ad615662b1b3a0396ba1c...

@bors
Copy link
Contributor

bors commented Oct 4, 2020

💔 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 Oct 4, 2020
@Aaron1011
Copy link
Member Author

I didn't have profiler = true in my config.toml, which caused a test to get skipped when I blessed the output.

@bor r=matthewjasper

@Aaron1011
Copy link
Member Author

@bors r=matthewjasper

@bors
Copy link
Contributor

bors commented Oct 4, 2020

📌 Commit b617bbb23ae20286fe72a01ecb8c5f5f49a29a6c has been approved by matthewjasper

@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 Oct 4, 2020
@bors
Copy link
Contributor

bors commented Oct 4, 2020

⌛ Testing commit b617bbb23ae20286fe72a01ecb8c5f5f49a29a6c with merge 8cb662339371f7fed8fe376b7ed914c80ef1ac74...

@bors
Copy link
Contributor

bors commented Oct 4, 2020

💔 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 Oct 4, 2020
@Aaron1011
Copy link
Member Author

@bors r=matthewjasper

@bors
Copy link
Contributor

bors commented Oct 4, 2020

📌 Commit ce8d757 has been approved by matthewjasper

@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 Oct 4, 2020
@bors
Copy link
Contributor

bors commented Oct 5, 2020

⌛ Testing commit ce8d757 with merge ced813f...

@bors
Copy link
Contributor

bors commented Oct 5, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: matthewjasper
Pushing ced813f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 5, 2020
@bors bors merged commit ced813f into rust-lang:master Oct 5, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 5, 2020
@ecstatic-morse
Copy link
Contributor

Final perf results are in. Looks like a small win across the board, with one exception. Thanks all!

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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants