Skip to content

Bump Strata to 24b8f04e (source range fix for invariants), and update do/while bad invariant tests#453

Merged
fabiomadge merged 2 commits into
mainfrom
fix/invariant-src-range-tests
Jun 17, 2026
Merged

Bump Strata to 24b8f04e (source range fix for invariants), and update do/while bad invariant tests#453
fabiomadge merged 2 commits into
mainfrom
fix/invariant-src-range-tests

Conversation

@kadirayk

@kadirayk kadirayk commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

What was changed?

Bumped the Strata submodule from e115b8ec to 24b8f04e (nightly, "Per-invariant source ranges for loop-invariant diagnostics", #1361) and brought JVerify in line with the updated Laurel dialect.

  • Strata submodule: updated pointer to 24b8f04e.
  • VerifyDoWhile test: updated the expected diagnostic for doWhileBadInitialInvariant to the new, tighter per-invariant range (points at the invariant condition rather than the whole do-while statement); added a negative regression case whileBadInvariant (invariant holds on entry but is not preserved by the loop body) with a matching diagnostic marker and doc comment; updated the @JVerifyTest counts to enforce the new expectations (methodsInvalid = 3, errorCount = 3).

This is not a user-visible behavior change for JVerify itself; it tracks the upstream Strata improvement to invariant diagnostic source ranges.

How has this been tested?

  • ./gradlew build passes (compile + full test suite)
  • ./gradlew :verifier:test --tests "*VerifyDoWhile*" --rerun-tasks passes, exercising the updated and newly added invariant diagnostic cases.

Fixes #437

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0.

kadirayk added 2 commits June 17, 2026 11:16
…ge-tests

# Conflicts:
#	Strata
#	verifier/src/main/java/org/strata/jverify/verifier/compiler/generator/laurel/JavaToLaurelCompiler.java
@kadirayk kadirayk changed the title Bump Strata to 24b8f04e (source range fix for invariants), regenerate Laurel AST, and update do… Bump Strata to 24b8f04e (source range fix for invariants), and update do/while bad invariant tests Jun 17, 2026

@fabiomadge fabiomadge left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving. Reviewed the full Strata delta: with #423 on main, this advances the pin by exactly one commit (8abb4630 + #1361 = 24b8f04e), plus the test updates. You've merged main in (head 49adb8b8), so it's cleanly mergeable; CI green on both platforms.

Substance holds: the per-invariant ranges work end-to-end — the ^^^^^^ carets are enforced assertions (the harness compares full ranges, not just counts), so this genuinely tests #1361. whileBadInvariant is a good negative regression, and the new methodsInvalid = 3 is it plus the two pre-existing failures. #428's StrataCLI wiring still holds.

@fabiomadge fabiomadge merged commit 121578b into main Jun 17, 2026
5 checks passed
fabiomadge added a commit that referenced this pull request Jun 17, 2026
The rebase carried the old submodule pin; align it with main (#453's bump,
per-invariant source ranges).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Inconsistency of source range for failing invariant checks in while and do-while

2 participants