feat: model interior borrows for refcell #786
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ requires "value.md" | |
|
|
||
| module RT-TYPES | ||
| imports BOOL | ||
| imports INT | ||
| imports MAP | ||
| imports K-EQUAL | ||
|
|
||
|
|
@@ -59,6 +60,35 @@ Pointers to arrays/slices are compatible with pointers to the element type | |
|
|
||
| rule #isArrayOf(typeInfoArrayType(TY, _), TY) => true | ||
| rule #isArrayOf( _ , _ ) => false [owise] | ||
|
|
||
| rule #typesCompatible(SRC, OTHER) => true | ||
| requires #zeroSizedType(SRC) orBool #zeroSizedType(OTHER) | ||
|
|
||
| syntax Bool ::= #zeroSizedType ( TypeInfo ) [function, total] | ||
|
|
||
| rule #zeroSizedType(typeInfoTupleType(.Tys)) => true | ||
| rule #zeroSizedType(typeInfoStructType(_, _, .Tys, _)) => true | ||
| rule #zeroSizedType(_) => false [owise] | ||
|
||
|
|
||
| rule #typesCompatible(typeInfoStructType(_, _, FIELD .Tys, LAYOUT), OTHER) | ||
| => #typesCompatible(lookupTy(FIELD), OTHER) | ||
| requires #zeroFieldOffset(LAYOUT) | ||
|
|
||
| rule #typesCompatible(OTHER, typeInfoStructType(_, _, FIELD .Tys, LAYOUT)) | ||
| => #typesCompatible(OTHER, lookupTy(FIELD)) | ||
| requires #zeroFieldOffset(LAYOUT) | ||
|
|
||
| syntax Bool ::= #zeroFieldOffset ( MaybeLayoutShape ) [function, total] | ||
|
|
||
| rule #zeroFieldOffset(LAYOUT) | ||
| => #structOffsets(LAYOUT) ==K .MachineSizes | ||
| orBool #structOffsets(LAYOUT) ==K machineSize(mirInt(0)) .MachineSizes | ||
| orBool #structOffsets(LAYOUT) ==K machineSize(0) .MachineSizes | ||
|
||
|
|
||
| syntax MachineSizes ::= #structOffsets ( MaybeLayoutShape ) [function, total] | ||
|
|
||
| rule #structOffsets(someLayoutShape(layoutShape(fieldsShapeArbitrary(mk(OFFSETS)), _, _, _, _))) => OFFSETS | ||
| rule #structOffsets(_) => .MachineSizes [owise] | ||
| ``` | ||
|
|
||
| ## Determining types of places with projection | ||
|
|
@@ -70,6 +100,24 @@ To make this function total, an optional `MaybeTy` is used. | |
| syntax MaybeTy ::= Ty | ||
| | "TyUnknown" | ||
|
|
||
| syntax MaybeTy ::= #transparentFieldTy ( TypeInfo ) [function, total] | ||
|
|
||
| rule #transparentFieldTy(typeInfoStructType(_, _, FIELD .Tys, LAYOUT)) => FIELD | ||
| requires #zeroFieldOffset(LAYOUT) | ||
| rule #transparentFieldTy(_) => TyUnknown [owise] | ||
|
|
||
| syntax Int ::= #transparentDepth ( TypeInfo ) [function, total] | ||
|
|
||
| rule #transparentDepth(typeInfoStructType(_, _, FIELD .Tys, LAYOUT)) | ||
| => 1 +Int #transparentDepth(lookupTy(FIELD)) | ||
| requires #zeroFieldOffset(LAYOUT) | ||
| rule #transparentDepth(_) => 0 [owise] | ||
|
|
||
| syntax TypeInfo ::= #lookupMaybeTy ( MaybeTy ) [function, total] | ||
|
|
||
| rule #lookupMaybeTy(TY:Ty) => lookupTy(TY) | ||
| rule #lookupMaybeTy(TyUnknown) => typeInfoVoidType | ||
|
|
||
| syntax MaybeTy ::= getTyOf( MaybeTy , ProjectionElems ) [function, total] | ||
| // ----------------------------------------------------------- | ||
| rule getTyOf(TyUnknown, _ ) => TyUnknown | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,42 @@ | ||
| <kmir> | ||
| <k> | ||
| #EndProgram ~> .K | ||
| </k> | ||
| <retVal> | ||
| noReturn | ||
| </retVal> | ||
| <currentFunc> | ||
| ty ( -1 ) | ||
| </currentFunc> | ||
| <currentFrame> | ||
| <currentBody> | ||
| ListItem ( basicBlock (... statements: .Statements , terminator: terminator (... kind: terminatorKindCall (... func: operandConstant ( constOperand (... span: span ( 64 ) , userTy: someUserTypeAnnotationIndex ( userTypeAnnotationIndex ( 0 ) ) , const: mirConst (... kind: constantKindZeroSized , ty: ty ( 33 ) , id: mirConstId ( 11 ) ) ) ) , args: operandConstant ( constOperand (... span: span ( 65 ) , userTy: noUserTypeAnnotationIndex , const: mirConst (... kind: constantKindAllocated ( allocation (... bytes: b")\x00\x00\x00\x00\x00\x00\x00" , provenance: provenanceMap (... ptrs: .ProvenanceMapEntries ) , align: align ( 8 ) , mutability: mutabilityMut ) ) , ty: ty ( 25 ) , id: mirConstId ( 12 ) ) ) ) .Operands , destination: place (... local: local ( 1 ) , projection: .ProjectionElems ) , target: someBasicBlockIdx ( basicBlockIdx ( 1 ) ) , unwind: unwindActionContinue ) , span: span ( 66 ) ) ) ) | ||
| ListItem ( basicBlock (... statements: statement (... kind: statementKindAssign (... place: place (... local: local ( 3 ) , projection: .ProjectionElems ) , rvalue: rvalueRef ( region (... kind: regionKindReErased ) , borrowKindShared , place (... local: local ( 1 ) , projection: .ProjectionElems ) ) ) , span: span ( 69 ) ) .Statements , terminator: terminator (... kind: terminatorKindCall (... func: operandConstant ( constOperand (... span: span ( 67 ) , userTy: noUserTypeAnnotationIndex , const: mirConst (... kind: constantKindZeroSized , ty: ty ( 34 ) , id: mirConstId ( 13 ) ) ) ) , args: operandCopy ( place (... local: local ( 3 ) , projection: .ProjectionElems ) ) .Operands , destination: place (... local: local ( 2 ) , projection: .ProjectionElems ) , target: someBasicBlockIdx ( basicBlockIdx ( 2 ) ) , unwind: unwindActionContinue ) , span: span ( 68 ) ) ) ) | ||
| ListItem ( basicBlock (... statements: .Statements , terminator: terminator (... kind: terminatorKindSwitchInt (... discr: operandMove ( place (... local: local ( 2 ) , projection: .ProjectionElems ) ) , targets: switchTargets (... branches: branch ( 41 , basicBlockIdx ( 3 ) ) .Branches , otherwise: basicBlockIdx ( 4 ) ) ) , span: span ( 70 ) ) ) ) | ||
| ListItem ( basicBlock (... statements: .Statements , terminator: terminator (... kind: terminatorKindReturn , span: span ( 71 ) ) ) ) | ||
| ListItem ( basicBlock (... statements: .Statements , terminator: terminator (... kind: terminatorKindCall (... func: operandConstant ( constOperand (... span: span ( 72 ) , userTy: noUserTypeAnnotationIndex , const: mirConst (... kind: constantKindZeroSized , ty: ty ( 35 ) , id: mirConstId ( 14 ) ) ) ) , args: operandConstant ( constOperand (... span: span ( 32 ) , userTy: noUserTypeAnnotationIndex , const: mirConst (... kind: constantKindAllocated ( allocation (... bytes: b"\x00\x00\x00\x00\x00\x00\x00\x00#\x00\x00\x00\x00\x00\x00\x00" , provenance: provenanceMap (... ptrs: provenanceMapEntry (... offset: 0 , allocId: allocId ( 0 ) ) .ProvenanceMapEntries ) , align: align ( 8 ) , mutability: mutabilityMut ) ) , ty: ty ( 36 ) , id: mirConstId ( 15 ) ) ) ) .Operands , destination: place (... local: local ( 4 ) , projection: .ProjectionElems ) , target: noBasicBlockIdx , unwind: unwindActionContinue ) , span: span ( 72 ) ) ) ) | ||
| </currentBody> | ||
| <caller> | ||
| ty ( -1 ) | ||
| </caller> | ||
| <dest> | ||
| place (... local: local ( 0 ) , projection: .ProjectionElems ) | ||
| </dest> | ||
| <target> | ||
| noBasicBlockIdx | ||
| </target> | ||
| <unwind> | ||
| unwindActionContinue | ||
| </unwind> | ||
| <locals> | ||
| ListItem ( newLocal ( ty ( 1 ) , mutabilityMut ) ) | ||
| ListItem ( typedValue ( Aggregate ( variantIdx ( 0 ) , ListItem ( Integer ( 41 , 64 , true ) ) ) , ty ( 26 ) , mutabilityNot ) ) | ||
| ListItem ( typedValue ( Moved , ty ( 25 ) , mutabilityMut ) ) | ||
| ListItem ( typedValue ( Reference ( 0 , place (... local: local ( 1 ) , projection: .ProjectionElems ) , mutabilityNot , metadata ( noMetadataSize , 0 , noMetadataSize ) ) , ty ( 30 ) , mutabilityNot ) ) | ||
| ListItem ( newLocal ( ty ( 37 ) , mutabilityMut ) ) | ||
| </locals> | ||
| </currentFrame> | ||
| <stack> | ||
| ListItem ( StackFrame ( ty ( -1 ) , place (... local: local ( -1 ) , projection: .ProjectionElems ) , noBasicBlockIdx , unwindActionUnreachable , .List ) ) | ||
| </stack> | ||
| </kmir> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So I guess this means that any cast involving a ZST is valid? This is in a section about points to array slices being compatible, I think this needs to be under a ZST section with an explanation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I followed the current semantics writing style and tried to keep changes simple. Do you mean to move these rules to a separate section with more decriptions?