Move resolve_lifetimes query in librustc_resolve. by cjgillot · Pull Request #67699 · rust-lang/rust

cjgillot · 2019-12-29T10:09:30Z

Split out of #67688

r? @Zoxc

petrochenkov · 2019-12-29T12:05:29Z

@cjgillot
Could you move it to rustc_resolve instead?

librustc/middle/resolve_lifetime.rs → librustc_resolve/lifetimes.rs

r? @petrochenkov

Zoxc · 2019-12-29T12:59:28Z

@petrochenkov It does not really belong there though and rustc_resolve is rather large already.

petrochenkov · 2019-12-29T13:11:21Z

Why not?

Lifetime resolution is basically like late resolution for other names, including labels (rustc_resolve/late.rs), and it would be better to perform it on AST with the results being built into HIR, as with other resolveable names.

Moving it was in my task queue for quite some time.

(Defaults for implicit lifetimes are a bit different story, yes, but it's done in a single pass with a regular resolution right now.)

Zoxc · 2019-12-29T13:15:06Z

@petrochenkov I was mixing it up with middle::region, so maybe rustc_resolve is fine for this.

cjgillot · 2019-12-29T14:20:47Z

Renamed and squashed, with review comments.

bors · 2019-12-30T02:07:11Z

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

petrochenkov · 2019-12-30T06:03:17Z

r=me after rebase

cjgillot · 2019-12-30T10:38:02Z

Rebased.

Zoxc · 2019-12-30T22:27:31Z

@bors r+

bors · 2019-12-30T22:27:33Z

📌 Commit 28c2dbdbf9df891331e843175cd69e577a550205 has been approved by Zoxc

Zoxc · 2019-12-30T22:48:44Z

@bors p=1

bors · 2019-12-31T00:21:10Z

⌛ Testing commit 28c2dbdbf9df891331e843175cd69e577a550205 with merge ecb5028390694a634c5cd39f1113a8c062205a61...

rust-highfive · 2019-12-31T03:27:17Z

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

2019-12-31T03:00:49.4395863Z status: exit code: 2
2019-12-31T03:00:49.4395958Z command: "make" "make"
2019-12-31T03:00:49.4396024Z stdout:
2019-12-31T03:00:49.4396481Z ------------------------------------------
2019-12-31T03:00:49.4396817Z # We don't compile `opaque` with either optimizations or instrumentation.
2019-12-31T03:00:49.4397339Z # We don't compile `opaque` with either optimizations or instrumentation.
2019-12-31T03:00:49.4398452Z LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights opaque.rs
2019-12-31T03:00:49.4398871Z # Compile the test program with instrumentation
2019-12-31T03:00:49.4399276Z mkdir -p "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights"/prof_data_dir
2019-12-31T03:00:49.4400928Z LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights interesting.rs \
2019-12-31T03:00:49.4401636Z -Cprofile-generate="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights"/prof_data_dir -O -Ccodegen-units=1
2019-12-31T03:00:49.4402875Z LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights main.rs -Cprofile-generate="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights"/prof_data_dir -O
2019-12-31T03:00:49.4403281Z # The argument below generates to the expected branch weights
2019-12-31T03:00:49.4404215Z LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib" /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights/main aaaaaaaaaaaa2bbbbbbbbbbbb2bbbbbbbbbbbbbbbbcc || exit 1
2019-12-31T03:00:49.4404717Z "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin"/llvm-profdata merge \
2019-12-31T03:00:49.4405129Z -o "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights"/prof_data_dir/merged.profdata \
2019-12-31T03:00:49.4405524Z "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights"/prof_data_dir
2019-12-31T03:00:49.4406707Z LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights interesting.rs \
2019-12-31T03:00:49.4407381Z -Cprofile-use="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights"/prof_data_dir/merged.profdata -O \
2019-12-31T03:00:49.4407799Z -Ccodegen-units=1 --emit=llvm-ir
2019-12-31T03:00:49.4408286Z cat "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps/pgo-branch-weights/pgo-branch-weights"/interesting.ll | "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" filecheck-patterns.txt
2019-12-31T03:00:49.4408697Z ------------------------------------------
2019-12-31T03:00:49.4408793Z stderr:
2019-12-31T03:00:49.4409089Z ------------------------------------------
2019-12-31T03:00:49.4409089Z ------------------------------------------
2019-12-31T03:00:49.4409416Z filecheck-patterns.txt:5:8: error: CHECK: expected string not found in input
2019-12-31T03:00:49.4409803Z CHECK: define void @function_called_twice(i32 %c) {{.*}} !prof [[function_called_twice_id:![0-9]+]] {
2019-12-31T03:00:49.4409985Z <stdin>:1:1: note: scanning from here
2019-12-31T03:00:49.4409985Z <stdin>:1:1: note: scanning from here
2019-12-31T03:00:49.4410496Z ; ModuleID = 'interesting.3a1fbbbh-cgu.0'
2019-12-31T03:00:49.4410696Z <stdin>:7:1: note: possible intended match here
2019-12-31T03:00:49.4410696Z <stdin>:7:1: note: possible intended match here
2019-12-31T03:00:49.4410779Z define void @function_called_twice(i32 %c) unnamed_addr #0 {
2019-12-31T03:00:49.4410870Z ^
2019-12-31T03:00:49.4410929Z make: *** [Makefile:30: all] Error 1
2019-12-31T03:00:49.4411289Z ------------------------------------------
2019-12-31T03:00:49.4411338Z 2019-12-31T03:00:49.4411391Z 2019-12-31T03:00:49.4411426Z ---
2019-12-31T03:00:49.4412566Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:385:22
2019-12-31T03:00:49.4412671Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-12-31T03:00:49.4417584Z 2019-12-31T03:00:49.4417745Z 2019-12-31T03:00:49.4424621Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--rustdoc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "--src-base" "/checkout/src/test/run-make-fulldeps" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-fulldeps" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "run-make" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--llvm-version" "9.0.0-rust-1.42.0-nightly\n" "--cc" "cc" "--cxx" "c++" "--cflags" "-ffunction-sections -fdata-sections -fPIC -m64" "--llvm-components" "aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter binaryformat bitreader bitstreamreader bitwriter codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver engine executionengine fuzzmutate globalisel gtest gtest_main hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interpreter ipo irreader jitlink libdriver lineeditor linker lto mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts object objectyaml option orcjit passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo riscvutils runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target testingsupport textapi transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86utils xray" "--llvm-cxxflags" "-I/checkout/src/llvm-project/llvm/include -I/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/include -std=c++11 -fno-exceptions -fno-rtti -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" "--ar" "ar" "--llvm-bin-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-12-31T03:00:49.4427998Z 2019-12-31T03:00:49.4428108Z 2019-12-31T03:00:49.4431415Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-12-31T03:00:49.4431644Z Build completed unsuccessfully in 2:33:41
2019-12-31T03:00:49.4431644Z Build completed unsuccessfully in 2:33:41
2019-12-31T03:00:49.4565377Z == clock drift check ==
2019-12-31T03:00:49.4585459Z local time: Tue Dec 31 03:00:49 UTC 2019
2019-12-31T03:00:50.0105559Z network time: Tue, 31 Dec 2019 03:00:50 GMT
2019-12-31T03:00:50.0106666Z == end clock drift check ==
2019-12-31T03:00:58.9433573Z 2019-12-31T03:00:58.9618922Z ##[error]Bash exited with code '1'.
2019-12-31T03:00:58.9689204Z ##[section]Starting: Checkout
2019-12-31T03:00:58.9691438Z ==============================================================================
2019-12-31T03:00:58.9691544Z Task : Get sources
2019-12-31T03:00:58.9691637Z 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-12-31T03:27:29Z

💔 Test failed - checks-azure

Zoxc · 2019-12-31T03:36:14Z

@bors retry

petrochenkov · 2019-12-31T05:57:24Z

r? @Zoxc

bors · 2019-12-31T06:44:41Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout passes-resolve(switch to your branch)
git fetch upstream master(retrieve the latest master)
git rebase upstream/master -p(rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self passes-resolve --force-with-lease(update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging src/librustc_resolve/lib.rs
Auto-merging src/librustc_interface/passes.rs
Auto-merging src/librustc/middle/resolve_lifetime.rs
CONFLICT (content): Merge conflict in src/librustc/middle/resolve_lifetime.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2019-12-31T06:46:37Z

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

cjgillot · 2019-12-31T09:28:32Z

Rebased.

Zoxc · 2019-12-31T10:31:27Z

@bors r+

bors · 2019-12-31T10:31:29Z

📌 Commit 7e4345c has been approved by Zoxc

bors · 2019-12-31T16:21:16Z

⌛ Testing commit 7e4345c with merge 769eb21...

@Zoxc

Move resolve_lifetimes query in librustc_resolve. Split out of #67688 r? @Zoxc

bors · 2019-12-31T19:41:30Z

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

rust-highfive assigned Zoxc Dec 29, 2019

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

rust-highfive assigned petrochenkov and unassigned Zoxc Dec 29, 2019

petrochenkov 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 Dec 29, 2019

Zoxc reviewed Dec 29, 2019
View reviewed changes

Comment threadsrc/librustc/middle/resolve_lifetime.rs Outdated

cjgillot force-pushed the passes-resolve branch from 9b1f1b2 to b51444bCompare December 29, 2019 14:18

petrochenkov reviewed Dec 29, 2019
View reviewed changes

Comment threadsrc/librustc/middle/resolve_lifetime.rs Outdated
Comment threadsrc/librustc_resolve/lib.rs Outdated

cjgillot force-pushed the passes-resolve branch from 05f4026 to 254e163Compare December 30, 2019 10:37

Zoxc reviewed Dec 30, 2019
View reviewed changes

Comment threadsrc/librustc/middle/resolve_lifetime.rs Outdated

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 Dec 30, 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 Dec 31, 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 Dec 31, 2019

rust-highfive assigned Zoxc and unassigned petrochenkov Dec 31, 2019

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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 31, 2019

cjgillot changed the title ~~Move resolve_lifetimes query in librustc_passes.~~Move resolve_lifetimes query in librustc_resolve.Dec 31, 2019

cjgillot added 5 commits December 31, 2019 10:21

Move resolve_lifetime.rs to librustc_resolve.
2675765

Move resolve_lifetimes query in librustc_resolve.
28eefb3

Inert doc comments.
1b92e7e

Review comments.
31f85d3

Simplify ResolveLiftimes creation.
7e4345c

cjgillot force-pushed the passes-resolve branch from 28c2dbd to 7e4345cCompare December 31, 2019 09:24

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 Dec 31, 2019

bors added a commit that referenced this pull request Dec 31, 2019
Auto merge of#67699- cjgillot:passes-resolve, r=Zoxc
769eb21
Move resolve_lifetimes query in librustc_resolve. Split out of #67688 r? @Zoxc

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 31, 2019

bors merged commit 7e4345c into rust-lang:masterDec 31, 2019

This was referenced Dec 31, 2019
Move stability queries to librustc_passes. #67700
Merged
Rename syntax_pos to rustc_span in source code #67763
Merged

cjgillot deleted the passes-resolve branch January 1, 2020 01:00

Uh oh!

Uh oh!

Conversation

cjgillot commented Dec 29, 2019

Uh oh!

petrochenkov commented Dec 29, 2019

Uh oh!

Zoxc commented Dec 29, 2019

Uh oh!

petrochenkov commented Dec 29, 2019

Uh oh!

Zoxc commented Dec 29, 2019

Uh oh!

Uh oh!

cjgillot commented Dec 29, 2019

Uh oh!

Uh oh!

Uh oh!

bors commented Dec 30, 2019

Uh oh!

petrochenkov commented Dec 30, 2019

Uh oh!

cjgillot commented Dec 30, 2019

Uh oh!

Uh oh!

Zoxc commented Dec 30, 2019

Uh oh!

bors commented Dec 30, 2019

Uh oh!

Zoxc commented Dec 30, 2019

Uh oh!

bors commented Dec 31, 2019

Uh oh!

rust-highfive commented Dec 31, 2019

Uh oh!

bors commented Dec 31, 2019

Uh oh!

Zoxc commented Dec 31, 2019

Uh oh!

petrochenkov commented Dec 31, 2019

Uh oh!

bors commented Dec 31, 2019

Uh oh!

bors commented Dec 31, 2019

Uh oh!

cjgillot commented Dec 31, 2019

Uh oh!

Zoxc commented Dec 31, 2019

Uh oh!

bors commented Dec 31, 2019

Uh oh!

bors commented Dec 31, 2019

Uh oh!

bors commented Dec 31, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants