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

compiler: implement labeled switch/continue #19812

Open
wants to merge 9 commits into
base: master
Choose a base branch
from

Commits on May 3, 2024

  1. Builder: add indirectbr llvm instruction

    jacobly0 authored and mlugg committed May 3, 2024
    Configuration menu
    Copy the full SHA
    d27e73c View commit details
    Browse the repository at this point in the history
  2. Air: direct representation of ranges in switch cases

    This commit modifies the representation of the AIR `switch_br`
    instruction to represent ranges in cases. Previously, Sema emitted
    different AIR in the case of a range, where the `else` branch of the
    `switch_br` contained a simple `cond_br` for each such case which did a
    simple range check (`x > a and x < b`). Not only does this add
    complexity to Sema, which -- as our secondary bottleneck -- we would
    like to keep as small as possible, but it also gets in the way of the
    implementation of ziglang#8220. This proposal turns certain `switch` statements
    into a looping construct, and for optimization purposes, we want to
    lower this to AIR fairly directly (i.e. without involving a `loop`
    instruction). That means we would ideally like a single instruction to
    represent the entire `switch` statement, so that we can dispatch back to
    it with a different operand as in ziglang#8220. This is not really possible to
    do correctly under the status quo system.
    
    For now, the actual lowering of `switch` is identical for the LLVM and C
    backends. This commit contains a TODO which temporarily regresseses all
    remaining self-hosted backends in the presence of switch case ranges.
    This functionality will be restored for at least the x86_64 backend
    before merge of this branch.
    mlugg committed May 3, 2024
    Configuration menu
    Copy the full SHA
    0d99a13 View commit details
    Browse the repository at this point in the history
  3. Air: add explicit repeat instruction to repeat loops

    This commit introduces a new AIR instruction, `repeat`, which causes
    control flow to move back to the start of a given AIR loop. `loop`
    instructions will no longer automatically perform this operation after
    control flow reaches the end of the body.
    
    The motivation for making this change now was really just consistency
    with the upcoming implementation of ziglang#8220: it wouldn't make sense to
    have this feature work significantly differently. However, there were
    already some TODOs kicking around which wanted this feature. It's useful
    for two key reasons:
    
    * It allows loops over AIR instruction bodies to loop precisely until
      they reach a `noreturn` instruction. This allows for tail calling a
      few things, and avoiding a range check on each iteration of a hot
      path, plus gives a nice assertion that validates AIR structure a
      little. This is a very minor benefit, which this commit does apply to
      the LLVM and C backends.
    
    * It should allow for more compact ZIR and AIR to be emitted by having
      AstGen emit `repeat` instructions more often rather than having
      `continue` statements `break` to a `block` which is *followed* by a
      `repeat`. This is done in status quo because `repeat` instructions
      only ever cause the direct parent block to repeat. Now that AIR is
      more flexible, this flexibility can be pretty trivially extended to
      ZIR, and we can then emit better ZIR. This commit does not implement
      this.
    
    Support for this feature is currently regressed on all self-hosted
    native backends, including x86_64. This support will be added where
    necessary before this branch is merged.
    mlugg committed May 3, 2024
    Configuration menu
    Copy the full SHA
    3fd3bda View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    db6c216 View commit details
    Browse the repository at this point in the history
  5. std.zig: resolve syntactic ambiguity

    The parse of `fn foo(a: switch (...) { ... })` was previously handled
    incorrectly; `a` was treated as both the parameter name and a label.
    
    The same issue exists for `for` and `while` expressions -- they should
    be fixed too, and the grammar amended appropriately. This commit does
    not do this: it only aims to avoid introducing regressions from labeled
    switch syntax.
    mlugg committed May 3, 2024
    Configuration menu
    Copy the full SHA
    aaa83b3 View commit details
    Browse the repository at this point in the history
  6. x86_64: un-regress loop and switch_br

    This commit fixes codegen for the `loop` and `switch_br` instructions in
    the self-hosted x86_64 backend, which was previously regressed by this
    branch. It does *not* yet implement the new `loop_switch_br`
    instruction.
    mlugg committed May 3, 2024
    Configuration menu
    Copy the full SHA
    750b804 View commit details
    Browse the repository at this point in the history
  7. wasm: un-regress loop

    mlugg committed May 3, 2024
    Configuration menu
    Copy the full SHA
    2ed552d View commit details
    Browse the repository at this point in the history
  8. wasm: un-regress switch_br and fix loop

    `.loop` is also a block, so the block_depth being stored for the loop
    was incorrect. By storing the value *after* block creation, we ensure
    a correct block_depth to jump back to when receiving `.repeat`.
    
    This also un-regresses `switch_br` which now correctly handles ranges
    within cases. It supports it for both jump tables as well as regular
    conditional branches.
    Luukdegram authored and mlugg committed May 3, 2024
    Configuration menu
    Copy the full SHA
    e962ba9 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    ac6e2e7 View commit details
    Browse the repository at this point in the history