Skip to content

Commit 682df6b

Browse files
rv-jenkinsrv-auditorgithub-actions[bot]dkcumming
authored
Update dependency: deps/stable-mir-json_release (#947)
- [stable-mir-json PR 122](https://github.com/runtimeverification/stable-mir-json/pull/122/changes#diff-f3fb88e143d9d90b06c9086e1c660a3e28674c1c1cebf1870de06d73156e3d54R413-R416) Added `Dyn` which needed corresponding K and python productions added to AST - [stable-mir-json PR 129](runtimeverification/stable-mir-json#129) or [131](runtimeverification/stable-mir-json#131) changes closures which do not have corresponding K updates in this PR, proofs `and_then_closure` and `closure_acces_struct` are regressed to failing for now with semantics for correct usage expected to come after merging --------- Co-authored-by: devops <devops@runtimeverification.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Daniel Cumming <124537596+dkcumming@users.noreply.github.com> Co-authored-by: dkcumming <daniel.cumming@runtimeverification.com>
1 parent 2c84b7f commit 682df6b

14 files changed

Lines changed: 92 additions & 36 deletions

File tree

deps/stable-mir-json

Submodule stable-mir-json updated 57 files

deps/stable-mir-json_release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9a7810914a338dfc2533b04bdb14b19c1943fdb8
1+
047ca6ac01786e1b616e13a216d70268b9785e17

flake.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
flake-utils.url = "github:numtide/flake-utils";
88

9-
stable-mir-json-flake.url = "github:runtimeverification/stable-mir-json/9a7810914a338dfc2533b04bdb14b19c1943fdb8";
9+
stable-mir-json-flake.url = "github:runtimeverification/stable-mir-json/047ca6ac01786e1b616e13a216d70268b9785e17";
1010
stable-mir-json-flake = {
1111
inputs.nixpkgs.follows = "nixpkgs";
1212
inputs.flake-utils.follows = "flake-utils";

kmir/src/kmir/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
from typing import Final
33

44
__version__: Final = version('kmir')
5-
__smir_version__: Final = '9a7810914a338dfc2533b04bdb14b19c1943fdb8'
5+
__smir_version__: Final = '047ca6ac01786e1b616e13a216d70268b9785e17'

kmir/src/kmir/kdist/mir-semantics/ty.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,8 @@ syntax ExistentialPredicateBinders ::= List {ExistentialPredicateBinder, ""}
280280
| typeInfoRefType(Ty) [symbol(TypeInfo::RefType) , group(mir-enum---pointee-type)]
281281
| typeInfoTupleType(types: Tys, layout: MaybeLayoutShape)
282282
[symbol(TypeInfo::TupleType) , group(mir-enum---types--layout)]
283+
| TypeInfoDynType(name: MIRString, layout: MaybeLayoutShape)
284+
[symbol(TypeInfo::DynType) , group(mir-enum---name--layout)]
283285
| typeInfoFunType(MIRString) [symbol(TypeInfo::FunType) , group(mir-enum)]
284286
| "typeInfoVoidType" [symbol(TypeInfo::VoidType) , group(mir-enum)]
285287

kmir/src/kmir/ty.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,28 @@ def nbytes(self, types: Mapping[Ty, TypeMetadata]) -> int:
675675
return size.in_bytes
676676

677677

678+
@dataclass
679+
class DynT(TypeMetadata):
680+
name: str
681+
layout: LayoutShape | None
682+
683+
@staticmethod
684+
def from_raw(data: Any) -> DynT:
685+
match data:
686+
case {
687+
'DynType': {
688+
'name': name,
689+
'layout': layout,
690+
}
691+
}:
692+
return DynT(
693+
name=name,
694+
layout=LayoutShape.from_raw(layout) if layout is not None else None,
695+
)
696+
case _:
697+
raise _cannot_parse_as('DynT', data)
698+
699+
678700
@dataclass
679701
class FunT(TypeMetadata):
680702
type_str: str

kmir/src/tests/integration/data/crate-tests/two-crate-bin/crate2::main.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
┌─ 1 (root, init)
33
│ #execTerminator ( terminator ( ... kind: terminatorKindCall ( ... func: operandC
44
5-
│ (736 steps)
5+
│ (740 steps)
66
├─ 3 (terminal)
77
│ #EndProgram ~> .K
88

kmir/src/tests/integration/data/prove-rs/and_then_closure.rs renamed to kmir/src/tests/integration/data/prove-rs/and_then_closure-fail.rs

File renamed without changes.

kmir/src/tests/integration/data/prove-rs/closure_access_struct.rs renamed to kmir/src/tests/integration/data/prove-rs/closure_access_struct-fail.rs

File renamed without changes.

0 commit comments

Comments
 (0)