BE-263: HashQL: add `body!` macro for declarative MIR construction in tests by indietyp · Pull Request #8229 · hashintel/hash

indietyp · 2025-12-30T22:55:16Z

🌟 What is the purpose of this PR?

Introduces the body! macro, a declarative DSL for constructing MIR bodies in tests. This replaces the verbose fluent builder API as the primary approach, making tests significantly more readable and concise (~940 net lines removed).

🔍 What does this change?

Adds new body! macro with IR-like syntax for MIR construction
Refactors builder module from single file into organized submodules (base.rs, body.rs, rvalue.rs, switch.rs, etc.)
Converts all MIR pass tests (both transform and analysis) from fluent builder to body! macro
Updates documentation to prioritize body! macro, with fluent builder as secondary option
Updates skill documentation with new MIR builder guide

Pre-Merge Checklist 🚀

🚢 Has this modified a publishable library?

This PR:

does not modify any publishable blocks or libraries, or modifications do not need publishing

📜 Does this require a change to the docs?

The changes in this PR:

are internal and do not require a docs change

🕸️ Does this require a change to the Turbo Graph?

The changes in this PR:

do not affect the execution graph

📹 Demo

Before (fluent builder):

scaffold!(heap, interner, builder);
let env = Environment::new(&heap);
let int_ty = TypeBuilder::synthetic(&env).integer();
let x = builder.local("x", int_ty);
let const_1 = builder.const_int(1);
let bb0 = builder.reserve_block([]);
builder.build_block(bb0)
    .assign_place(x, |rv| rv.load(const_1))
    .ret(x);
let body = builder.finish(0, int_ty);

After (body! macro):

let heap = Heap::new();
let interner = Interner::new(&heap);
let env = Environment::new(&heap);

let body = body!(interner, env; fn@0/0 -> Int {
    decl x: Int;
    bb0() {
        x = load 1;
        return x;
    }
});

cursor · 2025-12-30T22:55:22Z

PR Summary

Introduces a declarative MIR-construction DSL and migrates tests to it.

Adds builder::body! macro (with projections, operands, statements, and terminators) plus lightweight helper macros (bb!, operand!, rvalue!, switch!) for concise CFG/test authoring
Refactors monolithic builder.rs into structured modules: base.rs, body.rs, basic_block.rs, operand.rs, place.rs, rvalue.rs, switch.rs, mod.rs; removes old builder.rs
Rewrites MIR pass tests (analysis: callgraph, data_dependency, liveness; transform: administrative_reduction) from fluent API to the new macro; minor harness tweaks (e.g., snapshot formatting, Changed capture comment)
Updates docs: mir-builder-guide.md to macro-first, adds mir-fluent-builder.md (advanced cases), refreshes SKILL guide with “Missing Macro Features” note and macro examples

^{Written by Cursor Bugbot for commit ed471cd. This will update automatically on new commits. Configure here.}

indietyp · 2025-12-30T22:55:45Z

This stack of pull requests is managed by Graphite. Learn more about stacking.

codspeed-hq · 2025-12-30T23:01:37Z

Merging this PR will not alter performance

✅ 14 untouched benchmarks
🗄️ 3 archived benchmarks run¹

_{Comparing bm/be-263-hashql-implement-mir-builder-macro (ed471cd) with main (fd458f2)}

3 benchmarks were run, but are now archived. If they were deleted in another branch, consider rebasing to remove them from the report. Instead if they were added back, click here to restore them. ↩

codecov · 2025-12-30T23:05:07Z

Codecov Report

❌ Patch coverage is 91.59562% with 69 lines in your changes missing coverage. Please review.
✅ Project coverage is 87.22%. Comparing base (c4139ea) to head (3c76437).

Files with missing lines	Patch %	Lines
libs/@local/hashql/mir/src/builder/rvalue.rs	83.44%	25 Missing ⚠️
libs/@local/hashql/mir/src/builder/basic_block.rs	78.30%	23 Missing ⚠️
libs/@local/hashql/mir/src/builder/place.rs	86.79%	7 Missing ⚠️
libs/@local/hashql/mir/src/builder/operand.rs	75.00%	6 Missing ⚠️
libs/@local/hashql/mir/src/builder/base.rs	85.71%	5 Missing ⚠️
libs/@local/hashql/mir/src/builder/switch.rs	88.88%	3 Missing ⚠️

Additional details and impacted files

@@                                   Coverage Diff                                   @@
##           bm/be-261-hashql-mir-administrative-reduction-pass    #8229       +/-   ##
=======================================================================================
+ Coverage                                               59.24%   87.22%   +27.98%     
=======================================================================================
  Files                                                    1191       69     -1122     
  Lines                                                  113321     8853   -104468     
  Branches                                                 4981      252     -4729     
=======================================================================================
- Hits                                                    67134     7722    -59412     
+ Misses                                                  45411     1034    -44377     
+ Partials                                                  776       97      -679

Flag	Coverage Δ
apps.hash-ai-worker-py	`?`
apps.hash-ai-worker-ts	`?`
apps.hash-api	`?`
backend-integration-tests	`?`
blockprotocol.type-system	`?`
deer	`?`
error-stack	`?`
local.claude-hooks	`?`
local.harpc-client	`?`
local.hash-backend-utils	`?`
local.hash-graph-sdk	`?`
local.hash-isomorphic-utils	`?`
local.hash-subgraph	`?`
rust.antsi	`?`
rust.deer	`?`
rust.error-stack	`?`
rust.harpc-codec	`?`
rust.harpc-net	`?`
rust.harpc-tower	`?`
rust.harpc-types	`?`
rust.harpc-wire-protocol	`?`
rust.hash-codec	`?`
rust.hash-graph-api	`?`
rust.hash-graph-authorization	`?`
rust.hash-graph-postgres-store	`?`
rust.hash-graph-store	`?`
rust.hash-graph-temporal-versioning	`?`
rust.hash-graph-types	`?`
rust.hash-graph-validation	`?`
rust.hashql-ast	`?`
rust.hashql-compiletest	`?`
rust.hashql-core	`?`
rust.hashql-diagnostics	`?`
rust.hashql-eval	`?`
rust.hashql-hir	`?`
rust.hashql-mir	`87.22% <91.59%> (-1.02%)`	⬇️
rust.hashql-syntax-jexpr	`?`
rust.sarif	`?`
sarif	`?`
tests.hash-backend-integration	`?`
unit-tests	`?`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

augmentcode

Review completed. 2 suggestions posted.

Comment augment review to trigger a new review at any time.

libs/@local/hashql/mir/src/builder/body.rs

graphite-app · 2026-01-16T15:24:32Z

Merge activity

Jan 16, 3:24 PM UTC: Graphite rebased this pull request, because this pull request is set to merge when ready.

augmentcode

Review completed. No suggestions at this time.

Comment augment review to trigger a new review at any time.

augmentcode

Review completed. 2 suggestions posted.

Comment augment review to trigger a new review at any time.

augmentcode · 2026-01-16T15:49:07Z

libs/@local/hashql/mir/src/builder/body.rs

+///
+/// | Syntax | Description |
+/// | ------ | ----------- |
+/// | `let x;` | `StorageLive(x)` |


The table says let x; / drop x; map to StorageLive(x) / StorageDead(x), but bb! expands these to storage_live($name) / storage_dead($name) which take a Local (while body! binds locals as Place). This makes the documented syntax look like it won’t type-check unless callers use something like x.local.

_{🤖 Was this useful? React with 👍 or 👎}

augmentcode · 2026-01-16T15:49:07Z

libs/@local/hashql/mir/src/builder/body.rs

+    (@type $types:ident; Int) => {
+        $types.integer()
+    };
+    (@type $types:ident; ($($sub:tt),*)) => {


In body!(@type ...), the tuple arm (@type $types; ($($sub:tt),*)) appears before the struct arm (@type $types; ($($name:ident: $sub:tt),*)), so a struct type like (a: Int, b: Bool) will match the tuple arm first and then fail to expand. This seems to contradict the docs that advertise struct-type support in body!.

_{🤖 Was this useful? React with 👍 or 👎}

graphite-app bot assigned indietyp Dec 30, 2025

github-actions bot added area/infra Relates to version control, CI, CD or IaC (area) area/libs Relates to first-party libraries/crates/packages (area) type/eng > backend Owned by the @backend team area/tests New or updated tests labels Dec 30, 2025

indietyp mentioned this pull request Dec 30, 2025

BE-261: HashQL: Implement Administrative Reduction pass for MIR #8227

Merged

3 tasks

vercel bot deployed to Preview – petrinaut December 30, 2025 23:00 View deployment

vercel bot temporarily deployed to Preview – petrinaut December 30, 2025 23:00 Inactive

vercel bot deployed to Preview – hash December 30, 2025 23:07 View deployment

graphite-app bot requested review from a team December 30, 2025 23:07

augmentcode bot reviewed Dec 30, 2025

View reviewed changes

libs/@local/hashql/mir/src/builder/body.rs Show resolved Hide resolved

libs/@local/hashql/mir/src/builder/body.rs Outdated Show resolved Hide resolved

This was referenced Dec 31, 2025

BE-264: HashQL: Rename SROA to ForwardSubstitution for better semantic clarity #8230

Merged

BE-265: HashQL: Make CopyPropagation aware of local re-assignments #8231

Merged

vercel bot temporarily deployed to Preview – petrinaut December 31, 2025 12:19 Inactive

This was referenced Jan 1, 2026

BE-266: HashQL: Implement PreInlining pass for MIR optimization #8233

Merged

BE-267: Use bump scopes instead of full resets across transformation passes #8234

Merged

indietyp added 10 commits January 16, 2026 15:23

feat: update DSE

3256e5b

feat: update InstSimplify

d3dc4a3

feat: update SsaRepair

4a980ba

feat: update Callgraph

7fd21e6

feat: update data dependency

0cd34f0

feat: update liveness analysis

e2158dd

chore: cleanup

d32c17e

chore: docs

b5a3397

chore: hide operand macro

1e9fe80

feat: apply suggestions from code review

ed471cd

indietyp force-pushed the graphite-base/8229 branch from 10798e5 to fd458f2 Compare January 16, 2026 15:23

indietyp force-pushed the bm/be-263-hashql-implement-mir-builder-macro branch from 4156c74 to ed471cd Compare January 16, 2026 15:24

graphite-app bot changed the base branch from graphite-base/8229 to main January 16, 2026 15:24

vercel bot deployed to Preview – petrinaut January 16, 2026 15:28 View deployment

vercel bot deployed to Preview – hash January 16, 2026 15:30 View deployment

indietyp added this pull request to the merge queue Jan 16, 2026

Merged via the queue into main with commit d451c18 Jan 16, 2026
53 of 74 checks passed

indietyp deleted the bm/be-263-hashql-implement-mir-builder-macro branch January 16, 2026 15:39

augmentcode bot reviewed Jan 16, 2026

View reviewed changes

This was referenced Jan 20, 2026

BE-301: HashQL: Implement size estimation analysis for MIR #8278

Open

BE-315: HashQL: Add GraphReadFilter source variant to MIR #8323

Open

BE-317: HashQL: Implement TraversalExtraction pass #8331

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

BE-263: HashQL: add `body!` macro for declarative MIR construction in tests#8229

BE-263: HashQL: add `body!` macro for declarative MIR construction in tests#8229
indietyp merged 21 commits intomainfrom
bm/be-263-hashql-implement-mir-builder-macro

indietyp commented Dec 30, 2025

Uh oh!

cursor bot commented Dec 30, 2025 •

edited

Loading

Uh oh!

indietyp commented Dec 30, 2025 •

edited

Loading

Uh oh!

codspeed-hq bot commented Dec 30, 2025 •

edited

Loading

Uh oh!

codecov bot commented Dec 30, 2025 •

edited

Loading

Uh oh!

augmentcode bot left a comment

Uh oh!

Uh oh!

Uh oh!

graphite-app bot commented Jan 16, 2026

Uh oh!

Uh oh!

augmentcode bot left a comment

Uh oh!

augmentcode bot left a comment

Uh oh!

augmentcode bot Jan 16, 2026

Uh oh!

augmentcode bot Jan 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

2 participants

Conversation

indietyp commented Dec 30, 2025

🌟 What is the purpose of this PR?

🔍 What does this change?

Pre-Merge Checklist 🚀

🚢 Has this modified a publishable library?

📜 Does this require a change to the docs?

🕸️ Does this require a change to the Turbo Graph?

📹 Demo

Uh oh!

cursor bot commented Dec 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Summary

Uh oh!

indietyp commented Dec 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codspeed-hq bot commented Dec 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merging this PR will not alter performance

Footnotes

Uh oh!

codecov bot commented Dec 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

augmentcode bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

graphite-app bot commented Jan 16, 2026

Merge activity

Uh oh!

Uh oh!

augmentcode bot left a comment

Choose a reason for hiding this comment

Uh oh!

augmentcode bot left a comment

Choose a reason for hiding this comment

Uh oh!

augmentcode bot Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

augmentcode bot Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

2 participants

cursor bot commented Dec 30, 2025 •

edited

Loading

indietyp commented Dec 30, 2025 •

edited

Loading

codspeed-hq bot commented Dec 30, 2025 •

edited

Loading

codecov bot commented Dec 30, 2025 •

edited

Loading