about summary refs log tree commit diff
path: root/compiler/rustc_codegen_llvm/src
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2024-07-17 16:22:28 +0200
committerGitHub <noreply@github.com>2024-07-17 16:22:28 +0200
commitc98487e3bebc81139973e2eb8008eb3a331cb309 (patch)
treef1f2271bbcc3beeaa707267e36bce36b0371a2f6 /compiler/rustc_codegen_llvm/src
parent3ddfd97198f614120d552f363860493a77aeeb46 (diff)
parent1cf4eb2ad258281fcf59ec93f41b43117bb5b824 (diff)
downloadrust-c98487e3bebc81139973e2eb8008eb3a331cb309.tar.gz
rust-c98487e3bebc81139973e2eb8008eb3a331cb309.zip
Rollup merge of #127472 - Zalathar:block-and-unit, r=fmease
MIR building: Stop using `unpack!` for `BlockAnd<()>`

This is a subset of #127416, containing only the parts related to `BlockAnd<()>`.

The first patch removes the non-assigning form of the `unpack!` macro, because it is frustratingly inconsistent with the main form. We can replace it with an ordinary method that discards the `()` and returns the block.

The second patch then finds all of the remaining code that was using `unpack!` with `BlockAnd<()>`, and updates it to use that new method instead.

---

Changes since original review of #127416:
- Renamed `fn unpack_block` → `fn into_block`
- Removed `fn unpack_discard`, replacing it with `let _: BlockAnd<()> = ...` (2 occurrences)
- Tweaked `arm_end_blocks` to unpack earlier and build `Vec<BasicBlock>` instead of `Vec<BlockAnd<()>>`
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
0 files changed, 0 insertions, 0 deletions