Don't use hash for longjmp

Author: sim642

src/analyses/activeSetjmp.ml

@@ -35,8 +35,7 @@ struct
     let desc = LibraryFunctions.find f in
     match desc.special arglist with
     | Setjmp _ ->
-      let controlctx = ControlSpecC.hash (ctx.control_context ()) in
-      let entry = (ctx.prev_node, IntDomain.Flattened.of_int (Int64.of_int controlctx)) in
+      let entry = (ctx.prev_node, ctx.control_context ()) in
       D.add (Target entry) ctx.local
     | Longjmp {env; value; sigrestore} -> ctx.local
     | _ -> ctx.local

src/analyses/base.ml

@@ -2239,8 +2239,7 @@ struct
     | Setjmp { env; savesigs}, _ ->
       (let st' = (match (eval_rv (Analyses.ask_of_ctx ctx) gs st env) with
            | `Address jmp_buf ->
-             let controlctx = ControlSpecC.hash (ctx.control_context ()) in
-             let value = `JmpBuf ((ValueDomain.JmpBufs.Bufs.singleton (Target (ctx.prev_node, IntDomain.Flattened.of_int (Int64.of_int controlctx)))),false) in
+             let value = `JmpBuf (ValueDomain.JmpBufs.Bufs.singleton (Target (ctx.prev_node, ctx.control_context ())),false) in
              let r = set ~ctx (Analyses.ask_of_ctx ctx) gs st jmp_buf (Cilfacade.typeOf env) value in
              M.tracel "setjmp" "setting setjmp %a on %a -> %a\n" d_exp env  D.pretty st  D.pretty r;
              r

src/analyses/modifiedSinceLongjmp.ml

@@ -55,8 +55,7 @@ struct
     let desc = LibraryFunctions.find f in
     match desc.special arglist with
     | Setjmp _ ->
-      let controlctx = ControlSpecC.hash (ctx.control_context ()) in
-      let entry = (ctx.prev_node, IntDomain.Flattened.of_int (Int64.of_int controlctx)) in
+      let entry = (ctx.prev_node, ctx.control_context ()) in
       let v = D.find entry ctx.local in (* Will make bot binding explicit here *)
       (* LHS of setjmp not marked as tainted on purpose *)
       D.add entry v ctx.local

src/cdomains/jmpBufDomain.ml

@@ -1,4 +1,4 @@
-module BufferEntry = Printable.ProdSimple(Node)(IntDomain.Flattened)
+module BufferEntry = Printable.ProdSimple(Node)(ControlSpecC)
 
 module BufferEntryOrTop = struct
   include Printable.Std

src/framework/constraints.ml

@@ -684,8 +684,7 @@ struct
         | Target (targetnode, targetcontext) ->
         let target_in_caller () = CilType.Fundec.equal (Node.find_fundec targetnode) current_fundec in
         let targetcontext_matches () =
-          let controlctx = ControlSpecC.hash (ctx.control_context ()) in
-          targetcontext = IntDomain.Flattened.of_int (Int64.of_int controlctx)
+          ControlSpecC.equal targetcontext (ctx.control_context ())
         in
         (* Check if corresponding setjmp call was in current function & in current context *)
         if targetcontext_matches () && target_in_caller () then
@@ -799,8 +798,7 @@ struct
             if not (JmpBufDomain.JmpBufSet.mem (Target (node,c)) validBuffers) then
               M.warn "Longjmp to potentially invalid target! (Target %s in Function %s which may have already returned or is in a different thread)" (Node.show node) (Node.find_fundec node).svar.vname
             else
-              (let controlctx = ControlSpecC.hash (ctx.control_context ()) in
-               if c = IntDomain.Flattened.of_int (Int64.of_int controlctx) && (Node.find_fundec node).svar.vname = current_fundec.svar.vname then
+              (if ControlSpecC.equal c (ctx.control_context ()) && (Node.find_fundec node).svar.vname = current_fundec.svar.vname then
                  (if M.tracing then Messages.tracel "longjmp" "Potentially from same context, side-effect to %s\n" (Node.show node);
                   match node with
                   | Statement { skind = Instr [Call (lval, exp, args,_, _)] ;_ } ->