Support FRU pattern with `[feature(capture_disjoint_fields)]` by null-sleep · Pull Request #81291 · rust-lang/rust

null-sleep · 2021-01-23T03:50:28Z

In case of a functional record update syntax for creating a structure, ExprUseVisitor to only detect the precise use of some of the field in the ..x part of the syntax. However, when we start building MIR, we

First, build the place for x
and then, add precise field projections so that only some parts of x end up getting read.

When capture_disjoint_fields is enabled, and FRU is used within a closure x won't be completely captured, and therefore the first step will fail. This PR updates mir_build to create a place builder in the first step and then create place from the builder only after applying the field projection.

Closes rust-lang/project-rfc-2229#32
r? @nikomatsakis

rust-log-analyzer · 2021-01-23T04:08:21Z

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

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

......................................................................i.i........................... 11200/11280
................................................................................
failures:

---- [ui] ui/closures/2229_closure_analysis/run_pass/fru_syntax.rs stdout ----
normalized stderr:
warning: the feature `capture_disjoint_fields` is incomplete and may not be safe to use and/or cause compiler crashes
  --> $DIR/fru_syntax.rs:6:12
   |
LL | #![feature(capture_disjoint_fields)]
   |
   = note: `#[warn(incomplete_features)]` on by default
   = note: see issue #53488 <https://github.com/rust-lang/rust/issues/53488> for more information


warning: 1 warning emitted




The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/closures/2229_closure_analysis/run_pass/fru_syntax/fru_syntax.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args closures/2229_closure_analysis/run_pass/fru_syntax.rs`
error: 1 errors occurred comparing output.
status: exit code: 0
status: exit code: 0
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/closures/2229_closure_analysis/run_pass/fru_syntax.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zemit-future-incompat-report" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/closures/2229_closure_analysis/run_pass/fru_syntax/a" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/closures/2229_closure_analysis/run_pass/fru_syntax/auxiliary"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
warning: the feature `capture_disjoint_fields` is incomplete and may not be safe to use and/or cause compiler crashes
  --> /checkout/src/test/ui/closures/2229_closure_analysis/run_pass/fru_syntax.rs:6:12
   |
LL | #![feature(capture_disjoint_fields)]
   |
   = note: `#[warn(incomplete_features)]` on by default
   = note: see issue #53488 <https://github.com/rust-lang/rust/issues/53488> for more information

---



failures:
    [ui] ui/closures/2229_closure_analysis/run_pass/fru_syntax.rs
test result: FAILED. 11192 passed; 1 failed; 87 ignored; 0 measured; 0 filtered out; finished in 134.30s

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



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/x86_64-unknown-linux-gnu/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-x86_64-unknown-linux-gnu" "--suite" "ui" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-9/bin/FileCheck" "--nodejs" "/usr/bin/node" "--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/python3" "--lldb-python" "/usr/bin/python3" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "9.0.0" "--llvm-components" "aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets amdgpu amdgpuasmparser amdgpucodegen amdgpudesc amdgpudisassembler amdgpuinfo amdgpuutils analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler bpfinfo codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver engine executionengine fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interpreter ipo irreader jitlink lanai lanaiasmparser lanaicodegen lanaidesc lanaidisassembler lanaiinfo 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 perfjitevents 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 textapi transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86utils xcore xcorecodegen xcoredesc xcoredisassembler xcoreinfo xray" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--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 --exclude src/tools/tidy
Build completed unsuccessfully in 0:15:04

…res when feature capture_disjoint_fields is enabled

nikomatsakis

This looks good. Approved but I think maybe we want one more test.

nikomatsakis · 2021-01-25T10:31:37Z

src/test/ui/closures/2229_closure_analysis/run_pass/fru_syntax.rs

+    let c = || {
+        let s2 = S {
+            a: format!("New a"),
+            ..s


Should we add a test for something like ..s.a?

nikomatsakis · 2021-01-25T10:32:06Z

@bors delegate+

You can feel free to r=nikomatsakis once the test is added.

bors · 2021-01-25T10:32:08Z

✌️ @null-sleep can now approve this pull request

null-sleep · 2021-01-29T04:36:18Z

@bors r=nikomatsakis

bors · 2021-01-29T04:36:20Z

📌 Commit 5e983d7 has been approved by nikomatsakis

…ional-record-update-syntax-error, r=nikomatsakis Support FRU pattern with `[feature(capture_disjoint_fields)]` In case of a functional record update syntax for creating a structure, `ExprUseVisitor` to only detect the precise use of some of the field in the `..x` part of the syntax. However, when we start building MIR, we 1. First, build the place for `x` 2. and then, add precise field projections so that only some parts of `x` end up getting read. When `capture_disjoint_fields` is enabled, and FRU is used within a closure `x` won't be completely captured, and therefore the first step will fail. This PR updates `mir_build` to create a place builder in the first step and then create place from the builder only after applying the field projection. Closes rust-lang/project-rfc-2229#32 r? `@nikomatsakis`

Rollup of 16 pull requests Successful merges: - rust-lang#79023 (Add `core::stream::Stream`) - rust-lang#80562 (Consider Scalar to be a bool only if its unsigned) - rust-lang#80886 (Stabilize raw ref macros) - rust-lang#80959 (Stabilize `unsigned_abs`) - rust-lang#81291 (Support FRU pattern with `[feature(capture_disjoint_fields)]`) - rust-lang#81409 (Slight simplification of chars().count()) - rust-lang#81468 (cfg(version): treat nightlies as complete) - rust-lang#81473 (Warn write-only fields) - rust-lang#81495 (rustdoc: Remove unnecessary optional) - rust-lang#81499 (Updated Vec::splice documentation) - rust-lang#81501 (update rustfmt to v1.4.34) - rust-lang#81505 (`fn cold_path` doesn't need to be pub) - rust-lang#81512 (Add missing variants in match binding) - rust-lang#81515 (Fix typo in pat.rs) - rust-lang#81519 (Don't print error output from rustup when detecting default build triple) - rust-lang#81520 (Don't clone LLVM submodule when download-ci-llvm is set) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned nikomatsakis Jan 23, 2021

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

Make functional record update/struct update syntax works inside closu…

e94cf57

…res when feature capture_disjoint_fields is enabled

null-sleep force-pushed the fix-struct-update-functional-record-update-syntax-error branch from 42cf990 to e94cf57 Compare January 23, 2021 04:10

nikomatsakis approved these changes Jan 25, 2021

View reviewed changes

Add a test for syntax like: ..t.s

5e983d7

null-sleep force-pushed the fix-struct-update-functional-record-update-syntax-error branch from e6e342d to 5e983d7 Compare January 29, 2021 04:27

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 29, 2021

henryboisdequin mentioned this pull request Jan 29, 2021

Rollup of 8 pull requests #81510

Closed

This was referenced Jan 29, 2021

Rollup of 16 pull requests #81523

Closed

Rollup of 15 pull requests #81525

Closed

Rollup of 15 pull requests #81528

Closed

jonas-schievink mentioned this pull request Jan 29, 2021

Rollup of 15 pull requests #81537

Closed

JohnTitor mentioned this pull request Jan 30, 2021

Rollup of 16 pull requests #81545

Merged

bors merged commit 7fa991f into rust-lang:master Jan 30, 2021

rustbot added this to the 1.51.0 milestone Jan 30, 2021

m-ou-se mentioned this pull request Sep 3, 2021

🎉 Rust 2021 celebration and thanks #88623

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Support FRU pattern with `[feature(capture_disjoint_fields)]`#81291

Support FRU pattern with `[feature(capture_disjoint_fields)]`#81291
bors merged 2 commits intorust-lang:masterfrom
sexxi-goose:fix-struct-update-functional-record-update-syntax-error

null-sleep commented Jan 23, 2021

Uh oh!

rust-log-analyzer commented Jan 23, 2021

Uh oh!

nikomatsakis left a comment

Uh oh!

nikomatsakis Jan 25, 2021

Uh oh!

nikomatsakis commented Jan 25, 2021

Uh oh!

bors commented Jan 25, 2021

Uh oh!

null-sleep commented Jan 29, 2021

Uh oh!

bors commented Jan 29, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Conversation

null-sleep commented Jan 23, 2021

Uh oh!

rust-log-analyzer commented Jan 23, 2021

Uh oh!

nikomatsakis left a comment

Choose a reason for hiding this comment

Uh oh!

nikomatsakis Jan 25, 2021

Choose a reason for hiding this comment

Uh oh!

nikomatsakis commented Jan 25, 2021

Uh oh!

bors commented Jan 25, 2021

Uh oh!

null-sleep commented Jan 29, 2021

Uh oh!

bors commented Jan 29, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants