Merge remote-tracking branch 'origin/develop'

runtimeverification · Aug 22, 2024 · 33c140c · 33c140c
2 parents 17f06d2 + d64af2f
commit 33c140c
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/deps/llvm-backend_release b/deps/llvm-backend_release
@@ -1 +1 @@
-0.1.81
+0.1.84
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "K Framework";
   inputs = {
-    llvm-backend.url = "github:runtimeverification/llvm-backend/v0.1.81";
+    llvm-backend.url = "github:runtimeverification/llvm-backend/v0.1.84";
     haskell-backend = {
       url = "github:runtimeverification/haskell-backend/v0.1.76";
       inputs.rv-utils.follows = "llvm-backend/rv-utils";

diff --git a/k-distribution/tests/regression-new/proof-instrumentation-debug/input.test.out b/k-distribution/tests/regression-new/proof-instrumentation-debug/input.test.out
diff --git a/k-distribution/tests/regression-new/proof-instrumentation/input.test.out b/k-distribution/tests/regression-new/proof-instrumentation/input.test.out
diff --git a/llvm-backend/src/main/native/llvm-backend b/llvm-backend/src/main/native/llvm-backend
diff --git a/pyk/src/tests/integration/kllvm/test_prooftrace.py b/pyk/src/tests/integration/kllvm/test_prooftrace.py
@@ -97,7 +97,7 @@ def test_proof_trace(self, hints: bytes, header: prooftrace.KoreHeader, definiti
     def test_streaming_parser_iter(self, header: prooftrace.KoreHeader, hints_file: Path) -> None:
         # read the hints file and get the iterator for the proof trace
         it = prooftrace.LLVMRewriteTraceIterator.from_file(hints_file, header)
-        assert it.version == 11
+        assert it.version == 12
 
         # Test that the __iter__ is working
         list_of_events = list(it)
@@ -126,7 +126,7 @@ def test_streaming_parser_next(self, header: prooftrace.KoreHeader, hints_file:
 
         # read the hints file and get the iterator for the proof trace
         it = prooftrace.LLVMRewriteTraceIterator.from_file(hints_file, header)
-        assert it.version == 11
+        assert it.version == 12
 
         # skip pre-trace events
         while True:
@@ -810,7 +810,7 @@ def test_parse_proof_hint_peano(self, hints: bytes, header: prooftrace.KoreHeade
         assert len(pt.pre_trace) == 11
 
         # 404 post-initial-configuration events
-        assert len(pt.trace) == 404
+        assert len(pt.trace) == 419
 
 
 class TestIMP5(ProofTraceTest):

diff --git a/pyk/src/tests/integration/test_krun_proof_hints.py b/pyk/src/tests/integration/test_krun_proof_hints.py
@@ -30,7 +30,7 @@ class Test0Decrement(KRunTest, ProofTraceTest):
         LblinitGeneratedTopCell{}(Lbl'Unds'Map'Unds'{}(Lbl'Stop'Map{}(),Lbl'UndsPipe'-'-GT-Unds'{}(inj{SortKConfigVar{}, SortKItem{}}(\\dv{SortKConfigVar{}}("$PGM")),inj{SortNat{}, SortKItem{}}(Lbl0'Unds'DECREMENT-SYNTAX'Unds'Nat{}()))))
     """
 
-    HINTS_OUTPUT = """version: 11
+    HINTS_OUTPUT = """version: 12
 hook: MAP.element Lbl'UndsPipe'-'-GT-Unds'{} ()
   function: Lbl'UndsPipe'-'-GT-Unds'{} ()
   arg: kore[\\dv{SortKConfigVar{}}("$PGM")]