rebase onto master

Author: FelixKrayer

src/analyses/unassumeAnalysis.ml

@@ -267,7 +267,7 @@ struct
   let enter ctx lv f args =
     [(ctx.local, D.empty ())]
 
-  let combine ctx lv fe f args fc fd =
+  let combine ctx lv fe f args fc fd f_ask =
     emit_unassume ctx
 
   (* not in sync, query, entry, threadenter because they aren't final transfer function on edge *)

src/util/wideningTokens.ml

@@ -168,7 +168,7 @@ struct
   let asm ctx         = lift_fun ctx lift'   S.asm    identity
   let skip ctx        = lift_fun ctx lift'   S.skip   identity
   let special ctx r f args       = lift_fun ctx lift' S.special ((|>) args % (|>) f % (|>) r)
-  let combine ctx r fe f args fc es = lift_fun ctx lift' S.combine (fun p -> p r fe f args fc (D.unlift es)) (* TODO: use tokens from es *)
+  let combine ctx r fe f args fc es f_ask = lift_fun ctx lift' S.combine (fun p -> p r fe f args fc (D.unlift es) f_ask) (* TODO: use tokens from es *)
 
   let threadenter ctx lval f args = lift_fun ctx (fun l ts -> List.map (Fun.flip lift' ts) l) S.threadenter ((|>) args % (|>) f % (|>) lval)
   let threadspawn ctx lval f args fctx = lift_fun ctx lift' S.threadspawn ((|>) (conv fctx) % (|>) args % (|>) f % (|>) lval)