use PlaceRef more consistently instead of loosely coupled local+projection #80624

RalfJung · 2021-01-02T18:35:18Z

Instead of working directly with the projections array, use iter_projections and last_projection. This avoids having to construct new PlaceRef from the pieces everywhere.

I only did this for a few files, to see how people think about this. If y'all are happy with this, I'll open an E-mentor issue to complete this. I grepped for Place::ty_from to find the places that need adjusting -- this could miss some, but I am not sure what else to grep for.

rust-highfive · 2021-01-02T18:35:21Z

r? @oli-obk

(rust-highfive has picked a reviewer for you, use r? to override)

compiler/rustc_middle/src/mir/mod.rs

oli-obk · 2021-01-02T21:38:49Z

r=me with the FIXMEs removed

…ction

RalfJung · 2021-01-03T13:15:19Z

@bors r=oli-obk

bors · 2021-01-03T13:15:21Z

📌 Commit afa7408 has been approved by oli-obk

bors · 2021-01-03T15:15:13Z

⌛ Testing commit afa7408 with merge 77fa8e0314833fe7a8be22d6c94a3a1a5eab7ff3...

rust-log-analyzer · 2021-01-03T17:41:50Z

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

Click to see the possible cause of the failure (guessed by this bot)

---- [ui] ui/process/process-sigpipe.rs stdout ----

error: test run failed!
status: exit code: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/remote-test-client" "run" "0" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/process/process-sigpipe/a"
------------------------------------------
------------------------------------------
uploaded "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/process/process-sigpipe/a", waiting for result
------------------------------------------
stderr:
------------------------------------------

---

Some tests failed in compiletest suite=ui mode=ui host=x86_64-unknown-linux-gnu target=arm-unknown-linux-gnueabihf


command did not execute successfully: "/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/arm-unknown-linux-gnueabihf/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-arm-unknown-linux-gnueabihf" "--suite" "ui" "--mode" "ui" "--target" "arm-unknown-linux-gnueabihf" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--linker" "arm-linux-gnueabihf-gcc" "--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/arm-unknown-linux-gnueabihf/native/rust-test-helpers" "--docck-python" "/usr/bin/python3" "--lldb-python" "/usr/bin/python3" "--llvm-version" "11.0.0-rust-1.51.0-nightly" "--llvm-components" "aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter cfguard codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker engine executionengine extensions frontendopenmp 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 orcerror 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 xray" "--cc" "" "--cxx" "" "--cflags" "" "--remote-test-client" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/remote-test-client" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"


failed to run: /checkout/obj/build/bootstrap/debug/bootstrap --stage 2 test --host= --target arm-unknown-linux-gnueabihf
Build completed unsuccessfully in 2:18:31

bors · 2021-01-03T17:42:21Z

💔 Test failed - checks-actions

RalfJung · 2021-01-03T18:11:38Z

2021-01-03T17:41:39.5146680Z failures:
2021-01-03T17:41:39.5148760Z 
2021-01-03T17:41:39.5151967Z ---- [ui] ui/process/process-sigpipe.rs stdout ----
2021-01-03T17:41:39.5154877Z 
2021-01-03T17:41:39.5156220Z error: test run failed!
2021-01-03T17:41:39.5158151Z status: exit code: 1
2021-01-03T17:41:39.5172948Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/remote-test-client" "run" "0" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/process/process-sigpipe/a"
2021-01-03T17:41:39.5179517Z stdout:
2021-01-03T17:41:39.5181565Z ------------------------------------------
2021-01-03T17:41:39.5185896Z uploaded "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/process/process-sigpipe/a", waiting for result
2021-01-03T17:41:39.5189140Z 
2021-01-03T17:41:39.5191590Z ------------------------------------------
2021-01-03T17:41:39.5193899Z stderr:
2021-01-03T17:41:39.5196848Z ------------------------------------------
2021-01-03T17:41:39.5197920Z 
2021-01-03T17:41:39.5199732Z ------------------------------------------
2021-01-03T17:41:39.5200813Z 
2021-01-03T17:41:39.5201526Z 
2021-01-03T17:41:39.5202277Z 
2021-01-03T17:41:39.5203408Z failures:
2021-01-03T17:41:39.5205554Z     [ui] ui/process/process-sigpipe.rs

Not sure what this is, hopefully spurious?

@bors retry

bors · 2021-01-03T23:46:05Z

⌛ Testing commit afa7408 with merge bf497e5b25b3cd9dc3eaa7796c08f4d2f55d5599...

rust-log-analyzer · 2021-01-04T02:15:22Z

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

Click to see the possible cause of the failure (guessed by this bot)

---- [ui] ui/process/process-sigpipe.rs stdout ----

error: test run failed!
status: exit code: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/remote-test-client" "run" "0" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/process/process-sigpipe/a"
------------------------------------------
------------------------------------------
uploaded "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/process/process-sigpipe/a", waiting for result
------------------------------------------
stderr:
------------------------------------------

---

Some tests failed in compiletest suite=ui mode=ui host=x86_64-unknown-linux-gnu target=arm-unknown-linux-gnueabihf


command did not execute successfully: "/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/arm-unknown-linux-gnueabihf/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-arm-unknown-linux-gnueabihf" "--suite" "ui" "--mode" "ui" "--target" "arm-unknown-linux-gnueabihf" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--linker" "arm-linux-gnueabihf-gcc" "--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/arm-unknown-linux-gnueabihf/native/rust-test-helpers" "--docck-python" "/usr/bin/python3" "--lldb-python" "/usr/bin/python3" "--llvm-version" "11.0.0-rust-1.51.0-nightly" "--llvm-components" "aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter cfguard codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker engine executionengine extensions frontendopenmp 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 orcerror 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 xray" "--cc" "" "--cxx" "" "--cflags" "" "--remote-test-client" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/remote-test-client" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"


failed to run: /checkout/obj/build/bootstrap/debug/bootstrap --stage 2 test --host= --target arm-unknown-linux-gnueabihf
Build completed unsuccessfully in 2:22:26

bors · 2021-01-04T02:15:53Z

💔 Test failed - checks-actions

RalfJung · 2021-01-04T14:39:03Z

Same failure again...?!? No idea what to make of this.

@bors retry

bors · 2021-01-04T20:56:43Z

⌛ Testing commit afa7408 with merge 61f5a00...

bors · 2021-01-04T23:47:28Z

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 61f5a00 to master...

spastorino · 2021-01-05T20:30:12Z

❤️ I had this in my list of pending things, thanks @RalfJung for fixing it.

RalfJung · 2021-01-05T21:36:33Z

@spastorino this is not done yet, it's just a start: #80647.

rust-highfive assigned oli-obk Jan 2, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 2, 2021

RalfJung commented Jan 2, 2021

View reviewed changes

compiler/rustc_middle/src/mir/mod.rs Outdated Show resolved Hide resolved

use PlaceRef more consistently instead of loosely coupled local+proje…

afa7408

…ction

RalfJung force-pushed the place-ref branch from ad6a394 to afa7408 Compare January 3, 2021 13:15

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 Jan 3, 2021

RalfJung mentioned this pull request Jan 3, 2021

use PlaceRef abstraction more consistently #80647

Open

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 Jan 3, 2021

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 Jan 3, 2021

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 Jan 4, 2021

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 Jan 4, 2021

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 4, 2021

bors merged commit 61f5a00 into rust-lang:master Jan 4, 2021

rustbot added this to the 1.51.0 milestone Jan 4, 2021

bors mentioned this pull request Jan 5, 2021

Split rustc_mir #80522

Merged

RalfJung deleted the place-ref branch January 5, 2021 21:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

use PlaceRef more consistently instead of loosely coupled local+projection #80624

use PlaceRef more consistently instead of loosely coupled local+projection #80624

RalfJung commented Jan 2, 2021

rust-highfive commented Jan 2, 2021

oli-obk commented Jan 2, 2021

RalfJung commented Jan 3, 2021

bors commented Jan 3, 2021

bors commented Jan 3, 2021

rust-log-analyzer commented Jan 3, 2021

bors commented Jan 3, 2021

RalfJung commented Jan 3, 2021

bors commented Jan 3, 2021

rust-log-analyzer commented Jan 4, 2021

bors commented Jan 4, 2021

RalfJung commented Jan 4, 2021

bors commented Jan 4, 2021

bors commented Jan 4, 2021

spastorino commented Jan 5, 2021

RalfJung commented Jan 5, 2021

use PlaceRef more consistently instead of loosely coupled local+projection #80624

use PlaceRef more consistently instead of loosely coupled local+projection #80624

Conversation

RalfJung commented Jan 2, 2021

rust-highfive commented Jan 2, 2021

oli-obk commented Jan 2, 2021

RalfJung commented Jan 3, 2021

bors commented Jan 3, 2021

bors commented Jan 3, 2021

rust-log-analyzer commented Jan 3, 2021

bors commented Jan 3, 2021

RalfJung commented Jan 3, 2021

bors commented Jan 3, 2021

rust-log-analyzer commented Jan 4, 2021

bors commented Jan 4, 2021

RalfJung commented Jan 4, 2021

bors commented Jan 4, 2021

bors commented Jan 4, 2021

spastorino commented Jan 5, 2021

RalfJung commented Jan 5, 2021