Skip to content
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.

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

Fix name of modifiedSinceSetjmp #1280

Merged
merged 1 commit into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/analyses/accessAnalysis.ml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ struct
let init _ =
collect_local := get_bool "witness.yaml.enabled" && get_bool "witness.invariant.accessed";
let activated = get_string_list "ana.activated" in
emit_single_threaded := List.mem (ModifiedSinceLongjmp.Spec.name ()) activated || List.mem (PoisonVariables.Spec.name ()) activated
emit_single_threaded := List.mem (ModifiedSinceSetjmp.Spec.name ()) activated || List.mem (PoisonVariables.Spec.name ()) activated

let do_access (ctx: (D.t, G.t, C.t, V.t) ctx) (kind:AccessKind.t) (reach:bool) (e:exp) =
if M.tracing then M.trace "access" "do_access %a %a %B\n" d_exp e AccessKind.pretty kind reach;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
(** Analysis of variables modified since [setjmp] ([modifiedSinceLongjmp]). *)

(* TODO: this name is wrong *)
(** Analysis of variables modified since [setjmp] ([modifiedSinceSetjmp]). *)

open GoblintCil
open Analyses
Expand All @@ -9,7 +7,7 @@ module Spec =
struct
include Analyses.IdentitySpec

let name () = "modifiedSinceLongjmp"
let name () = "modifiedSinceSetjmp"
module D = JmpBufDomain.LocallyModifiedMap
module VS = D.VarSet
module C = Lattice.Unit
Expand Down
2 changes: 1 addition & 1 deletion src/autoTune.ml
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ let reduceThreadAnalyses () =

(* This is run independent of the autotuner being enabled or not to be sound in the presence of setjmp/longjmp *)
(* It is done this way around to allow enabling some of these analyses also for programs without longjmp *)
let longjmpAnalyses = ["activeLongjmp"; "activeSetjmp"; "taintPartialContexts"; "modifiedSinceLongjmp"; "poisonVariables"; "expsplit"; "vla"]
let longjmpAnalyses = ["activeLongjmp"; "activeSetjmp"; "taintPartialContexts"; "modifiedSinceSetjmp"; "poisonVariables"; "expsplit"; "vla"]

let activateLongjmpAnalysesWhenRequired () =
let isLongjmp = function
Expand Down
2 changes: 1 addition & 1 deletion src/goblint_lib.ml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ module ExtractPthread = ExtractPthread
Analyses related to [longjmp] and [setjmp]. *)

module ActiveSetjmp = ActiveSetjmp
module ModifiedSinceLongjmp = ModifiedSinceLongjmp
module ModifiedSinceSetjmp = ModifiedSinceSetjmp
module ActiveLongjmp = ActiveLongjmp
module PoisonVariables = PoisonVariables
module Vla = Vla
Expand Down
Loading