Skip to content

Weaken Lattice.Lift{,2}Conf arguments, remove Lattice.LiftPO #1728

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

Merged
merged 4 commits into from
Apr 17, 2025
Merged

Weaken Lattice.Lift{,2}Conf arguments, remove Lattice.LiftPO #1728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9adcbe9
Weaken Lattice.LiftConf argument, remove Lattice.LiftPO
sim642 Apr 15, 2025
f91d7e9
Weaken Lattice.Lift2Conf arguments
sim642 Apr 15, 2025
b101311
Remove dummy top/bot from DomVariantLattice0
sim642 Apr 16, 2025
30ccf69
Merge branch 'master' into lattice-lift-po
sim642 Apr 17, 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
7 changes: 1 addition & 6 deletions src/analyses/mCPRegistry.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ struct
end

module DomVariantLattice0 (DLSpec : DomainListLatticeSpec)
: Lattice.S with type t = int * Obj.t
: Lattice.PO with type t = int * Obj.t
=
struct
open DLSpec
Expand All @@ -403,11 +403,6 @@ struct

let leq = binop_map' (fun _ (module S : Lattice.S) x y -> S.leq (Obj.obj x) (Obj.obj y))

let is_top x = false
let is_bot x = false
let top () = failwith "DomVariantLattice0.top"
let bot () = failwith "DomVariantLattice0.bot"

let pretty_diff () (x, y) =
let f _ (module S : Lattice.S) x y =
if S.leq (Obj.obj x) (Obj.obj y) then nil
Expand Down
2 changes: 1 addition & 1 deletion src/cdomain/value/cdomains/intDomain0.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@ end

module Lift (Base: IkindUnawareS): IkindUnawareS with type t = [ `Bot | `Lifted of Base.t | `Top ] and type int_t = Base.int_t = (* identical to Flat, but does not go to `Top/Bot` if Base raises Unknown/Error *)
struct
include Lattice.LiftPO (struct
include Lattice.LiftConf (struct
include Printable.DefaultConf
let top_name = "MaxInt"
let bot_name = "MinInt"
Expand Down
76 changes: 6 additions & 70 deletions src/domain/lattice.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ end
module Flat = FlatConf (Printable.DefaultConf)


module LiftConf (Conf: Printable.LiftConf) (Base: S) =
module LiftConf (Conf: Printable.LiftConf) (Base: PO) =
struct
include Printable.LiftConf (Conf) (Base)

Expand Down Expand Up @@ -270,7 +270,7 @@ struct
| (x, `Bot) -> x
| (`Lifted x, `Lifted y) ->
try `Lifted (Base.join x y)
with TopValue -> `Top
with TopValue | Uncomparable -> `Top

let meet x y =
match (x,y) with
Expand All @@ -280,14 +280,14 @@ struct
| (x, `Top) -> x
| (`Lifted x, `Lifted y) ->
try `Lifted (Base.meet x y)
with BotValue -> `Bot
with BotValue | Uncomparable -> `Bot

let widen x y =
match (x,y) with
| (`Lifted x, `Lifted y) ->
begin
try `Lifted (Base.widen x y)
with TopValue -> `Top
with TopValue | Uncomparable -> `Top
end
| _ -> y

Expand All @@ -296,7 +296,7 @@ struct
| (`Lifted x, `Lifted y) ->
begin
try `Lifted (Base.narrow x y)
with BotValue -> `Bot
with BotValue | Uncomparable -> `Bot
end
| (_, `Bot) -> `Bot
| (`Top, y) -> y
Expand All @@ -305,71 +305,7 @@ end

module Lift = LiftConf (Printable.DefaultConf)

module LiftPO (Conf: Printable.LiftConf) (Base: PO) =
struct
include Printable.LiftConf (Conf) (Base)

let bot () = `Bot
let is_bot x = x = `Bot
let top () = `Top
let is_top x = x = `Top

let leq x y =
match (x,y) with
| (_, `Top) -> true
| (`Top, _) -> false
| (`Bot, _) -> true
| (_, `Bot) -> false
| (`Lifted x, `Lifted y) -> Base.leq x y

let pretty_diff () ((x:t),(y:t)): Pretty.doc =
match (x,y) with
| (`Lifted x, `Lifted y) -> Base.pretty_diff () (x,y)
| _ -> if leq x y then Pretty.text "No Changes" else
Pretty.dprintf "%a instead of %a" pretty x pretty y

let join x y =
match (x,y) with
| (`Top, _) -> `Top
| (_, `Top) -> `Top
| (`Bot, x) -> x
| (x, `Bot) -> x
| (`Lifted x, `Lifted y) ->
try `Lifted (Base.join x y)
with Uncomparable | TopValue -> `Top

let meet x y =
match (x,y) with
| (`Bot, _) -> `Bot
| (_, `Bot) -> `Bot
| (`Top, x) -> x
| (x, `Top) -> x
| (`Lifted x, `Lifted y) ->
try `Lifted (Base.meet x y)
with Uncomparable | BotValue -> `Bot

let widen x y =
match (x,y) with
| (`Lifted x, `Lifted y) ->
begin
try `Lifted (Base.widen x y)
with Uncomparable | TopValue -> `Top
end
| _ -> y

let narrow x y =
match (x,y) with
| (`Lifted x, `Lifted y) ->
begin
try `Lifted (Base.narrow x y)
with Uncomparable | BotValue -> `Bot
end
| (_, `Bot) -> `Bot
| (`Top, y) -> y
| _ -> x
end

module Lift2Conf (Conf: Printable.Lift2Conf) (Base1: S) (Base2: S) =
module Lift2Conf (Conf: Printable.Lift2Conf) (Base1: PO) (Base2: PO) =
struct
include Printable.Lift2Conf (Conf) (Base1) (Base2)

Expand Down
Loading