Skip to content

Adapt according to nilness-checking changes in Gobra #431

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
jcp19 wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Adapt according to nilness-checking changes in Gobra #431

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
eca2579
add more nil pres
jcp19 Aug 8, 2026
a957cdc
Apply suggestion from @jcp19
jcp19 Aug 9, 2026
c3e775e
Merge branch 'master' into strengthen-specs-nil
jcp19 Aug 11, 2026
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
1 change: 1 addition & 0 deletions pkg/slayers/scmp_msg_spec.gobra
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ pred (s *SCMPDestinationUnreachable) NonInitMem() {
}

pred (s *SCMPDestinationUnreachable) Mem(ub []byte) {
s != nil &&
s.BaseLayer.Mem(ub, 4)
}

Expand Down
9 changes: 9 additions & 0 deletions router/dataplane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ func (e scmpError) Error() string {
}

// SetIA sets the local IA for the dataplane.
// @ requires d != nil
// @ requires acc(d.Mem(), OutMutexPerm)
// @ requires !d.IsRunning()
// @ requires d.LocalIA().IsZero()
Expand Down Expand Up @@ -307,6 +308,7 @@ func (d *DataPlane) SetIA(ia addr.IA) (e error) {

// SetKey sets the key used for MAC verification. The key provided here should
// already be derived as in scrypto.HFMacFactory.
// @ requires d != nil
// @ requires acc(d.Mem(), OutMutexPerm)
// @ requires !d.IsRunning()
// @ requires !d.KeyIsSet()
Expand Down Expand Up @@ -371,6 +373,7 @@ func (d *DataPlane) SetKey(key []byte) (res error) {
// send/receive traffic in the local AS. This can only be called once; future
// calls will return an error. This can only be called on a not yet running
// dataplane.
// @ requires d != nil
// @ requires acc(d.Mem(), OutMutexPerm)
// @ requires !d.IsRunning()
// @ requires !d.InternalConnIsSet()
Expand Down Expand Up @@ -416,6 +419,7 @@ func (d *DataPlane) AddInternalInterface(conn BatchConn, ip net.IP) error {
// AddExternalInterface adds the inter AS connection for the given interface ID.
// If a connection for the given ID is already set this method will return an
// error. This can only be called on a not yet running dataplane.
// @ requires d != nil
// @ requires conn != nil && conn.Mem()
// @ preserves acc(d.Mem(), OutMutexPerm)
// @ preserves !d.IsRunning()
Expand Down Expand Up @@ -464,6 +468,7 @@ func (d *DataPlane) AddExternalInterface(ifID uint16, conn BatchConn) error {
// AddNeighborIA adds the neighboring IA for a given interface ID. If an IA for
// the given ID is already set, this method will return an error. This can only
// be called on a yet running dataplane.
// @ requires d != nil
// @ requires !remote.IsZero()
// @ preserves acc(d.Mem(), OutMutexPerm)
// @ preserves !d.IsRunning()
Expand Down Expand Up @@ -630,6 +635,7 @@ func (d *DataPlane) addBFDController(ifID uint16, s *bfdSend, cfg control.BFD,
// AddSvc adds the address for the given service. This can be called multiple
// times for the same service, with the address added to the list of addresses
// that provide the service.
// @ requires d != nil
// @ requires a != nil && acc(a.Mem(), R10)
// @ preserves acc(d.Mem(), OutMutexPerm)
// @ preserves !d.IsRunning()
Expand Down Expand Up @@ -691,6 +697,7 @@ func (d *DataPlane) AddSvc(svc addr.HostSVC, a *net.UDPAddr) error {
// absence of race conditions. To specify that the router is not running,
// we need to pass perms to d.Mem(), but if we do this, then we don't need
// the lock invariant to perform the operations in this function.
// @ requires d != nil
// @ requires a != nil && acc(a.Mem(), R10)
// @ preserves acc(d.Mem(), OutMutexPerm/2)
// @ preserves d.mtx.LockP()
Expand Down Expand Up @@ -724,6 +731,7 @@ func (d *DataPlane) DelSvc(svc addr.HostSVC, a *net.UDPAddr) error {
// AddNextHop sets the next hop address for the given interface ID. If the
// interface ID already has an address associated this operation fails. This can
// only be called on a not yet running dataplane.
// @ requires d != nil
// @ requires a != nil && a.Mem()
// @ preserves acc(d.Mem(), OutMutexPerm)
// @ preserves !d.IsRunning()
Expand Down Expand Up @@ -816,6 +824,7 @@ func (d *DataPlane) AddNextHopBFD(ifID uint16, src, dst *net.UDPAddr, cfg contro
// @ requires d.mtx.LockInv() == MutexInvariant{d}
// @ requires ctx != nil && ctx.Mem()
// contracts for IO-spec
// @ requires d != nil
// @ requires dp.Valid()
// @ requires d.DpAgreesWithSpec(dp)
// @ requires io.token(place) && dp.dp3s_iospec_ordered(state, place)
Expand Down
3 changes: 3 additions & 0 deletions router/svc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ func newServices() (s *services) {
return tmp
}

// @ requires s != nil
// @ preserves acc(s.Mem(), R50)
// @ requires acc(a.Mem(), R10)
// @ decreases 0 if sync.IgnoreBlockingForTermination()
Expand Down Expand Up @@ -68,6 +69,7 @@ func (s *services) AddSvc(svc addr.HostSVC, a *net.UDPAddr) {
//@ fold acc(s.Mem(), R50)
}

// @ requires s != nil
// @ preserves acc(s.Mem(), R50)
// @ preserves acc(a.Mem(), R10)
// @ decreases 0 if sync.IgnoreBlockingForTermination()
Expand Down Expand Up @@ -101,6 +103,7 @@ func (s *services) DelSvc(svc addr.HostSVC, a *net.UDPAddr) {
//@ fold acc(s.Mem(), R50)
}

// @ requires s != nil
// @ requires acc(s.Mem(), _)
// @ ensures !b ==> r == nil
// @ ensures b ==> acc(r.Mem(), _)
Expand Down
Loading