Skip to content

Do not check mutability when computing projections #572

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.

Sign up for GitHub

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Do not check mutability when computing projections #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70d9d29
kmir/rt/data: remove mutability checks in calculated #projectedUpdate
ehildenb May 8, 2025
25a9c16
kmir/rt/data: separate out writing from computing projection
ehildenb May 8, 2025
ad40948
Set Version: 0.3.152
rv-auditor May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kmir/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "hatchling.build"

[project]
name = "kmir"
version = "0.3.151"
version = "0.3.152"
description = ""
requires-python = "~=3.10"
dependencies = [
Expand Down
2 changes: 1 addition & 1 deletion kmir/src/kmir/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from typing import Final

VERSION: Final = '0.3.151'
VERSION: Final = '0.3.152'
106 changes: 41 additions & 65 deletions kmir/src/kmir/kdist/mir-semantics/rt/data.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ In contrast to regular write operations, the value does not have to be _mutable_

rule <k> VAL:TypedLocal ~> #markMoved(OLDLOCAL, local(I), PROJECTIONS) ~> CONT
=>
#projectedUpdate(toLocal(I), OLDLOCAL, PROJECTIONS, Moved, .Contexts, true)
#projectedUpdate(toLocal(I), OLDLOCAL, PROJECTIONS, .Contexts) ~> #writeProjectedUpdate(Moved, true)
~> VAL
~> CONT
</k>
Expand Down Expand Up @@ -400,11 +400,12 @@ The `#setLocalValue` operation writes a `TypedLocal` value to a given `Place` wi
Write operations to places that include (a chain of) projections are handled by a special rewrite symbol `#projectedUpdate`.

```k
syntax KItem ::= #projectedUpdate ( WriteTo , TypedLocal, ProjectionElems, TypedLocal, Contexts , Bool )
syntax KItem ::= #projectedUpdate ( WriteTo , TypedLocal, ProjectionElems, Contexts )
| #writeProjectedUpdate ( TypedLocal , Bool )

rule <k> #setLocalValue(place(local(I), PROJ), VAL)
=>
#projectedUpdate(toLocal(I), {LOCALS[I]}:>TypedLocal, PROJ, VAL, .Contexts, false)
#projectedUpdate(toLocal(I), {LOCALS[I]}:>TypedLocal, PROJ, .Contexts) ~> #writeProjectedUpdate(VAL, false)
...
</k>
<locals> LOCALS </locals>
Expand Down Expand Up @@ -446,37 +447,31 @@ The solution is to use rewrite operations in a downward pass through the project

rule <k> #projectedUpdate(
DEST,
typedValue(Aggregate(IDX, ARGS), TY, MUT),
typedValue(Aggregate(IDX, ARGS), TY, _),
projectionElemField(fieldIdx(I), _) PROJS,
UPDATE,
CTXTS,
FORCE
CTXTS
) =>
#projectedUpdate(DEST, {ARGS[I]}:>TypedLocal, PROJS, UPDATE, CtxField(TY, IDX, ARGS, I) CTXTS, FORCE)
#projectedUpdate(DEST, {ARGS[I]}:>TypedLocal, PROJS, CtxField(TY, IDX, ARGS, I) CTXTS)
...
</k>
requires 0 <=Int I
andBool I <Int size(ARGS)
andBool isTypedLocal(ARGS[I])
andBool (FORCE orBool MUT ==K mutabilityMut)
[preserves-definedness] // valid list indexing checked

rule <k> #projectedUpdate(
DEST,
typedValue(Range(ELEMENTS), TY, MUT),
typedValue(Range(ELEMENTS), TY, _),
projectionElemIndex(local(LOCAL)) PROJS,
UPDATE,
CTXTS,
FORCE
CTXTS
)
=>
#projectedUpdate(
DEST,
{ELEMENTS[#expectUsize({LOCALS[LOCAL]}:>TypedValue)]}:>TypedValue,
PROJS,
UPDATE,
CtxIndex(TY, ELEMENTS, #expectUsize({LOCALS[LOCAL]}:>TypedValue)) CTXTS,
FORCE)
CtxIndex(TY, ELEMENTS, #expectUsize({LOCALS[LOCAL]}:>TypedValue)) CTXTS
)
...
</k>
<locals> LOCALS </locals>
Expand All @@ -487,118 +482,99 @@ The solution is to use rewrite operations in a downward pass through the project
andBool 0 <=Int #expectUsize({LOCALS[LOCAL]}:>TypedValue)
andBool #expectUsize({LOCALS[LOCAL]}:>TypedValue) <Int size(ELEMENTS)
andBool isTypedValue(ELEMENTS[#expectUsize({LOCALS[LOCAL]}:>TypedValue)])
andBool (FORCE orBool MUT ==K mutabilityMut)
[preserves-definedness] // index checked, valid Int can be read, ELEMENT indexable and writeable or forced

rule <k> #projectedUpdate(
DEST,
typedValue(Range(ELEMENTS), TY, MUT),
typedValue(Range(ELEMENTS), TY, _),
projectionElemConstantIndex(OFFSET:Int, _MINLEN, false) PROJS,
UPDATE,
CTXTS,
FORCE
CTXTS
)
=>
#projectedUpdate(
DEST,
{ELEMENTS[OFFSET]}:>TypedValue,
PROJS,
UPDATE,
CtxIndex(TY, ELEMENTS, OFFSET) CTXTS,
FORCE)
CtxIndex(TY, ELEMENTS, OFFSET) CTXTS
)
...
</k>
requires 0 <=Int OFFSET
andBool OFFSET <Int size(ELEMENTS)
andBool isTypedValue(ELEMENTS[OFFSET])
andBool (FORCE orBool MUT ==K mutabilityMut)
[preserves-definedness] // ELEMENT indexable and writeable or forced

rule <k> #projectedUpdate(
DEST,
typedValue(Range(ELEMENTS), TY, MUT),
typedValue(Range(ELEMENTS), TY, _),
projectionElemConstantIndex(OFFSET:Int, MINLEN, true) PROJS, // from end
UPDATE,
CTXTS,
FORCE
CTXTS
)
=>
#projectedUpdate(
DEST,
{ELEMENTS[OFFSET]}:>TypedValue,
PROJS,
UPDATE,
CtxIndex(TY, ELEMENTS, MINLEN -Int OFFSET) CTXTS,
FORCE)
CtxIndex(TY, ELEMENTS, MINLEN -Int OFFSET) CTXTS
)
...
</k>
requires 0 <Int OFFSET
andBool OFFSET <=Int MINLEN
andBool MINLEN ==Int size(ELEMENTS) // assumed for valid MIR code
andBool isTypedValue(ELEMENTS[MINLEN -Int OFFSET])
andBool (FORCE orBool MUT ==K mutabilityMut)
[preserves-definedness] // ELEMENT indexable and writeable or forced

rule <k> #projectedUpdate(
_DEST,
typedValue(Reference(OFFSET, place(LOCAL, PLACEPROJ), MUT), _, _),
projectionElemDeref PROJS,
UPDATE,
_CTXTS,
FORCE
)
_DEST,
typedValue(Reference(OFFSET, place(LOCAL, PLACEPROJ), _), _, _),
projectionElemDeref PROJS,
_CTXTS
)
=>
#projectedUpdate(
#projectedUpdate(
toStack(OFFSET, LOCAL),
#localFromFrame({STACK[OFFSET -Int 1]}:>StackFrame, LOCAL, OFFSET),
appendP(PLACEPROJ, PROJS), // apply reference projections first, then rest
UPDATE,
.Contexts, // previous contexts obsolete
FORCE
)
.Contexts // previous contexts obsolete
)
...
</k>
<stack> STACK </stack>
requires 0 <Int OFFSET
andBool OFFSET <=Int size(STACK)
andBool isStackFrame(STACK[OFFSET -Int 1])
andBool (FORCE orBool MUT ==K mutabilityMut)
[preserves-definedness]

rule <k> #projectedUpdate(
_DEST,
typedValue(Reference(OFFSET, place(local(I), PLACEPROJ), MUT), _, _),
projectionElemDeref PROJS,
UPDATE,
_CTXTS,
FORCE
)
_DEST,
typedValue(Reference(OFFSET, place(local(I), PLACEPROJ), _), _, _),
projectionElemDeref PROJS,
_CTXTS
)
=>
#projectedUpdate(
toLocal(I),
{LOCALS[I]}:>TypedLocal,
appendP(PLACEPROJ, PROJS), // apply reference projections first, then rest
UPDATE,
.Contexts, // previous contexts obsolete
FORCE
)
#projectedUpdate(
toLocal(I),
{LOCALS[I]}:>TypedLocal,
appendP(PLACEPROJ, PROJS), // apply reference projections first, then rest
.Contexts // previous contexts obsolete
)
...
</k>
<locals> LOCALS </locals>
requires OFFSET ==Int 0
andBool 0 <=Int I
andBool I <Int size(LOCALS)
andBool (FORCE orBool MUT ==K mutabilityMut)
[preserves-definedness]

rule <k> #projectedUpdate(toLocal(I), _ORIGINAL, .ProjectionElems, NEW, CONTEXTS, false)
rule <k> #projectedUpdate(toLocal(I), _ORIGINAL, .ProjectionElems, CONTEXTS) ~> #writeProjectedUpdate(NEW, false)
=>
#setLocalValue(place(local(I), .ProjectionElems), #buildUpdate(NEW, CONTEXTS))
...
</k>
[preserves-definedness] // valid conmtext ensured upon context construction

rule <k> #projectedUpdate(toLocal(I), _ORIGINAL, .ProjectionElems, NEW, CONTEXTS, true)
rule <k> #projectedUpdate(toLocal(I), _ORIGINAL, .ProjectionElems, CONTEXTS) ~> #writeProjectedUpdate(NEW, true)
=>
#forceSetLocal(local(I), #buildUpdate(NEW, CONTEXTS))
...
Expand All @@ -618,7 +594,7 @@ The solution is to use rewrite operations in a downward pass through the project
andBool I <Int size(LOCALS)
[preserves-definedness] // valid list indexing checked

rule <k> #projectedUpdate(toStack(FRAME, local(I)), _ORIGINAL, .ProjectionElems, NEW, CONTEXTS, _) => .K ... </k>
rule <k> #projectedUpdate(toStack(FRAME, local(I)), _ORIGINAL, .ProjectionElems, CONTEXTS) ~> #writeProjectedUpdate(NEW, _) => .K ... </k>
<stack> STACK
=>
STACK[(FRAME -Int 1) <-
Expand Down
2 changes: 1 addition & 1 deletion kmir/uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.151
0.3.152