[clang] enforce that `instruction` always returns one SIL expression

Summary:
Previously, the type of `trans_result` contained a list of SIL expressions.
However, most of the time we expect to get exactly one, and getting a different
number is a soft(!) error, usually returning `-1`.

This splits `trans_result` into `control`, which contains the information
needed for temporary computation (hence when we don't necessarily know the
return value yet), and a new version of `trans_result` that includes `control`,
the previous `exps` list but replaced by a single `return` expression instead,
and a couple other values that made sense to move out of `control`. This allows
some flexibility in the frontend compared to enforcing exactly one return
expression always: if they are not known yet we stick to `control` instead (see
eg `compute_controls_to_parent`).

This creates more garbage temporary identifiers, however they do not show up in
the final cfg. Instead, we see that temporary IDs are now often not
consecutive...

The most painful complication is in the treatment of `DeclRefExpr`, which was
actually returning *two* expressions: the method name and the `this` object.
Now the method name is a separate (optional) field in `trans_result`.

Reviewed By: mbouaziz

Differential Revision: D7881088

fbshipit-source-id: 41ad3b5

infer/src/IR/Exp.ml

@@ -304,3 +304,17 @@ let rec gen_program_vars =
 
 
 let program_vars e = Sequence.Generator.run (gen_program_vars e)
+
+let zero_of_type typ =
+  match typ.Typ.desc with
+  | Typ.Tint _ ->
+      Some (Const (Cint IntLit.zero))
+  | Typ.Tfloat _ ->
+      Some (Const (Cfloat 0.0))
+  | Typ.Tptr _ ->
+      Some (Const (Cint IntLit.null))
+  | _ ->
+      None
+
+
+let zero_of_type_exn typ = Option.value_exn (zero_of_type typ)

infer/src/IR/Exp.mli

@@ -136,3 +136,8 @@ val pp : F.formatter -> t -> unit
 val to_string : t -> string
 
 val is_objc_block_closure : t -> bool
+
+val zero_of_type : Typ.t -> t option
+(** Returns the zero value of a type, for int, float and ptr types *)
+
+val zero_of_type_exn : Typ.t -> t

infer/src/IR/Sil.ml

@@ -211,22 +211,6 @@ let is_objc_object = function
       false
 
 
-(** Returns the zero value of a type, for int, float and ptr types, None othwewise *)
-let zero_value_of_numerical_type_option typ =
-  match typ.Typ.desc with
-  | Typ.Tint _ ->
-      Some (Exp.Const (Cint IntLit.zero))
-  | Typ.Tfloat _ ->
-      Some (Exp.Const (Cfloat 0.0))
-  | Typ.Tptr _ ->
-      Some (Exp.Const (Cint IntLit.null))
-  | _ ->
-      None
-
-
-(** Returns the zero value of a type, for int, float and ptr types, fail otherwise *)
-let zero_value_of_numerical_type typ = Option.value_exn (zero_value_of_numerical_type_option typ)
-
 (** Check if a pvar is a local static in objc *)
 let is_static_local_name pname pvar =
   (* local static name is of the form procname_varname *)

infer/src/IR/Sil.mli

@@ -240,12 +240,6 @@ val hpred_compact : sharing_env -> hpred -> hpred
 val is_objc_object : hpred -> bool
 (** {2 Comparision And Inspection Functions} *)
 
-val zero_value_of_numerical_type_option : Typ.t -> Exp.t option
-(** Returns the zero value of a type, for int, float and ptr types, None othwewise *)
-
-val zero_value_of_numerical_type : Typ.t -> Exp.t
-(** Returns the zero value of a type, for int, float and ptr types, fail otherwise *)
-
 val is_static_local_name : string -> Pvar.t -> bool
 (** Check if a pvar is a local static in objc *)
 

infer/src/clang/cAst_utils.ml

@@ -70,12 +70,6 @@ let dummy_stmt_info () =
   {Clang_ast_t.si_pointer= get_fresh_pointer (); si_source_range= dummy_source_range ()}
 
 
-let dummy_stmt () =
-  let pointer = get_fresh_pointer () in
-  let source_range = dummy_source_range () in
-  Clang_ast_t.NullStmt ({Clang_ast_t.si_pointer= pointer; si_source_range= source_range}, [])
-
-
 let get_decl decl_ptr = Int.Table.find ClangPointers.pointer_decl_table decl_ptr
 
 let get_decl_opt decl_ptr_opt =

infer/src/clang/cAst_utils.mli

@@ -11,8 +11,6 @@ open! IStd
 
 (** Functions for transformations of ast nodes *)
 
-val dummy_stmt : unit -> Clang_ast_t.stmt
-
 val dummy_source_range : unit -> Clang_ast_t.source_range
 
 val dummy_stmt_info : unit -> Clang_ast_t.stmt_info

infer/src/clang/cFrontend_decl.ml

@@ -57,7 +57,8 @@ module CFrontend_decl_funct (T : CModule_type.CTranslation) : CModule_type.CFron
       CMethod_trans.create_external_procdesc cfg procname method_kind None
     in
     let pp_context fmt () =
-      F.fprintf fmt "Aborting translation of method '%a'" Typ.Procname.pp procname
+      F.fprintf fmt "Aborting translation of method '%a' in file '%a'" Typ.Procname.pp procname
+        SourceFile.pp trans_unit_ctx.CFrontend_config.source_file
     in
     let f () =
       match Typ.Procname.Hash.find cfg procname with

infer/src/clang/cTrans_utils.ml

@@ -14,24 +14,14 @@ module Hashtbl = Caml.Hashtbl
 
 module L = Logging
 
-(** Extract the element of a singleton list. If the list is not a singleton It stops the computation
+(** Extract the element of a singleton list. If the list is not a singleton it crashes *)
-   giving a warning. We use this because we assume in many places that a list is just a
+let extract_item_from_singleton l pp warning_string =
-   singleton. We use the warning if to see which assumption was not correct. *)
-let extract_item_from_singleton l warning_string failure_val =
   match l with
   | [item] ->
       item
   | _ ->
-      L.(debug Capture Medium) "%s" warning_string ;
+      L.die InternalError "List has %d elements, 1 expected:@\n[@[<h>%a@]]@\n%s" (List.length l)
-      failure_val
+        (Pp.semicolon_seq pp) l warning_string
-
-
-let dummy_exp = (Exp.minus_one, Typ.mk (Tint Typ.IInt))
-
-(** Extract the element of a singleton list. If the list is not a singleton Gives a warning and
-   return -1 as standard value indicating something went wrong. *)
-let extract_exp_from_list el warning_string =
-  extract_item_from_singleton el warning_string dummy_exp
 
 
 module Nodes = struct
@@ -50,13 +40,9 @@ module Nodes = struct
     Procdesc.create_node procdesc loc node_kind instrs
 
 
-  let create_prune_node ~branch ~negate_cond e_cond instrs_cond loc if_kind context =
+  let create_prune_node ~branch ~negate_cond (e_cond, _) instrs_cond loc if_kind context =
-    let e_cond', _ =
+    let e_cond = if negate_cond then Exp.UnOp (Unop.LNot, e_cond, None) else e_cond in
-      extract_exp_from_list e_cond
+    let instrs_cond' = instrs_cond @ [Sil.Prune (e_cond, loc, branch, if_kind)] in
-        "@\nWARNING: Missing expression for Conditional operator. Need to be fixed"
-    in
-    let e_cond'' = if negate_cond then Exp.UnOp (Unop.LNot, e_cond', None) else e_cond' in
-    let instrs_cond' = instrs_cond @ [Sil.Prune (e_cond'', loc, branch, if_kind)] in
     create_node (prune_kind branch if_kind) instrs_cond' loc context
 
 
@@ -140,20 +126,6 @@ type trans_state =
   ; opaque_exp: (Exp.t * Typ.t) option
   ; is_fst_arg_objc_method_call: bool }
 
-(** A translation result. It is returned by the translation function. *)
-type trans_result =
-  { root_nodes: Procdesc.Node.t list  (** Top cfg nodes (root) created by the translation *)
-  ; leaf_nodes: Procdesc.Node.t list  (** Bottom cfg nodes (leaf) created by the translate *)
-  ; instrs: Sil.instr list
-        (** list of SIL instruction that need to be placed in cfg nodes of the parent*)
-  ; exps: (Exp.t * Typ.t) list  (** SIL expressions resulting from translation of clang stmt *)
-  ; initd_exps: Exp.t list
-  ; is_cpp_call_virtual: bool }
-
-let empty_res_trans =
-  {root_nodes= []; leaf_nodes= []; instrs= []; exps= []; initd_exps= []; is_cpp_call_virtual= false}
-
-
 let default_trans_state context =
   { context
   ; succ_nodes= []
@@ -164,31 +136,47 @@ let default_trans_state context =
   ; is_fst_arg_objc_method_call= false }
 
 
+type control =
+  { root_nodes: Procdesc.Node.t list
+  ; leaf_nodes: Procdesc.Node.t list
+  ; instrs: Sil.instr list
+  ; initd_exps: Exp.t list }
+
+type trans_result =
+  { control: control
+  ; return: Exp.t * Typ.t
+  ; method_name: Typ.Procname.t option
+  ; is_cpp_call_virtual: bool }
+
+let empty_control = {root_nodes= []; leaf_nodes= []; instrs= []; initd_exps= []}
+
+let mk_trans_result ?method_name ?(is_cpp_call_virtual= false) return control =
+  {control; return; method_name; is_cpp_call_virtual}
+
+
 let undefined_expression () = Exp.Var (Ident.create_fresh Ident.knormal)
 
 (** Collect the results of translating a list of instructions, and link up the nodes created. *)
-let collect_res_trans pdesc l =
+let collect_controls pdesc l =
-  let rec collect l rt =
+  let collect_one result_rev {root_nodes; leaf_nodes; instrs; initd_exps} =
-    match l with
+    if root_nodes <> [] then
-    | [] ->
-        rt
-    | rt' :: l' ->
-        let root_nodes = if rt.root_nodes <> [] then rt.root_nodes else rt'.root_nodes in
-        let leaf_nodes = if rt'.leaf_nodes <> [] then rt'.leaf_nodes else rt.leaf_nodes in
-        if rt'.root_nodes <> [] then
       List.iter
-            ~f:(fun n -> Procdesc.node_set_succs_exn pdesc n rt'.root_nodes [])
+        ~f:(fun n -> Procdesc.node_set_succs_exn pdesc n root_nodes [])
-            rt.leaf_nodes ;
+        result_rev.leaf_nodes ;
-        collect l'
+    let root_nodes = if result_rev.root_nodes <> [] then result_rev.root_nodes else root_nodes in
+    let leaf_nodes = if leaf_nodes <> [] then leaf_nodes else result_rev.leaf_nodes in
     { root_nodes
     ; leaf_nodes
-          ; instrs= List.rev_append rt'.instrs rt.instrs
+    ; instrs= List.rev_append instrs result_rev.instrs
-          ; exps= List.rev_append rt'.exps rt.exps
+    ; initd_exps= List.rev_append initd_exps result_rev.initd_exps }
-          ; initd_exps= List.rev_append rt'.initd_exps rt.initd_exps
-          ; is_cpp_call_virtual= false }
   in
-  let rt = collect l empty_res_trans in
+  let rev_result = List.fold l ~init:empty_control ~f:collect_one in
-  {rt with instrs= List.rev rt.instrs; exps= List.rev rt.exps; initd_exps= List.rev rt.initd_exps}
+  {rev_result with instrs= List.rev rev_result.instrs; initd_exps= List.rev rev_result.initd_exps}
+
+
+let collect_trans_results pdesc ~return trans_results =
+  List.map trans_results ~f:(fun {control} -> control) |> collect_controls pdesc
+  |> mk_trans_result return
 
 
 module PriorityNode = struct
@@ -216,16 +204,16 @@ module PriorityNode = struct
     match pri with Busy p when Int.equal p stmt_info.Clang_ast_t.si_pointer -> true | _ -> false
 
 
-  (* Used by translation functions to handle potenatial cfg nodes. *)
+  (* Used by translation functions to handle potential cfg nodes. *)
   (* It connects nodes returned by translation of stmt children and *)
   (* deals with creating or not a cfg node depending of owning the *)
   (* priority_node. It returns nodes, ids, instrs that should be passed to parent *)
-  let compute_results_to_parent trans_state loc nd_name stmt_info res_states_children =
+  let compute_controls_to_parent trans_state loc ~node_name stmt_info res_states_children =
-    let res_state = collect_res_trans trans_state.context.procdesc res_states_children in
+    let res_state = collect_controls trans_state.context.procdesc res_states_children in
     let create_node = own_priority_node trans_state.priority stmt_info && res_state.instrs <> [] in
     if create_node then (
       (* We need to create a node *)
-      let node_kind = Procdesc.Node.Stmt_node nd_name in
+      let node_kind = Procdesc.Node.Stmt_node node_name in
       let node = Nodes.create_node node_kind res_state.instrs loc trans_state.context in
       Procdesc.node_set_succs_exn trans_state.context.procdesc node trans_state.succ_nodes [] ;
       List.iter
@@ -233,10 +221,23 @@ module PriorityNode = struct
         res_state.leaf_nodes ;
       (* Invariant: if root_nodes is empty then the params have not created a node.*)
       let root_nodes = if res_state.root_nodes <> [] then res_state.root_nodes else [node] in
-      {res_state with root_nodes; leaf_nodes= [node]; instrs= []; exps= []} )
+      {res_state with root_nodes; leaf_nodes= [node]; instrs= []} )
-    else
+    else (* The node is created by the parent. We just pass back nodes/leafs params *)
-      (* The node is created by the parent. We just pass back nodes/leafs params *)
+      res_state
-      {res_state with exps= []}
+
+
+  let compute_results_to_parent trans_state loc ~node_name stmt_info ~return trans_results =
+    List.map trans_results ~f:(fun trans_result -> trans_result.control)
+    |> compute_controls_to_parent trans_state loc ~node_name stmt_info |> mk_trans_result return
+
+
+  let compute_control_to_parent trans_state loc ~node_name stmt_info control =
+    compute_controls_to_parent trans_state loc ~node_name stmt_info [control]
+
+
+  let compute_result_to_parent trans_state loc ~node_name stmt_info trans_result =
+    compute_control_to_parent trans_state loc ~node_name stmt_info trans_result.control
+    |> mk_trans_result trans_result.return
 end
 
 module Loops = struct
@@ -355,12 +356,10 @@ let create_alloc_instrs ~alloc_builtin ?size_exp ?placement_args_exps sil_loc fu
 
 let alloc_trans trans_state ~alloc_builtin loc stmt_info function_type =
   let function_type, instrs, exp = create_alloc_instrs ~alloc_builtin loc function_type in
-  let res_trans_tmp = {empty_res_trans with instrs} in
+  let control_tmp = {empty_control with instrs} in
-  let res_trans =
+  PriorityNode.compute_control_to_parent trans_state loc ~node_name:"Call alloc" stmt_info
-    let nname = "Call alloc" in
+    control_tmp
-    PriorityNode.compute_results_to_parent trans_state loc nname stmt_info [res_trans_tmp]
+  |> mk_trans_result (exp, function_type)
-  in
-  {res_trans with exps= [(exp, function_type)]}
 
 
 let objc_new_trans trans_state ~alloc_builtin loc stmt_info cls_name function_type =
@@ -382,12 +381,10 @@ let objc_new_trans trans_state ~alloc_builtin loc stmt_info cls_name function_ty
     Sil.Call (ret_id_typ, Exp.Const (Const.Cfun pname), args, loc, call_flags)
   in
   let instrs = alloc_stmt_call @ [init_stmt_call] in
-  let res_trans_tmp = {empty_res_trans with instrs} in
+  let res_trans_tmp = {empty_control with instrs} in
-  let res_trans =
+  let node_name = "Call objC new" in
-    let nname = "Call objC new" in
+  PriorityNode.compute_control_to_parent trans_state loc ~node_name stmt_info res_trans_tmp
-    PriorityNode.compute_results_to_parent trans_state loc nname stmt_info [res_trans_tmp]
+  |> mk_trans_result (Exp.Var init_ret_id, alloc_ret_type)
-  in
-  {res_trans with exps= [(Exp.Var init_ret_id, alloc_ret_type)]}
 
 
 let new_or_alloc_trans trans_state loc stmt_info qual_type class_name_opt selector =
@@ -421,7 +418,7 @@ let cpp_new_trans sil_loc function_type size_exp placement_args_exps =
   let function_type, stmt_call, exp =
     create_alloc_instrs ~alloc_builtin ?size_exp ~placement_args_exps sil_loc function_type
   in
-  {empty_res_trans with instrs= stmt_call; exps= [(exp, function_type)]}
+  mk_trans_result (exp, function_type) {empty_control with instrs= stmt_call}
 
 
 let create_call_to_free_cf sil_loc exp typ =
@@ -446,7 +443,7 @@ let dereference_var_sil (exp, typ) sil_loc =
 (** Given trans_result with ONE expression, create temporary variable with value of an expression
     assigned to it *)
 let dereference_value_from_result sil_loc trans_result ~strip_pointer =
-  let obj_sil, class_typ = extract_exp_from_list trans_result.exps "" in
+  let obj_sil, class_typ = trans_result.return in
   let typ_no_ptr =
     match class_typ.Typ.desc with
     | Tptr (typ, _) ->
@@ -458,15 +455,16 @@ let dereference_value_from_result sil_loc trans_result ~strip_pointer =
   in
   let cast_typ = if strip_pointer then typ_no_ptr else class_typ in
   let cast_inst, cast_exp = dereference_var_sil (obj_sil, cast_typ) sil_loc in
-  {trans_result with instrs= trans_result.instrs @ cast_inst; exps= [(cast_exp, cast_typ)]}
+  { trans_result with
+    control= {trans_result.control with instrs= trans_result.control.instrs @ cast_inst}
+  ; return= (cast_exp, cast_typ) }
 
 
-let cast_operation cast_kind exps cast_typ sil_loc =
+let cast_operation cast_kind ((exp, typ) as exp_typ) cast_typ sil_loc =
-  let exp, typ = extract_exp_from_list exps "" in
   match cast_kind with
   | `NoOp | `DerivedToBase | `UncheckedDerivedToBase ->
       (* These casts ignore change of type *)
-      ([], (exp, typ))
+      ([], exp_typ)
   | `BitCast | `IntegralCast | `IntegralToBoolean ->
       (* This is treated as a nop by returning the same expressions exps*)
       ([], (exp, cast_typ))
@@ -491,20 +489,17 @@ let cast_operation cast_kind exps cast_typ sil_loc =
 let trans_assertion_failure sil_loc (context: CContext.t) =
   let assert_fail_builtin = Exp.Const (Const.Cfun BuiltinDecl.__infer_fail) in
   let args = [(Exp.Const (Const.Cstr Config.default_failure_name), Typ.mk Tvoid)] in
+  let ret_id = Ident.create_fresh Ident.knormal in
+  let ret_typ = Typ.mk Tvoid in
   let call_instr =
-    Sil.Call
+    Sil.Call ((ret_id, ret_typ), assert_fail_builtin, args, sil_loc, CallFlags.default)
-      ( (Ident.create_fresh Ident.knormal, Typ.mk Tvoid)
-      , assert_fail_builtin
-      , args
-      , sil_loc
-      , CallFlags.default )
   in
   let exit_node = Procdesc.get_exit_node (CContext.get_procdesc context)
   and failure_node =
     Nodes.create_node (Procdesc.Node.Stmt_node "Assertion failure") [call_instr] sil_loc context
   in
   Procdesc.node_set_succs_exn context.procdesc failure_node [exit_node] [] ;
-  {empty_res_trans with root_nodes= [failure_node]}
+  mk_trans_result (Exp.Var ret_id, ret_typ) {empty_control with root_nodes= [failure_node]}
 
 
 let trans_assume_false sil_loc (context: CContext.t) succ_nodes =
@@ -512,7 +507,8 @@ let trans_assume_false sil_loc (context: CContext.t) succ_nodes =
   let instrs_cond = [Sil.Prune (Exp.zero, sil_loc, true, if_kind)] in
   let prune_node = Nodes.create_node (Nodes.prune_kind true if_kind) instrs_cond sil_loc context in
   Procdesc.node_set_succs_exn context.procdesc prune_node succ_nodes [] ;
-  {empty_res_trans with root_nodes= [prune_node]; leaf_nodes= [prune_node]}
+  mk_trans_result (Exp.zero, Typ.(mk (Tint IInt)))
+    {empty_control with root_nodes= [prune_node]; leaf_nodes= [prune_node]}
 
 
 let trans_assertion trans_state sil_loc =
@@ -535,16 +531,15 @@ let trans_std_addressof params_trans_res =
 
 let trans_replace_with_deref_first_arg sil_loc params_trans_res ~cxx_method_call =
   let first_arg_res_trans =
+    if cxx_method_call then
       match params_trans_res with
-    | _ :: fst_arg_res :: _ when not cxx_method_call ->
+      | fst_arg_res :: _ ->
+          assert (Option.is_some fst_arg_res.method_name) ;
           fst_arg_res
-    | ({exps= _method_exp :: rest} as fst_arg_res) :: _ when cxx_method_call ->
+      | [] ->
-        (* method_deref_trans uses a different format to store the first argument: it stores the
-           [method_exp] first.  We need to get rid of first exp before calling
-           dereference_value_from_result *)
-        {fst_arg_res with exps= rest}
-    | _ ->
           assert false
+    else
+      match params_trans_res with _ :: fst_arg_res :: _ -> fst_arg_res | [] | [_] -> assert false
   in
   dereference_value_from_result sil_loc first_arg_res_trans ~strip_pointer:true
 
@@ -565,16 +560,13 @@ let cxx_method_builtin_trans trans_state loc params_trans_res pname =
   else None
 
 
-let define_condition_side_effects e_cond instrs_cond sil_loc =
+let define_condition_side_effects ((e_cond_exp, e_cond_typ) as e_cond) instrs_cond sil_loc =
-  let e', typ =
+  match e_cond_exp with
-    extract_exp_from_list e_cond "@\nWARNING: Missing expression in IfStmt. Need to be fixed@\n"
-  in
-  match e' with
   | Exp.Lvar pvar ->
       let id = Ident.create_fresh Ident.knormal in
-      ([(Exp.Var id, typ)], [Sil.Load (id, Exp.Lvar pvar, typ, sil_loc)])
+      ((Exp.Var id, e_cond_typ), [Sil.Load (id, Exp.Lvar pvar, e_cond_typ, sil_loc)])
   | _ ->
-      ([(e', typ)], instrs_cond)
+      (e_cond, instrs_cond)
 
 
 let is_superinstance mei =
@@ -584,7 +576,7 @@ let is_superinstance mei =
 let is_null_stmt s = match s with Clang_ast_t.NullStmt _ -> true | _ -> false
 
 let extract_stmt_from_singleton stmt_list warning_string =
-  extract_item_from_singleton stmt_list warning_string (CAst_utils.dummy_stmt ())
+  extract_item_from_singleton stmt_list (Pp.to_string ~f:Clang_ast_j.string_of_stmt) warning_string
 
 
 module Self = struct
@@ -596,7 +588,7 @@ module Self = struct
 
   let add_self_parameter_for_super_instance stmt_info context procname loc mei =
     if is_superinstance mei then
-      let typ, self_expr, ins =
+      let typ, self_expr, instrs =
         let t' =
           CType.add_pointer_to_typ
             (Typ.mk (Tstruct (CContext.get_curr_class_typename stmt_info context)))
@@ -605,8 +597,8 @@ module Self = struct
         let id = Ident.create_fresh Ident.knormal in
         (t', Exp.Var id, [Sil.Load (id, e, t', loc)])
       in
-      {empty_res_trans with exps= [(self_expr, typ)]; instrs= ins}
+      Some (mk_trans_result (self_expr, typ) {empty_control with instrs})
-    else empty_res_trans
+    else None
 
 
   let is_var_self pvar is_objc_method =
@@ -636,3 +628,20 @@ let is_logical_negation_of_int tenv ei uoi =
       true
   | _, _ ->
       false
+
+
+let mk_fresh_void_exp_typ () = (Exp.Var (Ident.create_fresh Ident.knormal), Typ.mk Tvoid)
+
+let mk_fresh_void_id_typ () = (Ident.create_fresh Ident.knormal, Typ.mk Tvoid)
+
+let mk_fresh_void_return () =
+  let id = Ident.create_fresh Ident.knormal and void = Typ.mk Tvoid in
+  ((id, void), (Exp.Var id, void))
+
+
+let last_or_mk_fresh_void_exp_typ exp_typs =
+  match List.last exp_typs with
+  | Some last_exp_typ ->
+      last_exp_typ
+  | None ->
+      mk_fresh_void_exp_typ ()

infer/src/clang/cTrans_utils.mli

@@ -30,33 +30,50 @@ type trans_state =
   ; opaque_exp: (Exp.t * Typ.t) option
   ; is_fst_arg_objc_method_call: bool }
 
-(** A translation result. It is returned by the translation function. *)
+val default_trans_state : CContext.t -> trans_state
-type trans_result =
+
+(** Part of the translation result that is (loosely) related to control flow graph
+   construction. More importantly, this is the part of a [trans_result] that some internal
+   translation functions work on when constructing a [trans_result] before the other components of
+   the translation result are available (such as the return expression). This is made into a
+   separate type to make intermediate computations easier to write and easier to typecheck. *)
+type control =
   { root_nodes: Procdesc.Node.t list  (** Top cfg nodes (root) created by the translation *)
   ; leaf_nodes: Procdesc.Node.t list  (** Bottom cfg nodes (leaf) created by the translate *)
   ; instrs: Sil.instr list
         (** list of SIL instruction that need to be placed in cfg nodes of the parent*)
-  ; exps: (Exp.t * Typ.t) list  (** SIL expressions resulting from translation of clang stmt *)
+  ; initd_exps: Exp.t list  (** list of expressions that are initialised by the instructions *) }
-  ; initd_exps: Exp.t list
+
+(** A translation result. It is returned by the translation function. *)
+type trans_result =
+  { control: control
+  ; return: Exp.t * Typ.t  (** value returned by the translated statement *)
+  ; method_name: Typ.Procname.t option
+        (** in the specific case of translating a method call in C++, we get the method name called
+            at the same time we get the [this] object that contains the method. The [this] instance
+            object is returned as the [return] field, while the method to call is filled in here.
+            This field is [None] in all other cases. *)
   ; is_cpp_call_virtual: bool }
 
-val empty_res_trans : trans_result
+val empty_control : control
 
-val default_trans_state : CContext.t -> trans_state
+val mk_trans_result :
+  ?method_name:BuiltinDecl.t -> ?is_cpp_call_virtual:bool -> Exp.t * Typ.typ -> control
+  -> trans_result
 
 val undefined_expression : unit -> Exp.t
 
-val collect_res_trans : Procdesc.t -> trans_result list -> trans_result
+val collect_controls : Procdesc.t -> control list -> control
 (** Collect the results of translating a list of instructions, and link up the nodes created. *)
 
+val collect_trans_results : Procdesc.t -> return:Exp.t * Typ.t -> trans_result list -> trans_result
+
 val is_return_temp : continuation option -> bool
 
 val mk_cond_continuation : continuation option -> continuation option
 
-val extract_exp_from_list : (Exp.t * Typ.t) list -> string -> Exp.t * Typ.t
-
 val define_condition_side_effects :
-  (Exp.t * Typ.t) list -> Sil.instr list -> Location.t -> (Exp.t * Typ.t) list * Sil.instr list
+  Exp.t * Typ.t -> Sil.instr list -> Location.t -> (Exp.t * Typ.t) * Sil.instr list
 
 val extract_stmt_from_singleton : Clang_ast_t.stmt list -> string -> Clang_ast_t.stmt
 
@@ -68,8 +85,7 @@ val dereference_value_from_result :
     expression assigned to it *)
 
 val cast_operation :
-  Clang_ast_t.cast_kind -> (Exp.t * Typ.t) list -> Typ.t -> Location.t
+  Clang_ast_t.cast_kind -> Exp.t * Typ.t -> Typ.t -> Location.t -> Sil.instr list * (Exp.t * Typ.t)
-  -> Sil.instr list * (Exp.t * Typ.t)
 
 val trans_assertion : trans_state -> Location.t -> trans_result
 
@@ -95,8 +111,8 @@ module Nodes : sig
     Procdesc.Node.nodekind -> Sil.instr list -> Location.t -> CContext.t -> Procdesc.Node.t
 
   val create_prune_node :
-    branch:bool -> negate_cond:bool -> (Exp.t * Typ.t) list -> Sil.instr list -> Location.t
+    branch:bool -> negate_cond:bool -> Exp.t * Typ.t -> Sil.instr list -> Location.t -> Sil.if_kind
-    -> Sil.if_kind -> CContext.t -> Procdesc.Node.t
+    -> CContext.t -> Procdesc.Node.t
 
   val is_true_prune_node : Procdesc.Node.t -> bool
 end
@@ -121,14 +137,23 @@ module PriorityNode : sig
 
   val own_priority_node : t -> Clang_ast_t.stmt_info -> bool
 
-  (* Used by translation functions to handle potenatial cfg nodes. *)
+  val compute_controls_to_parent :
-  (* It connects nodes returned by translation of stmt children and *)
+    trans_state -> Location.t -> node_name:string -> Clang_ast_t.stmt_info -> control list
-  (* deals with creating or not a cfg node depending of owning the *)
+    -> control
-  (* priority_node. It returns nodes, ids, instrs that should be passed to parent *)
+  (** Used by translation functions to handle potential cfg nodes. It connects nodes returned by the
+      translation of stmt children and deals with creating or not a cfg node depending of owning the
+      priority_node. It returns the [control] that should be passed to the parent. *)
 
   val compute_results_to_parent :
-    trans_state -> Location.t -> string -> Clang_ast_t.stmt_info -> trans_result list
+    trans_state -> Location.t -> node_name:string -> Clang_ast_t.stmt_info -> return:Exp.t * Typ.t
+    -> trans_result list -> trans_result
+  (** convenience wrapper around [compute_controls_to_parent] *)
+
+  val compute_result_to_parent :
+    trans_state -> Location.t -> node_name:string -> Clang_ast_t.stmt_info -> trans_result
     -> trans_result
+  (** convenience function like [compute_results_to_parent] when there is a single [trans_result]
+      to consider *)
 end
 
 (** Module for translating goto instructions by keeping a map of labels. *)
@@ -171,10 +196,18 @@ module Self : sig
 
   val add_self_parameter_for_super_instance :
     Clang_ast_t.stmt_info -> CContext.t -> Typ.Procname.t -> Location.t
-    -> Clang_ast_t.obj_c_message_expr_info -> trans_result
+    -> Clang_ast_t.obj_c_message_expr_info -> trans_result option
 
   val is_var_self : Pvar.t -> bool -> bool
 end
 
 val is_logical_negation_of_int :
   Tenv.t -> Clang_ast_t.expr_info -> Clang_ast_t.unary_operator_info -> bool
+
+val mk_fresh_void_exp_typ : unit -> Exp.t * Typ.t
+
+val mk_fresh_void_id_typ : unit -> Ident.t * Typ.t
+
+val mk_fresh_void_return : unit -> (Ident.t * Typ.t) * (Exp.t * Typ.t)
+
+val last_or_mk_fresh_void_exp_typ : (Exp.t * Typ.t) list -> Exp.t * Typ.t

infer/tests/build_systems/codetoanalyze/clang_translation/src/main.cpp.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$0=*&f:std::atomic_flag* [line 967, column 51]\n  _=*n$0:std::atomic_flag [line 967, column 51]\n  n$2=_fun_std::atomic_flag_clear(n$0:std::atomic_flag*,5:int) [line 967, column 51]\n " shape="box"]
+"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 967, column 51]\n  _=*n$1:std::atomic_flag [line 967, column 51]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 967, column 51]\n " shape="box"]
 	
 
 	 "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" -> "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$0=*&f:std::atomic_flag* [line 966, column 60]\n  _=*n$0:std::atomic_flag [line 966, column 60]\n  n$2=_fun_std::atomic_flag_clear(n$0:std::atomic_flag*,5:int) [line 966, column 60]\n " shape="box"]
+"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 966, column 60]\n  _=*n$1:std::atomic_flag [line 966, column 60]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 966, column 60]\n " shape="box"]
 	
 
 	 "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" -> "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_2" ;
@@ -29,7 +29,7 @@ digraph cfg {
 "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$0=*&f:std::atomic_flag* [line 973, column 3]\n  _=*n$0:std::atomic_flag [line 973, column 3]\n  n$2=*&mo:int [line 973, column 12]\n  n$3=_fun_std::atomic_flag_clear(n$0:std::atomic_flag*,n$2:int) [line 973, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 973, column 3]\n  _=*n$1:std::atomic_flag [line 973, column 3]\n  n$3=*&mo:int [line 973, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 973, column 3]\n " shape="box"]
 	
 
 	 "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" -> "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_2" ;
@@ -40,7 +40,7 @@ digraph cfg {
 "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$0=*&f:std::atomic_flag* [line 970, column 3]\n  _=*n$0:std::atomic_flag [line 970, column 3]\n  n$2=*&mo:int [line 970, column 12]\n  n$3=_fun_std::atomic_flag_clear(n$0:std::atomic_flag*,n$2:int) [line 970, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 970, column 3]\n  _=*n$1:std::atomic_flag [line 970, column 3]\n  n$3=*&mo:int [line 970, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 970, column 3]\n " shape="box"]
 	
 
 	 "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" -> "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_2" ;
@@ -124,23 +124,23 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$4=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>_basic_string(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 22, column 15]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$5=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>_basic_string(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 22, column 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$6=_fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 21, column 24]\n  n$5=*&x:int* [line 21, column 24]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$7=_fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 21, column 24]\n  n$6=*&x:int* [line 21, column 24]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_external::fun \n   n$7=_fun_external::fun(1:int) [line 20, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_external::fun \n   n$8=_fun_external::fun(1:int) [line 20, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal_exclude::fun \n   n$8=_fun_internal_exclude::fun(1:int) [line 19, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal_exclude::fun \n   n$9=_fun_internal_exclude::fun(1:int) [line 19, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  Call _fun_internal::fun \n   n$9=_fun_internal::fun(1:int) [line 18, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  Call _fun_internal::fun \n   n$10=_fun_internal::fun(1:int) [line 18, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
@@ -155,7 +155,7 @@ digraph cfg {
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_2" ;
-"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   n$2=_fun_internal::used_in_main_header(0:int) [line 17, column 11]\n  *&x:int=n$2 [line 17, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   n$3=_fun_internal::used_in_main_header(0:int) [line 17, column 11]\n  *&x:int=n$3 [line 17, column 3]\n " shape="box"]
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" ;
@@ -177,7 +177,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_2" [label="2: Exit std::__infer_atomic_base<long>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<long>* [line 167, column 46]\n  n$1=*&desired:long [line 167, column 61]\n  *n$0._wrapped_value:long=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<long>* [line 167, column 46]\n  n$3=*&desired:long [line 167, column 61]\n  *n$2._wrapped_value:long=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_3" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_2" ;
@@ -188,7 +188,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_2" [label="2: Exit std::__infer_atomic_base<unsigned long>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned long>* [line 167, column 46]\n  n$1=*&desired:unsigned long [line 167, column 61]\n  *n$0._wrapped_value:unsigned long=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned long>* [line 167, column 46]\n  n$3=*&desired:unsigned long [line 167, column 61]\n  *n$2._wrapped_value:unsigned long=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_2" ;
@@ -199,7 +199,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$1=*&desired:char [line 167, column 61]\n  *n$0._wrapped_value:char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$3=*&desired:char [line 167, column 61]\n  *n$2._wrapped_value:char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_2" ;
@@ -210,7 +210,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_2" [label="2: Exit std::__infer_atomic_base<short>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<short>* [line 167, column 46]\n  n$1=*&desired:short [line 167, column 61]\n  *n$0._wrapped_value:short=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<short>* [line 167, column 46]\n  n$3=*&desired:short [line 167, column 61]\n  *n$2._wrapped_value:short=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_3" -> "__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_2" ;
@@ -221,7 +221,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_2" [label="2: Exit std::__infer_atomic_base<unsigned short>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned short>* [line 167, column 46]\n  n$1=*&desired:unsigned short [line 167, column 61]\n  *n$0._wrapped_value:unsigned short=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned short>* [line 167, column 46]\n  n$3=*&desired:unsigned short [line 167, column 61]\n  *n$2._wrapped_value:unsigned short=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_2" ;
@@ -232,7 +232,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$1=*&desired:char [line 167, column 61]\n  *n$0._wrapped_value:char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$3=*&desired:char [line 167, column 61]\n  *n$2._wrapped_value:char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_2" ;
@@ -243,7 +243,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_2" [label="2: Exit std::__infer_atomic_base<long long>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<long long>* [line 167, column 46]\n  n$1=*&desired:long long [line 167, column 61]\n  *n$0._wrapped_value:long long=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<long long>* [line 167, column 46]\n  n$3=*&desired:long long [line 167, column 61]\n  *n$2._wrapped_value:long long=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_3" -> "__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_2" ;
@@ -254,7 +254,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_2" [label="2: Exit std::__infer_atomic_base<signed char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<signed char>* [line 167, column 46]\n  n$1=*&desired:signed char [line 167, column 61]\n  *n$0._wrapped_value:signed char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<signed char>* [line 167, column 46]\n  n$3=*&desired:signed char [line 167, column 61]\n  *n$2._wrapped_value:signed char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_3" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_2" ;
@@ -265,7 +265,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$1=*&desired:char [line 167, column 61]\n  *n$0._wrapped_value:char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$3=*&desired:char [line 167, column 61]\n  *n$2._wrapped_value:char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_2" ;
@@ -276,7 +276,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_2" [label="2: Exit std::__infer_atomic_base<unsigned long long>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned long long>* [line 167, column 46]\n  n$1=*&desired:unsigned long long [line 167, column 61]\n  *n$0._wrapped_value:unsigned long long=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned long long>* [line 167, column 46]\n  n$3=*&desired:unsigned long long [line 167, column 61]\n  *n$2._wrapped_value:unsigned long long=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_2" ;
@@ -287,7 +287,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_2" [label="2: Exit std::__infer_atomic_base<unsigned char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned char>* [line 167, column 46]\n  n$1=*&desired:unsigned char [line 167, column 61]\n  *n$0._wrapped_value:unsigned char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned char>* [line 167, column 46]\n  n$3=*&desired:unsigned char [line 167, column 61]\n  *n$2._wrapped_value:unsigned char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_2" ;
@@ -298,7 +298,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_2" [label="2: Exit std::__infer_atomic_base<int>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<int>* [line 167, column 46]\n  n$1=*&desired:int [line 167, column 61]\n  *n$0._wrapped_value:int=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<int>* [line 167, column 46]\n  n$3=*&desired:int [line 167, column 61]\n  *n$2._wrapped_value:int=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_3" -> "__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_2" ;
@@ -309,7 +309,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_2" [label="2: Exit std::__infer_atomic_base<unsigned int>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned int>* [line 167, column 46]\n  n$1=*&desired:unsigned int [line 167, column 61]\n  *n$0._wrapped_value:unsigned int=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned int>* [line 167, column 46]\n  n$3=*&desired:unsigned int [line 167, column 61]\n  *n$2._wrapped_value:unsigned int=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_2" ;
@@ -320,7 +320,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$1=*&desired:char [line 167, column 61]\n  *n$0._wrapped_value:char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$3=*&desired:char [line 167, column 61]\n  *n$2._wrapped_value:char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_2" ;
@@ -331,7 +331,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$1=*&d:char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$3=*&d:char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$2:std::__infer_atomic_integral<char>*,n$3:char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_2" ;
@@ -342,7 +342,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_2" [label="2: Exit std::__infer_atomic_integral<unsigned short>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned short>* [line 187, column 53]\n  n$1=*&d:unsigned short [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned short>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned short>*,n$1:unsigned short) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned short>* [line 187, column 53]\n  n$3=*&d:unsigned short [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned short>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned short>*,n$3:unsigned short) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_2" ;
@@ -353,7 +353,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_2" [label="2: Exit std::__infer_atomic_integral<unsigned long long>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned long long>* [line 187, column 53]\n  n$1=*&d:unsigned long long [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned long long>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned long long>*,n$1:unsigned long long) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned long long>* [line 187, column 53]\n  n$3=*&d:unsigned long long [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned long long>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned long long>*,n$3:unsigned long long) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_2" ;
@@ -364,7 +364,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_2" [label="2: Exit std::__infer_atomic_integral<short>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<short>* [line 187, column 53]\n  n$1=*&d:short [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<short>___infer_atomic_base(n$0:std::__infer_atomic_integral<short>*,n$1:short) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<short>* [line 187, column 53]\n  n$3=*&d:short [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<short>___infer_atomic_base(n$2:std::__infer_atomic_integral<short>*,n$3:short) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_3" -> "__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_2" ;
@@ -375,7 +375,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$1=*&d:char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$3=*&d:char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$2:std::__infer_atomic_integral<char>*,n$3:char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_2" ;
@@ -386,7 +386,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_2" [label="2: Exit std::__infer_atomic_integral<signed char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<signed char>* [line 187, column 53]\n  n$1=*&d:signed char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<signed char>___infer_atomic_base(n$0:std::__infer_atomic_integral<signed char>*,n$1:signed char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<signed char>* [line 187, column 53]\n  n$3=*&d:signed char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<signed char>___infer_atomic_base(n$2:std::__infer_atomic_integral<signed char>*,n$3:signed char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_3" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_2" ;
@@ -397,7 +397,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$1=*&d:char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$3=*&d:char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$2:std::__infer_atomic_integral<char>*,n$3:char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_2" ;
@@ -408,7 +408,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_2" [label="2: Exit std::__infer_atomic_integral<long long>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<long long>* [line 187, column 53]\n  n$1=*&d:long long [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<long long>___infer_atomic_base(n$0:std::__infer_atomic_integral<long long>*,n$1:long long) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<long long>* [line 187, column 53]\n  n$3=*&d:long long [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<long long>___infer_atomic_base(n$2:std::__infer_atomic_integral<long long>*,n$3:long long) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_3" -> "__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_2" ;
@@ -419,7 +419,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_2" [label="2: Exit std::__infer_atomic_integral<long>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<long>* [line 187, column 53]\n  n$1=*&d:long [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<long>___infer_atomic_base(n$0:std::__infer_atomic_integral<long>*,n$1:long) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<long>* [line 187, column 53]\n  n$3=*&d:long [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<long>___infer_atomic_base(n$2:std::__infer_atomic_integral<long>*,n$3:long) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_3" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_2" ;
@@ -430,7 +430,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_2" [label="2: Exit std::__infer_atomic_integral<unsigned long>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned long>* [line 187, column 53]\n  n$1=*&d:unsigned long [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned long>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned long>*,n$1:unsigned long) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned long>* [line 187, column 53]\n  n$3=*&d:unsigned long [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned long>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned long>*,n$3:unsigned long) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_2" ;
@@ -441,7 +441,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_2" [label="2: Exit std::__infer_atomic_integral<unsigned int>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned int>* [line 187, column 53]\n  n$1=*&d:unsigned int [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned int>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned int>*,n$1:unsigned int) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned int>* [line 187, column 53]\n  n$3=*&d:unsigned int [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned int>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned int>*,n$3:unsigned int) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_2" ;
@@ -452,7 +452,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_2" [label="2: Exit std::__infer_atomic_integral<unsigned char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned char>* [line 187, column 53]\n  n$1=*&d:unsigned char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned char>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned char>*,n$1:unsigned char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned char>* [line 187, column 53]\n  n$3=*&d:unsigned char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned char>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned char>*,n$3:unsigned char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_2" ;
@@ -463,7 +463,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$1=*&d:char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$3=*&d:char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$2:std::__infer_atomic_integral<char>*,n$3:char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_2" ;
@@ -474,7 +474,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_2" [label="2: Exit std::__infer_atomic_integral<int>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<int>* [line 187, column 53]\n  n$1=*&d:int [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<int>___infer_atomic_base(n$0:std::__infer_atomic_integral<int>*,n$1:int) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<int>* [line 187, column 53]\n  n$3=*&d:int [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<int>___infer_atomic_base(n$2:std::__infer_atomic_integral<int>*,n$3:int) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_3" -> "__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_2" ;
@@ -489,7 +489,7 @@ digraph cfg {
 	
 
 	 "__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_3" -> "__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_2" ;
-"__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_4" [label="4:  Call _fun_std::shared_ptr<int>_reset<int,_void> \n   n$3=*&this:int** [line 180, column 19]\n  _=*n$3:int* [line 180, column 19]\n  n$5=_fun_std::shared_ptr<int>_reset<int,_void>(n$3:int**,null:int*) [line 180, column 19]\n " shape="box"]
+"__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_4" [label="4:  Call _fun_std::shared_ptr<int>_reset<int,_void> \n   n$5=*&this:int** [line 180, column 19]\n  _=*n$5:int* [line 180, column 19]\n  n$7=_fun_std::shared_ptr<int>_reset<int,_void>(n$5:int**,null:int*) [line 180, column 19]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_4" -> "__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_3" ;
@@ -500,7 +500,7 @@ digraph cfg {
 "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_2" [label="2: Exit std::atomic<unsigned short>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned short>* [line 408, column 50]\n  n$1=*&d:unsigned short [line 408, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned short>___infer_atomic_integral(n$0:std::atomic<unsigned short>*,n$1:unsigned short) [line 408, column 50]\n " shape="box"]
+"atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned short>* [line 408, column 50]\n  n$3=*&d:unsigned short [line 408, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned short>___infer_atomic_integral(n$2:std::atomic<unsigned short>*,n$3:unsigned short) [line 408, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" -> "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_2" ;
@@ -511,7 +511,7 @@ digraph cfg {
 "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 472, column 50]\n  n$1=*&d:char [line 472, column 57]\n  n$2=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 472, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<char>* [line 472, column 50]\n  n$3=*&d:char [line 472, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 472, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" -> "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_2" ;
@@ -522,7 +522,7 @@ digraph cfg {
 "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_2" [label="2: Exit std::atomic<unsigned long>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned long>* [line 444, column 50]\n  n$1=*&d:unsigned long [line 444, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned long>___infer_atomic_integral(n$0:std::atomic<unsigned long>*,n$1:unsigned long) [line 444, column 50]\n " shape="box"]
+"atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned long>* [line 444, column 50]\n  n$3=*&d:unsigned long [line 444, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned long>___infer_atomic_integral(n$2:std::atomic<unsigned long>*,n$3:unsigned long) [line 444, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" -> "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_2" ;
@@ -533,7 +533,7 @@ digraph cfg {
 "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_2" [label="2: Exit std::atomic<short>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<short>* [line 399, column 50]\n  n$1=*&d:short [line 399, column 57]\n  n$2=_fun_std::__infer_atomic_integral<short>___infer_atomic_integral(n$0:std::atomic<short>*,n$1:short) [line 399, column 50]\n " shape="box"]
+"atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<short>* [line 399, column 50]\n  n$3=*&d:short [line 399, column 57]\n  n$4=_fun_std::__infer_atomic_integral<short>___infer_atomic_integral(n$2:std::atomic<short>*,n$3:short) [line 399, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" -> "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_2" ;
@@ -544,7 +544,7 @@ digraph cfg {
 "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_2" [label="2: Exit std::atomic<long>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<long>* [line 435, column 50]\n  n$1=*&d:long [line 435, column 57]\n  n$2=_fun_std::__infer_atomic_integral<long>___infer_atomic_integral(n$0:std::atomic<long>*,n$1:long) [line 435, column 50]\n " shape="box"]
+"atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<long>* [line 435, column 50]\n  n$3=*&d:long [line 435, column 57]\n  n$4=_fun_std::__infer_atomic_integral<long>___infer_atomic_integral(n$2:std::atomic<long>*,n$3:long) [line 435, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" -> "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_2" ;
@@ -555,7 +555,7 @@ digraph cfg {
 "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_2" [label="2: Exit std::atomic<int>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<int>* [line 417, column 50]\n  n$1=*&d:int [line 417, column 57]\n  n$2=_fun_std::__infer_atomic_integral<int>___infer_atomic_integral(n$0:std::atomic<int>*,n$1:int) [line 417, column 50]\n " shape="box"]
+"atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<int>* [line 417, column 50]\n  n$3=*&d:int [line 417, column 57]\n  n$4=_fun_std::__infer_atomic_integral<int>___infer_atomic_integral(n$2:std::atomic<int>*,n$3:int) [line 417, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" -> "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_2" ;
@@ -566,7 +566,7 @@ digraph cfg {
 "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_2" [label="2: Exit std::atomic<unsigned char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned char>* [line 390, column 50]\n  n$1=*&d:unsigned char [line 390, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned char>___infer_atomic_integral(n$0:std::atomic<unsigned char>*,n$1:unsigned char) [line 390, column 50]\n " shape="box"]
+"atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned char>* [line 390, column 50]\n  n$3=*&d:unsigned char [line 390, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned char>___infer_atomic_integral(n$2:std::atomic<unsigned char>*,n$3:unsigned char) [line 390, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" -> "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_2" ;
@@ -577,7 +577,7 @@ digraph cfg {
 "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 481, column 50]\n  n$1=*&d:char [line 481, column 57]\n  n$2=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 481, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<char>* [line 481, column 50]\n  n$3=*&d:char [line 481, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 481, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" -> "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_2" ;
@@ -588,7 +588,7 @@ digraph cfg {
 "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_2" [label="2: Exit std::atomic<signed char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<signed char>* [line 381, column 50]\n  n$1=*&d:signed char [line 381, column 57]\n  n$2=_fun_std::__infer_atomic_integral<signed char>___infer_atomic_integral(n$0:std::atomic<signed char>*,n$1:signed char) [line 381, column 50]\n " shape="box"]
+"atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<signed char>* [line 381, column 50]\n  n$3=*&d:signed char [line 381, column 57]\n  n$4=_fun_std::__infer_atomic_integral<signed char>___infer_atomic_integral(n$2:std::atomic<signed char>*,n$3:signed char) [line 381, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" -> "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_2" ;
@@ -599,7 +599,7 @@ digraph cfg {
 "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 372, column 50]\n  n$1=*&d:char [line 372, column 57]\n  n$2=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 372, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<char>* [line 372, column 50]\n  n$3=*&d:char [line 372, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 372, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" -> "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_2" ;
@@ -610,7 +610,7 @@ digraph cfg {
 "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 490, column 50]\n  n$1=*&d:char [line 490, column 57]\n  n$2=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 490, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<char>* [line 490, column 50]\n  n$3=*&d:char [line 490, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 490, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" -> "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_2" ;
@@ -621,7 +621,7 @@ digraph cfg {
 "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_2" [label="2: Exit std::atomic<unsigned int>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned int>* [line 426, column 50]\n  n$1=*&d:unsigned int [line 426, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned int>___infer_atomic_integral(n$0:std::atomic<unsigned int>*,n$1:unsigned int) [line 426, column 50]\n " shape="box"]
+"atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned int>* [line 426, column 50]\n  n$3=*&d:unsigned int [line 426, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned int>___infer_atomic_integral(n$2:std::atomic<unsigned int>*,n$3:unsigned int) [line 426, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" -> "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_2" ;
@@ -632,7 +632,7 @@ digraph cfg {
 "atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_2" [label="2: Exit std::atomic<unsigned long long>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned long long>* [line 463, column 50]\n  n$1=*&d:unsigned long long [line 463, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned long long>___infer_atomic_integral(n$0:std::atomic<unsigned long long>*,n$1:unsigned long long) [line 463, column 50]\n " shape="box"]
+"atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned long long>* [line 463, column 50]\n  n$3=*&d:unsigned long long [line 463, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned long long>___infer_atomic_integral(n$2:std::atomic<unsigned long long>*,n$3:unsigned long long) [line 463, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_3" -> "atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_2" ;
@@ -643,7 +643,7 @@ digraph cfg {
 "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_2" [label="2: Exit std::atomic<long long>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<long long>* [line 453, column 50]\n  n$1=*&d:long long [line 453, column 57]\n  n$2=_fun_std::__infer_atomic_integral<long long>___infer_atomic_integral(n$0:std::atomic<long long>*,n$1:long long) [line 453, column 50]\n " shape="box"]
+"atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<long long>* [line 453, column 50]\n  n$3=*&d:long long [line 453, column 57]\n  n$4=_fun_std::__infer_atomic_integral<long long>___infer_atomic_integral(n$2:std::atomic<long long>*,n$3:long long) [line 453, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" -> "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_2" ;
@@ -654,7 +654,7 @@ digraph cfg {
 "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_2" [label="2: Exit std::atomic_flag_atomic_flag \n  " color=yellow style=filled]
 	
 
-"atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic_flag* [line 929, column 44]\n  n$1=*&i:_Bool [line 929, column 46]\n  *n$0.a:_Bool=n$1 [line 929, column 44]\n " shape="box"]
+"atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic_flag* [line 929, column 44]\n  n$3=*&i:_Bool [line 929, column 46]\n  *n$2.a:_Bool=n$3 [line 929, column 44]\n " shape="box"]
 	
 
 	 "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" -> "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_2" ;
@@ -665,7 +665,7 @@ digraph cfg {
 "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:std::atomic_flag* [line 946, column 5]\n  *n$0.a:_Bool=0 [line 946, column 5]\n " shape="box"]
+"clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 946, column 5]\n  *n$1.a:_Bool=0 [line 946, column 5]\n " shape="box"]
 	
 
 	 "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" -> "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_2" ;
@@ -676,7 +676,7 @@ digraph cfg {
 "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:std::atomic_flag* [line 948, column 65]\n  *n$0.a:_Bool=0 [line 948, column 65]\n " shape="box"]
+"clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 948, column 65]\n  *n$1.a:_Bool=0 [line 948, column 65]\n " shape="box"]
 	
 
 	 "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" -> "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_2" ;
@@ -687,7 +687,7 @@ digraph cfg {
 "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_2" [label="2: Exit std::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void const ** [line 67, column 6]\n  n$1=*&value:void* [line 67, column 37]\n  *n$0:void const *=n$1 [line 67, column 5]\n " shape="box"]
+"model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&self:void const ** [line 67, column 6]\n  n$2=*&value:void* [line 67, column 37]\n  *n$1:void const *=n$2 [line 67, column 5]\n " shape="box"]
 	
 
 	 "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" -> "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_2" ;
@@ -698,7 +698,7 @@ digraph cfg {
 "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_2" [label="2: Exit std::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void const ** [line 55, column 6]\n  n$1=*&value:int [line 55, column 13]\n  *n$0:void const *=n$1 [line 55, column 5]\n " shape="box"]
+"model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&self:void const ** [line 55, column 6]\n  n$2=*&value:int [line 55, column 13]\n  *n$1:void const *=n$2 [line 55, column 5]\n " shape="box"]
 	
 
 	 "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" -> "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_2" ;
@@ -709,7 +709,7 @@ digraph cfg {
 "reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_2" [label="2: Exit std::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
 	
 
-"reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 238, column 15]\n  n$1=*&p:int* [line 238, column 42]\n  n$2=_fun_std::shared_ptr<int>_model_set(n$0:void const **,n$1:void*) [line 238, column 5]\n " shape="box"]
+"reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$2=*&this:int** [line 238, column 15]\n  n$3=*&p:int* [line 238, column 42]\n  n$4=_fun_std::shared_ptr<int>_model_set(n$2:void const **,n$3:void*) [line 238, column 5]\n " shape="box"]
 	
 
 	 "reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_3" -> "reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_2" ;
@@ -720,11 +720,11 @@ digraph cfg {
 "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_2" [label="2: Exit std::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
 	
 
-"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 99, column 15]\n  n$1=_fun_std::shared_ptr<int>_model_set(n$0:void const **,null:int) [line 99, column 5]\n " shape="box"]
+"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$2=*&this:int** [line 99, column 15]\n  n$3=_fun_std::shared_ptr<int>_model_set(n$2:void const **,null:int) [line 99, column 5]\n " shape="box"]
 	
 
 	 "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_3" -> "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_2" ;
-"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_4" [label="4:  Constructor Init \n   n$2=*&this:int** [line 99, column 42]\n  n$4=_fun_std::std__shared_ptr<int>_std__shared_ptr(n$2:int**) [line 98, column 13]\n  n$3=*n$2:int* [line 98, column 13]\n " shape="box"]
+"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_4" [label="4:  Constructor Init \n   n$4=*&this:int** [line 99, column 42]\n  n$6=_fun_std::std__shared_ptr<int>_std__shared_ptr(n$4:int**) [line 98, column 13]\n  n$5=*n$4:int* [line 98, column 13]\n " shape="box"]
 	
 
 	 "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_4" -> "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_3" ;
@@ -739,11 +739,11 @@ digraph cfg {
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_3" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_2" ;
-"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 936, column 5]\n  *n$1.a:_Bool=1 [line 936, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:std::atomic_flag* [line 936, column 5]\n  *n$2.a:_Bool=1 [line 936, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_3" ;
-"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   n$2=*&this:std::atomic_flag* [line 935, column 16]\n  n$3=*n$2.a:_Bool [line 935, column 16]\n  *&ret:_Bool=n$3 [line 935, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   n$3=*&this:std::atomic_flag* [line 935, column 16]\n  n$4=*n$3.a:_Bool [line 935, column 16]\n  *&ret:_Bool=n$4 [line 935, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" ;
@@ -758,11 +758,11 @@ digraph cfg {
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_3" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_2" ;
-"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 941, column 5]\n  *n$1.a:_Bool=1 [line 941, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:std::atomic_flag* [line 941, column 5]\n  *n$2.a:_Bool=1 [line 941, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_3" ;
-"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   n$2=*&this:std::atomic_flag* [line 940, column 16]\n  n$3=*n$2.a:_Bool [line 940, column 16]\n  *&ret:_Bool=n$3 [line 940, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   n$3=*&this:std::atomic_flag* [line 940, column 16]\n  n$4=*n$3.a:_Bool [line 940, column 16]\n  *&ret:_Bool=n$4 [line 940, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" ;

infer/tests/build_systems/codetoanalyze/clang_translation/src/main_default_root.cpp.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$0=*&f:std::atomic_flag* [line 967, column 51]\n  _=*n$0:std::atomic_flag [line 967, column 51]\n  n$2=_fun_std::atomic_flag_clear(n$0:std::atomic_flag*,5:int) [line 967, column 51]\n " shape="box"]
+"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 967, column 51]\n  _=*n$1:std::atomic_flag [line 967, column 51]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 967, column 51]\n " shape="box"]
 	
 
 	 "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" -> "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$0=*&f:std::atomic_flag* [line 966, column 60]\n  _=*n$0:std::atomic_flag [line 966, column 60]\n  n$2=_fun_std::atomic_flag_clear(n$0:std::atomic_flag*,5:int) [line 966, column 60]\n " shape="box"]
+"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 966, column 60]\n  _=*n$1:std::atomic_flag [line 966, column 60]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 966, column 60]\n " shape="box"]
 	
 
 	 "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" -> "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_2" ;
@@ -29,7 +29,7 @@ digraph cfg {
 "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$0=*&f:std::atomic_flag* [line 973, column 3]\n  _=*n$0:std::atomic_flag [line 973, column 3]\n  n$2=*&mo:int [line 973, column 12]\n  n$3=_fun_std::atomic_flag_clear(n$0:std::atomic_flag*,n$2:int) [line 973, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 973, column 3]\n  _=*n$1:std::atomic_flag [line 973, column 3]\n  n$3=*&mo:int [line 973, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 973, column 3]\n " shape="box"]
 	
 
 	 "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" -> "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_2" ;
@@ -40,7 +40,7 @@ digraph cfg {
 "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$0=*&f:std::atomic_flag* [line 970, column 3]\n  _=*n$0:std::atomic_flag [line 970, column 3]\n  n$2=*&mo:int [line 970, column 12]\n  n$3=_fun_std::atomic_flag_clear(n$0:std::atomic_flag*,n$2:int) [line 970, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 970, column 3]\n  _=*n$1:std::atomic_flag [line 970, column 3]\n  n$3=*&mo:int [line 970, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 970, column 3]\n " shape="box"]
 	
 
 	 "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" -> "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_2" ;
@@ -124,23 +124,23 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$4=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>_basic_string(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 22, column 15]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$5=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>_basic_string(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 22, column 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$6=_fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 21, column 24]\n  n$5=*&x:int* [line 21, column 24]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$7=_fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 21, column 24]\n  n$6=*&x:int* [line 21, column 24]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_external::fun \n   n$7=_fun_external::fun(1:int) [line 20, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_external::fun \n   n$8=_fun_external::fun(1:int) [line 20, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal_exclude::fun \n   n$8=_fun_internal_exclude::fun(1:int) [line 19, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal_exclude::fun \n   n$9=_fun_internal_exclude::fun(1:int) [line 19, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  Call _fun_internal::fun \n   n$9=_fun_internal::fun(1:int) [line 18, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  Call _fun_internal::fun \n   n$10=_fun_internal::fun(1:int) [line 18, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
@@ -155,7 +155,7 @@ digraph cfg {
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_2" ;
-"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   n$2=_fun_internal::used_in_main_header(0:int) [line 17, column 11]\n  *&x:int=n$2 [line 17, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   n$3=_fun_internal::used_in_main_header(0:int) [line 17, column 11]\n  *&x:int=n$3 [line 17, column 3]\n " shape="box"]
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" ;
@@ -177,7 +177,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_2" [label="2: Exit std::__infer_atomic_base<long>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<long>* [line 167, column 46]\n  n$1=*&desired:long [line 167, column 61]\n  *n$0._wrapped_value:long=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<long>* [line 167, column 46]\n  n$3=*&desired:long [line 167, column 61]\n  *n$2._wrapped_value:long=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_3" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_2" ;
@@ -188,7 +188,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_2" [label="2: Exit std::__infer_atomic_base<unsigned long>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned long>* [line 167, column 46]\n  n$1=*&desired:unsigned long [line 167, column 61]\n  *n$0._wrapped_value:unsigned long=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned long>* [line 167, column 46]\n  n$3=*&desired:unsigned long [line 167, column 61]\n  *n$2._wrapped_value:unsigned long=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_2" ;
@@ -199,7 +199,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$1=*&desired:char [line 167, column 61]\n  *n$0._wrapped_value:char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$3=*&desired:char [line 167, column 61]\n  *n$2._wrapped_value:char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_2" ;
@@ -210,7 +210,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_2" [label="2: Exit std::__infer_atomic_base<short>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<short>* [line 167, column 46]\n  n$1=*&desired:short [line 167, column 61]\n  *n$0._wrapped_value:short=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<short>* [line 167, column 46]\n  n$3=*&desired:short [line 167, column 61]\n  *n$2._wrapped_value:short=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_3" -> "__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_2" ;
@@ -221,7 +221,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_2" [label="2: Exit std::__infer_atomic_base<unsigned short>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned short>* [line 167, column 46]\n  n$1=*&desired:unsigned short [line 167, column 61]\n  *n$0._wrapped_value:unsigned short=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned short>* [line 167, column 46]\n  n$3=*&desired:unsigned short [line 167, column 61]\n  *n$2._wrapped_value:unsigned short=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_2" ;
@@ -232,7 +232,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$1=*&desired:char [line 167, column 61]\n  *n$0._wrapped_value:char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$3=*&desired:char [line 167, column 61]\n  *n$2._wrapped_value:char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_2" ;
@@ -243,7 +243,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_2" [label="2: Exit std::__infer_atomic_base<long long>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<long long>* [line 167, column 46]\n  n$1=*&desired:long long [line 167, column 61]\n  *n$0._wrapped_value:long long=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<long long>* [line 167, column 46]\n  n$3=*&desired:long long [line 167, column 61]\n  *n$2._wrapped_value:long long=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_3" -> "__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_2" ;
@@ -254,7 +254,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_2" [label="2: Exit std::__infer_atomic_base<signed char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<signed char>* [line 167, column 46]\n  n$1=*&desired:signed char [line 167, column 61]\n  *n$0._wrapped_value:signed char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<signed char>* [line 167, column 46]\n  n$3=*&desired:signed char [line 167, column 61]\n  *n$2._wrapped_value:signed char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_3" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_2" ;
@@ -265,7 +265,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$1=*&desired:char [line 167, column 61]\n  *n$0._wrapped_value:char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$3=*&desired:char [line 167, column 61]\n  *n$2._wrapped_value:char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_2" ;
@@ -276,7 +276,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_2" [label="2: Exit std::__infer_atomic_base<unsigned long long>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned long long>* [line 167, column 46]\n  n$1=*&desired:unsigned long long [line 167, column 61]\n  *n$0._wrapped_value:unsigned long long=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned long long>* [line 167, column 46]\n  n$3=*&desired:unsigned long long [line 167, column 61]\n  *n$2._wrapped_value:unsigned long long=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_2" ;
@@ -287,7 +287,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_2" [label="2: Exit std::__infer_atomic_base<unsigned char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned char>* [line 167, column 46]\n  n$1=*&desired:unsigned char [line 167, column 61]\n  *n$0._wrapped_value:unsigned char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned char>* [line 167, column 46]\n  n$3=*&desired:unsigned char [line 167, column 61]\n  *n$2._wrapped_value:unsigned char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_2" ;
@@ -298,7 +298,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_2" [label="2: Exit std::__infer_atomic_base<int>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<int>* [line 167, column 46]\n  n$1=*&desired:int [line 167, column 61]\n  *n$0._wrapped_value:int=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<int>* [line 167, column 46]\n  n$3=*&desired:int [line 167, column 61]\n  *n$2._wrapped_value:int=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_3" -> "__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_2" ;
@@ -309,7 +309,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_2" [label="2: Exit std::__infer_atomic_base<unsigned int>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned int>* [line 167, column 46]\n  n$1=*&desired:unsigned int [line 167, column 61]\n  *n$0._wrapped_value:unsigned int=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned int>* [line 167, column 46]\n  n$3=*&desired:unsigned int [line 167, column 61]\n  *n$2._wrapped_value:unsigned int=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_2" ;
@@ -320,7 +320,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$1=*&desired:char [line 167, column 61]\n  *n$0._wrapped_value:char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$3=*&desired:char [line 167, column 61]\n  *n$2._wrapped_value:char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_2" ;
@@ -331,7 +331,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$1=*&d:char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$3=*&d:char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$2:std::__infer_atomic_integral<char>*,n$3:char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_2" ;
@@ -342,7 +342,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_2" [label="2: Exit std::__infer_atomic_integral<unsigned short>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned short>* [line 187, column 53]\n  n$1=*&d:unsigned short [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned short>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned short>*,n$1:unsigned short) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned short>* [line 187, column 53]\n  n$3=*&d:unsigned short [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned short>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned short>*,n$3:unsigned short) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_2" ;
@@ -353,7 +353,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_2" [label="2: Exit std::__infer_atomic_integral<unsigned long long>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned long long>* [line 187, column 53]\n  n$1=*&d:unsigned long long [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned long long>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned long long>*,n$1:unsigned long long) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned long long>* [line 187, column 53]\n  n$3=*&d:unsigned long long [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned long long>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned long long>*,n$3:unsigned long long) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_2" ;
@@ -364,7 +364,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_2" [label="2: Exit std::__infer_atomic_integral<short>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<short>* [line 187, column 53]\n  n$1=*&d:short [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<short>___infer_atomic_base(n$0:std::__infer_atomic_integral<short>*,n$1:short) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<short>* [line 187, column 53]\n  n$3=*&d:short [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<short>___infer_atomic_base(n$2:std::__infer_atomic_integral<short>*,n$3:short) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_3" -> "__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_2" ;
@@ -375,7 +375,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$1=*&d:char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$3=*&d:char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$2:std::__infer_atomic_integral<char>*,n$3:char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_2" ;
@@ -386,7 +386,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_2" [label="2: Exit std::__infer_atomic_integral<signed char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<signed char>* [line 187, column 53]\n  n$1=*&d:signed char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<signed char>___infer_atomic_base(n$0:std::__infer_atomic_integral<signed char>*,n$1:signed char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<signed char>* [line 187, column 53]\n  n$3=*&d:signed char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<signed char>___infer_atomic_base(n$2:std::__infer_atomic_integral<signed char>*,n$3:signed char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_3" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_2" ;
@@ -397,7 +397,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$1=*&d:char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$3=*&d:char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$2:std::__infer_atomic_integral<char>*,n$3:char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_2" ;
@@ -408,7 +408,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_2" [label="2: Exit std::__infer_atomic_integral<long long>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<long long>* [line 187, column 53]\n  n$1=*&d:long long [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<long long>___infer_atomic_base(n$0:std::__infer_atomic_integral<long long>*,n$1:long long) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<long long>* [line 187, column 53]\n  n$3=*&d:long long [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<long long>___infer_atomic_base(n$2:std::__infer_atomic_integral<long long>*,n$3:long long) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_3" -> "__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_2" ;
@@ -419,7 +419,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_2" [label="2: Exit std::__infer_atomic_integral<long>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<long>* [line 187, column 53]\n  n$1=*&d:long [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<long>___infer_atomic_base(n$0:std::__infer_atomic_integral<long>*,n$1:long) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<long>* [line 187, column 53]\n  n$3=*&d:long [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<long>___infer_atomic_base(n$2:std::__infer_atomic_integral<long>*,n$3:long) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_3" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_2" ;
@@ -430,7 +430,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_2" [label="2: Exit std::__infer_atomic_integral<unsigned long>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned long>* [line 187, column 53]\n  n$1=*&d:unsigned long [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned long>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned long>*,n$1:unsigned long) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned long>* [line 187, column 53]\n  n$3=*&d:unsigned long [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned long>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned long>*,n$3:unsigned long) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_2" ;
@@ -441,7 +441,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_2" [label="2: Exit std::__infer_atomic_integral<unsigned int>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned int>* [line 187, column 53]\n  n$1=*&d:unsigned int [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned int>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned int>*,n$1:unsigned int) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned int>* [line 187, column 53]\n  n$3=*&d:unsigned int [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned int>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned int>*,n$3:unsigned int) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_2" ;
@@ -452,7 +452,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_2" [label="2: Exit std::__infer_atomic_integral<unsigned char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned char>* [line 187, column 53]\n  n$1=*&d:unsigned char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned char>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned char>*,n$1:unsigned char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned char>* [line 187, column 53]\n  n$3=*&d:unsigned char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned char>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned char>*,n$3:unsigned char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_2" ;
@@ -463,7 +463,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$1=*&d:char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$3=*&d:char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$2:std::__infer_atomic_integral<char>*,n$3:char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_2" ;
@@ -474,7 +474,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_2" [label="2: Exit std::__infer_atomic_integral<int>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<int>* [line 187, column 53]\n  n$1=*&d:int [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<int>___infer_atomic_base(n$0:std::__infer_atomic_integral<int>*,n$1:int) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<int>* [line 187, column 53]\n  n$3=*&d:int [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<int>___infer_atomic_base(n$2:std::__infer_atomic_integral<int>*,n$3:int) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_3" -> "__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_2" ;
@@ -489,7 +489,7 @@ digraph cfg {
 	
 
 	 "__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_3" -> "__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_2" ;
-"__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_4" [label="4:  Call _fun_std::shared_ptr<int>_reset<int,_void> \n   n$3=*&this:int** [line 180, column 19]\n  _=*n$3:int* [line 180, column 19]\n  n$5=_fun_std::shared_ptr<int>_reset<int,_void>(n$3:int**,null:int*) [line 180, column 19]\n " shape="box"]
+"__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_4" [label="4:  Call _fun_std::shared_ptr<int>_reset<int,_void> \n   n$5=*&this:int** [line 180, column 19]\n  _=*n$5:int* [line 180, column 19]\n  n$7=_fun_std::shared_ptr<int>_reset<int,_void>(n$5:int**,null:int*) [line 180, column 19]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_4" -> "__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_3" ;
@@ -500,7 +500,7 @@ digraph cfg {
 "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_2" [label="2: Exit std::atomic<unsigned short>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned short>* [line 408, column 50]\n  n$1=*&d:unsigned short [line 408, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned short>___infer_atomic_integral(n$0:std::atomic<unsigned short>*,n$1:unsigned short) [line 408, column 50]\n " shape="box"]
+"atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned short>* [line 408, column 50]\n  n$3=*&d:unsigned short [line 408, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned short>___infer_atomic_integral(n$2:std::atomic<unsigned short>*,n$3:unsigned short) [line 408, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" -> "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_2" ;
@@ -511,7 +511,7 @@ digraph cfg {
 "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 472, column 50]\n  n$1=*&d:char [line 472, column 57]\n  n$2=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 472, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<char>* [line 472, column 50]\n  n$3=*&d:char [line 472, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 472, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" -> "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_2" ;
@@ -522,7 +522,7 @@ digraph cfg {
 "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_2" [label="2: Exit std::atomic<unsigned long>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned long>* [line 444, column 50]\n  n$1=*&d:unsigned long [line 444, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned long>___infer_atomic_integral(n$0:std::atomic<unsigned long>*,n$1:unsigned long) [line 444, column 50]\n " shape="box"]
+"atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned long>* [line 444, column 50]\n  n$3=*&d:unsigned long [line 444, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned long>___infer_atomic_integral(n$2:std::atomic<unsigned long>*,n$3:unsigned long) [line 444, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" -> "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_2" ;
@@ -533,7 +533,7 @@ digraph cfg {
 "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_2" [label="2: Exit std::atomic<short>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<short>* [line 399, column 50]\n  n$1=*&d:short [line 399, column 57]\n  n$2=_fun_std::__infer_atomic_integral<short>___infer_atomic_integral(n$0:std::atomic<short>*,n$1:short) [line 399, column 50]\n " shape="box"]
+"atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<short>* [line 399, column 50]\n  n$3=*&d:short [line 399, column 57]\n  n$4=_fun_std::__infer_atomic_integral<short>___infer_atomic_integral(n$2:std::atomic<short>*,n$3:short) [line 399, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" -> "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_2" ;
@@ -544,7 +544,7 @@ digraph cfg {
 "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_2" [label="2: Exit std::atomic<long>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<long>* [line 435, column 50]\n  n$1=*&d:long [line 435, column 57]\n  n$2=_fun_std::__infer_atomic_integral<long>___infer_atomic_integral(n$0:std::atomic<long>*,n$1:long) [line 435, column 50]\n " shape="box"]
+"atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<long>* [line 435, column 50]\n  n$3=*&d:long [line 435, column 57]\n  n$4=_fun_std::__infer_atomic_integral<long>___infer_atomic_integral(n$2:std::atomic<long>*,n$3:long) [line 435, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" -> "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_2" ;
@@ -555,7 +555,7 @@ digraph cfg {
 "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_2" [label="2: Exit std::atomic<int>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<int>* [line 417, column 50]\n  n$1=*&d:int [line 417, column 57]\n  n$2=_fun_std::__infer_atomic_integral<int>___infer_atomic_integral(n$0:std::atomic<int>*,n$1:int) [line 417, column 50]\n " shape="box"]
+"atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<int>* [line 417, column 50]\n  n$3=*&d:int [line 417, column 57]\n  n$4=_fun_std::__infer_atomic_integral<int>___infer_atomic_integral(n$2:std::atomic<int>*,n$3:int) [line 417, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" -> "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_2" ;
@@ -566,7 +566,7 @@ digraph cfg {
 "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_2" [label="2: Exit std::atomic<unsigned char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned char>* [line 390, column 50]\n  n$1=*&d:unsigned char [line 390, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned char>___infer_atomic_integral(n$0:std::atomic<unsigned char>*,n$1:unsigned char) [line 390, column 50]\n " shape="box"]
+"atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned char>* [line 390, column 50]\n  n$3=*&d:unsigned char [line 390, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned char>___infer_atomic_integral(n$2:std::atomic<unsigned char>*,n$3:unsigned char) [line 390, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" -> "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_2" ;
@@ -577,7 +577,7 @@ digraph cfg {
 "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 481, column 50]\n  n$1=*&d:char [line 481, column 57]\n  n$2=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 481, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<char>* [line 481, column 50]\n  n$3=*&d:char [line 481, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 481, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" -> "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_2" ;
@@ -588,7 +588,7 @@ digraph cfg {
 "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_2" [label="2: Exit std::atomic<signed char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<signed char>* [line 381, column 50]\n  n$1=*&d:signed char [line 381, column 57]\n  n$2=_fun_std::__infer_atomic_integral<signed char>___infer_atomic_integral(n$0:std::atomic<signed char>*,n$1:signed char) [line 381, column 50]\n " shape="box"]
+"atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<signed char>* [line 381, column 50]\n  n$3=*&d:signed char [line 381, column 57]\n  n$4=_fun_std::__infer_atomic_integral<signed char>___infer_atomic_integral(n$2:std::atomic<signed char>*,n$3:signed char) [line 381, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" -> "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_2" ;
@@ -599,7 +599,7 @@ digraph cfg {
 "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 372, column 50]\n  n$1=*&d:char [line 372, column 57]\n  n$2=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 372, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<char>* [line 372, column 50]\n  n$3=*&d:char [line 372, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 372, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" -> "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_2" ;
@@ -610,7 +610,7 @@ digraph cfg {
 "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 490, column 50]\n  n$1=*&d:char [line 490, column 57]\n  n$2=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 490, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<char>* [line 490, column 50]\n  n$3=*&d:char [line 490, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 490, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" -> "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_2" ;
@@ -621,7 +621,7 @@ digraph cfg {
 "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_2" [label="2: Exit std::atomic<unsigned int>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned int>* [line 426, column 50]\n  n$1=*&d:unsigned int [line 426, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned int>___infer_atomic_integral(n$0:std::atomic<unsigned int>*,n$1:unsigned int) [line 426, column 50]\n " shape="box"]
+"atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned int>* [line 426, column 50]\n  n$3=*&d:unsigned int [line 426, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned int>___infer_atomic_integral(n$2:std::atomic<unsigned int>*,n$3:unsigned int) [line 426, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" -> "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_2" ;
@@ -632,7 +632,7 @@ digraph cfg {
 "atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_2" [label="2: Exit std::atomic<unsigned long long>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned long long>* [line 463, column 50]\n  n$1=*&d:unsigned long long [line 463, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned long long>___infer_atomic_integral(n$0:std::atomic<unsigned long long>*,n$1:unsigned long long) [line 463, column 50]\n " shape="box"]
+"atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned long long>* [line 463, column 50]\n  n$3=*&d:unsigned long long [line 463, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned long long>___infer_atomic_integral(n$2:std::atomic<unsigned long long>*,n$3:unsigned long long) [line 463, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_3" -> "atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_2" ;
@@ -643,7 +643,7 @@ digraph cfg {
 "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_2" [label="2: Exit std::atomic<long long>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<long long>* [line 453, column 50]\n  n$1=*&d:long long [line 453, column 57]\n  n$2=_fun_std::__infer_atomic_integral<long long>___infer_atomic_integral(n$0:std::atomic<long long>*,n$1:long long) [line 453, column 50]\n " shape="box"]
+"atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<long long>* [line 453, column 50]\n  n$3=*&d:long long [line 453, column 57]\n  n$4=_fun_std::__infer_atomic_integral<long long>___infer_atomic_integral(n$2:std::atomic<long long>*,n$3:long long) [line 453, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" -> "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_2" ;
@@ -654,7 +654,7 @@ digraph cfg {
 "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_2" [label="2: Exit std::atomic_flag_atomic_flag \n  " color=yellow style=filled]
 	
 
-"atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic_flag* [line 929, column 44]\n  n$1=*&i:_Bool [line 929, column 46]\n  *n$0.a:_Bool=n$1 [line 929, column 44]\n " shape="box"]
+"atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic_flag* [line 929, column 44]\n  n$3=*&i:_Bool [line 929, column 46]\n  *n$2.a:_Bool=n$3 [line 929, column 44]\n " shape="box"]
 	
 
 	 "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" -> "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_2" ;
@@ -665,7 +665,7 @@ digraph cfg {
 "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:std::atomic_flag* [line 946, column 5]\n  *n$0.a:_Bool=0 [line 946, column 5]\n " shape="box"]
+"clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 946, column 5]\n  *n$1.a:_Bool=0 [line 946, column 5]\n " shape="box"]
 	
 
 	 "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" -> "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_2" ;
@@ -676,7 +676,7 @@ digraph cfg {
 "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:std::atomic_flag* [line 948, column 65]\n  *n$0.a:_Bool=0 [line 948, column 65]\n " shape="box"]
+"clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 948, column 65]\n  *n$1.a:_Bool=0 [line 948, column 65]\n " shape="box"]
 	
 
 	 "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" -> "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_2" ;
@@ -687,7 +687,7 @@ digraph cfg {
 "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_2" [label="2: Exit std::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void const ** [line 67, column 6]\n  n$1=*&value:void* [line 67, column 37]\n  *n$0:void const *=n$1 [line 67, column 5]\n " shape="box"]
+"model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&self:void const ** [line 67, column 6]\n  n$2=*&value:void* [line 67, column 37]\n  *n$1:void const *=n$2 [line 67, column 5]\n " shape="box"]
 	
 
 	 "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" -> "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_2" ;
@@ -698,7 +698,7 @@ digraph cfg {
 "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_2" [label="2: Exit std::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void const ** [line 55, column 6]\n  n$1=*&value:int [line 55, column 13]\n  *n$0:void const *=n$1 [line 55, column 5]\n " shape="box"]
+"model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&self:void const ** [line 55, column 6]\n  n$2=*&value:int [line 55, column 13]\n  *n$1:void const *=n$2 [line 55, column 5]\n " shape="box"]
 	
 
 	 "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" -> "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_2" ;
@@ -709,7 +709,7 @@ digraph cfg {
 "reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_2" [label="2: Exit std::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
 	
 
-"reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 238, column 15]\n  n$1=*&p:int* [line 238, column 42]\n  n$2=_fun_std::shared_ptr<int>_model_set(n$0:void const **,n$1:void*) [line 238, column 5]\n " shape="box"]
+"reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$2=*&this:int** [line 238, column 15]\n  n$3=*&p:int* [line 238, column 42]\n  n$4=_fun_std::shared_ptr<int>_model_set(n$2:void const **,n$3:void*) [line 238, column 5]\n " shape="box"]
 	
 
 	 "reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_3" -> "reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_2" ;
@@ -720,11 +720,11 @@ digraph cfg {
 "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_2" [label="2: Exit std::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
 	
 
-"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 99, column 15]\n  n$1=_fun_std::shared_ptr<int>_model_set(n$0:void const **,null:int) [line 99, column 5]\n " shape="box"]
+"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$2=*&this:int** [line 99, column 15]\n  n$3=_fun_std::shared_ptr<int>_model_set(n$2:void const **,null:int) [line 99, column 5]\n " shape="box"]
 	
 
 	 "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_3" -> "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_2" ;
-"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_4" [label="4:  Constructor Init \n   n$2=*&this:int** [line 99, column 42]\n  n$4=_fun_std::std__shared_ptr<int>_std__shared_ptr(n$2:int**) [line 98, column 13]\n  n$3=*n$2:int* [line 98, column 13]\n " shape="box"]
+"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_4" [label="4:  Constructor Init \n   n$4=*&this:int** [line 99, column 42]\n  n$6=_fun_std::std__shared_ptr<int>_std__shared_ptr(n$4:int**) [line 98, column 13]\n  n$5=*n$4:int* [line 98, column 13]\n " shape="box"]
 	
 
 	 "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_4" -> "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_3" ;
@@ -739,11 +739,11 @@ digraph cfg {
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_3" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_2" ;
-"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 936, column 5]\n  *n$1.a:_Bool=1 [line 936, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:std::atomic_flag* [line 936, column 5]\n  *n$2.a:_Bool=1 [line 936, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_3" ;
-"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   n$2=*&this:std::atomic_flag* [line 935, column 16]\n  n$3=*n$2.a:_Bool [line 935, column 16]\n  *&ret:_Bool=n$3 [line 935, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   n$3=*&this:std::atomic_flag* [line 935, column 16]\n  n$4=*n$3.a:_Bool [line 935, column 16]\n  *&ret:_Bool=n$4 [line 935, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" ;
@@ -758,11 +758,11 @@ digraph cfg {
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_3" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_2" ;
-"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 941, column 5]\n  *n$1.a:_Bool=1 [line 941, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:std::atomic_flag* [line 941, column 5]\n  *n$2.a:_Bool=1 [line 941, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_3" ;
-"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   n$2=*&this:std::atomic_flag* [line 940, column 16]\n  n$3=*n$2.a:_Bool [line 940, column 16]\n  *&ret:_Bool=n$3 [line 940, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   n$3=*&this:std::atomic_flag* [line 940, column 16]\n  n$4=*n$3.a:_Bool [line 940, column 16]\n  *&ret:_Bool=n$4 [line 940, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" ;

infer/tests/build_systems/codetoanalyze/clang_translation/src/main_default_symlink.cpp.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$0=*&f:std::atomic_flag* [line 967, column 51]\n  _=*n$0:std::atomic_flag [line 967, column 51]\n  n$2=_fun_std::atomic_flag_clear(n$0:std::atomic_flag*,5:int) [line 967, column 51]\n " shape="box"]
+"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 967, column 51]\n  _=*n$1:std::atomic_flag [line 967, column 51]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 967, column 51]\n " shape="box"]
 	
 
 	 "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" -> "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$0=*&f:std::atomic_flag* [line 966, column 60]\n  _=*n$0:std::atomic_flag [line 966, column 60]\n  n$2=_fun_std::atomic_flag_clear(n$0:std::atomic_flag*,5:int) [line 966, column 60]\n " shape="box"]
+"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 966, column 60]\n  _=*n$1:std::atomic_flag [line 966, column 60]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 966, column 60]\n " shape="box"]
 	
 
 	 "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" -> "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_2" ;
@@ -29,7 +29,7 @@ digraph cfg {
 "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$0=*&f:std::atomic_flag* [line 973, column 3]\n  _=*n$0:std::atomic_flag [line 973, column 3]\n  n$2=*&mo:int [line 973, column 12]\n  n$3=_fun_std::atomic_flag_clear(n$0:std::atomic_flag*,n$2:int) [line 973, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 973, column 3]\n  _=*n$1:std::atomic_flag [line 973, column 3]\n  n$3=*&mo:int [line 973, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 973, column 3]\n " shape="box"]
 	
 
 	 "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" -> "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_2" ;
@@ -40,7 +40,7 @@ digraph cfg {
 "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$0=*&f:std::atomic_flag* [line 970, column 3]\n  _=*n$0:std::atomic_flag [line 970, column 3]\n  n$2=*&mo:int [line 970, column 12]\n  n$3=_fun_std::atomic_flag_clear(n$0:std::atomic_flag*,n$2:int) [line 970, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 970, column 3]\n  _=*n$1:std::atomic_flag [line 970, column 3]\n  n$3=*&mo:int [line 970, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 970, column 3]\n " shape="box"]
 	
 
 	 "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" -> "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_2" ;
@@ -124,23 +124,23 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$4=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>_basic_string(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 22, column 15]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$5=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>_basic_string(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 22, column 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$6=_fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 21, column 24]\n  n$5=*&x:int* [line 21, column 24]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$7=_fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 21, column 24]\n  n$6=*&x:int* [line 21, column 24]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_external::fun \n   n$7=_fun_external::fun(1:int) [line 20, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_external::fun \n   n$8=_fun_external::fun(1:int) [line 20, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal_exclude::fun \n   n$8=_fun_internal_exclude::fun(1:int) [line 19, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal_exclude::fun \n   n$9=_fun_internal_exclude::fun(1:int) [line 19, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  Call _fun_internal::fun \n   n$9=_fun_internal::fun(1:int) [line 18, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  Call _fun_internal::fun \n   n$10=_fun_internal::fun(1:int) [line 18, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
@@ -155,7 +155,7 @@ digraph cfg {
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_2" ;
-"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   n$2=_fun_internal::used_in_main_header(0:int) [line 17, column 11]\n  *&x:int=n$2 [line 17, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   n$3=_fun_internal::used_in_main_header(0:int) [line 17, column 11]\n  *&x:int=n$3 [line 17, column 3]\n " shape="box"]
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" ;
@@ -177,7 +177,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_2" [label="2: Exit std::__infer_atomic_base<long>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<long>* [line 167, column 46]\n  n$1=*&desired:long [line 167, column 61]\n  *n$0._wrapped_value:long=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<long>* [line 167, column 46]\n  n$3=*&desired:long [line 167, column 61]\n  *n$2._wrapped_value:long=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_3" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_2" ;
@@ -188,7 +188,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_2" [label="2: Exit std::__infer_atomic_base<unsigned long>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned long>* [line 167, column 46]\n  n$1=*&desired:unsigned long [line 167, column 61]\n  *n$0._wrapped_value:unsigned long=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned long>* [line 167, column 46]\n  n$3=*&desired:unsigned long [line 167, column 61]\n  *n$2._wrapped_value:unsigned long=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_2" ;
@@ -199,7 +199,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$1=*&desired:char [line 167, column 61]\n  *n$0._wrapped_value:char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$3=*&desired:char [line 167, column 61]\n  *n$2._wrapped_value:char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_2" ;
@@ -210,7 +210,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_2" [label="2: Exit std::__infer_atomic_base<short>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<short>* [line 167, column 46]\n  n$1=*&desired:short [line 167, column 61]\n  *n$0._wrapped_value:short=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<short>* [line 167, column 46]\n  n$3=*&desired:short [line 167, column 61]\n  *n$2._wrapped_value:short=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_3" -> "__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_2" ;
@@ -221,7 +221,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_2" [label="2: Exit std::__infer_atomic_base<unsigned short>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned short>* [line 167, column 46]\n  n$1=*&desired:unsigned short [line 167, column 61]\n  *n$0._wrapped_value:unsigned short=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned short>* [line 167, column 46]\n  n$3=*&desired:unsigned short [line 167, column 61]\n  *n$2._wrapped_value:unsigned short=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_2" ;
@@ -232,7 +232,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$1=*&desired:char [line 167, column 61]\n  *n$0._wrapped_value:char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$3=*&desired:char [line 167, column 61]\n  *n$2._wrapped_value:char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_2" ;
@@ -243,7 +243,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_2" [label="2: Exit std::__infer_atomic_base<long long>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<long long>* [line 167, column 46]\n  n$1=*&desired:long long [line 167, column 61]\n  *n$0._wrapped_value:long long=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<long long>* [line 167, column 46]\n  n$3=*&desired:long long [line 167, column 61]\n  *n$2._wrapped_value:long long=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_3" -> "__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_2" ;
@@ -254,7 +254,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_2" [label="2: Exit std::__infer_atomic_base<signed char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<signed char>* [line 167, column 46]\n  n$1=*&desired:signed char [line 167, column 61]\n  *n$0._wrapped_value:signed char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<signed char>* [line 167, column 46]\n  n$3=*&desired:signed char [line 167, column 61]\n  *n$2._wrapped_value:signed char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_3" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_2" ;
@@ -265,7 +265,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$1=*&desired:char [line 167, column 61]\n  *n$0._wrapped_value:char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$3=*&desired:char [line 167, column 61]\n  *n$2._wrapped_value:char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_2" ;
@@ -276,7 +276,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_2" [label="2: Exit std::__infer_atomic_base<unsigned long long>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned long long>* [line 167, column 46]\n  n$1=*&desired:unsigned long long [line 167, column 61]\n  *n$0._wrapped_value:unsigned long long=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned long long>* [line 167, column 46]\n  n$3=*&desired:unsigned long long [line 167, column 61]\n  *n$2._wrapped_value:unsigned long long=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_2" ;
@@ -287,7 +287,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_2" [label="2: Exit std::__infer_atomic_base<unsigned char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned char>* [line 167, column 46]\n  n$1=*&desired:unsigned char [line 167, column 61]\n  *n$0._wrapped_value:unsigned char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned char>* [line 167, column 46]\n  n$3=*&desired:unsigned char [line 167, column 61]\n  *n$2._wrapped_value:unsigned char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_2" ;
@@ -298,7 +298,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_2" [label="2: Exit std::__infer_atomic_base<int>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<int>* [line 167, column 46]\n  n$1=*&desired:int [line 167, column 61]\n  *n$0._wrapped_value:int=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<int>* [line 167, column 46]\n  n$3=*&desired:int [line 167, column 61]\n  *n$2._wrapped_value:int=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_3" -> "__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_2" ;
@@ -309,7 +309,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_2" [label="2: Exit std::__infer_atomic_base<unsigned int>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned int>* [line 167, column 46]\n  n$1=*&desired:unsigned int [line 167, column 61]\n  *n$0._wrapped_value:unsigned int=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned int>* [line 167, column 46]\n  n$3=*&desired:unsigned int [line 167, column 61]\n  *n$2._wrapped_value:unsigned int=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_2" ;
@@ -320,7 +320,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$1=*&desired:char [line 167, column 61]\n  *n$0._wrapped_value:char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$3=*&desired:char [line 167, column 61]\n  *n$2._wrapped_value:char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_2" ;
@@ -331,7 +331,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$1=*&d:char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$3=*&d:char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$2:std::__infer_atomic_integral<char>*,n$3:char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_2" ;
@@ -342,7 +342,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_2" [label="2: Exit std::__infer_atomic_integral<unsigned short>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned short>* [line 187, column 53]\n  n$1=*&d:unsigned short [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned short>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned short>*,n$1:unsigned short) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned short>* [line 187, column 53]\n  n$3=*&d:unsigned short [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned short>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned short>*,n$3:unsigned short) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_2" ;
@@ -353,7 +353,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_2" [label="2: Exit std::__infer_atomic_integral<unsigned long long>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned long long>* [line 187, column 53]\n  n$1=*&d:unsigned long long [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned long long>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned long long>*,n$1:unsigned long long) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned long long>* [line 187, column 53]\n  n$3=*&d:unsigned long long [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned long long>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned long long>*,n$3:unsigned long long) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_2" ;
@@ -364,7 +364,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_2" [label="2: Exit std::__infer_atomic_integral<short>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<short>* [line 187, column 53]\n  n$1=*&d:short [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<short>___infer_atomic_base(n$0:std::__infer_atomic_integral<short>*,n$1:short) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<short>* [line 187, column 53]\n  n$3=*&d:short [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<short>___infer_atomic_base(n$2:std::__infer_atomic_integral<short>*,n$3:short) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_3" -> "__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_2" ;
@@ -375,7 +375,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$1=*&d:char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$3=*&d:char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$2:std::__infer_atomic_integral<char>*,n$3:char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_2" ;
@@ -386,7 +386,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_2" [label="2: Exit std::__infer_atomic_integral<signed char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<signed char>* [line 187, column 53]\n  n$1=*&d:signed char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<signed char>___infer_atomic_base(n$0:std::__infer_atomic_integral<signed char>*,n$1:signed char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<signed char>* [line 187, column 53]\n  n$3=*&d:signed char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<signed char>___infer_atomic_base(n$2:std::__infer_atomic_integral<signed char>*,n$3:signed char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_3" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_2" ;
@@ -397,7 +397,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$1=*&d:char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$3=*&d:char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$2:std::__infer_atomic_integral<char>*,n$3:char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_2" ;
@@ -408,7 +408,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_2" [label="2: Exit std::__infer_atomic_integral<long long>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<long long>* [line 187, column 53]\n  n$1=*&d:long long [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<long long>___infer_atomic_base(n$0:std::__infer_atomic_integral<long long>*,n$1:long long) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<long long>* [line 187, column 53]\n  n$3=*&d:long long [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<long long>___infer_atomic_base(n$2:std::__infer_atomic_integral<long long>*,n$3:long long) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_3" -> "__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_2" ;
@@ -419,7 +419,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_2" [label="2: Exit std::__infer_atomic_integral<long>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<long>* [line 187, column 53]\n  n$1=*&d:long [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<long>___infer_atomic_base(n$0:std::__infer_atomic_integral<long>*,n$1:long) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<long>* [line 187, column 53]\n  n$3=*&d:long [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<long>___infer_atomic_base(n$2:std::__infer_atomic_integral<long>*,n$3:long) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_3" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_2" ;
@@ -430,7 +430,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_2" [label="2: Exit std::__infer_atomic_integral<unsigned long>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned long>* [line 187, column 53]\n  n$1=*&d:unsigned long [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned long>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned long>*,n$1:unsigned long) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned long>* [line 187, column 53]\n  n$3=*&d:unsigned long [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned long>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned long>*,n$3:unsigned long) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_2" ;
@@ -441,7 +441,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_2" [label="2: Exit std::__infer_atomic_integral<unsigned int>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned int>* [line 187, column 53]\n  n$1=*&d:unsigned int [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned int>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned int>*,n$1:unsigned int) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned int>* [line 187, column 53]\n  n$3=*&d:unsigned int [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned int>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned int>*,n$3:unsigned int) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_2" ;
@@ -452,7 +452,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_2" [label="2: Exit std::__infer_atomic_integral<unsigned char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned char>* [line 187, column 53]\n  n$1=*&d:unsigned char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned char>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned char>*,n$1:unsigned char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned char>* [line 187, column 53]\n  n$3=*&d:unsigned char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned char>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned char>*,n$3:unsigned char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_2" ;
@@ -463,7 +463,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$1=*&d:char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$3=*&d:char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$2:std::__infer_atomic_integral<char>*,n$3:char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_2" ;
@@ -474,7 +474,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_2" [label="2: Exit std::__infer_atomic_integral<int>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<int>* [line 187, column 53]\n  n$1=*&d:int [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<int>___infer_atomic_base(n$0:std::__infer_atomic_integral<int>*,n$1:int) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<int>* [line 187, column 53]\n  n$3=*&d:int [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<int>___infer_atomic_base(n$2:std::__infer_atomic_integral<int>*,n$3:int) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_3" -> "__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_2" ;
@@ -489,7 +489,7 @@ digraph cfg {
 	
 
 	 "__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_3" -> "__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_2" ;
-"__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_4" [label="4:  Call _fun_std::shared_ptr<int>_reset<int,_void> \n   n$3=*&this:int** [line 180, column 19]\n  _=*n$3:int* [line 180, column 19]\n  n$5=_fun_std::shared_ptr<int>_reset<int,_void>(n$3:int**,null:int*) [line 180, column 19]\n " shape="box"]
+"__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_4" [label="4:  Call _fun_std::shared_ptr<int>_reset<int,_void> \n   n$5=*&this:int** [line 180, column 19]\n  _=*n$5:int* [line 180, column 19]\n  n$7=_fun_std::shared_ptr<int>_reset<int,_void>(n$5:int**,null:int*) [line 180, column 19]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_4" -> "__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_3" ;
@@ -500,7 +500,7 @@ digraph cfg {
 "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_2" [label="2: Exit std::atomic<unsigned short>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned short>* [line 408, column 50]\n  n$1=*&d:unsigned short [line 408, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned short>___infer_atomic_integral(n$0:std::atomic<unsigned short>*,n$1:unsigned short) [line 408, column 50]\n " shape="box"]
+"atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned short>* [line 408, column 50]\n  n$3=*&d:unsigned short [line 408, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned short>___infer_atomic_integral(n$2:std::atomic<unsigned short>*,n$3:unsigned short) [line 408, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" -> "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_2" ;
@@ -511,7 +511,7 @@ digraph cfg {
 "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 472, column 50]\n  n$1=*&d:char [line 472, column 57]\n  n$2=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 472, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<char>* [line 472, column 50]\n  n$3=*&d:char [line 472, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 472, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" -> "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_2" ;
@@ -522,7 +522,7 @@ digraph cfg {
 "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_2" [label="2: Exit std::atomic<unsigned long>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned long>* [line 444, column 50]\n  n$1=*&d:unsigned long [line 444, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned long>___infer_atomic_integral(n$0:std::atomic<unsigned long>*,n$1:unsigned long) [line 444, column 50]\n " shape="box"]
+"atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned long>* [line 444, column 50]\n  n$3=*&d:unsigned long [line 444, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned long>___infer_atomic_integral(n$2:std::atomic<unsigned long>*,n$3:unsigned long) [line 444, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" -> "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_2" ;
@@ -533,7 +533,7 @@ digraph cfg {
 "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_2" [label="2: Exit std::atomic<short>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<short>* [line 399, column 50]\n  n$1=*&d:short [line 399, column 57]\n  n$2=_fun_std::__infer_atomic_integral<short>___infer_atomic_integral(n$0:std::atomic<short>*,n$1:short) [line 399, column 50]\n " shape="box"]
+"atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<short>* [line 399, column 50]\n  n$3=*&d:short [line 399, column 57]\n  n$4=_fun_std::__infer_atomic_integral<short>___infer_atomic_integral(n$2:std::atomic<short>*,n$3:short) [line 399, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" -> "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_2" ;
@@ -544,7 +544,7 @@ digraph cfg {
 "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_2" [label="2: Exit std::atomic<long>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<long>* [line 435, column 50]\n  n$1=*&d:long [line 435, column 57]\n  n$2=_fun_std::__infer_atomic_integral<long>___infer_atomic_integral(n$0:std::atomic<long>*,n$1:long) [line 435, column 50]\n " shape="box"]
+"atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<long>* [line 435, column 50]\n  n$3=*&d:long [line 435, column 57]\n  n$4=_fun_std::__infer_atomic_integral<long>___infer_atomic_integral(n$2:std::atomic<long>*,n$3:long) [line 435, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" -> "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_2" ;
@@ -555,7 +555,7 @@ digraph cfg {
 "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_2" [label="2: Exit std::atomic<int>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<int>* [line 417, column 50]\n  n$1=*&d:int [line 417, column 57]\n  n$2=_fun_std::__infer_atomic_integral<int>___infer_atomic_integral(n$0:std::atomic<int>*,n$1:int) [line 417, column 50]\n " shape="box"]
+"atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<int>* [line 417, column 50]\n  n$3=*&d:int [line 417, column 57]\n  n$4=_fun_std::__infer_atomic_integral<int>___infer_atomic_integral(n$2:std::atomic<int>*,n$3:int) [line 417, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" -> "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_2" ;
@@ -566,7 +566,7 @@ digraph cfg {
 "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_2" [label="2: Exit std::atomic<unsigned char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned char>* [line 390, column 50]\n  n$1=*&d:unsigned char [line 390, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned char>___infer_atomic_integral(n$0:std::atomic<unsigned char>*,n$1:unsigned char) [line 390, column 50]\n " shape="box"]
+"atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned char>* [line 390, column 50]\n  n$3=*&d:unsigned char [line 390, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned char>___infer_atomic_integral(n$2:std::atomic<unsigned char>*,n$3:unsigned char) [line 390, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" -> "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_2" ;
@@ -577,7 +577,7 @@ digraph cfg {
 "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 481, column 50]\n  n$1=*&d:char [line 481, column 57]\n  n$2=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 481, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<char>* [line 481, column 50]\n  n$3=*&d:char [line 481, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 481, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" -> "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_2" ;
@@ -588,7 +588,7 @@ digraph cfg {
 "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_2" [label="2: Exit std::atomic<signed char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<signed char>* [line 381, column 50]\n  n$1=*&d:signed char [line 381, column 57]\n  n$2=_fun_std::__infer_atomic_integral<signed char>___infer_atomic_integral(n$0:std::atomic<signed char>*,n$1:signed char) [line 381, column 50]\n " shape="box"]
+"atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<signed char>* [line 381, column 50]\n  n$3=*&d:signed char [line 381, column 57]\n  n$4=_fun_std::__infer_atomic_integral<signed char>___infer_atomic_integral(n$2:std::atomic<signed char>*,n$3:signed char) [line 381, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" -> "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_2" ;
@@ -599,7 +599,7 @@ digraph cfg {
 "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 372, column 50]\n  n$1=*&d:char [line 372, column 57]\n  n$2=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 372, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<char>* [line 372, column 50]\n  n$3=*&d:char [line 372, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 372, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" -> "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_2" ;
@@ -610,7 +610,7 @@ digraph cfg {
 "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 490, column 50]\n  n$1=*&d:char [line 490, column 57]\n  n$2=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 490, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<char>* [line 490, column 50]\n  n$3=*&d:char [line 490, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 490, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" -> "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_2" ;
@@ -621,7 +621,7 @@ digraph cfg {
 "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_2" [label="2: Exit std::atomic<unsigned int>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned int>* [line 426, column 50]\n  n$1=*&d:unsigned int [line 426, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned int>___infer_atomic_integral(n$0:std::atomic<unsigned int>*,n$1:unsigned int) [line 426, column 50]\n " shape="box"]
+"atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned int>* [line 426, column 50]\n  n$3=*&d:unsigned int [line 426, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned int>___infer_atomic_integral(n$2:std::atomic<unsigned int>*,n$3:unsigned int) [line 426, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" -> "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_2" ;
@@ -632,7 +632,7 @@ digraph cfg {
 "atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_2" [label="2: Exit std::atomic<unsigned long long>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned long long>* [line 463, column 50]\n  n$1=*&d:unsigned long long [line 463, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned long long>___infer_atomic_integral(n$0:std::atomic<unsigned long long>*,n$1:unsigned long long) [line 463, column 50]\n " shape="box"]
+"atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned long long>* [line 463, column 50]\n  n$3=*&d:unsigned long long [line 463, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned long long>___infer_atomic_integral(n$2:std::atomic<unsigned long long>*,n$3:unsigned long long) [line 463, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_3" -> "atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_2" ;
@@ -643,7 +643,7 @@ digraph cfg {
 "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_2" [label="2: Exit std::atomic<long long>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<long long>* [line 453, column 50]\n  n$1=*&d:long long [line 453, column 57]\n  n$2=_fun_std::__infer_atomic_integral<long long>___infer_atomic_integral(n$0:std::atomic<long long>*,n$1:long long) [line 453, column 50]\n " shape="box"]
+"atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<long long>* [line 453, column 50]\n  n$3=*&d:long long [line 453, column 57]\n  n$4=_fun_std::__infer_atomic_integral<long long>___infer_atomic_integral(n$2:std::atomic<long long>*,n$3:long long) [line 453, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" -> "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_2" ;
@@ -654,7 +654,7 @@ digraph cfg {
 "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_2" [label="2: Exit std::atomic_flag_atomic_flag \n  " color=yellow style=filled]
 	
 
-"atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic_flag* [line 929, column 44]\n  n$1=*&i:_Bool [line 929, column 46]\n  *n$0.a:_Bool=n$1 [line 929, column 44]\n " shape="box"]
+"atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic_flag* [line 929, column 44]\n  n$3=*&i:_Bool [line 929, column 46]\n  *n$2.a:_Bool=n$3 [line 929, column 44]\n " shape="box"]
 	
 
 	 "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" -> "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_2" ;
@@ -665,7 +665,7 @@ digraph cfg {
 "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:std::atomic_flag* [line 946, column 5]\n  *n$0.a:_Bool=0 [line 946, column 5]\n " shape="box"]
+"clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 946, column 5]\n  *n$1.a:_Bool=0 [line 946, column 5]\n " shape="box"]
 	
 
 	 "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" -> "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_2" ;
@@ -676,7 +676,7 @@ digraph cfg {
 "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:std::atomic_flag* [line 948, column 65]\n  *n$0.a:_Bool=0 [line 948, column 65]\n " shape="box"]
+"clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 948, column 65]\n  *n$1.a:_Bool=0 [line 948, column 65]\n " shape="box"]
 	
 
 	 "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" -> "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_2" ;
@@ -687,7 +687,7 @@ digraph cfg {
 "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_2" [label="2: Exit std::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void const ** [line 67, column 6]\n  n$1=*&value:void* [line 67, column 37]\n  *n$0:void const *=n$1 [line 67, column 5]\n " shape="box"]
+"model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&self:void const ** [line 67, column 6]\n  n$2=*&value:void* [line 67, column 37]\n  *n$1:void const *=n$2 [line 67, column 5]\n " shape="box"]
 	
 
 	 "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" -> "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_2" ;
@@ -698,7 +698,7 @@ digraph cfg {
 "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_2" [label="2: Exit std::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void const ** [line 55, column 6]\n  n$1=*&value:int [line 55, column 13]\n  *n$0:void const *=n$1 [line 55, column 5]\n " shape="box"]
+"model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&self:void const ** [line 55, column 6]\n  n$2=*&value:int [line 55, column 13]\n  *n$1:void const *=n$2 [line 55, column 5]\n " shape="box"]
 	
 
 	 "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" -> "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_2" ;
@@ -709,7 +709,7 @@ digraph cfg {
 "reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_2" [label="2: Exit std::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
 	
 
-"reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 238, column 15]\n  n$1=*&p:int* [line 238, column 42]\n  n$2=_fun_std::shared_ptr<int>_model_set(n$0:void const **,n$1:void*) [line 238, column 5]\n " shape="box"]
+"reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$2=*&this:int** [line 238, column 15]\n  n$3=*&p:int* [line 238, column 42]\n  n$4=_fun_std::shared_ptr<int>_model_set(n$2:void const **,n$3:void*) [line 238, column 5]\n " shape="box"]
 	
 
 	 "reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_3" -> "reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_2" ;
@@ -720,11 +720,11 @@ digraph cfg {
 "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_2" [label="2: Exit std::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
 	
 
-"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 99, column 15]\n  n$1=_fun_std::shared_ptr<int>_model_set(n$0:void const **,null:int) [line 99, column 5]\n " shape="box"]
+"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$2=*&this:int** [line 99, column 15]\n  n$3=_fun_std::shared_ptr<int>_model_set(n$2:void const **,null:int) [line 99, column 5]\n " shape="box"]
 	
 
 	 "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_3" -> "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_2" ;
-"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_4" [label="4:  Constructor Init \n   n$2=*&this:int** [line 99, column 42]\n  n$4=_fun_std::std__shared_ptr<int>_std__shared_ptr(n$2:int**) [line 98, column 13]\n  n$3=*n$2:int* [line 98, column 13]\n " shape="box"]
+"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_4" [label="4:  Constructor Init \n   n$4=*&this:int** [line 99, column 42]\n  n$6=_fun_std::std__shared_ptr<int>_std__shared_ptr(n$4:int**) [line 98, column 13]\n  n$5=*n$4:int* [line 98, column 13]\n " shape="box"]
 	
 
 	 "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_4" -> "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_3" ;
@@ -739,11 +739,11 @@ digraph cfg {
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_3" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_2" ;
-"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 936, column 5]\n  *n$1.a:_Bool=1 [line 936, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:std::atomic_flag* [line 936, column 5]\n  *n$2.a:_Bool=1 [line 936, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_3" ;
-"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   n$2=*&this:std::atomic_flag* [line 935, column 16]\n  n$3=*n$2.a:_Bool [line 935, column 16]\n  *&ret:_Bool=n$3 [line 935, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   n$3=*&this:std::atomic_flag* [line 935, column 16]\n  n$4=*n$3.a:_Bool [line 935, column 16]\n  *&ret:_Bool=n$4 [line 935, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" ;
@@ -758,11 +758,11 @@ digraph cfg {
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_3" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_2" ;
-"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 941, column 5]\n  *n$1.a:_Bool=1 [line 941, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:std::atomic_flag* [line 941, column 5]\n  *n$2.a:_Bool=1 [line 941, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_3" ;
-"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   n$2=*&this:std::atomic_flag* [line 940, column 16]\n  n$3=*n$2.a:_Bool [line 940, column 16]\n  *&ret:_Bool=n$3 [line 940, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   n$3=*&this:std::atomic_flag* [line 940, column 16]\n  n$4=*n$3.a:_Bool [line 940, column 16]\n  *&ret:_Bool=n$4 [line 940, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" ;

infer/tests/build_systems/codetoanalyze/clang_translation/src/main_symlink.cpp.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$0=*&f:std::atomic_flag* [line 967, column 51]\n  _=*n$0:std::atomic_flag [line 967, column 51]\n  n$2=_fun_std::atomic_flag_clear(n$0:std::atomic_flag*,5:int) [line 967, column 51]\n " shape="box"]
+"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 967, column 51]\n  _=*n$1:std::atomic_flag [line 967, column 51]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 967, column 51]\n " shape="box"]
 	
 
 	 "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" -> "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$0=*&f:std::atomic_flag* [line 966, column 60]\n  _=*n$0:std::atomic_flag [line 966, column 60]\n  n$2=_fun_std::atomic_flag_clear(n$0:std::atomic_flag*,5:int) [line 966, column 60]\n " shape="box"]
+"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 966, column 60]\n  _=*n$1:std::atomic_flag [line 966, column 60]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 966, column 60]\n " shape="box"]
 	
 
 	 "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" -> "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_2" ;
@@ -29,7 +29,7 @@ digraph cfg {
 "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$0=*&f:std::atomic_flag* [line 973, column 3]\n  _=*n$0:std::atomic_flag [line 973, column 3]\n  n$2=*&mo:int [line 973, column 12]\n  n$3=_fun_std::atomic_flag_clear(n$0:std::atomic_flag*,n$2:int) [line 973, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 973, column 3]\n  _=*n$1:std::atomic_flag [line 973, column 3]\n  n$3=*&mo:int [line 973, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 973, column 3]\n " shape="box"]
 	
 
 	 "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" -> "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_2" ;
@@ -40,7 +40,7 @@ digraph cfg {
 "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$0=*&f:std::atomic_flag* [line 970, column 3]\n  _=*n$0:std::atomic_flag [line 970, column 3]\n  n$2=*&mo:int [line 970, column 12]\n  n$3=_fun_std::atomic_flag_clear(n$0:std::atomic_flag*,n$2:int) [line 970, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 970, column 3]\n  _=*n$1:std::atomic_flag [line 970, column 3]\n  n$3=*&mo:int [line 970, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 970, column 3]\n " shape="box"]
 	
 
 	 "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" -> "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_2" ;
@@ -124,23 +124,23 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$4=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>_basic_string(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 22, column 15]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$5=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>_basic_string(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 22, column 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$6=_fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 21, column 24]\n  n$5=*&x:int* [line 21, column 24]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$7=_fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 21, column 24]\n  n$6=*&x:int* [line 21, column 24]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_external::fun \n   n$7=_fun_external::fun(1:int) [line 20, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_external::fun \n   n$8=_fun_external::fun(1:int) [line 20, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal_exclude::fun \n   n$8=_fun_internal_exclude::fun(1:int) [line 19, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal_exclude::fun \n   n$9=_fun_internal_exclude::fun(1:int) [line 19, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  Call _fun_internal::fun \n   n$9=_fun_internal::fun(1:int) [line 18, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  Call _fun_internal::fun \n   n$10=_fun_internal::fun(1:int) [line 18, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
@@ -155,7 +155,7 @@ digraph cfg {
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_2" ;
-"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   n$2=_fun_internal::used_in_main_header(0:int) [line 17, column 11]\n  *&x:int=n$2 [line 17, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   n$3=_fun_internal::used_in_main_header(0:int) [line 17, column 11]\n  *&x:int=n$3 [line 17, column 3]\n " shape="box"]
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" ;
@@ -177,7 +177,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_2" [label="2: Exit std::__infer_atomic_base<long>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<long>* [line 167, column 46]\n  n$1=*&desired:long [line 167, column 61]\n  *n$0._wrapped_value:long=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<long>* [line 167, column 46]\n  n$3=*&desired:long [line 167, column 61]\n  *n$2._wrapped_value:long=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_3" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_2" ;
@@ -188,7 +188,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_2" [label="2: Exit std::__infer_atomic_base<unsigned long>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned long>* [line 167, column 46]\n  n$1=*&desired:unsigned long [line 167, column 61]\n  *n$0._wrapped_value:unsigned long=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned long>* [line 167, column 46]\n  n$3=*&desired:unsigned long [line 167, column 61]\n  *n$2._wrapped_value:unsigned long=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_2" ;
@@ -199,7 +199,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$1=*&desired:char [line 167, column 61]\n  *n$0._wrapped_value:char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$3=*&desired:char [line 167, column 61]\n  *n$2._wrapped_value:char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_2" ;
@@ -210,7 +210,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_2" [label="2: Exit std::__infer_atomic_base<short>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<short>* [line 167, column 46]\n  n$1=*&desired:short [line 167, column 61]\n  *n$0._wrapped_value:short=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<short>* [line 167, column 46]\n  n$3=*&desired:short [line 167, column 61]\n  *n$2._wrapped_value:short=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_3" -> "__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_2" ;
@@ -221,7 +221,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_2" [label="2: Exit std::__infer_atomic_base<unsigned short>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned short>* [line 167, column 46]\n  n$1=*&desired:unsigned short [line 167, column 61]\n  *n$0._wrapped_value:unsigned short=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned short>* [line 167, column 46]\n  n$3=*&desired:unsigned short [line 167, column 61]\n  *n$2._wrapped_value:unsigned short=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_2" ;
@@ -232,7 +232,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$1=*&desired:char [line 167, column 61]\n  *n$0._wrapped_value:char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$3=*&desired:char [line 167, column 61]\n  *n$2._wrapped_value:char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_2" ;
@@ -243,7 +243,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_2" [label="2: Exit std::__infer_atomic_base<long long>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<long long>* [line 167, column 46]\n  n$1=*&desired:long long [line 167, column 61]\n  *n$0._wrapped_value:long long=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<long long>* [line 167, column 46]\n  n$3=*&desired:long long [line 167, column 61]\n  *n$2._wrapped_value:long long=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_3" -> "__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_2" ;
@@ -254,7 +254,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_2" [label="2: Exit std::__infer_atomic_base<signed char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<signed char>* [line 167, column 46]\n  n$1=*&desired:signed char [line 167, column 61]\n  *n$0._wrapped_value:signed char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<signed char>* [line 167, column 46]\n  n$3=*&desired:signed char [line 167, column 61]\n  *n$2._wrapped_value:signed char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_3" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_2" ;
@@ -265,7 +265,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$1=*&desired:char [line 167, column 61]\n  *n$0._wrapped_value:char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$3=*&desired:char [line 167, column 61]\n  *n$2._wrapped_value:char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_2" ;
@@ -276,7 +276,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_2" [label="2: Exit std::__infer_atomic_base<unsigned long long>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned long long>* [line 167, column 46]\n  n$1=*&desired:unsigned long long [line 167, column 61]\n  *n$0._wrapped_value:unsigned long long=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned long long>* [line 167, column 46]\n  n$3=*&desired:unsigned long long [line 167, column 61]\n  *n$2._wrapped_value:unsigned long long=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned long long>#std#{7573412317894445992|constexpr}.ff0e487372c722b860a1cd876aa6c750_2" ;
@@ -287,7 +287,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_2" [label="2: Exit std::__infer_atomic_base<unsigned char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned char>* [line 167, column 46]\n  n$1=*&desired:unsigned char [line 167, column 61]\n  *n$0._wrapped_value:unsigned char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned char>* [line 167, column 46]\n  n$3=*&desired:unsigned char [line 167, column 61]\n  *n$2._wrapped_value:unsigned char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_2" ;
@@ -298,7 +298,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_2" [label="2: Exit std::__infer_atomic_base<int>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<int>* [line 167, column 46]\n  n$1=*&desired:int [line 167, column 61]\n  *n$0._wrapped_value:int=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<int>* [line 167, column 46]\n  n$3=*&desired:int [line 167, column 61]\n  *n$2._wrapped_value:int=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_3" -> "__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_2" ;
@@ -309,7 +309,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_2" [label="2: Exit std::__infer_atomic_base<unsigned int>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned int>* [line 167, column 46]\n  n$1=*&desired:unsigned int [line 167, column 61]\n  *n$0._wrapped_value:unsigned int=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<unsigned int>* [line 167, column 46]\n  n$3=*&desired:unsigned int [line 167, column 61]\n  *n$2._wrapped_value:unsigned int=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_2" ;
@@ -320,7 +320,7 @@ digraph cfg {
 "__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$1=*&desired:char [line 167, column 61]\n  *n$0._wrapped_value:char=n$1 [line 167, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_base<char>* [line 167, column 46]\n  n$3=*&desired:char [line 167, column 61]\n  *n$2._wrapped_value:char=n$3 [line 167, column 46]\n " shape="box"]
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_2" ;
@@ -331,7 +331,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$1=*&d:char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$3=*&d:char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$2:std::__infer_atomic_integral<char>*,n$3:char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_2" ;
@@ -342,7 +342,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_2" [label="2: Exit std::__infer_atomic_integral<unsigned short>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned short>* [line 187, column 53]\n  n$1=*&d:unsigned short [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned short>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned short>*,n$1:unsigned short) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned short>* [line 187, column 53]\n  n$3=*&d:unsigned short [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned short>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned short>*,n$3:unsigned short) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_2" ;
@@ -353,7 +353,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_2" [label="2: Exit std::__infer_atomic_integral<unsigned long long>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned long long>* [line 187, column 53]\n  n$1=*&d:unsigned long long [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned long long>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned long long>*,n$1:unsigned long long) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned long long>* [line 187, column 53]\n  n$3=*&d:unsigned long long [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned long long>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned long long>*,n$3:unsigned long long) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{14753850656660515810|conste.316dccad2dcde8efca58b19fda679f20_2" ;
@@ -364,7 +364,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_2" [label="2: Exit std::__infer_atomic_integral<short>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<short>* [line 187, column 53]\n  n$1=*&d:short [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<short>___infer_atomic_base(n$0:std::__infer_atomic_integral<short>*,n$1:short) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<short>* [line 187, column 53]\n  n$3=*&d:short [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<short>___infer_atomic_base(n$2:std::__infer_atomic_integral<short>*,n$3:short) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_3" -> "__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_2" ;
@@ -375,7 +375,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$1=*&d:char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$3=*&d:char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$2:std::__infer_atomic_integral<char>*,n$3:char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_2" ;
@@ -386,7 +386,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_2" [label="2: Exit std::__infer_atomic_integral<signed char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<signed char>* [line 187, column 53]\n  n$1=*&d:signed char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<signed char>___infer_atomic_base(n$0:std::__infer_atomic_integral<signed char>*,n$1:signed char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<signed char>* [line 187, column 53]\n  n$3=*&d:signed char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<signed char>___infer_atomic_base(n$2:std::__infer_atomic_integral<signed char>*,n$3:signed char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_3" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_2" ;
@@ -397,7 +397,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$1=*&d:char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$3=*&d:char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$2:std::__infer_atomic_integral<char>*,n$3:char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_2" ;
@@ -408,7 +408,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_2" [label="2: Exit std::__infer_atomic_integral<long long>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<long long>* [line 187, column 53]\n  n$1=*&d:long long [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<long long>___infer_atomic_base(n$0:std::__infer_atomic_integral<long long>*,n$1:long long) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<long long>* [line 187, column 53]\n  n$3=*&d:long long [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<long long>___infer_atomic_base(n$2:std::__infer_atomic_integral<long long>*,n$3:long long) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_3" -> "__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_2" ;
@@ -419,7 +419,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_2" [label="2: Exit std::__infer_atomic_integral<long>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<long>* [line 187, column 53]\n  n$1=*&d:long [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<long>___infer_atomic_base(n$0:std::__infer_atomic_integral<long>*,n$1:long) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<long>* [line 187, column 53]\n  n$3=*&d:long [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<long>___infer_atomic_base(n$2:std::__infer_atomic_integral<long>*,n$3:long) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_3" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_2" ;
@@ -430,7 +430,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_2" [label="2: Exit std::__infer_atomic_integral<unsigned long>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned long>* [line 187, column 53]\n  n$1=*&d:unsigned long [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned long>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned long>*,n$1:unsigned long) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned long>* [line 187, column 53]\n  n$3=*&d:unsigned long [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned long>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned long>*,n$3:unsigned long) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_2" ;
@@ -441,7 +441,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_2" [label="2: Exit std::__infer_atomic_integral<unsigned int>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned int>* [line 187, column 53]\n  n$1=*&d:unsigned int [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned int>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned int>*,n$1:unsigned int) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned int>* [line 187, column 53]\n  n$3=*&d:unsigned int [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned int>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned int>*,n$3:unsigned int) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_2" ;
@@ -452,7 +452,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_2" [label="2: Exit std::__infer_atomic_integral<unsigned char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned char>* [line 187, column 53]\n  n$1=*&d:unsigned char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<unsigned char>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned char>*,n$1:unsigned char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<unsigned char>* [line 187, column 53]\n  n$3=*&d:unsigned char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<unsigned char>___infer_atomic_base(n$2:std::__infer_atomic_integral<unsigned char>*,n$3:unsigned char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_2" ;
@@ -463,7 +463,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$1=*&d:char [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<char>* [line 187, column 53]\n  n$3=*&d:char [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<char>___infer_atomic_base(n$2:std::__infer_atomic_integral<char>*,n$3:char) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_2" ;
@@ -474,7 +474,7 @@ digraph cfg {
 "__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_2" [label="2: Exit std::__infer_atomic_integral<int>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<int>* [line 187, column 53]\n  n$1=*&d:int [line 187, column 60]\n  n$2=_fun_std::__infer_atomic_base<int>___infer_atomic_base(n$0:std::__infer_atomic_integral<int>*,n$1:int) [line 187, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_3" [label="3:  Constructor Init \n   n$2=*&this:std::__infer_atomic_integral<int>* [line 187, column 53]\n  n$3=*&d:int [line 187, column 60]\n  n$4=_fun_std::__infer_atomic_base<int>___infer_atomic_base(n$2:std::__infer_atomic_integral<int>*,n$3:int) [line 187, column 53]\n " shape="box"]
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_3" -> "__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_2" ;
@@ -489,7 +489,7 @@ digraph cfg {
 	
 
 	 "__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_3" -> "__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_2" ;
-"__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_4" [label="4:  Call _fun_std::shared_ptr<int>_reset<int,_void> \n   n$3=*&this:int** [line 180, column 19]\n  _=*n$3:int* [line 180, column 19]\n  n$5=_fun_std::shared_ptr<int>_reset<int,_void>(n$3:int**,null:int*) [line 180, column 19]\n " shape="box"]
+"__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_4" [label="4:  Call _fun_std::shared_ptr<int>_reset<int,_void> \n   n$5=*&this:int** [line 180, column 19]\n  _=*n$5:int* [line 180, column 19]\n  n$7=_fun_std::shared_ptr<int>_reset<int,_void>(n$5:int**,null:int*) [line 180, column 19]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_4" -> "__infer_inner_destructor_~shared_ptr#shared_ptr<int>#std#(11841665744792554656).9277443e4e3f26d7cc1cd9ee0f2e3637_3" ;
@@ -500,7 +500,7 @@ digraph cfg {
 "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_2" [label="2: Exit std::atomic<unsigned short>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned short>* [line 408, column 50]\n  n$1=*&d:unsigned short [line 408, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned short>___infer_atomic_integral(n$0:std::atomic<unsigned short>*,n$1:unsigned short) [line 408, column 50]\n " shape="box"]
+"atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned short>* [line 408, column 50]\n  n$3=*&d:unsigned short [line 408, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned short>___infer_atomic_integral(n$2:std::atomic<unsigned short>*,n$3:unsigned short) [line 408, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" -> "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_2" ;
@@ -511,7 +511,7 @@ digraph cfg {
 "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 472, column 50]\n  n$1=*&d:char [line 472, column 57]\n  n$2=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 472, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<char>* [line 472, column 50]\n  n$3=*&d:char [line 472, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 472, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" -> "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_2" ;
@@ -522,7 +522,7 @@ digraph cfg {
 "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_2" [label="2: Exit std::atomic<unsigned long>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned long>* [line 444, column 50]\n  n$1=*&d:unsigned long [line 444, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned long>___infer_atomic_integral(n$0:std::atomic<unsigned long>*,n$1:unsigned long) [line 444, column 50]\n " shape="box"]
+"atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned long>* [line 444, column 50]\n  n$3=*&d:unsigned long [line 444, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned long>___infer_atomic_integral(n$2:std::atomic<unsigned long>*,n$3:unsigned long) [line 444, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" -> "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_2" ;
@@ -533,7 +533,7 @@ digraph cfg {
 "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_2" [label="2: Exit std::atomic<short>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<short>* [line 399, column 50]\n  n$1=*&d:short [line 399, column 57]\n  n$2=_fun_std::__infer_atomic_integral<short>___infer_atomic_integral(n$0:std::atomic<short>*,n$1:short) [line 399, column 50]\n " shape="box"]
+"atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<short>* [line 399, column 50]\n  n$3=*&d:short [line 399, column 57]\n  n$4=_fun_std::__infer_atomic_integral<short>___infer_atomic_integral(n$2:std::atomic<short>*,n$3:short) [line 399, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" -> "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_2" ;
@@ -544,7 +544,7 @@ digraph cfg {
 "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_2" [label="2: Exit std::atomic<long>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<long>* [line 435, column 50]\n  n$1=*&d:long [line 435, column 57]\n  n$2=_fun_std::__infer_atomic_integral<long>___infer_atomic_integral(n$0:std::atomic<long>*,n$1:long) [line 435, column 50]\n " shape="box"]
+"atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<long>* [line 435, column 50]\n  n$3=*&d:long [line 435, column 57]\n  n$4=_fun_std::__infer_atomic_integral<long>___infer_atomic_integral(n$2:std::atomic<long>*,n$3:long) [line 435, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" -> "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_2" ;
@@ -555,7 +555,7 @@ digraph cfg {
 "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_2" [label="2: Exit std::atomic<int>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<int>* [line 417, column 50]\n  n$1=*&d:int [line 417, column 57]\n  n$2=_fun_std::__infer_atomic_integral<int>___infer_atomic_integral(n$0:std::atomic<int>*,n$1:int) [line 417, column 50]\n " shape="box"]
+"atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<int>* [line 417, column 50]\n  n$3=*&d:int [line 417, column 57]\n  n$4=_fun_std::__infer_atomic_integral<int>___infer_atomic_integral(n$2:std::atomic<int>*,n$3:int) [line 417, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" -> "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_2" ;
@@ -566,7 +566,7 @@ digraph cfg {
 "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_2" [label="2: Exit std::atomic<unsigned char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned char>* [line 390, column 50]\n  n$1=*&d:unsigned char [line 390, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned char>___infer_atomic_integral(n$0:std::atomic<unsigned char>*,n$1:unsigned char) [line 390, column 50]\n " shape="box"]
+"atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned char>* [line 390, column 50]\n  n$3=*&d:unsigned char [line 390, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned char>___infer_atomic_integral(n$2:std::atomic<unsigned char>*,n$3:unsigned char) [line 390, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" -> "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_2" ;
@@ -577,7 +577,7 @@ digraph cfg {
 "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 481, column 50]\n  n$1=*&d:char [line 481, column 57]\n  n$2=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 481, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<char>* [line 481, column 50]\n  n$3=*&d:char [line 481, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 481, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" -> "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_2" ;
@@ -588,7 +588,7 @@ digraph cfg {
 "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_2" [label="2: Exit std::atomic<signed char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<signed char>* [line 381, column 50]\n  n$1=*&d:signed char [line 381, column 57]\n  n$2=_fun_std::__infer_atomic_integral<signed char>___infer_atomic_integral(n$0:std::atomic<signed char>*,n$1:signed char) [line 381, column 50]\n " shape="box"]
+"atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<signed char>* [line 381, column 50]\n  n$3=*&d:signed char [line 381, column 57]\n  n$4=_fun_std::__infer_atomic_integral<signed char>___infer_atomic_integral(n$2:std::atomic<signed char>*,n$3:signed char) [line 381, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" -> "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_2" ;
@@ -599,7 +599,7 @@ digraph cfg {
 "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 372, column 50]\n  n$1=*&d:char [line 372, column 57]\n  n$2=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 372, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<char>* [line 372, column 50]\n  n$3=*&d:char [line 372, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 372, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" -> "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_2" ;
@@ -610,7 +610,7 @@ digraph cfg {
 "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 490, column 50]\n  n$1=*&d:char [line 490, column 57]\n  n$2=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 490, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<char>* [line 490, column 50]\n  n$3=*&d:char [line 490, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 490, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" -> "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_2" ;
@@ -621,7 +621,7 @@ digraph cfg {
 "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_2" [label="2: Exit std::atomic<unsigned int>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned int>* [line 426, column 50]\n  n$1=*&d:unsigned int [line 426, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned int>___infer_atomic_integral(n$0:std::atomic<unsigned int>*,n$1:unsigned int) [line 426, column 50]\n " shape="box"]
+"atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned int>* [line 426, column 50]\n  n$3=*&d:unsigned int [line 426, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned int>___infer_atomic_integral(n$2:std::atomic<unsigned int>*,n$3:unsigned int) [line 426, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" -> "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_2" ;
@@ -632,7 +632,7 @@ digraph cfg {
 "atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_2" [label="2: Exit std::atomic<unsigned long long>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned long long>* [line 463, column 50]\n  n$1=*&d:unsigned long long [line 463, column 57]\n  n$2=_fun_std::__infer_atomic_integral<unsigned long long>___infer_atomic_integral(n$0:std::atomic<unsigned long long>*,n$1:unsigned long long) [line 463, column 50]\n " shape="box"]
+"atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<unsigned long long>* [line 463, column 50]\n  n$3=*&d:unsigned long long [line 463, column 57]\n  n$4=_fun_std::__infer_atomic_integral<unsigned long long>___infer_atomic_integral(n$2:std::atomic<unsigned long long>*,n$3:unsigned long long) [line 463, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_3" -> "atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_2" ;
@@ -643,7 +643,7 @@ digraph cfg {
 "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_2" [label="2: Exit std::atomic<long long>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<long long>* [line 453, column 50]\n  n$1=*&d:long long [line 453, column 57]\n  n$2=_fun_std::__infer_atomic_integral<long long>___infer_atomic_integral(n$0:std::atomic<long long>*,n$1:long long) [line 453, column 50]\n " shape="box"]
+"atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic<long long>* [line 453, column 50]\n  n$3=*&d:long long [line 453, column 57]\n  n$4=_fun_std::__infer_atomic_integral<long long>___infer_atomic_integral(n$2:std::atomic<long long>*,n$3:long long) [line 453, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" -> "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_2" ;
@@ -654,7 +654,7 @@ digraph cfg {
 "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_2" [label="2: Exit std::atomic_flag_atomic_flag \n  " color=yellow style=filled]
 	
 
-"atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic_flag* [line 929, column 44]\n  n$1=*&i:_Bool [line 929, column 46]\n  *n$0.a:_Bool=n$1 [line 929, column 44]\n " shape="box"]
+"atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" [label="3:  Constructor Init \n   n$2=*&this:std::atomic_flag* [line 929, column 44]\n  n$3=*&i:_Bool [line 929, column 46]\n  *n$2.a:_Bool=n$3 [line 929, column 44]\n " shape="box"]
 	
 
 	 "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" -> "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_2" ;
@@ -665,7 +665,7 @@ digraph cfg {
 "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:std::atomic_flag* [line 946, column 5]\n  *n$0.a:_Bool=0 [line 946, column 5]\n " shape="box"]
+"clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 946, column 5]\n  *n$1.a:_Bool=0 [line 946, column 5]\n " shape="box"]
 	
 
 	 "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" -> "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_2" ;
@@ -676,7 +676,7 @@ digraph cfg {
 "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:std::atomic_flag* [line 948, column 65]\n  *n$0.a:_Bool=0 [line 948, column 65]\n " shape="box"]
+"clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 948, column 65]\n  *n$1.a:_Bool=0 [line 948, column 65]\n " shape="box"]
 	
 
 	 "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" -> "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_2" ;
@@ -687,7 +687,7 @@ digraph cfg {
 "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_2" [label="2: Exit std::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void const ** [line 67, column 6]\n  n$1=*&value:void* [line 67, column 37]\n  *n$0:void const *=n$1 [line 67, column 5]\n " shape="box"]
+"model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&self:void const ** [line 67, column 6]\n  n$2=*&value:void* [line 67, column 37]\n  *n$1:void const *=n$2 [line 67, column 5]\n " shape="box"]
 	
 
 	 "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" -> "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_2" ;
@@ -698,7 +698,7 @@ digraph cfg {
 "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_2" [label="2: Exit std::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void const ** [line 55, column 6]\n  n$1=*&value:int [line 55, column 13]\n  *n$0:void const *=n$1 [line 55, column 5]\n " shape="box"]
+"model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&self:void const ** [line 55, column 6]\n  n$2=*&value:int [line 55, column 13]\n  *n$1:void const *=n$2 [line 55, column 5]\n " shape="box"]
 	
 
 	 "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" -> "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_2" ;
@@ -709,7 +709,7 @@ digraph cfg {
 "reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_2" [label="2: Exit std::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
 	
 
-"reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 238, column 15]\n  n$1=*&p:int* [line 238, column 42]\n  n$2=_fun_std::shared_ptr<int>_model_set(n$0:void const **,n$1:void*) [line 238, column 5]\n " shape="box"]
+"reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$2=*&this:int** [line 238, column 15]\n  n$3=*&p:int* [line 238, column 42]\n  n$4=_fun_std::shared_ptr<int>_model_set(n$2:void const **,n$3:void*) [line 238, column 5]\n " shape="box"]
 	
 
 	 "reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_3" -> "reset<int,_void>#shared_ptr<int>#std#(5124141554651620350).9719d311878ee7b168751a9cb4fd4371_2" ;
@@ -720,11 +720,11 @@ digraph cfg {
 "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_2" [label="2: Exit std::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
 	
 
-"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 99, column 15]\n  n$1=_fun_std::shared_ptr<int>_model_set(n$0:void const **,null:int) [line 99, column 5]\n " shape="box"]
+"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$2=*&this:int** [line 99, column 15]\n  n$3=_fun_std::shared_ptr<int>_model_set(n$2:void const **,null:int) [line 99, column 5]\n " shape="box"]
 	
 
 	 "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_3" -> "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_2" ;
-"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_4" [label="4:  Constructor Init \n   n$2=*&this:int** [line 99, column 42]\n  n$4=_fun_std::std__shared_ptr<int>_std__shared_ptr(n$2:int**) [line 98, column 13]\n  n$3=*n$2:int* [line 98, column 13]\n " shape="box"]
+"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_4" [label="4:  Constructor Init \n   n$4=*&this:int** [line 99, column 42]\n  n$6=_fun_std::std__shared_ptr<int>_std__shared_ptr(n$4:int**) [line 98, column 13]\n  n$5=*n$4:int* [line 98, column 13]\n " shape="box"]
 	
 
 	 "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_4" -> "shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_3" ;
@@ -739,11 +739,11 @@ digraph cfg {
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_3" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_2" ;
-"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 936, column 5]\n  *n$1.a:_Bool=1 [line 936, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:std::atomic_flag* [line 936, column 5]\n  *n$2.a:_Bool=1 [line 936, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_3" ;
-"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   n$2=*&this:std::atomic_flag* [line 935, column 16]\n  n$3=*n$2.a:_Bool [line 935, column 16]\n  *&ret:_Bool=n$3 [line 935, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   n$3=*&this:std::atomic_flag* [line 935, column 16]\n  n$4=*n$3.a:_Bool [line 935, column 16]\n  *&ret:_Bool=n$4 [line 935, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" ;
@@ -758,11 +758,11 @@ digraph cfg {
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_3" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_2" ;
-"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 941, column 5]\n  *n$1.a:_Bool=1 [line 941, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:std::atomic_flag* [line 941, column 5]\n  *n$2.a:_Bool=1 [line 941, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_3" ;
-"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   n$2=*&this:std::atomic_flag* [line 940, column 16]\n  n$3=*n$2.a:_Bool [line 940, column 16]\n  *&ret:_Bool=n$3 [line 940, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   n$3=*&this:std::atomic_flag* [line 940, column 16]\n  n$4=*n$3.a:_Bool [line 940, column 16]\n  *&ret:_Bool=n$4 [line 940, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" ;

infer/tests/codetoanalyze/c/frontend/arithmetic/negate.c.dot

@@ -20,11 +20,11 @@ digraph cfg {
 	
 
 	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_5" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_7" ;
-"neg_bool.e953d6477eaaeafaa430423a26fbaac9_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 14, column 32]\n " shape="box"]
+"neg_bool.e953d6477eaaeafaa430423a26fbaac9_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 14, column 32]\n " shape="box"]
 	
 
 	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_6" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_3" ;
-"neg_bool.e953d6477eaaeafaa430423a26fbaac9_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 14, column 32]\n " shape="box"]
+"neg_bool.e953d6477eaaeafaa430423a26fbaac9_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 14, column 32]\n " shape="box"]
 	
 
 	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_7" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_3" ;
@@ -52,11 +52,11 @@ digraph cfg {
 	
 
 	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_5" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_7" ;
-"neg_char.53ef6b31d84386046a4728d1c45b5f7a_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 12, column 31]\n " shape="box"]
+"neg_char.53ef6b31d84386046a4728d1c45b5f7a_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 12, column 31]\n " shape="box"]
 	
 
 	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_6" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_3" ;
-"neg_char.53ef6b31d84386046a4728d1c45b5f7a_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 12, column 31]\n " shape="box"]
+"neg_char.53ef6b31d84386046a4728d1c45b5f7a_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 12, column 31]\n " shape="box"]
 	
 
 	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_7" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_3" ;
@@ -84,11 +84,11 @@ digraph cfg {
 	
 
 	 "neg_int.2aa25aca565c41dd997912d11504462c_5" -> "neg_int.2aa25aca565c41dd997912d11504462c_7" ;
-"neg_int.2aa25aca565c41dd997912d11504462c_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 10, column 29]\n " shape="box"]
+"neg_int.2aa25aca565c41dd997912d11504462c_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 10, column 29]\n " shape="box"]
 	
 
 	 "neg_int.2aa25aca565c41dd997912d11504462c_6" -> "neg_int.2aa25aca565c41dd997912d11504462c_3" ;
-"neg_int.2aa25aca565c41dd997912d11504462c_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 10, column 29]\n " shape="box"]
+"neg_int.2aa25aca565c41dd997912d11504462c_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 10, column 29]\n " shape="box"]
 	
 
 	 "neg_int.2aa25aca565c41dd997912d11504462c_7" -> "neg_int.2aa25aca565c41dd997912d11504462c_3" ;

infer/tests/codetoanalyze/c/frontend/booleans/condition_as_param.c.dot

@@ -31,11 +31,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 14, column 9]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 14, column 9]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 14, column 9]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 14, column 9]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;

infer/tests/codetoanalyze/c/frontend/conditional_operator/array_access.c.dot

@@ -37,16 +37,16 @@ digraph cfg {
 	
 
 	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_9" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_5" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_10" [label="10:  UnaryOperator \n   n$7=*&p:int** [line 15, column 11]\n  n$8=*n$7:int* [line 15, column 10]\n " shape="box"]
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_10" [label="10:  UnaryOperator \n   n$10=*&p:int** [line 15, column 11]\n  n$11=*n$10:int* [line 15, column 10]\n " shape="box"]
 	
 
 	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_10" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_11" ;
 	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_10" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_12" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_11" [label="11: Prune (true branch, if) \n   n$6=*&p:int** [line 15, column 7]\n  n$9=*n$8:int [line 15, column 9]\n  n$10=*n$6[n$9]:int* [line 15, column 7]\n  PRUNE(n$10, true); [line 15, column 7]\n " shape="invhouse"]
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_11" [label="11: Prune (true branch, if) \n   n$9=*&p:int** [line 15, column 7]\n  n$12=*n$11:int [line 15, column 9]\n  n$13=*n$9[n$12]:int* [line 15, column 7]\n  PRUNE(n$13, true); [line 15, column 7]\n " shape="invhouse"]
 	
 
 	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_11" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_9" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_12" [label="12: Prune (false branch, if) \n   n$6=*&p:int** [line 15, column 7]\n  n$9=*n$8:int [line 15, column 9]\n  n$10=*n$6[n$9]:int* [line 15, column 7]\n  PRUNE(!n$10, false); [line 15, column 7]\n " shape="invhouse"]
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_12" [label="12: Prune (false branch, if) \n   n$9=*&p:int** [line 15, column 7]\n  n$12=*n$11:int [line 15, column 9]\n  n$13=*n$9[n$12]:int* [line 15, column 7]\n  PRUNE(!n$13, false); [line 15, column 7]\n " shape="invhouse"]
 	
 
 	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_12" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_9" ;
@@ -54,16 +54,16 @@ digraph cfg {
 	
 
 	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_13" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_10" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_14" [label="14:  UnaryOperator \n   n$11=*&p:int** [line 13, column 9]\n " shape="box"]
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_14" [label="14:  UnaryOperator \n   n$17=*&p:int** [line 13, column 9]\n " shape="box"]
 	
 
 	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_14" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_15" ;
 	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_14" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_16" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_15" [label="15: Prune (true branch, if) \n   n$12=*n$11:int* [line 13, column 7]\n  n$13=*n$12[1]:int [line 13, column 7]\n  PRUNE(n$13, true); [line 13, column 7]\n " shape="invhouse"]
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_15" [label="15: Prune (true branch, if) \n   n$18=*n$17:int* [line 13, column 7]\n  n$19=*n$18[1]:int [line 13, column 7]\n  PRUNE(n$19, true); [line 13, column 7]\n " shape="invhouse"]
 	
 
 	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_15" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_13" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_16" [label="16: Prune (false branch, if) \n   n$12=*n$11:int* [line 13, column 7]\n  n$13=*n$12[1]:int [line 13, column 7]\n  PRUNE(!n$13, false); [line 13, column 7]\n " shape="invhouse"]
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_16" [label="16: Prune (false branch, if) \n   n$18=*n$17:int* [line 13, column 7]\n  n$19=*n$18[1]:int [line 13, column 7]\n  PRUNE(!n$19, false); [line 13, column 7]\n " shape="invhouse"]
 	
 
 	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_16" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_13" ;
@@ -71,11 +71,11 @@ digraph cfg {
 	
 
 	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_17" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_14" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_18" [label="18: Prune (true branch, if) \n   n$14=*&p:int** [line 11, column 7]\n  n$15=*n$14[0]:int* [line 11, column 7]\n  PRUNE(n$15, true); [line 11, column 7]\n " shape="invhouse"]
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_18" [label="18: Prune (true branch, if) \n   n$23=*&p:int** [line 11, column 7]\n  n$24=*n$23[0]:int* [line 11, column 7]\n  PRUNE(n$24, true); [line 11, column 7]\n " shape="invhouse"]
 	
 
 	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_18" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_17" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_19" [label="19: Prune (false branch, if) \n   n$14=*&p:int** [line 11, column 7]\n  n$15=*n$14[0]:int* [line 11, column 7]\n  PRUNE(!n$15, false); [line 11, column 7]\n " shape="invhouse"]
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_19" [label="19: Prune (false branch, if) \n   n$23=*&p:int** [line 11, column 7]\n  n$24=*n$23[0]:int* [line 11, column 7]\n  PRUNE(!n$24, false); [line 11, column 7]\n " shape="invhouse"]
 	
 
 	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_19" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_17" ;

infer/tests/codetoanalyze/c/frontend/conditional_operator/binary_operator.c.dot

@@ -21,11 +21,11 @@ digraph cfg {
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_5" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_7" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_6" [label="6:  ConditinalStmt Branch \n   n$1=*&z:int [line 26, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$1 [line 26, column 13]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_6" [label="6:  ConditionalStmt Branch \n   n$1=*&z:int [line 26, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$1 [line 26, column 13]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_6" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_3" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_7" [label="7:  ConditinalStmt Branch \n   n$2=*&z:int [line 26, column 21]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$2 [line 26, column 13]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_7" [label="7:  ConditionalStmt Branch \n   n$2=*&z:int [line 26, column 21]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$2 [line 26, column 13]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_7" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_3" ;
@@ -41,11 +41,11 @@ digraph cfg {
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_10" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_12" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_11" [label="11:  ConditinalStmt Branch \n   n$5=*&z:int [line 26, column 31]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=n$5 [line 26, column 27]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_11" [label="11:  ConditionalStmt Branch \n   n$5=*&z:int [line 26, column 31]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=n$5 [line 26, column 27]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_11" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_8" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_12" [label="12:  ConditinalStmt Branch \n   n$6=*&z:int [line 26, column 35]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=n$6 [line 26, column 27]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_12" [label="12:  ConditionalStmt Branch \n   n$6=*&z:int [line 26, column 35]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=n$6 [line 26, column 27]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_12" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_8" ;
@@ -65,11 +65,11 @@ digraph cfg {
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_16" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_18" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_17" [label="17:  ConditinalStmt Branch \n   n$9=*&z:int [line 24, column 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=n$9 [line 24, column 18]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_17" [label="17:  ConditionalStmt Branch \n   n$9=*&z:int [line 24, column 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=n$9 [line 24, column 18]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_17" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_14" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_18" [label="18:  ConditinalStmt Branch \n   n$10=*&z:int [line 24, column 26]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=n$10 [line 24, column 18]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_18" [label="18:  ConditionalStmt Branch \n   n$10=*&z:int [line 24, column 26]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=n$10 [line 24, column 18]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_18" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_14" ;
@@ -90,11 +90,11 @@ digraph cfg {
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_22" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_24" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_23" [label="23:  ConditinalStmt Branch \n   n$13=*&z:int [line 22, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$12:int=n$13 [line 22, column 13]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_23" [label="23:  ConditionalStmt Branch \n   n$13=*&z:int [line 22, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$12:int=n$13 [line 22, column 13]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_23" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_20" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_24" [label="24:  ConditinalStmt Branch \n   n$14=*&z:int [line 22, column 21]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$12:int=n$14 [line 22, column 13]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_24" [label="24:  ConditionalStmt Branch \n   n$14=*&z:int [line 22, column 21]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$12:int=n$14 [line 22, column 13]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_24" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_20" ;
@@ -116,11 +116,11 @@ digraph cfg {
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_28" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_30" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_29" [label="29:  ConditinalStmt Branch \n   n$17=*&z:int [line 19, column 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$16:int=n$17 [line 19, column 9]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_29" [label="29:  ConditionalStmt Branch \n   n$17=*&z:int [line 19, column 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$16:int=n$17 [line 19, column 9]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_29" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_26" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_30" [label="30:  ConditinalStmt Branch \n   n$18=*&z:int [line 19, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$16:int=n$18 [line 19, column 9]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_30" [label="30:  ConditionalStmt Branch \n   n$18=*&z:int [line 19, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$16:int=n$18 [line 19, column 9]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_30" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_26" ;
@@ -136,11 +136,11 @@ digraph cfg {
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_33" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_35" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_34" [label="34:  ConditinalStmt Branch \n   n$21=*&z:int [line 19, column 27]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$20:int=n$21 [line 19, column 23]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_34" [label="34:  ConditionalStmt Branch \n   n$21=*&z:int [line 19, column 27]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$20:int=n$21 [line 19, column 23]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_34" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_31" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_35" [label="35:  ConditinalStmt Branch \n   n$22=*&z:int [line 19, column 31]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$20:int=n$22 [line 19, column 23]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_35" [label="35:  ConditionalStmt Branch \n   n$22=*&z:int [line 19, column 31]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$20:int=n$22 [line 19, column 23]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_35" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_31" ;
@@ -161,11 +161,11 @@ digraph cfg {
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_39" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_41" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_40" [label="40:  ConditinalStmt Branch \n   n$25=*&z:int [line 16, column 18]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$24:int=n$25 [line 16, column 14]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_40" [label="40:  ConditionalStmt Branch \n   n$25=*&z:int [line 16, column 18]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$24:int=n$25 [line 16, column 14]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_40" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_37" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_41" [label="41:  ConditinalStmt Branch \n   n$26=*&z:int [line 16, column 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$24:int=n$26 [line 16, column 14]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_41" [label="41:  ConditionalStmt Branch \n   n$26=*&z:int [line 16, column 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$24:int=n$26 [line 16, column 14]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_41" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_37" ;
@@ -186,11 +186,11 @@ digraph cfg {
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_45" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_47" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_46" [label="46:  ConditinalStmt Branch \n   n$29=*&z:int [line 13, column 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$28:int=n$29 [line 13, column 9]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_46" [label="46:  ConditionalStmt Branch \n   n$29=*&z:int [line 13, column 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$28:int=n$29 [line 13, column 9]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_46" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_43" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_47" [label="47:  ConditinalStmt Branch \n   n$30=*&z:int [line 13, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$28:int=n$30 [line 13, column 9]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_47" [label="47:  ConditionalStmt Branch \n   n$30=*&z:int [line 13, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$28:int=n$30 [line 13, column 9]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_47" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_43" ;

infer/tests/codetoanalyze/c/frontend/conditional_operator/cond2.c.dot

@@ -23,11 +23,11 @@ digraph cfg {
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_6" -> "bar.37b51d194a7513e45b56f6524f2d51f2_8" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 24, column 17]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 24, column 17]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_7" -> "bar.37b51d194a7513e45b56f6524f2d51f2_4" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=2 [line 24, column 17]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=2 [line 24, column 17]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_8" -> "bar.37b51d194a7513e45b56f6524f2d51f2_4" ;
@@ -44,11 +44,11 @@ digraph cfg {
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_11" -> "bar.37b51d194a7513e45b56f6524f2d51f2_13" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_12" [label="12:  ConditinalStmt Branch \n   *&x:int=1 [line 24, column 39]\n  n$3=*&x:int [line 24, column 39]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$3 [line 24, column 16]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_12" [label="12:  ConditionalStmt Branch \n   *&x:int=1 [line 24, column 39]\n  n$3=*&x:int [line 24, column 39]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$3 [line 24, column 16]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_12" -> "bar.37b51d194a7513e45b56f6524f2d51f2_3" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_13" [label="13:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 24, column 16]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_13" [label="13:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 24, column 16]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_13" -> "bar.37b51d194a7513e45b56f6524f2d51f2_3" ;
@@ -73,11 +73,11 @@ digraph cfg {
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_18" -> "bar.37b51d194a7513e45b56f6524f2d51f2_20" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_19" [label="19:  ConditinalStmt Branch \n   n$7=*&x:int [line 23, column 22]\n  *&x:int=(n$7 + 1) [line 23, column 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int=(n$7 + 1) [line 23, column 7]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_19" [label="19:  ConditionalStmt Branch \n   n$7=*&x:int [line 23, column 22]\n  *&x:int=(n$7 + 1) [line 23, column 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int=(n$7 + 1) [line 23, column 7]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_19" -> "bar.37b51d194a7513e45b56f6524f2d51f2_15" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_20" [label="20:  ConditinalStmt Branch \n   n$8=*&x:int [line 23, column 30]\n  *&x:int=(n$8 - 1) [line 23, column 30]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int=n$8 [line 23, column 7]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_20" [label="20:  ConditionalStmt Branch \n   n$8=*&x:int [line 23, column 30]\n  *&x:int=(n$8 - 1) [line 23, column 30]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int=n$8 [line 23, column 7]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_20" -> "bar.37b51d194a7513e45b56f6524f2d51f2_15" ;
@@ -105,11 +105,11 @@ digraph cfg {
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_5" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_7" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 18, column 16]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 18, column 16]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_6" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 18, column 16]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 18, column 16]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_7" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" ;
@@ -130,7 +130,7 @@ digraph cfg {
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_11" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_14" ;
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_11" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_15" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 17, column 8]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_12" [label="12:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 17, column 8]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_12" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_9" ;
@@ -146,15 +146,15 @@ digraph cfg {
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_15" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_17" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 17, column 21]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_16" [label="16:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 17, column 21]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_16" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_13" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=2 [line 17, column 21]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_17" [label="17:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=2 [line 17, column 21]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_17" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_13" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_18" [label="18:  ConditinalStmt Branch \n   n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 17, column 21]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$4 [line 17, column 8]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_18" [label="18:  ConditionalStmt Branch \n   n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 17, column 21]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$4 [line 17, column 8]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_18" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_9" ;
@@ -188,11 +188,11 @@ digraph cfg {
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_25" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_27" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_26" [label="26:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=1 [line 16, column 12]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_26" [label="26:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=1 [line 16, column 12]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_26" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_20" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_27" [label="27:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=2 [line 16, column 12]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_27" [label="27:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=2 [line 16, column 12]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_27" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_20" ;
@@ -218,16 +218,16 @@ digraph cfg {
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_32" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_33" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_33" [label="33:  BinaryOperatorStmt: LT \n   n$10=*&x:int [line 12, column 21]\n  *&x:int=(n$10 + 1) [line 12, column 21]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_33" [label="33:  BinaryOperatorStmt: LT \n   n$11=*&x:int [line 12, column 21]\n  *&x:int=(n$11 + 1) [line 12, column 21]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_33" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_34" ;
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_33" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_35" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_34" [label="34: Prune (true branch, if) \n   PRUNE((7 < n$10), true); [line 12, column 16]\n " shape="invhouse"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_34" [label="34: Prune (true branch, if) \n   PRUNE((7 < n$11), true); [line 12, column 16]\n " shape="invhouse"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_34" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_36" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_35" [label="35: Prune (false branch, if) \n   PRUNE(!(7 < n$10), false); [line 12, column 16]\n " shape="invhouse"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_35" [label="35: Prune (false branch, if) \n   PRUNE(!(7 < n$11), false); [line 12, column 16]\n " shape="invhouse"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_35" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_30" ;

infer/tests/codetoanalyze/c/frontend/conditional_operator/conditional_operator.c.dot

@@ -20,11 +20,11 @@ digraph cfg {
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_5" -> "test.098f6bcd4621d373cade4e832627b4f6_7" ;
-"test.098f6bcd4621d373cade4e832627b4f6_6" [label="6:  ConditinalStmt Branch \n   n$2=*&b:int [line 14, column 36]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$2 [line 14, column 32]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_6" [label="6:  ConditionalStmt Branch \n   n$2=*&b:int [line 14, column 36]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$2 [line 14, column 32]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_6" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;
-"test.098f6bcd4621d373cade4e832627b4f6_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 14, column 32]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 14, column 32]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_7" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;
@@ -56,11 +56,11 @@ digraph cfg {
 	
 
 	 "test1.5a105e8b9d40e1329780d62ea2265d8a_6" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_8" ;
-"test1.5a105e8b9d40e1329780d62ea2265d8a_7" [label="7:  ConditinalStmt Branch \n   n$3=*&b:int [line 17, column 15]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$3 [line 17, column 11]\n " shape="box"]
+"test1.5a105e8b9d40e1329780d62ea2265d8a_7" [label="7:  ConditionalStmt Branch \n   n$3=*&b:int [line 17, column 15]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$3 [line 17, column 11]\n " shape="box"]
 	
 
 	 "test1.5a105e8b9d40e1329780d62ea2265d8a_7" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_4" ;
-"test1.5a105e8b9d40e1329780d62ea2265d8a_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 17, column 11]\n " shape="box"]
+"test1.5a105e8b9d40e1329780d62ea2265d8a_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 17, column 11]\n " shape="box"]
 	
 
 	 "test1.5a105e8b9d40e1329780d62ea2265d8a_8" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_4" ;
@@ -102,15 +102,15 @@ digraph cfg {
 	
 
 	 "test3.8ad8757baa8564dc136c1e07507f4a98_6" -> "test3.8ad8757baa8564dc136c1e07507f4a98_8" ;
-"test3.8ad8757baa8564dc136c1e07507f4a98_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$1 [line 22, column 11]\n " shape="box"]
+"test3.8ad8757baa8564dc136c1e07507f4a98_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$1 [line 22, column 11]\n " shape="box"]
 	
 
 	 "test3.8ad8757baa8564dc136c1e07507f4a98_7" -> "test3.8ad8757baa8564dc136c1e07507f4a98_4" ;
-"test3.8ad8757baa8564dc136c1e07507f4a98_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 22, column 11]\n " shape="box"]
+"test3.8ad8757baa8564dc136c1e07507f4a98_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 22, column 11]\n " shape="box"]
 	
 
 	 "test3.8ad8757baa8564dc136c1e07507f4a98_8" -> "test3.8ad8757baa8564dc136c1e07507f4a98_4" ;
-"test3.8ad8757baa8564dc136c1e07507f4a98_9" [label="9:  BinaryConditinalStmt Init \n   n$1=*&b:int [line 22, column 11]\n " shape="box"]
+"test3.8ad8757baa8564dc136c1e07507f4a98_9" [label="9:  BinaryConditionalStmt Init \n   n$1=*&b:int [line 22, column 11]\n " shape="box"]
 	
 
 	 "test3.8ad8757baa8564dc136c1e07507f4a98_9" -> "test3.8ad8757baa8564dc136c1e07507f4a98_5" ;
@@ -138,15 +138,15 @@ digraph cfg {
 	
 
 	 "test4.86985e105f79b95d6bc918fb45ec7727_5" -> "test4.86985e105f79b95d6bc918fb45ec7727_7" ;
-"test4.86985e105f79b95d6bc918fb45ec7727_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$0 [line 26, column 33]\n " shape="box"]
+"test4.86985e105f79b95d6bc918fb45ec7727_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$0 [line 26, column 33]\n " shape="box"]
 	
 
 	 "test4.86985e105f79b95d6bc918fb45ec7727_6" -> "test4.86985e105f79b95d6bc918fb45ec7727_3" ;
-"test4.86985e105f79b95d6bc918fb45ec7727_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 26, column 33]\n " shape="box"]
+"test4.86985e105f79b95d6bc918fb45ec7727_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 26, column 33]\n " shape="box"]
 	
 
 	 "test4.86985e105f79b95d6bc918fb45ec7727_7" -> "test4.86985e105f79b95d6bc918fb45ec7727_3" ;
-"test4.86985e105f79b95d6bc918fb45ec7727_8" [label="8:  BinaryConditinalStmt Init \n   n$0=*&b:int [line 26, column 33]\n " shape="box"]
+"test4.86985e105f79b95d6bc918fb45ec7727_8" [label="8:  BinaryConditionalStmt Init \n   n$0=*&b:int [line 26, column 33]\n " shape="box"]
 	
 
 	 "test4.86985e105f79b95d6bc918fb45ec7727_8" -> "test4.86985e105f79b95d6bc918fb45ec7727_4" ;
@@ -174,15 +174,15 @@ digraph cfg {
 	
 
 	 "test5.e3d704f3542b44a621ebed70dc0efe13_5" -> "test5.e3d704f3542b44a621ebed70dc0efe13_7" ;
-"test5.e3d704f3542b44a621ebed70dc0efe13_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$0 [line 28, column 27]\n " shape="box"]
+"test5.e3d704f3542b44a621ebed70dc0efe13_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$0 [line 28, column 27]\n " shape="box"]
 	
 
 	 "test5.e3d704f3542b44a621ebed70dc0efe13_6" -> "test5.e3d704f3542b44a621ebed70dc0efe13_3" ;
-"test5.e3d704f3542b44a621ebed70dc0efe13_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 28, column 27]\n " shape="box"]
+"test5.e3d704f3542b44a621ebed70dc0efe13_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 28, column 27]\n " shape="box"]
 	
 
 	 "test5.e3d704f3542b44a621ebed70dc0efe13_7" -> "test5.e3d704f3542b44a621ebed70dc0efe13_3" ;
-"test5.e3d704f3542b44a621ebed70dc0efe13_8" [label="8:  BinaryConditinalStmt Init \n   n$0=*&b:int [line 28, column 27]\n " shape="box"]
+"test5.e3d704f3542b44a621ebed70dc0efe13_8" [label="8:  BinaryConditionalStmt Init \n   n$0=*&b:int [line 28, column 27]\n " shape="box"]
 	
 
 	 "test5.e3d704f3542b44a621ebed70dc0efe13_8" -> "test5.e3d704f3542b44a621ebed70dc0efe13_4" ;
@@ -215,11 +215,11 @@ digraph cfg {
 	
 
 	 "test6.4cfad7076129962ee70c36839a1e3e15_6" -> "test6.4cfad7076129962ee70c36839a1e3e15_8" ;
-"test6.4cfad7076129962ee70c36839a1e3e15_7" [label="7:  ConditinalStmt Branch \n   n$2=*&p:int* [line 31, column 16]\n  n$3=*n$2:int [line 31, column 15]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$3 [line 31, column 11]\n " shape="box"]
+"test6.4cfad7076129962ee70c36839a1e3e15_7" [label="7:  ConditionalStmt Branch \n   n$2=*&p:int* [line 31, column 16]\n  n$3=*n$2:int [line 31, column 15]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$3 [line 31, column 11]\n " shape="box"]
 	
 
 	 "test6.4cfad7076129962ee70c36839a1e3e15_7" -> "test6.4cfad7076129962ee70c36839a1e3e15_4" ;
-"test6.4cfad7076129962ee70c36839a1e3e15_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=0 [line 31, column 11]\n " shape="box"]
+"test6.4cfad7076129962ee70c36839a1e3e15_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=0 [line 31, column 11]\n " shape="box"]
 	
 
 	 "test6.4cfad7076129962ee70c36839a1e3e15_8" -> "test6.4cfad7076129962ee70c36839a1e3e15_4" ;
@@ -246,15 +246,15 @@ digraph cfg {
 	
 
 	 "test7.b04083e53e242626595e2b8ea327e525_5" -> "test7.b04083e53e242626595e2b8ea327e525_7" ;
-"test7.b04083e53e242626595e2b8ea327e525_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$1 [line 35, column 27]\n " shape="box"]
+"test7.b04083e53e242626595e2b8ea327e525_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$1 [line 35, column 27]\n " shape="box"]
 	
 
 	 "test7.b04083e53e242626595e2b8ea327e525_6" -> "test7.b04083e53e242626595e2b8ea327e525_3" ;
-"test7.b04083e53e242626595e2b8ea327e525_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=2 [line 35, column 27]\n " shape="box"]
+"test7.b04083e53e242626595e2b8ea327e525_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=2 [line 35, column 27]\n " shape="box"]
 	
 
 	 "test7.b04083e53e242626595e2b8ea327e525_7" -> "test7.b04083e53e242626595e2b8ea327e525_3" ;
-"test7.b04083e53e242626595e2b8ea327e525_8" [label="8:  BinaryConditinalStmt Init \n   n$0=_fun_test2(2:int) [line 35, column 37]\n  n$1=_fun_test2((2 + n$0):int) [line 35, column 27]\n " shape="box"]
+"test7.b04083e53e242626595e2b8ea327e525_8" [label="8:  BinaryConditionalStmt Init \n   n$0=_fun_test2(2:int) [line 35, column 37]\n  n$1=_fun_test2((2 + n$0):int) [line 35, column 27]\n " shape="box"]
 	
 
 	 "test7.b04083e53e242626595e2b8ea327e525_8" -> "test7.b04083e53e242626595e2b8ea327e525_4" ;

infer/tests/codetoanalyze/c/frontend/conditional_operator/function_call.c.dot

@@ -20,11 +20,11 @@ digraph cfg {
 	
 
 	 "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_5" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_7" ;
-"fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 12, column 27]\n " shape="box"]
+"fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 12, column 27]\n " shape="box"]
 	
 
 	 "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_6" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_3" ;
-"fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 12, column 27]\n " shape="box"]
+"fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 12, column 27]\n " shape="box"]
 	
 
 	 "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_7" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_3" ;
@@ -53,11 +53,11 @@ digraph cfg {
 	
 
 	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_5" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_7" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 15, column 4]\n " shape="box"]
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 15, column 4]\n " shape="box"]
 	
 
 	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_6" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_3" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 15, column 4]\n " shape="box"]
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 15, column 4]\n " shape="box"]
 	
 
 	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_7" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_3" ;
@@ -74,11 +74,11 @@ digraph cfg {
 	
 
 	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_10" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_12" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 15, column 25]\n " shape="box"]
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_11" [label="11:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 15, column 25]\n " shape="box"]
 	
 
 	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_11" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_8" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 15, column 25]\n " shape="box"]
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_12" [label="12:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 15, column 25]\n " shape="box"]
 	
 
 	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_12" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_8" ;
@@ -95,11 +95,11 @@ digraph cfg {
 	
 
 	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_15" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_17" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=2 [line 15, column 36]\n " shape="box"]
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_16" [label="16:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=2 [line 15, column 36]\n " shape="box"]
 	
 
 	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_16" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_13" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=2 [line 15, column 36]\n " shape="box"]
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_17" [label="17:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=2 [line 15, column 36]\n " shape="box"]
 	
 
 	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_17" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_13" ;
@@ -115,11 +115,11 @@ digraph cfg {
 	
 
 	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_20" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_22" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_21" [label="21:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=3 [line 15, column 47]\n " shape="box"]
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_21" [label="21:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=3 [line 15, column 47]\n " shape="box"]
 	
 
 	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_21" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_18" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_22" [label="22:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=3 [line 15, column 47]\n " shape="box"]
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_22" [label="22:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=3 [line 15, column 47]\n " shape="box"]
 	
 
 	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_22" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_18" ;
@@ -148,11 +148,11 @@ digraph cfg {
 	
 
 	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_5" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_7" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 18, column 33]\n " shape="box"]
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 18, column 33]\n " shape="box"]
 	
 
 	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_6" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_3" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 18, column 33]\n " shape="box"]
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 18, column 33]\n " shape="box"]
 	
 
 	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_7" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_3" ;
@@ -169,11 +169,11 @@ digraph cfg {
 	
 
 	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_10" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_12" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=2 [line 18, column 44]\n " shape="box"]
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_11" [label="11:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=2 [line 18, column 44]\n " shape="box"]
 	
 
 	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_11" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_8" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=2 [line 18, column 44]\n " shape="box"]
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_12" [label="12:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=2 [line 18, column 44]\n " shape="box"]
 	
 
 	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_12" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_8" ;
@@ -189,11 +189,11 @@ digraph cfg {
 	
 
 	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_15" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_17" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 18, column 55]\n " shape="box"]
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_16" [label="16:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 18, column 55]\n " shape="box"]
 	
 
 	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_16" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_13" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 18, column 55]\n " shape="box"]
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_17" [label="17:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 18, column 55]\n " shape="box"]
 	
 
 	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_17" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_13" ;
@@ -222,11 +222,11 @@ digraph cfg {
 	
 
 	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_5" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_7" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 20, column 27]\n " shape="box"]
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 20, column 27]\n " shape="box"]
 	
 
 	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_6" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_3" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 20, column 27]\n " shape="box"]
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 20, column 27]\n " shape="box"]
 	
 
 	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_7" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_3" ;
@@ -243,11 +243,11 @@ digraph cfg {
 	
 
 	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_10" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_12" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 20, column 48]\n " shape="box"]
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_11" [label="11:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 20, column 48]\n " shape="box"]
 	
 
 	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_11" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_8" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 20, column 48]\n " shape="box"]
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_12" [label="12:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 20, column 48]\n " shape="box"]
 	
 
 	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_12" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_8" ;
@@ -263,11 +263,11 @@ digraph cfg {
 	
 
 	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_15" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_17" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 20, column 62]\n " shape="box"]
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_16" [label="16:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 20, column 62]\n " shape="box"]
 	
 
 	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_16" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_13" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 20, column 62]\n " shape="box"]
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_17" [label="17:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 20, column 62]\n " shape="box"]
 	
 
 	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_17" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_13" ;

infer/tests/codetoanalyze/c/frontend/conditional_operator/if_short_circuit.c.dot

@@ -74,7 +74,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_18" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
-"main.fad58de7366495db4650cfefac2fcd61_19" [label="19:  BinaryOperatorStmt: Assign \n   n$7=_fun_getenv(\"BLOCK\":char const *) [line 47, column 10]\n  *&spec:char*=n$7 [line 47, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_19" [label="19:  BinaryOperatorStmt: Assign \n   n$10=_fun_getenv(\"BLOCK\":char const *) [line 47, column 10]\n  *&spec:char*=n$10 [line 47, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_19" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
@@ -95,24 +95,24 @@ digraph cfg {
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_4" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_2" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_5" [label="5: Prune (true branch, if) \n   n$0=*&x:int* [line 22, column 8]\n  PRUNE(!n$0, true); [line 22, column 8]\n " shape="invhouse"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_5" [label="5: Prune (true branch, if) \n   n$1=*&x:int* [line 22, column 8]\n  PRUNE(!n$1, true); [line 22, column 8]\n " shape="invhouse"]
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_5" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_7" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_6" [label="6: Prune (false branch, if) \n   n$0=*&x:int* [line 22, column 8]\n  PRUNE(n$0, false); [line 22, column 8]\n " shape="invhouse"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_6" [label="6: Prune (false branch, if) \n   n$1=*&x:int* [line 22, column 8]\n  PRUNE(n$1, false); [line 22, column 8]\n " shape="invhouse"]
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_6" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_11" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_7" [label="7:  BinaryOperatorStmt: Assign \n   n$1=_fun_getenv(\"BLOCK\":char const *) [line 22, column 19]\n  *&x:int*=n$1 [line 22, column 15]\n  n$2=*&x:int* [line 22, column 15]\n " shape="box"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_7" [label="7:  BinaryOperatorStmt: Assign \n   n$2=_fun_getenv(\"BLOCK\":char const *) [line 22, column 19]\n  *&x:int*=n$2 [line 22, column 15]\n  n$3=*&x:int* [line 22, column 15]\n " shape="box"]
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_7" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_8" ;
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_7" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_9" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_8" [label="8: Prune (true branch, if) \n   PRUNE(!n$2, true); [line 22, column 15]\n " shape="invhouse"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_8" [label="8: Prune (true branch, if) \n   PRUNE(!n$3, true); [line 22, column 15]\n " shape="invhouse"]
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_8" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_10" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_9" [label="9: Prune (false branch, if) \n   PRUNE(n$2, false); [line 22, column 15]\n " shape="invhouse"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_9" [label="9: Prune (false branch, if) \n   PRUNE(n$3, false); [line 22, column 15]\n " shape="invhouse"]
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_9" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_11" ;
@@ -120,7 +120,7 @@ digraph cfg {
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_10" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_3" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_11" [label="11:  BinaryOperatorStmt: Assign \n   n$3=*&x:int* [line 25, column 6]\n  *n$3:int=32 [line 25, column 5]\n " shape="box"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_11" [label="11:  BinaryOperatorStmt: Assign \n   n$4=*&x:int* [line 25, column 6]\n  *n$4:int=32 [line 25, column 5]\n " shape="box"]
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_11" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_3" ;
@@ -139,29 +139,29 @@ digraph cfg {
 	
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_4" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_2" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_5" [label="5:  BinaryOperatorStmt: EQ \n   n$0=*&x:int* [line 14, column 7]\n " shape="box"]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_5" [label="5:  BinaryOperatorStmt: EQ \n   n$1=*&x:int* [line 14, column 7]\n " shape="box"]
 	
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_5" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_6" ;
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_5" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_7" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_6" [label="6: Prune (true branch, if) \n   PRUNE((n$0 == null), true); [line 14, column 7]\n " shape="invhouse"]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_6" [label="6: Prune (true branch, if) \n   PRUNE((n$1 == null), true); [line 14, column 7]\n " shape="invhouse"]
 	
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_6" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_11" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$0 == null), false); [line 14, column 7]\n " shape="invhouse"]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$1 == null), false); [line 14, column 7]\n " shape="invhouse"]
 	
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_7" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_8" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_8" [label="8:  BinaryOperatorStmt: EQ \n   n$1=*&x:int* [line 14, column 18]\n  n$2=*n$1:int [line 14, column 17]\n " shape="box"]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_8" [label="8:  BinaryOperatorStmt: EQ \n   n$2=*&x:int* [line 14, column 18]\n  n$3=*n$2:int [line 14, column 17]\n " shape="box"]
 	
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_8" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_9" ;
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_8" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_10" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_9" [label="9: Prune (true branch, if) \n   PRUNE((n$2 == 2), true); [line 14, column 17]\n " shape="invhouse"]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_9" [label="9: Prune (true branch, if) \n   PRUNE((n$3 == 2), true); [line 14, column 17]\n " shape="invhouse"]
 	
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_9" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_11" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_10" [label="10: Prune (false branch, if) \n   PRUNE(!(n$2 == 2), false); [line 14, column 17]\n " shape="invhouse"]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_10" [label="10: Prune (false branch, if) \n   PRUNE(!(n$3 == 2), false); [line 14, column 17]\n " shape="invhouse"]
 	
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_10" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_12" ;
@@ -223,7 +223,7 @@ digraph cfg {
 	
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_12" -> "test_loop.254a9d372f8f45542e409771135b9322_3" ;
-"test_loop.254a9d372f8f45542e409771135b9322_13" [label="13:  BinaryOperatorStmt: Assign \n   n$5=_fun_getenv(\"BLOCK\":char const *) [line 34, column 10]\n  *&spec:char*=n$5 [line 34, column 3]\n " shape="box"]
+"test_loop.254a9d372f8f45542e409771135b9322_13" [label="13:  BinaryOperatorStmt: Assign \n   n$6=_fun_getenv(\"BLOCK\":char const *) [line 34, column 10]\n  *&spec:char*=n$6 [line 34, column 3]\n " shape="box"]
 	
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_13" -> "test_loop.254a9d372f8f45542e409771135b9322_3" ;

infer/tests/codetoanalyze/c/frontend/conditional_operator/int_negation.c.dot

@@ -64,11 +64,11 @@ digraph cfg {
 	
 
 	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_7" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_9" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 22, column 16]\n " shape="box"]
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 22, column 16]\n " shape="box"]
 	
 
 	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_8" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_5" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_9" [label="9:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 22, column 16]\n " shape="box"]
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_9" [label="9:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 22, column 16]\n " shape="box"]
 	
 
 	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_9" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_5" ;
@@ -124,11 +124,11 @@ digraph cfg {
 	
 
 	 "neg.f24c2c15b9d03797c6874986a8d19516_5" -> "neg.f24c2c15b9d03797c6874986a8d19516_7" ;
-"neg.f24c2c15b9d03797c6874986a8d19516_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 29, column 25]\n " shape="box"]
+"neg.f24c2c15b9d03797c6874986a8d19516_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 29, column 25]\n " shape="box"]
 	
 
 	 "neg.f24c2c15b9d03797c6874986a8d19516_6" -> "neg.f24c2c15b9d03797c6874986a8d19516_3" ;
-"neg.f24c2c15b9d03797c6874986a8d19516_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 29, column 25]\n " shape="box"]
+"neg.f24c2c15b9d03797c6874986a8d19516_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 29, column 25]\n " shape="box"]
 	
 
 	 "neg.f24c2c15b9d03797c6874986a8d19516_7" -> "neg.f24c2c15b9d03797c6874986a8d19516_3" ;

infer/tests/codetoanalyze/c/frontend/conditional_operator/member_access.c.dot

@@ -20,11 +20,11 @@ digraph cfg {
 	
 
 	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_5" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_7" ;
-"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_6" [label="6:  ConditinalStmt Branch \n   n$1=_fun_ret_ptr(4:int) [line 22, column 50]\n  n$2=*n$1.field:int [line 22, column 49]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$2 [line 22, column 45]\n " shape="box"]
+"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_6" [label="6:  ConditionalStmt Branch \n   n$1=_fun_ret_ptr(4:int) [line 22, column 50]\n  n$2=*n$1.field:int [line 22, column 49]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$2 [line 22, column 45]\n " shape="box"]
 	
 
 	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_6" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_3" ;
-"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 22, column 45]\n " shape="box"]
+"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 22, column 45]\n " shape="box"]
 	
 
 	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_7" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_3" ;
@@ -52,11 +52,11 @@ digraph cfg {
 	
 
 	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_5" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_7" ;
-"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=2 [line 20, column 54]\n " shape="box"]
+"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=2 [line 20, column 54]\n " shape="box"]
 	
 
 	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_6" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_3" ;
-"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=3 [line 20, column 54]\n " shape="box"]
+"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=3 [line 20, column 54]\n " shape="box"]
 	
 
 	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_7" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_3" ;
@@ -84,11 +84,11 @@ digraph cfg {
 	
 
 	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_5" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_7" ;
-"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_6" [label="6:  ConditinalStmt Branch \n   n$1=*&p:s* [line 17, column 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:s*=n$1 [line 17, column 12]\n " shape="box"]
+"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_6" [label="6:  ConditionalStmt Branch \n   n$1=*&p:s* [line 17, column 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:s*=n$1 [line 17, column 12]\n " shape="box"]
 	
 
 	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_6" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_3" ;
-"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_7" [label="7:  ConditinalStmt Branch \n   n$2=*&q:s* [line 17, column 20]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:s*=n$2 [line 17, column 12]\n " shape="box"]
+"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_7" [label="7:  ConditionalStmt Branch \n   n$2=*&q:s* [line 17, column 20]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:s*=n$2 [line 17, column 12]\n " shape="box"]
 	
 
 	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_7" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_3" ;

infer/tests/codetoanalyze/c/frontend/conditional_operator/preincrement.c.dot

@@ -20,11 +20,11 @@ digraph cfg {
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_5" -> "preincrement.db7c6523f16e1ab3058057cee6614472_7" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_6" [label="6:  ConditinalStmt Branch \n   n$1=*&p:s* [line 18, column 8]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:s*=n$1 [line 18, column 4]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_6" [label="6:  ConditionalStmt Branch \n   n$1=*&p:s* [line 18, column 8]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:s*=n$1 [line 18, column 4]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_6" -> "preincrement.db7c6523f16e1ab3058057cee6614472_3" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_7" [label="7:  ConditinalStmt Branch \n   n$2=*&p:s* [line 18, column 12]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:s*=n$2 [line 18, column 4]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_7" [label="7:  ConditionalStmt Branch \n   n$2=*&p:s* [line 18, column 12]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:s*=n$2 [line 18, column 4]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_7" -> "preincrement.db7c6523f16e1ab3058057cee6614472_3" ;
@@ -40,11 +40,11 @@ digraph cfg {
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_10" -> "preincrement.db7c6523f16e1ab3058057cee6614472_12" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 18, column 21]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_11" [label="11:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 18, column 21]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_11" -> "preincrement.db7c6523f16e1ab3058057cee6614472_8" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=7 [line 18, column 21]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_12" [label="12:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=7 [line 18, column 21]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_12" -> "preincrement.db7c6523f16e1ab3058057cee6614472_8" ;
@@ -64,11 +64,11 @@ digraph cfg {
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_16" -> "preincrement.db7c6523f16e1ab3058057cee6614472_18" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=3 [line 17, column 11]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_17" [label="17:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=3 [line 17, column 11]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_17" -> "preincrement.db7c6523f16e1ab3058057cee6614472_14" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_18" [label="18:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=7 [line 17, column 11]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_18" [label="18:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=7 [line 17, column 11]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_18" -> "preincrement.db7c6523f16e1ab3058057cee6614472_14" ;
@@ -89,11 +89,11 @@ digraph cfg {
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_22" -> "preincrement.db7c6523f16e1ab3058057cee6614472_24" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_23" [label="23:  ConditinalStmt Branch \n   n$12=*&p:s* [line 16, column 8]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$11:s*=n$12 [line 16, column 4]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_23" [label="23:  ConditionalStmt Branch \n   n$12=*&p:s* [line 16, column 8]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$11:s*=n$12 [line 16, column 4]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_23" -> "preincrement.db7c6523f16e1ab3058057cee6614472_20" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_24" [label="24:  ConditinalStmt Branch \n   n$13=*&p:s* [line 16, column 12]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$11:s*=n$13 [line 16, column 4]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_24" [label="24:  ConditionalStmt Branch \n   n$13=*&p:s* [line 16, column 12]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$11:s*=n$13 [line 16, column 4]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_24" -> "preincrement.db7c6523f16e1ab3058057cee6614472_20" ;

infer/tests/codetoanalyze/c/frontend/conditional_operator/unary_operator.c.dot

@@ -20,11 +20,11 @@ digraph cfg {
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_5" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_7" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_6" [label="6:  ConditinalStmt Branch \n   n$1=*&p:int* [line 16, column 9]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int*=n$1 [line 16, column 5]\n " shape="box"]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_6" [label="6:  ConditionalStmt Branch \n   n$1=*&p:int* [line 16, column 9]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int*=n$1 [line 16, column 5]\n " shape="box"]
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_6" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_3" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_7" [label="7:  ConditinalStmt Branch \n   n$2=*&p:int* [line 16, column 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int*=n$2 [line 16, column 5]\n " shape="box"]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_7" [label="7:  ConditionalStmt Branch \n   n$2=*&p:int* [line 16, column 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int*=n$2 [line 16, column 5]\n " shape="box"]
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_7" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_3" ;
@@ -48,11 +48,11 @@ digraph cfg {
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_12" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_14" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_13" [label="13:  ConditinalStmt Branch \n   n$6=*&p:int* [line 14, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int*=n$6 [line 14, column 13]\n " shape="box"]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_13" [label="13:  ConditionalStmt Branch \n   n$6=*&p:int* [line 14, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int*=n$6 [line 14, column 13]\n " shape="box"]
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_13" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_10" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_14" [label="14:  ConditinalStmt Branch \n   n$7=*&p:int* [line 14, column 21]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int*=n$7 [line 14, column 13]\n " shape="box"]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_14" [label="14:  ConditionalStmt Branch \n   n$7=*&p:int* [line 14, column 21]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int*=n$7 [line 14, column 13]\n " shape="box"]
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_14" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_10" ;
@@ -73,11 +73,11 @@ digraph cfg {
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_18" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_20" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_19" [label="19:  ConditinalStmt Branch \n   n$11=*&p:int* [line 12, column 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$10:int*=n$11 [line 12, column 9]\n " shape="box"]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_19" [label="19:  ConditionalStmt Branch \n   n$11=*&p:int* [line 12, column 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$10:int*=n$11 [line 12, column 9]\n " shape="box"]
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_19" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_16" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_20" [label="20:  ConditinalStmt Branch \n   n$12=*&p:int* [line 12, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$10:int*=n$12 [line 12, column 9]\n " shape="box"]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_20" [label="20:  ConditionalStmt Branch \n   n$12=*&p:int* [line 12, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$10:int*=n$12 [line 12, column 9]\n " shape="box"]
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_20" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_16" ;

infer/tests/codetoanalyze/c/frontend/gotostmt/goto_ex.c.dot

@@ -31,16 +31,16 @@ digraph cfg {
 	
 
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_8" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_7" ;
-"g0.8ac829e3bb8338d74cfb45ebe834d8e1_9" [label="9:  BinaryOperatorStmt: GT \n   n$0=_fun_getValue() [line 16, column 7]\n " shape="box"]
+"g0.8ac829e3bb8338d74cfb45ebe834d8e1_9" [label="9:  BinaryOperatorStmt: GT \n   n$3=_fun_getValue() [line 16, column 7]\n " shape="box"]
 	
 
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_9" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_10" ;
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_9" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_11" ;
-"g0.8ac829e3bb8338d74cfb45ebe834d8e1_10" [label="10: Prune (true branch, if) \n   PRUNE((n$0 > 1), true); [line 16, column 7]\n " shape="invhouse"]
+"g0.8ac829e3bb8338d74cfb45ebe834d8e1_10" [label="10: Prune (true branch, if) \n   PRUNE((n$3 > 1), true); [line 16, column 7]\n " shape="invhouse"]
 	
 
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_10" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_6" ;
-"g0.8ac829e3bb8338d74cfb45ebe834d8e1_11" [label="11: Prune (false branch, if) \n   PRUNE(!(n$0 > 1), false); [line 16, column 7]\n " shape="invhouse"]
+"g0.8ac829e3bb8338d74cfb45ebe834d8e1_11" [label="11: Prune (false branch, if) \n   PRUNE(!(n$3 > 1), false); [line 16, column 7]\n " shape="invhouse"]
 	
 
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_11" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_8" ;
@@ -75,16 +75,16 @@ digraph cfg {
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_7" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_6" ;
-"g1.0120a4f9196a5f9eb9f523f31f914da7_8" [label="8:  BinaryOperatorStmt: GT \n   n$0=_fun_getValue() [line 28, column 7]\n " shape="box"]
+"g1.0120a4f9196a5f9eb9f523f31f914da7_8" [label="8:  BinaryOperatorStmt: GT \n   n$1=_fun_getValue() [line 28, column 7]\n " shape="box"]
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_8" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_9" ;
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_8" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_10" ;
-"g1.0120a4f9196a5f9eb9f523f31f914da7_9" [label="9: Prune (true branch, if) \n   PRUNE((n$0 > 1), true); [line 28, column 7]\n " shape="invhouse"]
+"g1.0120a4f9196a5f9eb9f523f31f914da7_9" [label="9: Prune (true branch, if) \n   PRUNE((n$1 > 1), true); [line 28, column 7]\n " shape="invhouse"]
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_9" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_5" ;
-"g1.0120a4f9196a5f9eb9f523f31f914da7_10" [label="10: Prune (false branch, if) \n   PRUNE(!(n$0 > 1), false); [line 28, column 7]\n " shape="invhouse"]
+"g1.0120a4f9196a5f9eb9f523f31f914da7_10" [label="10: Prune (false branch, if) \n   PRUNE(!(n$1 > 1), false); [line 28, column 7]\n " shape="invhouse"]
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_10" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_7" ;
@@ -131,16 +131,16 @@ digraph cfg {
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_10" -> "g2.e1c80488853d86ab9d6decfe30d8930f_9" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_11" [label="11:  BinaryOperatorStmt: GT \n   n$0=_fun_getValue() [line 46, column 7]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_11" [label="11:  BinaryOperatorStmt: GT \n   n$2=_fun_getValue() [line 46, column 7]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_11" -> "g2.e1c80488853d86ab9d6decfe30d8930f_12" ;
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_11" -> "g2.e1c80488853d86ab9d6decfe30d8930f_13" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_12" [label="12: Prune (true branch, if) \n   PRUNE((n$0 > 1), true); [line 46, column 7]\n " shape="invhouse"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_12" [label="12: Prune (true branch, if) \n   PRUNE((n$2 > 1), true); [line 46, column 7]\n " shape="invhouse"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_12" -> "g2.e1c80488853d86ab9d6decfe30d8930f_14" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_13" [label="13: Prune (false branch, if) \n   PRUNE(!(n$0 > 1), false); [line 46, column 7]\n " shape="invhouse"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_13" [label="13: Prune (false branch, if) \n   PRUNE(!(n$2 > 1), false); [line 46, column 7]\n " shape="invhouse"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_13" -> "g2.e1c80488853d86ab9d6decfe30d8930f_10" ;
@@ -152,16 +152,16 @@ digraph cfg {
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_15" -> "g2.e1c80488853d86ab9d6decfe30d8930f_11" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_16" [label="16:  Call _fun_getValue \n   n$1=_fun_getValue() [line 44, column 8]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_16" [label="16:  Call _fun_getValue \n   n$6=_fun_getValue() [line 44, column 8]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_16" -> "g2.e1c80488853d86ab9d6decfe30d8930f_17" ;
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_16" -> "g2.e1c80488853d86ab9d6decfe30d8930f_18" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_17" [label="17: Prune (true branch, if) \n   PRUNE(!n$1, true); [line 44, column 8]\n " shape="invhouse"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_17" [label="17: Prune (true branch, if) \n   PRUNE(!n$6, true); [line 44, column 8]\n " shape="invhouse"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_17" -> "g2.e1c80488853d86ab9d6decfe30d8930f_8" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_18" [label="18: Prune (false branch, if) \n   PRUNE(n$1, false); [line 44, column 8]\n " shape="invhouse"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_18" [label="18: Prune (false branch, if) \n   PRUNE(n$6, false); [line 44, column 8]\n " shape="invhouse"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_18" -> "g2.e1c80488853d86ab9d6decfe30d8930f_15" ;
@@ -169,16 +169,16 @@ digraph cfg {
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_19" -> "g2.e1c80488853d86ab9d6decfe30d8930f_16" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_20" [label="20:  Call _fun_getValue \n   n$2=_fun_getValue() [line 42, column 8]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_20" [label="20:  Call _fun_getValue \n   n$10=_fun_getValue() [line 42, column 8]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_20" -> "g2.e1c80488853d86ab9d6decfe30d8930f_21" ;
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_20" -> "g2.e1c80488853d86ab9d6decfe30d8930f_22" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_21" [label="21: Prune (true branch, if) \n   PRUNE(!n$2, true); [line 42, column 8]\n " shape="invhouse"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_21" [label="21: Prune (true branch, if) \n   PRUNE(!n$10, true); [line 42, column 8]\n " shape="invhouse"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_21" -> "g2.e1c80488853d86ab9d6decfe30d8930f_5" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_22" [label="22: Prune (false branch, if) \n   PRUNE(n$2, false); [line 42, column 8]\n " shape="invhouse"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_22" [label="22: Prune (false branch, if) \n   PRUNE(n$10, false); [line 42, column 8]\n " shape="invhouse"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_22" -> "g2.e1c80488853d86ab9d6decfe30d8930f_19" ;
@@ -209,7 +209,7 @@ digraph cfg {
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_5" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_4" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_6" [label="6:  Call _fun_printf \n   n$1=_fun_printf(\"A\\n\":char const *) [line 74, column 3]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_6" [label="6:  Call _fun_printf \n   n$2=_fun_printf(\"A\\n\":char const *) [line 74, column 3]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_6" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_5" ;
@@ -225,7 +225,7 @@ digraph cfg {
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_9" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_2" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_10" [label="10:  Call _fun_printf \n   n$2=_fun_printf(\"g3\\n\":char const *) [line 69, column 3]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_10" [label="10:  Call _fun_printf \n   n$4=_fun_printf(\"g3\\n\":char const *) [line 69, column 3]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_10" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_9" ;
@@ -233,16 +233,16 @@ digraph cfg {
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_11" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_10" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_12" [label="12:  BinaryOperatorStmt: GT \n   n$3=_fun_getValue() [line 67, column 7]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_12" [label="12:  BinaryOperatorStmt: GT \n   n$5=_fun_getValue() [line 67, column 7]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_12" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_13" ;
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_12" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_14" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_13" [label="13: Prune (true branch, if) \n   PRUNE((n$3 > 1), true); [line 67, column 7]\n " shape="invhouse"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_13" [label="13: Prune (true branch, if) \n   PRUNE((n$5 > 1), true); [line 67, column 7]\n " shape="invhouse"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_13" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_15" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_14" [label="14: Prune (false branch, if) \n   PRUNE(!(n$3 > 1), false); [line 67, column 7]\n " shape="invhouse"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_14" [label="14: Prune (false branch, if) \n   PRUNE(!(n$5 > 1), false); [line 67, column 7]\n " shape="invhouse"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_14" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_11" ;
@@ -254,16 +254,16 @@ digraph cfg {
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_16" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_12" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_17" [label="17:  Call _fun_getValue \n   n$4=_fun_getValue() [line 65, column 8]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_17" [label="17:  Call _fun_getValue \n   n$9=_fun_getValue() [line 65, column 8]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_17" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_18" ;
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_17" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_19" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_18" [label="18: Prune (true branch, if) \n   PRUNE(!n$4, true); [line 65, column 8]\n " shape="invhouse"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_18" [label="18: Prune (true branch, if) \n   PRUNE(!n$9, true); [line 65, column 8]\n " shape="invhouse"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_18" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_8" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_19" [label="19: Prune (false branch, if) \n   PRUNE(n$4, false); [line 65, column 8]\n " shape="invhouse"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_19" [label="19: Prune (false branch, if) \n   PRUNE(n$9, false); [line 65, column 8]\n " shape="invhouse"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_19" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_16" ;
@@ -271,20 +271,20 @@ digraph cfg {
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_20" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_17" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_21" [label="21:  Call _fun_getValue \n   n$5=_fun_getValue() [line 63, column 8]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_21" [label="21:  Call _fun_getValue \n   n$13=_fun_getValue() [line 63, column 8]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_21" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_22" ;
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_21" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_23" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_22" [label="22: Prune (true branch, if) \n   PRUNE(!n$5, true); [line 63, column 8]\n " shape="invhouse"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_22" [label="22: Prune (true branch, if) \n   PRUNE(!n$13, true); [line 63, column 8]\n " shape="invhouse"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_22" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_5" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_23" [label="23: Prune (false branch, if) \n   PRUNE(n$5, false); [line 63, column 8]\n " shape="invhouse"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_23" [label="23: Prune (false branch, if) \n   PRUNE(n$13, false); [line 63, column 8]\n " shape="invhouse"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_23" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_20" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_24" [label="24:  Call _fun_printf \n   n$6=_fun_printf(\"B\\n\":char const *) [line 61, column 3]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_24" [label="24:  Call _fun_printf \n   n$17=_fun_printf(\"B\\n\":char const *) [line 61, column 3]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_24" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_21" ;
@@ -307,7 +307,7 @@ digraph cfg {
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_5" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_4" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_6" [label="6:  Call _fun_printf \n   n$1=_fun_printf(\"A\\n\":char const *) [line 95, column 3]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_6" [label="6:  Call _fun_printf \n   n$2=_fun_printf(\"A\\n\":char const *) [line 95, column 3]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_6" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_5" ;
@@ -319,7 +319,7 @@ digraph cfg {
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_8" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_7" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_9" [label="9:  Call _fun_printf \n   n$2=_fun_printf(\"g4\\n\":char const *) [line 91, column 3]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_9" [label="9:  Call _fun_printf \n   n$4=_fun_printf(\"g4\\n\":char const *) [line 91, column 3]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_9" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_8" ;
@@ -327,16 +327,16 @@ digraph cfg {
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_10" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_9" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_11" [label="11:  BinaryOperatorStmt: GT \n   n$3=_fun_getValue() [line 89, column 7]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_11" [label="11:  BinaryOperatorStmt: GT \n   n$5=_fun_getValue() [line 89, column 7]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_11" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_12" ;
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_11" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_13" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_12" [label="12: Prune (true branch, if) \n   PRUNE((n$3 > 1), true); [line 89, column 7]\n " shape="invhouse"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_12" [label="12: Prune (true branch, if) \n   PRUNE((n$5 > 1), true); [line 89, column 7]\n " shape="invhouse"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_12" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_14" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_13" [label="13: Prune (false branch, if) \n   PRUNE(!(n$3 > 1), false); [line 89, column 7]\n " shape="invhouse"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_13" [label="13: Prune (false branch, if) \n   PRUNE(!(n$5 > 1), false); [line 89, column 7]\n " shape="invhouse"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_13" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_10" ;
@@ -348,16 +348,16 @@ digraph cfg {
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_15" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_11" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_16" [label="16:  Call _fun_getValue \n   n$4=_fun_getValue() [line 87, column 8]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_16" [label="16:  Call _fun_getValue \n   n$9=_fun_getValue() [line 87, column 8]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_16" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_17" ;
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_16" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_18" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_17" [label="17: Prune (true branch, if) \n   PRUNE(!n$4, true); [line 87, column 8]\n " shape="invhouse"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_17" [label="17: Prune (true branch, if) \n   PRUNE(!n$9, true); [line 87, column 8]\n " shape="invhouse"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_17" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_8" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_18" [label="18: Prune (false branch, if) \n   PRUNE(n$4, false); [line 87, column 8]\n " shape="invhouse"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_18" [label="18: Prune (false branch, if) \n   PRUNE(n$9, false); [line 87, column 8]\n " shape="invhouse"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_18" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_15" ;
@@ -365,20 +365,20 @@ digraph cfg {
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_19" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_16" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_20" [label="20:  Call _fun_getValue \n   n$5=_fun_getValue() [line 85, column 8]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_20" [label="20:  Call _fun_getValue \n   n$13=_fun_getValue() [line 85, column 8]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_20" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_21" ;
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_20" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_22" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_21" [label="21: Prune (true branch, if) \n   PRUNE(!n$5, true); [line 85, column 8]\n " shape="invhouse"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_21" [label="21: Prune (true branch, if) \n   PRUNE(!n$13, true); [line 85, column 8]\n " shape="invhouse"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_21" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_5" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_22" [label="22: Prune (false branch, if) \n   PRUNE(n$5, false); [line 85, column 8]\n " shape="invhouse"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_22" [label="22: Prune (false branch, if) \n   PRUNE(n$13, false); [line 85, column 8]\n " shape="invhouse"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_22" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_19" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_23" [label="23:  Call _fun_printf \n   n$6=_fun_printf(\"B\\n\":char const *) [line 83, column 3]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_23" [label="23:  Call _fun_printf \n   n$17=_fun_printf(\"B\\n\":char const *) [line 83, column 3]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_23" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_20" ;
@@ -393,7 +393,7 @@ digraph cfg {
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_3" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_8" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"exit\\n\":char const *) [line 120, column 3]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_4" [label="4:  Call _fun_printf \n   n$1=_fun_printf(\"exit\\n\":char const *) [line 120, column 3]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_4" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_3" ;
@@ -405,7 +405,7 @@ digraph cfg {
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_6" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_2" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_7" [label="7:  Call _fun_printf \n   n$1=_fun_printf(\"A\\n\":char const *) [line 116, column 3]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_7" [label="7:  Call _fun_printf \n   n$3=_fun_printf(\"A\\n\":char const *) [line 116, column 3]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_7" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_6" ;
@@ -417,16 +417,16 @@ digraph cfg {
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_9" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_5" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_10" [label="10:  BinaryOperatorStmt: GT \n   n$2=_fun_getValue() [line 110, column 7]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_10" [label="10:  BinaryOperatorStmt: GT \n   n$6=_fun_getValue() [line 110, column 7]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_10" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_11" ;
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_10" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_12" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_11" [label="11: Prune (true branch, if) \n   PRUNE((n$2 > 1), true); [line 110, column 7]\n " shape="invhouse"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_11" [label="11: Prune (true branch, if) \n   PRUNE((n$6 > 1), true); [line 110, column 7]\n " shape="invhouse"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_11" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_13" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_12" [label="12: Prune (false branch, if) \n   PRUNE(!(n$2 > 1), false); [line 110, column 7]\n " shape="invhouse"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_12" [label="12: Prune (false branch, if) \n   PRUNE(!(n$6 > 1), false); [line 110, column 7]\n " shape="invhouse"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_12" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_9" ;
@@ -438,16 +438,16 @@ digraph cfg {
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_14" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_10" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_15" [label="15:  Call _fun_getValue \n   n$3=_fun_getValue() [line 108, column 8]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_15" [label="15:  Call _fun_getValue \n   n$10=_fun_getValue() [line 108, column 8]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_15" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_16" ;
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_15" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_17" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_16" [label="16: Prune (true branch, if) \n   PRUNE(!n$3, true); [line 108, column 8]\n " shape="invhouse"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_16" [label="16: Prune (true branch, if) \n   PRUNE(!n$10, true); [line 108, column 8]\n " shape="invhouse"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_16" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_3" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_17" [label="17: Prune (false branch, if) \n   PRUNE(n$3, false); [line 108, column 8]\n " shape="invhouse"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_17" [label="17: Prune (false branch, if) \n   PRUNE(n$10, false); [line 108, column 8]\n " shape="invhouse"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_17" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_14" ;
@@ -455,20 +455,20 @@ digraph cfg {
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_18" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_15" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_19" [label="19:  Call _fun_getValue \n   n$4=_fun_getValue() [line 106, column 8]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_19" [label="19:  Call _fun_getValue \n   n$14=_fun_getValue() [line 106, column 8]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_19" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_20" ;
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_19" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_21" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_20" [label="20: Prune (true branch, if) \n   PRUNE(!n$4, true); [line 106, column 8]\n " shape="invhouse"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_20" [label="20: Prune (true branch, if) \n   PRUNE(!n$14, true); [line 106, column 8]\n " shape="invhouse"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_20" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_5" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_21" [label="21: Prune (false branch, if) \n   PRUNE(n$4, false); [line 106, column 8]\n " shape="invhouse"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_21" [label="21: Prune (false branch, if) \n   PRUNE(n$14, false); [line 106, column 8]\n " shape="invhouse"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_21" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_18" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_22" [label="22:  Call _fun_printf \n   n$5=_fun_printf(\"B\\n\":char const *) [line 104, column 3]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_22" [label="22:  Call _fun_printf \n   n$18=_fun_printf(\"B\\n\":char const *) [line 104, column 3]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_22" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_19" ;
@@ -483,7 +483,7 @@ digraph cfg {
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_3" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_8" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"exit\\n\":char const *) [line 142, column 3]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_4" [label="4:  Call _fun_printf \n   n$1=_fun_printf(\"exit\\n\":char const *) [line 142, column 3]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_4" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_3" ;
@@ -495,7 +495,7 @@ digraph cfg {
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_6" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_2" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_7" [label="7:  Call _fun_printf \n   n$1=_fun_printf(\"A\\n\":char const *) [line 138, column 3]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_7" [label="7:  Call _fun_printf \n   n$3=_fun_printf(\"A\\n\":char const *) [line 138, column 3]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_7" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_6" ;
@@ -507,16 +507,16 @@ digraph cfg {
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_9" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_5" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_10" [label="10:  BinaryOperatorStmt: GT \n   n$2=_fun_getValue() [line 132, column 7]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_10" [label="10:  BinaryOperatorStmt: GT \n   n$6=_fun_getValue() [line 132, column 7]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_10" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_11" ;
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_10" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_12" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_11" [label="11: Prune (true branch, if) \n   PRUNE((n$2 > 1), true); [line 132, column 7]\n " shape="invhouse"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_11" [label="11: Prune (true branch, if) \n   PRUNE((n$6 > 1), true); [line 132, column 7]\n " shape="invhouse"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_11" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_13" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_12" [label="12: Prune (false branch, if) \n   PRUNE(!(n$2 > 1), false); [line 132, column 7]\n " shape="invhouse"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_12" [label="12: Prune (false branch, if) \n   PRUNE(!(n$6 > 1), false); [line 132, column 7]\n " shape="invhouse"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_12" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_9" ;
@@ -528,16 +528,16 @@ digraph cfg {
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_14" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_10" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_15" [label="15:  Call _fun_getValue \n   n$3=_fun_getValue() [line 130, column 8]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_15" [label="15:  Call _fun_getValue \n   n$10=_fun_getValue() [line 130, column 8]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_15" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_16" ;
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_15" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_17" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_16" [label="16: Prune (true branch, if) \n   PRUNE(!n$3, true); [line 130, column 8]\n " shape="invhouse"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_16" [label="16: Prune (true branch, if) \n   PRUNE(!n$10, true); [line 130, column 8]\n " shape="invhouse"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_16" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_3" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_17" [label="17: Prune (false branch, if) \n   PRUNE(n$3, false); [line 130, column 8]\n " shape="invhouse"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_17" [label="17: Prune (false branch, if) \n   PRUNE(n$10, false); [line 130, column 8]\n " shape="invhouse"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_17" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_14" ;
@@ -545,20 +545,20 @@ digraph cfg {
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_18" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_15" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_19" [label="19:  Call _fun_getValue \n   n$4=_fun_getValue() [line 128, column 8]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_19" [label="19:  Call _fun_getValue \n   n$14=_fun_getValue() [line 128, column 8]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_19" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_20" ;
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_19" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_21" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_20" [label="20: Prune (true branch, if) \n   PRUNE(!n$4, true); [line 128, column 8]\n " shape="invhouse"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_20" [label="20: Prune (true branch, if) \n   PRUNE(!n$14, true); [line 128, column 8]\n " shape="invhouse"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_20" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_5" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_21" [label="21: Prune (false branch, if) \n   PRUNE(n$4, false); [line 128, column 8]\n " shape="invhouse"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_21" [label="21: Prune (false branch, if) \n   PRUNE(n$14, false); [line 128, column 8]\n " shape="invhouse"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_21" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_18" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_22" [label="22:  Call _fun_printf \n   n$5=_fun_printf(\"B\\n\":char const *) [line 126, column 3]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_22" [label="22:  Call _fun_printf \n   n$18=_fun_printf(\"B\\n\":char const *) [line 126, column 3]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_22" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_19" ;
@@ -585,7 +585,7 @@ digraph cfg {
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_6" -> "g7.727bb92f57c3951d11695a52c92c2b0c_25" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_7" [label="7:  Call _fun_printf \n   n$1=_fun_printf(\"out!\\n\":char const *) [line 162, column 3]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_7" [label="7:  Call _fun_printf \n   n$3=_fun_printf(\"out!\\n\":char const *) [line 162, column 3]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_7" -> "g7.727bb92f57c3951d11695a52c92c2b0c_6" ;
@@ -597,16 +597,16 @@ digraph cfg {
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_9" -> "g7.727bb92f57c3951d11695a52c92c2b0c_10" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_10" [label="10:  BinaryOperatorStmt: LT \n   n$2=*&i:int [line 148, column 10]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_10" [label="10:  BinaryOperatorStmt: LT \n   n$5=*&i:int [line 148, column 10]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_10" -> "g7.727bb92f57c3951d11695a52c92c2b0c_11" ;
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_10" -> "g7.727bb92f57c3951d11695a52c92c2b0c_12" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_11" [label="11: Prune (true branch, while) \n   PRUNE((n$2 < 10), true); [line 148, column 10]\n " shape="invhouse"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_11" [label="11: Prune (true branch, while) \n   PRUNE((n$5 < 10), true); [line 148, column 10]\n " shape="invhouse"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_11" -> "g7.727bb92f57c3951d11695a52c92c2b0c_13" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_12" [label="12: Prune (false branch, while) \n   PRUNE(!(n$2 < 10), false); [line 148, column 10]\n " shape="invhouse"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_12" [label="12: Prune (false branch, while) \n   PRUNE(!(n$5 < 10), false); [line 148, column 10]\n " shape="invhouse"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_12" -> "g7.727bb92f57c3951d11695a52c92c2b0c_8" ;
@@ -614,16 +614,16 @@ digraph cfg {
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_13" -> "g7.727bb92f57c3951d11695a52c92c2b0c_14" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_14" [label="14:  BinaryOperatorStmt: LT \n   n$3=*&j:int [line 149, column 12]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_14" [label="14:  BinaryOperatorStmt: LT \n   n$6=*&j:int [line 149, column 12]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_14" -> "g7.727bb92f57c3951d11695a52c92c2b0c_15" ;
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_14" -> "g7.727bb92f57c3951d11695a52c92c2b0c_16" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_15" [label="15: Prune (true branch, while) \n   PRUNE((n$3 < 10), true); [line 149, column 12]\n " shape="invhouse"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_15" [label="15: Prune (true branch, while) \n   PRUNE((n$6 < 10), true); [line 149, column 12]\n " shape="invhouse"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_15" -> "g7.727bb92f57c3951d11695a52c92c2b0c_17" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_16" [label="16: Prune (false branch, while) \n   PRUNE(!(n$3 < 10), false); [line 149, column 12]\n " shape="invhouse"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_16" [label="16: Prune (false branch, while) \n   PRUNE(!(n$6 < 10), false); [line 149, column 12]\n " shape="invhouse"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_16" -> "g7.727bb92f57c3951d11695a52c92c2b0c_9" ;
@@ -631,16 +631,16 @@ digraph cfg {
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_17" -> "g7.727bb92f57c3951d11695a52c92c2b0c_18" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_18" [label="18:  BinaryOperatorStmt: LT \n   n$4=*&k:int [line 150, column 14]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_18" [label="18:  BinaryOperatorStmt: LT \n   n$7=*&k:int [line 150, column 14]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_18" -> "g7.727bb92f57c3951d11695a52c92c2b0c_19" ;
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_18" -> "g7.727bb92f57c3951d11695a52c92c2b0c_20" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_19" [label="19: Prune (true branch, while) \n   PRUNE((n$4 < 10), true); [line 150, column 14]\n " shape="invhouse"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_19" [label="19: Prune (true branch, while) \n   PRUNE((n$7 < 10), true); [line 150, column 14]\n " shape="invhouse"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_19" -> "g7.727bb92f57c3951d11695a52c92c2b0c_26" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_20" [label="20: Prune (false branch, while) \n   PRUNE(!(n$4 < 10), false); [line 150, column 14]\n " shape="invhouse"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_20" [label="20: Prune (false branch, while) \n   PRUNE(!(n$7 < 10), false); [line 150, column 14]\n " shape="invhouse"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_20" -> "g7.727bb92f57c3951d11695a52c92c2b0c_13" ;
@@ -648,24 +648,24 @@ digraph cfg {
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_21" -> "g7.727bb92f57c3951d11695a52c92c2b0c_17" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_22" [label="22:  BinaryOperatorStmt: GE \n   n$5=*&v:int [line 152, column 13]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_22" [label="22:  BinaryOperatorStmt: GE \n   n$8=*&v:int [line 152, column 13]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_22" -> "g7.727bb92f57c3951d11695a52c92c2b0c_23" ;
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_22" -> "g7.727bb92f57c3951d11695a52c92c2b0c_24" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_23" [label="23: Prune (true branch, if) \n   PRUNE((n$5 >= 15), true); [line 152, column 13]\n " shape="invhouse"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_23" [label="23: Prune (true branch, if) \n   PRUNE((n$8 >= 15), true); [line 152, column 13]\n " shape="invhouse"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_23" -> "g7.727bb92f57c3951d11695a52c92c2b0c_8" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_24" [label="24: Prune (false branch, if) \n   PRUNE(!(n$5 >= 15), false); [line 152, column 13]\n " shape="invhouse"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_24" [label="24: Prune (false branch, if) \n   PRUNE(!(n$8 >= 15), false); [line 152, column 13]\n " shape="invhouse"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_24" -> "g7.727bb92f57c3951d11695a52c92c2b0c_21" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_25" [label="25:  Call _fun_printf \n   n$6=_fun_printf(\"wow\\n\":char const *) [line 155, column 11]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_25" [label="25:  Call _fun_printf \n   n$10=_fun_printf(\"wow\\n\":char const *) [line 155, column 11]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_25" -> "g7.727bb92f57c3951d11695a52c92c2b0c_5" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_26" [label="26:  DeclStmt \n   n$7=*&i:int [line 151, column 17]\n  n$8=*&j:int [line 151, column 21]\n  n$9=*&k:int [line 151, column 25]\n  *&v:int=((n$7 + n$8) + n$9) [line 151, column 9]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_26" [label="26:  DeclStmt \n   n$15=*&i:int [line 151, column 17]\n  n$16=*&j:int [line 151, column 21]\n  n$17=*&k:int [line 151, column 25]\n  *&v:int=((n$15 + n$16) + n$17) [line 151, column 9]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_26" -> "g7.727bb92f57c3951d11695a52c92c2b0c_22" ;
@@ -700,7 +700,7 @@ digraph cfg {
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_5" -> "g8.c98b82371573afc08575815d90f5eac4_4" ;
-"g8.c98b82371573afc08575815d90f5eac4_6" [label="6:  Call _fun_printf \n   n$1=_fun_printf(\"out!\\n\":char const *) [line 186, column 3]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_6" [label="6:  Call _fun_printf \n   n$2=_fun_printf(\"out!\\n\":char const *) [line 186, column 3]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_6" -> "g8.c98b82371573afc08575815d90f5eac4_5" ;
@@ -712,16 +712,16 @@ digraph cfg {
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_8" -> "g8.c98b82371573afc08575815d90f5eac4_9" ;
-"g8.c98b82371573afc08575815d90f5eac4_9" [label="9:  BinaryOperatorStmt: LT \n   n$2=*&i:int [line 173, column 10]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_9" [label="9:  BinaryOperatorStmt: LT \n   n$4=*&i:int [line 173, column 10]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_9" -> "g8.c98b82371573afc08575815d90f5eac4_10" ;
 	 "g8.c98b82371573afc08575815d90f5eac4_9" -> "g8.c98b82371573afc08575815d90f5eac4_11" ;
-"g8.c98b82371573afc08575815d90f5eac4_10" [label="10: Prune (true branch, while) \n   PRUNE((n$2 < 10), true); [line 173, column 10]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_10" [label="10: Prune (true branch, while) \n   PRUNE((n$4 < 10), true); [line 173, column 10]\n " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_10" -> "g8.c98b82371573afc08575815d90f5eac4_12" ;
-"g8.c98b82371573afc08575815d90f5eac4_11" [label="11: Prune (false branch, while) \n   PRUNE(!(n$2 < 10), false); [line 173, column 10]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_11" [label="11: Prune (false branch, while) \n   PRUNE(!(n$4 < 10), false); [line 173, column 10]\n " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_11" -> "g8.c98b82371573afc08575815d90f5eac4_7" ;
@@ -729,16 +729,16 @@ digraph cfg {
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_12" -> "g8.c98b82371573afc08575815d90f5eac4_13" ;
-"g8.c98b82371573afc08575815d90f5eac4_13" [label="13:  BinaryOperatorStmt: LT \n   n$3=*&j:int [line 174, column 12]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_13" [label="13:  BinaryOperatorStmt: LT \n   n$5=*&j:int [line 174, column 12]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_13" -> "g8.c98b82371573afc08575815d90f5eac4_14" ;
 	 "g8.c98b82371573afc08575815d90f5eac4_13" -> "g8.c98b82371573afc08575815d90f5eac4_15" ;
-"g8.c98b82371573afc08575815d90f5eac4_14" [label="14: Prune (true branch, while) \n   PRUNE((n$3 < 10), true); [line 174, column 12]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_14" [label="14: Prune (true branch, while) \n   PRUNE((n$5 < 10), true); [line 174, column 12]\n " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_14" -> "g8.c98b82371573afc08575815d90f5eac4_16" ;
-"g8.c98b82371573afc08575815d90f5eac4_15" [label="15: Prune (false branch, while) \n   PRUNE(!(n$3 < 10), false); [line 174, column 12]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_15" [label="15: Prune (false branch, while) \n   PRUNE(!(n$5 < 10), false); [line 174, column 12]\n " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_15" -> "g8.c98b82371573afc08575815d90f5eac4_8" ;
@@ -746,16 +746,16 @@ digraph cfg {
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_16" -> "g8.c98b82371573afc08575815d90f5eac4_17" ;
-"g8.c98b82371573afc08575815d90f5eac4_17" [label="17:  BinaryOperatorStmt: LT \n   n$4=*&k:int [line 175, column 14]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_17" [label="17:  BinaryOperatorStmt: LT \n   n$6=*&k:int [line 175, column 14]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_17" -> "g8.c98b82371573afc08575815d90f5eac4_18" ;
 	 "g8.c98b82371573afc08575815d90f5eac4_17" -> "g8.c98b82371573afc08575815d90f5eac4_19" ;
-"g8.c98b82371573afc08575815d90f5eac4_18" [label="18: Prune (true branch, while) \n   PRUNE((n$4 < 10), true); [line 175, column 14]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_18" [label="18: Prune (true branch, while) \n   PRUNE((n$6 < 10), true); [line 175, column 14]\n " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_18" -> "g8.c98b82371573afc08575815d90f5eac4_26" ;
-"g8.c98b82371573afc08575815d90f5eac4_19" [label="19: Prune (false branch, while) \n   PRUNE(!(n$4 < 10), false); [line 175, column 14]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_19" [label="19: Prune (false branch, while) \n   PRUNE(!(n$6 < 10), false); [line 175, column 14]\n " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_19" -> "g8.c98b82371573afc08575815d90f5eac4_12" ;
@@ -763,20 +763,20 @@ digraph cfg {
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_20" -> "g8.c98b82371573afc08575815d90f5eac4_16" ;
-"g8.c98b82371573afc08575815d90f5eac4_21" [label="21:  BinaryOperatorStmt: GE \n   n$5=*&v:int [line 177, column 13]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_21" [label="21:  BinaryOperatorStmt: GE \n   n$7=*&v:int [line 177, column 13]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_21" -> "g8.c98b82371573afc08575815d90f5eac4_22" ;
 	 "g8.c98b82371573afc08575815d90f5eac4_21" -> "g8.c98b82371573afc08575815d90f5eac4_23" ;
-"g8.c98b82371573afc08575815d90f5eac4_22" [label="22: Prune (true branch, if) \n   PRUNE((n$5 >= 15), true); [line 177, column 13]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_22" [label="22: Prune (true branch, if) \n   PRUNE((n$7 >= 15), true); [line 177, column 13]\n " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_22" -> "g8.c98b82371573afc08575815d90f5eac4_25" ;
-"g8.c98b82371573afc08575815d90f5eac4_23" [label="23: Prune (false branch, if) \n   PRUNE(!(n$5 >= 15), false); [line 177, column 13]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_23" [label="23: Prune (false branch, if) \n   PRUNE(!(n$7 >= 15), false); [line 177, column 13]\n " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_23" -> "g8.c98b82371573afc08575815d90f5eac4_20" ;
-"g8.c98b82371573afc08575815d90f5eac4_24" [label="24:  Call _fun_printf \n   n$6=_fun_printf(\"wow\\n\":char const *) [line 179, column 11]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_24" [label="24:  Call _fun_printf \n   n$8=_fun_printf(\"wow\\n\":char const *) [line 179, column 11]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_24" -> "g8.c98b82371573afc08575815d90f5eac4_20" ;
@@ -784,7 +784,7 @@ digraph cfg {
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_25" -> "g8.c98b82371573afc08575815d90f5eac4_24" ;
-"g8.c98b82371573afc08575815d90f5eac4_26" [label="26:  DeclStmt \n   n$7=*&i:int [line 176, column 17]\n  n$8=*&j:int [line 176, column 21]\n  n$9=*&k:int [line 176, column 25]\n  *&v:int=((n$7 + n$8) + n$9) [line 176, column 9]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_26" [label="26:  DeclStmt \n   n$12=*&i:int [line 176, column 17]\n  n$13=*&j:int [line 176, column 21]\n  n$14=*&k:int [line 176, column 25]\n  *&v:int=((n$12 + n$13) + n$14) [line 176, column 9]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_26" -> "g8.c98b82371573afc08575815d90f5eac4_21" ;
@@ -792,11 +792,11 @@ digraph cfg {
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_27" -> "g8.c98b82371573afc08575815d90f5eac4_8" ;
-"g8.c98b82371573afc08575815d90f5eac4_28" [label="28: Prune (true branch, if) \n   n$10=*&q:int [line 171, column 7]\n  PRUNE(n$10, true); [line 171, column 7]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_28" [label="28: Prune (true branch, if) \n   n$18=*&q:int [line 171, column 7]\n  PRUNE(n$18, true); [line 171, column 7]\n " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_28" -> "g8.c98b82371573afc08575815d90f5eac4_25" ;
-"g8.c98b82371573afc08575815d90f5eac4_29" [label="29: Prune (false branch, if) \n   n$10=*&q:int [line 171, column 7]\n  PRUNE(!n$10, false); [line 171, column 7]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_29" [label="29: Prune (false branch, if) \n   n$18=*&q:int [line 171, column 7]\n  PRUNE(!n$18, false); [line 171, column 7]\n " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_29" -> "g8.c98b82371573afc08575815d90f5eac4_27" ;

infer/tests/codetoanalyze/c/frontend/loops/for_no_condition_incr.c.dot

@@ -28,7 +28,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: AddAssign \n   n$0=*&j:int [line 13, column 10]\n  n$1=*&j:int [line 13, column 5]\n  *&j:int=(n$1 + n$0) [line 13, column 5]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: AddAssign \n   n$1=*&j:int [line 13, column 10]\n  n$2=*&j:int [line 13, column 5]\n  *&j:int=(n$2 + n$1) [line 13, column 5]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;

infer/tests/codetoanalyze/c/frontend/loops/for_only_body.c.dot

@@ -24,7 +24,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  UnaryOperator \n   n$0=*&i:int [line 13, column 5]\n  *&i:int=(n$0 + 1) [line 13, column 5]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  UnaryOperator \n   n$2=*&i:int [line 13, column 5]\n  *&i:int=(n$2 + 1) [line 13, column 5]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;

infer/tests/codetoanalyze/c/frontend/loops/while_with_continue_and_break.c.dot

@@ -58,20 +58,20 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  BinaryOperatorStmt: GT \n   n$1=*&x:int [line 15, column 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  BinaryOperatorStmt: GT \n   n$4=*&x:int [line 15, column 11]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_16" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_17" ;
-"main.fad58de7366495db4650cfefac2fcd61_16" [label="16: Prune (true branch, if) \n   PRUNE((n$1 > 5), true); [line 15, column 11]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_16" [label="16: Prune (true branch, if) \n   PRUNE((n$4 > 5), true); [line 15, column 11]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_16" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_17" [label="17: Prune (false branch, if) \n   PRUNE(!(n$1 > 5), false); [line 15, column 11]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_17" [label="17: Prune (false branch, if) \n   PRUNE(!(n$4 > 5), false); [line 15, column 11]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_17" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
-"main.fad58de7366495db4650cfefac2fcd61_18" [label="18:  BinaryOperatorStmt: AddAssign \n   n$2=*&x:int [line 14, column 7]\n  *&x:int=(n$2 + 1) [line 14, column 7]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_18" [label="18:  BinaryOperatorStmt: AddAssign \n   n$8=*&x:int [line 14, column 7]\n  *&x:int=(n$8 + 1) [line 14, column 7]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_18" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;

infer/tests/codetoanalyze/c/frontend/nestedoperators/gnuexpr.c.dot

@@ -69,11 +69,11 @@ digraph cfg {
 	
 
 	 "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_5" -> "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_7" ;
-"with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_6" [label="6:  ConditinalStmt Branch \n   n$2=*&p:int* [line 31, column 10]\n  n$3=*n$2:int [line 31, column 9]\n  n$4=*&x:int [line 31, column 14]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=(n$3 + n$4) [line 31, column 5]\n " shape="box"]
+"with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_6" [label="6:  ConditionalStmt Branch \n   n$2=*&p:int* [line 31, column 10]\n  n$3=*n$2:int [line 31, column 9]\n  n$4=*&x:int [line 31, column 14]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=(n$3 + n$4) [line 31, column 5]\n " shape="box"]
 	
 
 	 "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_6" -> "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_3" ;
-"with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_7" [label="7:  ConditinalStmt Branch \n   n$5=*&x:int [line 31, column 18]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$5 [line 31, column 5]\n " shape="box"]
+"with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_7" [label="7:  ConditionalStmt Branch \n   n$5=*&x:int [line 31, column 18]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$5 [line 31, column 5]\n " shape="box"]
 	
 
 	 "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_7" -> "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_3" ;

infer/tests/codetoanalyze/c/frontend/offsetof_expr/offsetof_expr.c.dot

@@ -36,7 +36,7 @@ digraph cfg {
 	
 
 	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_9" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_2" ;
-"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_10" [label="10:  DeclStmt \n   *&i:int=n$1 [line 19, column 3]\n " shape="box"]
+"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_10" [label="10:  DeclStmt \n   *&i:int=n$2 [line 19, column 3]\n " shape="box"]
 	
 
 	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_10" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_5" ;

infer/tests/codetoanalyze/c/frontend/switchstmt/switch.c.dot

@@ -52,7 +52,7 @@ digraph cfg {
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_10" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_11" ;
-"m1.ae7be26cdaa742ca148068d5ac90eaca_11" [label="11:  Call _fun_printf \n   n$3=_fun_printf(\"(2/def)HELLO WORLD!\":char const *) [line 27, column 9]\n " shape="box"]
+"m1.ae7be26cdaa742ca148068d5ac90eaca_11" [label="11:  Call _fun_printf \n   n$4=_fun_printf(\"(2/def)HELLO WORLD!\":char const *) [line 27, column 9]\n " shape="box"]
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_11" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_4" ;
@@ -64,7 +64,7 @@ digraph cfg {
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_13" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_10" ;
-"m1.ae7be26cdaa742ca148068d5ac90eaca_14" [label="14:  Call _fun_printf \n   n$4=_fun_printf(\"(1)HELLO WORLD!\":char const *) [line 23, column 9]\n " shape="box"]
+"m1.ae7be26cdaa742ca148068d5ac90eaca_14" [label="14:  Call _fun_printf \n   n$6=_fun_printf(\"(1)HELLO WORLD!\":char const *) [line 23, column 9]\n " shape="box"]
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_14" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_4" ;
@@ -77,7 +77,7 @@ digraph cfg {
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_16" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_12" ;
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_16" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_13" ;
-"m1.ae7be26cdaa742ca148068d5ac90eaca_17" [label="17:  Call _fun_printf \n   n$5=_fun_printf(\"(0)HELLO WORLD!\":char const *) [line 20, column 9]\n " shape="box"]
+"m1.ae7be26cdaa742ca148068d5ac90eaca_17" [label="17:  Call _fun_printf \n   n$8=_fun_printf(\"(0)HELLO WORLD!\":char const *) [line 20, column 9]\n " shape="box"]
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_17" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_8" ;
@@ -90,11 +90,11 @@ digraph cfg {
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_19" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_15" ;
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_19" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_16" ;
-"m1.ae7be26cdaa742ca148068d5ac90eaca_20" [label="20:  BinaryOperatorStmt: Assign \n   n$6=*&value:int [line 18, column 11]\n  *&x:int=(n$6 + 1) [line 18, column 7]\n " shape="box"]
+"m1.ae7be26cdaa742ca148068d5ac90eaca_20" [label="20:  BinaryOperatorStmt: Assign \n   n$9=*&value:int [line 18, column 11]\n  *&x:int=(n$9 + 1) [line 18, column 7]\n " shape="box"]
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_20" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_17" ;
-"m1.ae7be26cdaa742ca148068d5ac90eaca_21" [label="21:  Call _fun_printf \n   n$7=_fun_printf(\"(out)HELLO WORLD!\":char const *) [line 17, column 7]\n " shape="box"]
+"m1.ae7be26cdaa742ca148068d5ac90eaca_21" [label="21:  Call _fun_printf \n   n$10=_fun_printf(\"(out)HELLO WORLD!\":char const *) [line 17, column 7]\n " shape="box"]
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_21" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_20" ;
@@ -153,11 +153,11 @@ digraph cfg {
 	
 
 	 "m11.c4534fe0ca256b331e9a3f14fe17229d_7" -> "m11.c4534fe0ca256b331e9a3f14fe17229d_9" ;
-"m11.c4534fe0ca256b331e9a3f14fe17229d_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=7 [line 193, column 20]\n " shape="box"]
+"m11.c4534fe0ca256b331e9a3f14fe17229d_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=7 [line 193, column 20]\n " shape="box"]
 	
 
 	 "m11.c4534fe0ca256b331e9a3f14fe17229d_8" -> "m11.c4534fe0ca256b331e9a3f14fe17229d_4" ;
-"m11.c4534fe0ca256b331e9a3f14fe17229d_9" [label="9:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=9 [line 193, column 20]\n " shape="box"]
+"m11.c4534fe0ca256b331e9a3f14fe17229d_9" [label="9:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=9 [line 193, column 20]\n " shape="box"]
 	
 
 	 "m11.c4534fe0ca256b331e9a3f14fe17229d_9" -> "m11.c4534fe0ca256b331e9a3f14fe17229d_4" ;
@@ -223,7 +223,7 @@ digraph cfg {
 	
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_10" -> "m2.aaf2f89992379705dac844c0a2a1d45f_3" ;
-"m2.aaf2f89992379705dac844c0a2a1d45f_11" [label="11:  UnaryOperator \n   n$1=*&something:int [line 49, column 7]\n  *&something:int=(n$1 + 1) [line 49, column 7]\n " shape="box"]
+"m2.aaf2f89992379705dac844c0a2a1d45f_11" [label="11:  UnaryOperator \n   n$3=*&something:int [line 49, column 7]\n  *&something:int=(n$3 + 1) [line 49, column 7]\n " shape="box"]
 	
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_11" -> "m2.aaf2f89992379705dac844c0a2a1d45f_10" ;
@@ -244,7 +244,7 @@ digraph cfg {
 	
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_15" -> "m2.aaf2f89992379705dac844c0a2a1d45f_12" ;
-"m2.aaf2f89992379705dac844c0a2a1d45f_16" [label="16:  Call _fun_printf \n   n$2=_fun_printf(\"(0)HELLO WORLD!\":char const *) [line 42, column 7]\n " shape="box"]
+"m2.aaf2f89992379705dac844c0a2a1d45f_16" [label="16:  Call _fun_printf \n   n$5=_fun_printf(\"(0)HELLO WORLD!\":char const *) [line 42, column 7]\n " shape="box"]
 	
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_16" -> "m2.aaf2f89992379705dac844c0a2a1d45f_3" ;
@@ -257,11 +257,11 @@ digraph cfg {
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_18" -> "m2.aaf2f89992379705dac844c0a2a1d45f_13" ;
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_18" -> "m2.aaf2f89992379705dac844c0a2a1d45f_14" ;
-"m2.aaf2f89992379705dac844c0a2a1d45f_19" [label="19:  BinaryOperatorStmt: Assign \n   n$3=*&value:int [line 40, column 9]\n  *&x:int=(n$3 + 1) [line 40, column 5]\n " shape="box"]
+"m2.aaf2f89992379705dac844c0a2a1d45f_19" [label="19:  BinaryOperatorStmt: Assign \n   n$6=*&value:int [line 40, column 9]\n  *&x:int=(n$6 + 1) [line 40, column 5]\n " shape="box"]
 	
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_19" -> "m2.aaf2f89992379705dac844c0a2a1d45f_16" ;
-"m2.aaf2f89992379705dac844c0a2a1d45f_20" [label="20:  Call _fun_printf \n   n$4=_fun_printf(\"(out)HELLO WORLD!\":char const *) [line 39, column 5]\n " shape="box"]
+"m2.aaf2f89992379705dac844c0a2a1d45f_20" [label="20:  Call _fun_printf \n   n$7=_fun_printf(\"(out)HELLO WORLD!\":char const *) [line 39, column 5]\n " shape="box"]
 	
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_20" -> "m2.aaf2f89992379705dac844c0a2a1d45f_19" ;
@@ -310,7 +310,7 @@ digraph cfg {
 	
 
 	 "m3.9678f7a7939f457fa0d9353761e189c7_9" -> "m3.9678f7a7939f457fa0d9353761e189c7_3" ;
-"m3.9678f7a7939f457fa0d9353761e189c7_10" [label="10:  UnaryOperator \n   n$1=*&something:int [line 68, column 7]\n  *&something:int=(n$1 + 1) [line 68, column 7]\n " shape="box"]
+"m3.9678f7a7939f457fa0d9353761e189c7_10" [label="10:  UnaryOperator \n   n$3=*&something:int [line 68, column 7]\n  *&something:int=(n$3 + 1) [line 68, column 7]\n " shape="box"]
 	
 
 	 "m3.9678f7a7939f457fa0d9353761e189c7_10" -> "m3.9678f7a7939f457fa0d9353761e189c7_3" ;
@@ -327,7 +327,7 @@ digraph cfg {
 
 	 "m3.9678f7a7939f457fa0d9353761e189c7_13" -> "m3.9678f7a7939f457fa0d9353761e189c7_7" ;
 	 "m3.9678f7a7939f457fa0d9353761e189c7_13" -> "m3.9678f7a7939f457fa0d9353761e189c7_8" ;
-"m3.9678f7a7939f457fa0d9353761e189c7_14" [label="14:  Call _fun_printf \n   n$2=_fun_printf(\"(0)HELLO WORLD!\":char const *) [line 64, column 7]\n " shape="box"]
+"m3.9678f7a7939f457fa0d9353761e189c7_14" [label="14:  Call _fun_printf \n   n$5=_fun_printf(\"(0)HELLO WORLD!\":char const *) [line 64, column 7]\n " shape="box"]
 	
 
 	 "m3.9678f7a7939f457fa0d9353761e189c7_14" -> "m3.9678f7a7939f457fa0d9353761e189c7_3" ;
@@ -385,7 +385,7 @@ digraph cfg {
 	
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_10" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_3" ;
-"m4.fd6b6fc9220b72d21683ae8e4f50a210_11" [label="11:  UnaryOperator \n   n$1=*&something:int [line 92, column 7]\n  *&something:int=(n$1 + 1) [line 92, column 7]\n " shape="box"]
+"m4.fd6b6fc9220b72d21683ae8e4f50a210_11" [label="11:  UnaryOperator \n   n$3=*&something:int [line 92, column 7]\n  *&something:int=(n$3 + 1) [line 92, column 7]\n " shape="box"]
 	
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_11" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_10" ;
@@ -406,7 +406,7 @@ digraph cfg {
 	
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_15" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_12" ;
-"m4.fd6b6fc9220b72d21683ae8e4f50a210_16" [label="16:  Call _fun_printf \n   n$2=_fun_printf(\"(0)HELLO WORLD!\":char const *) [line 85, column 7]\n " shape="box"]
+"m4.fd6b6fc9220b72d21683ae8e4f50a210_16" [label="16:  Call _fun_printf \n   n$5=_fun_printf(\"(0)HELLO WORLD!\":char const *) [line 85, column 7]\n " shape="box"]
 	
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_16" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_3" ;
@@ -419,11 +419,11 @@ digraph cfg {
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_18" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_13" ;
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_18" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_14" ;
-"m4.fd6b6fc9220b72d21683ae8e4f50a210_19" [label="19:  BinaryOperatorStmt: Assign \n   n$3=*&value:int [line 83, column 9]\n  *&x:int=(n$3 + 1) [line 83, column 5]\n " shape="box"]
+"m4.fd6b6fc9220b72d21683ae8e4f50a210_19" [label="19:  BinaryOperatorStmt: Assign \n   n$6=*&value:int [line 83, column 9]\n  *&x:int=(n$6 + 1) [line 83, column 5]\n " shape="box"]
 	
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_19" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_16" ;
-"m4.fd6b6fc9220b72d21683ae8e4f50a210_20" [label="20:  Call _fun_printf \n   n$4=_fun_printf(\"(out)HELLO WORLD!\":char const *) [line 82, column 5]\n " shape="box"]
+"m4.fd6b6fc9220b72d21683ae8e4f50a210_20" [label="20:  Call _fun_printf \n   n$7=_fun_printf(\"(out)HELLO WORLD!\":char const *) [line 82, column 5]\n " shape="box"]
 	
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_20" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_19" ;
@@ -468,7 +468,7 @@ digraph cfg {
 
 	 "m5.7b1f6dff14d8c2dfeb7da9487be0612d_8" -> "m5.7b1f6dff14d8c2dfeb7da9487be0612d_10" ;
 	 "m5.7b1f6dff14d8c2dfeb7da9487be0612d_8" -> "m5.7b1f6dff14d8c2dfeb7da9487be0612d_11" ;
-"m5.7b1f6dff14d8c2dfeb7da9487be0612d_9" [label="9:  Call _fun_printf \n   n$2=_fun_printf(\"(0)HELLO WORLD!\":char const *) [line 112, column 9]\n " shape="box"]
+"m5.7b1f6dff14d8c2dfeb7da9487be0612d_9" [label="9:  Call _fun_printf \n   n$3=_fun_printf(\"(0)HELLO WORLD!\":char const *) [line 112, column 9]\n " shape="box"]
 	
 
 	 "m5.7b1f6dff14d8c2dfeb7da9487be0612d_9" -> "m5.7b1f6dff14d8c2dfeb7da9487be0612d_4" ;
@@ -480,11 +480,11 @@ digraph cfg {
 	
 
 	 "m5.7b1f6dff14d8c2dfeb7da9487be0612d_11" -> "m5.7b1f6dff14d8c2dfeb7da9487be0612d_4" ;
-"m5.7b1f6dff14d8c2dfeb7da9487be0612d_12" [label="12:  BinaryOperatorStmt: Assign \n   n$3=*&value:int [line 109, column 11]\n  *&x:int=(n$3 + 1) [line 109, column 7]\n " shape="box"]
+"m5.7b1f6dff14d8c2dfeb7da9487be0612d_12" [label="12:  BinaryOperatorStmt: Assign \n   n$5=*&value:int [line 109, column 11]\n  *&x:int=(n$5 + 1) [line 109, column 7]\n " shape="box"]
 	
 
 	 "m5.7b1f6dff14d8c2dfeb7da9487be0612d_12" -> "m5.7b1f6dff14d8c2dfeb7da9487be0612d_4" ;
-"m5.7b1f6dff14d8c2dfeb7da9487be0612d_13" [label="13:  Call _fun_printf \n   n$4=_fun_printf(\"(out)HELLO WORLD!\":char const *) [line 108, column 7]\n " shape="box"]
+"m5.7b1f6dff14d8c2dfeb7da9487be0612d_13" [label="13:  Call _fun_printf \n   n$6=_fun_printf(\"(out)HELLO WORLD!\":char const *) [line 108, column 7]\n " shape="box"]
 	
 
 	 "m5.7b1f6dff14d8c2dfeb7da9487be0612d_13" -> "m5.7b1f6dff14d8c2dfeb7da9487be0612d_12" ;
@@ -524,11 +524,11 @@ digraph cfg {
 	
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_7" -> "m6.36604411a85db2bd9e97e22bfb5b692d_9" ;
-"m6.36604411a85db2bd9e97e22bfb5b692d_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 121, column 11]\n " shape="box"]
+"m6.36604411a85db2bd9e97e22bfb5b692d_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 121, column 11]\n " shape="box"]
 	
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_8" -> "m6.36604411a85db2bd9e97e22bfb5b692d_4" ;
-"m6.36604411a85db2bd9e97e22bfb5b692d_9" [label="9:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 121, column 11]\n " shape="box"]
+"m6.36604411a85db2bd9e97e22bfb5b692d_9" [label="9:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 121, column 11]\n " shape="box"]
 	
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_9" -> "m6.36604411a85db2bd9e97e22bfb5b692d_4" ;
@@ -558,7 +558,7 @@ digraph cfg {
 	
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_15" -> "m6.36604411a85db2bd9e97e22bfb5b692d_3" ;
-"m6.36604411a85db2bd9e97e22bfb5b692d_16" [label="16:  UnaryOperator \n   n$3=*&something:int [line 127, column 7]\n  *&something:int=(n$3 + 1) [line 127, column 7]\n " shape="box"]
+"m6.36604411a85db2bd9e97e22bfb5b692d_16" [label="16:  UnaryOperator \n   n$5=*&something:int [line 127, column 7]\n  *&something:int=(n$5 + 1) [line 127, column 7]\n " shape="box"]
 	
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_16" -> "m6.36604411a85db2bd9e97e22bfb5b692d_3" ;
@@ -575,7 +575,7 @@ digraph cfg {
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_19" -> "m6.36604411a85db2bd9e97e22bfb5b692d_13" ;
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_19" -> "m6.36604411a85db2bd9e97e22bfb5b692d_14" ;
-"m6.36604411a85db2bd9e97e22bfb5b692d_20" [label="20:  Call _fun_printf \n   n$4=_fun_printf(\"(0)HELLO WORLD!\":char const *) [line 123, column 7]\n " shape="box"]
+"m6.36604411a85db2bd9e97e22bfb5b692d_20" [label="20:  Call _fun_printf \n   n$7=_fun_printf(\"(0)HELLO WORLD!\":char const *) [line 123, column 7]\n " shape="box"]
 	
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_20" -> "m6.36604411a85db2bd9e97e22bfb5b692d_3" ;
@@ -629,7 +629,7 @@ digraph cfg {
 	
 
 	 "m7.0449904fbf32607bf8ce5c26823dbc29_9" -> "m7.0449904fbf32607bf8ce5c26823dbc29_3" ;
-"m7.0449904fbf32607bf8ce5c26823dbc29_10" [label="10:  UnaryOperator \n   n$1=*&something:int [line 147, column 7]\n  *&something:int=(n$1 + 1) [line 147, column 7]\n " shape="box"]
+"m7.0449904fbf32607bf8ce5c26823dbc29_10" [label="10:  UnaryOperator \n   n$3=*&something:int [line 147, column 7]\n  *&something:int=(n$3 + 1) [line 147, column 7]\n " shape="box"]
 	
 
 	 "m7.0449904fbf32607bf8ce5c26823dbc29_10" -> "m7.0449904fbf32607bf8ce5c26823dbc29_3" ;
@@ -646,7 +646,7 @@ digraph cfg {
 
 	 "m7.0449904fbf32607bf8ce5c26823dbc29_13" -> "m7.0449904fbf32607bf8ce5c26823dbc29_7" ;
 	 "m7.0449904fbf32607bf8ce5c26823dbc29_13" -> "m7.0449904fbf32607bf8ce5c26823dbc29_8" ;
-"m7.0449904fbf32607bf8ce5c26823dbc29_14" [label="14:  Call _fun_printf \n   n$2=_fun_printf(\"(0)HELLO WORLD!\":char const *) [line 143, column 7]\n " shape="box"]
+"m7.0449904fbf32607bf8ce5c26823dbc29_14" [label="14:  Call _fun_printf \n   n$5=_fun_printf(\"(0)HELLO WORLD!\":char const *) [line 143, column 7]\n " shape="box"]
 	
 
 	 "m7.0449904fbf32607bf8ce5c26823dbc29_14" -> "m7.0449904fbf32607bf8ce5c26823dbc29_3" ;
@@ -712,11 +712,11 @@ digraph cfg {
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_12" -> "m8.980b79c2a71b9bcc117e08a990b5b332_14" ;
-"m8.980b79c2a71b9bcc117e08a990b5b332_13" [label="13:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 160, column 13]\n " shape="box"]
+"m8.980b79c2a71b9bcc117e08a990b5b332_13" [label="13:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 160, column 13]\n " shape="box"]
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_13" -> "m8.980b79c2a71b9bcc117e08a990b5b332_9" ;
-"m8.980b79c2a71b9bcc117e08a990b5b332_14" [label="14:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=2 [line 160, column 13]\n " shape="box"]
+"m8.980b79c2a71b9bcc117e08a990b5b332_14" [label="14:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=2 [line 160, column 13]\n " shape="box"]
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_14" -> "m8.980b79c2a71b9bcc117e08a990b5b332_9" ;
@@ -746,7 +746,7 @@ digraph cfg {
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_20" -> "m8.980b79c2a71b9bcc117e08a990b5b332_8" ;
-"m8.980b79c2a71b9bcc117e08a990b5b332_21" [label="21:  UnaryOperator \n   n$4=*&something:int [line 166, column 9]\n  *&something:int=(n$4 + 1) [line 166, column 9]\n " shape="box"]
+"m8.980b79c2a71b9bcc117e08a990b5b332_21" [label="21:  UnaryOperator \n   n$7=*&something:int [line 166, column 9]\n  *&something:int=(n$7 + 1) [line 166, column 9]\n " shape="box"]
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_21" -> "m8.980b79c2a71b9bcc117e08a990b5b332_4" ;
@@ -767,7 +767,7 @@ digraph cfg {
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_25" -> "m8.980b79c2a71b9bcc117e08a990b5b332_2" ;
-"m8.980b79c2a71b9bcc117e08a990b5b332_26" [label="26:  Call _fun_printf \n   n$5=_fun_printf(\"(0)HELLO WORLD!\":char const *) [line 162, column 9]\n " shape="box"]
+"m8.980b79c2a71b9bcc117e08a990b5b332_26" [label="26:  Call _fun_printf \n   n$8=_fun_printf(\"(0)HELLO WORLD!\":char const *) [line 162, column 9]\n " shape="box"]
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_26" -> "m8.980b79c2a71b9bcc117e08a990b5b332_25" ;

infer/tests/codetoanalyze/c/frontend/vaarg_expr/vaarg_expr.c.dot

@@ -40,11 +40,11 @@ digraph cfg {
 	
 
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_10" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_5" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_11" [label="11:  DeclStmt \n   *&i:int=n$3 [line 15, column 3]\n " shape="box"]
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_11" [label="11:  DeclStmt \n   *&i:int=n$4 [line 15, column 3]\n " shape="box"]
 	
 
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_11" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_6" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_12" [label="12:  Call _fun___builtin_va_start \n   n$4=_fun___builtin_va_start(&valist:void*,&x:int&) [line 14, column 3]\n " shape="box"]
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_12" [label="12:  Call _fun___builtin_va_start \n   n$5=_fun___builtin_va_start(&valist:void*,&x:int&) [line 14, column 3]\n " shape="box"]
 	
 
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_12" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_11" ;

infer/tests/codetoanalyze/cpp/frontend/attributes/clang_fallthrough.cpp.dot

@@ -22,46 +22,46 @@ digraph cfg {
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_3" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_2" ;
-"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_4" [label="4:  Switch_stmt \n   n$1=*&n:int [line 14, column 11]\n " shape="box"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_4" [label="4:  Switch_stmt \n   n$2=*&n:int [line 14, column 11]\n " shape="box"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_4" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_12" ;
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_4" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_13" ;
-"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=_fun_h() [line 21, column 13]\n  *&res:int=n$2 [line 21, column 7]\n " shape="box"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_5" [label="5:  BinaryOperatorStmt: Assign \n   n$5=_fun_h() [line 21, column 13]\n  *&res:int=n$5 [line 21, column 7]\n " shape="box"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_5" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_3" ;
-"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_6" [label="6: Prune (true branch, switch) \n   PRUNE((n$1 == 77), true); [line 20, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_6" [label="6: Prune (true branch, switch) \n   PRUNE((n$2 == 77), true); [line 20, column 5]\n " shape="invhouse"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_6" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_5" ;
-"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_7" [label="7: Prune (false branch, switch) \n   PRUNE(!(n$1 == 77), false); [line 20, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_7" [label="7: Prune (false branch, switch) \n   PRUNE(!(n$2 == 77), false); [line 20, column 5]\n " shape="invhouse"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_7" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_3" ;
-"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_8" [label="8: Prune (true branch, switch) \n   PRUNE((n$1 == 66), true); [line 18, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_8" [label="8: Prune (true branch, switch) \n   PRUNE((n$2 == 66), true); [line 18, column 5]\n " shape="invhouse"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_8" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_5" ;
-"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_9" [label="9: Prune (false branch, switch) \n   PRUNE(!(n$1 == 66), false); [line 18, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_9" [label="9: Prune (false branch, switch) \n   PRUNE(!(n$2 == 66), false); [line 18, column 5]\n " shape="invhouse"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_9" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_6" ;
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_9" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_7" ;
-"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_10" [label="10: Prune (true branch, switch) \n   PRUNE((n$1 == 33), true); [line 16, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_10" [label="10: Prune (true branch, switch) \n   PRUNE((n$2 == 33), true); [line 16, column 5]\n " shape="invhouse"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_10" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_5" ;
-"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_11" [label="11: Prune (false branch, switch) \n   PRUNE(!(n$1 == 33), false); [line 16, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_11" [label="11: Prune (false branch, switch) \n   PRUNE(!(n$2 == 33), false); [line 16, column 5]\n " shape="invhouse"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_11" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_8" ;
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_11" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_9" ;
-"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$1 == 22), true); [line 15, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$2 == 22), true); [line 15, column 5]\n " shape="invhouse"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_12" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_5" ;
-"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_13" [label="13: Prune (false branch, switch) \n   PRUNE(!(n$1 == 22), false); [line 15, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_13" [label="13: Prune (false branch, switch) \n   PRUNE(!(n$2 == 22), false); [line 15, column 5]\n " shape="invhouse"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_13" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_10" ;

infer/tests/codetoanalyze/cpp/frontend/builtin/new.cpp.dot

@@ -18,15 +18,15 @@ digraph cfg {
 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Call delete \n   n$0=*&i:int* [line 14, column 10]\n  n$1=_fun___delete(n$0:int*) [line 14, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Call delete \n   n$1=*&i:int* [line 14, column 10]\n  n$2=_fun___delete(n$1:int*) [line 14, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  CXXNewExpr \n   n$2=_fun___new(sizeof(t=int):unsigned long) [line 13, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  CXXNewExpr \n   n$3=_fun___new(sizeof(t=int):unsigned long) [line 13, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   n$3=_fun___new(sizeof(t=int):unsigned long) [line 12, column 12]\n  *&i:int*=n$3 [line 12, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   n$4=_fun___new(sizeof(t=int):unsigned long) [line 12, column 12]\n  *&i:int*=n$4 [line 12, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;
@@ -41,7 +41,7 @@ digraph cfg {
 "test_placement#7589029240520377616.7f92d4e10c030674dddd1682731c0ba3_2" [label="2: Exit test_placement \n  " color=yellow style=filled]
 	
 
-"test_placement#7589029240520377616.7f92d4e10c030674dddd1682731c0ba3_3" [label="3:  DeclStmt \n   n$2=*&ptr:void* [line 26, column 60]\n  n$0=*&ptr2:int* [line 26, column 65]\n  *&ptr2:int*=(n$0 + 1) [line 26, column 65]\n  n$1=*&ptr2:int* [line 26, column 65]\n  n$3=_fun___placement_new(sizeof(t=A):unsigned long,n$2:void*,n$1:void*) [line 26, column 55]\n  n$4=_fun_A_A(n$3:A*) [line 26, column 73]\n  *&p:A*=n$3 [line 26, column 45]\n " shape="box"]
+"test_placement#7589029240520377616.7f92d4e10c030674dddd1682731c0ba3_3" [label="3:  DeclStmt \n   n$3=*&ptr:void* [line 26, column 60]\n  n$1=*&ptr2:int* [line 26, column 65]\n  *&ptr2:int*=(n$1 + 1) [line 26, column 65]\n  n$2=*&ptr2:int* [line 26, column 65]\n  n$4=_fun___placement_new(sizeof(t=A):unsigned long,n$3:void*,n$2:void*) [line 26, column 55]\n  n$5=_fun_A_A(n$4:A*) [line 26, column 73]\n  *&p:A*=n$4 [line 26, column 45]\n " shape="box"]
 	
 
 	 "test_placement#7589029240520377616.7f92d4e10c030674dddd1682731c0ba3_3" -> "test_placement#7589029240520377616.7f92d4e10c030674dddd1682731c0ba3_2" ;

infer/tests/codetoanalyze/cpp/frontend/destructors/break_scope.cpp.dot

@@ -15,15 +15,15 @@ digraph cfg {
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_4" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_16" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_5" [label="5: Prune (true branch, do while) \n   n$2=*&a:_Bool [line 90, column 12]\n  PRUNE(n$2, true); [line 90, column 12]\n " shape="invhouse"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_5" [label="5: Prune (true branch, do while) \n   n$3=*&a:_Bool [line 90, column 12]\n  PRUNE(n$3, true); [line 90, column 12]\n " shape="invhouse"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_5" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_4" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_6" [label="6: Prune (false branch, do while) \n   n$2=*&a:_Bool [line 90, column 12]\n  PRUNE(!n$2, false); [line 90, column 12]\n " shape="invhouse"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_6" [label="6: Prune (false branch, do while) \n   n$3=*&a:_Bool [line 90, column 12]\n  PRUNE(!n$3, false); [line 90, column 12]\n " shape="invhouse"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_6" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_3" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_7" [label="7:  Destruction \n   _=*&x2:break_scope::X [line 90, column 3]\n  n$4=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 90, column 3]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_7" [label="7:  Destruction \n   _=*&x2:break_scope::X [line 90, column 3]\n  n$5=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 90, column 3]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_7" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_5" ;
@@ -32,44 +32,44 @@ digraph cfg {
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_8" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_7" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_9" [label="9: Prune (true branch, if) \n   n$5=*&b:_Bool [line 84, column 9]\n  PRUNE(n$5, true); [line 84, column 9]\n " shape="invhouse"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_9" [label="9: Prune (true branch, if) \n   n$7=*&b:_Bool [line 84, column 9]\n  PRUNE(n$7, true); [line 84, column 9]\n " shape="invhouse"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_9" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_13" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_10" [label="10: Prune (false branch, if) \n   n$5=*&b:_Bool [line 84, column 9]\n  PRUNE(!n$5, false); [line 84, column 9]\n " shape="invhouse"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_10" [label="10: Prune (false branch, if) \n   n$7=*&b:_Bool [line 84, column 9]\n  PRUNE(!n$7, false); [line 84, column 9]\n " shape="invhouse"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_10" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_15" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_11" [label="11:  Destruction \n   _=*&x3:break_scope::X [line 87, column 5]\n  n$7=_fun_break_scope::X_~X(&x3:break_scope::X*) [line 87, column 5]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_11" [label="11:  Destruction \n   _=*&x3:break_scope::X [line 87, column 5]\n  n$9=_fun_break_scope::X_~X(&x3:break_scope::X*) [line 87, column 5]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_11" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_8" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_12" [label="12:  Destruction \n   _=*&x3:break_scope::X [line 86, column 7]\n  n$9=_fun_break_scope::X_~X(&x3:break_scope::X*) [line 86, column 7]\n  _=*&x2:break_scope::X [line 86, column 7]\n  n$11=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 86, column 7]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_12" [label="12:  Destruction \n   _=*&x3:break_scope::X [line 86, column 7]\n  n$12=_fun_break_scope::X_~X(&x3:break_scope::X*) [line 86, column 7]\n  _=*&x2:break_scope::X [line 86, column 7]\n  n$14=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 86, column 7]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_12" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_3" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_13" [label="13:  DeclStmt \n   n$12=_fun_break_scope::X_X(&x3:break_scope::X*) [line 85, column 9]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_13" [label="13:  DeclStmt \n   n$16=_fun_break_scope::X_X(&x3:break_scope::X*) [line 85, column 9]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_13" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_12" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_14" [label="14:  Destruction \n   _=*&x4:break_scope::X [line 89, column 5]\n  n$14=_fun_break_scope::X_~X(&x4:break_scope::X*) [line 89, column 5]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_14" [label="14:  Destruction \n   _=*&x4:break_scope::X [line 89, column 5]\n  n$18=_fun_break_scope::X_~X(&x4:break_scope::X*) [line 89, column 5]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_14" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_8" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_15" [label="15:  DeclStmt \n   n$15=_fun_break_scope::X_X(&x4:break_scope::X*) [line 88, column 9]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_15" [label="15:  DeclStmt \n   n$20=_fun_break_scope::X_X(&x4:break_scope::X*) [line 88, column 9]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_15" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_14" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_16" [label="16:  DeclStmt \n   n$16=_fun_break_scope::X_X(&x2:break_scope::X*) [line 83, column 7]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_16" [label="16:  DeclStmt \n   n$22=_fun_break_scope::X_X(&x2:break_scope::X*) [line 83, column 7]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_16" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_9" ;
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_16" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_10" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_17" [label="17:  DeclStmt \n   n$17=_fun_break_scope::X_X(&x1:break_scope::X*) [line 81, column 5]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_17" [label="17:  DeclStmt \n   n$24=_fun_break_scope::X_X(&x1:break_scope::X*) [line 81, column 5]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_17" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_4" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_1" [label="1: Start break_scope::test_for\nFormals:  b:_Bool\nLocals:  x2:break_scope::X it:break_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$5:break_scope::iterator 0$?%__sil_tmp__temp_return_n$11:break_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$13:break_scope::iterator x1:break_scope::X vector:break_scope::vec \n   DECLARE_LOCALS(&return,&x2,&it,&0$?%__sil_tmpSIL_materialize_temp__n$5,&0$?%__sil_tmp__temp_return_n$11,&0$?%__sil_tmpSIL_materialize_temp__n$13,&x1,&vector); [line 57, column 1]\n " color=yellow style=filled]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_1" [label="1: Start break_scope::test_for\nFormals:  b:_Bool\nLocals:  x2:break_scope::X it:break_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$6:break_scope::iterator 0$?%__sil_tmp__temp_return_n$13:break_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$16:break_scope::iterator const  x1:break_scope::X vector:break_scope::vec \n   DECLARE_LOCALS(&return,&x2,&it,&0$?%__sil_tmpSIL_materialize_temp__n$6,&0$?%__sil_tmp__temp_return_n$13,&0$?%__sil_tmpSIL_materialize_temp__n$16,&x1,&vector); [line 57, column 1]\n " color=yellow style=filled]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_1" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_17" ;
@@ -80,7 +80,7 @@ digraph cfg {
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_3" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_2" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_4" [label="4:  DeclStmt \n   n$4=_fun_break_scope::X_X(&x2:break_scope::X*) [line 65, column 5]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_4" [label="4:  DeclStmt \n   n$5=_fun_break_scope::X_X(&x2:break_scope::X*) [line 65, column 5]\n " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_4" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_3" ;
@@ -88,25 +88,25 @@ digraph cfg {
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_5" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_8" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_6" [label="6:  DeclStmt \n   _=*&vector:break_scope::vec [line 59, column 22]\n  n$8=_fun_break_scope::vec_begin(&vector:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$5:break_scope::iterator*) [line 59, column 22]\n  n$9=_fun_break_scope::iterator_iterator(&it:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$5:break_scope::iterator&) [line 59, column 22]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_6" [label="6:  DeclStmt \n   _=*&vector:break_scope::vec [line 59, column 22]\n  n$9=_fun_break_scope::vec_begin(&vector:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$6:break_scope::iterator*) [line 59, column 22]\n  n$10=_fun_break_scope::iterator_iterator(&it:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$6:break_scope::iterator&) [line 59, column 22]\n " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_6" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_5" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_7" [label="7:  Call _fun_break_scope::iterator_operator++ \n   n$12=_fun_break_scope::iterator_operator++(&it:break_scope::iterator&,&0$?%__sil_tmp__temp_return_n$11:break_scope::iterator*) [line 59, column 58]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_7" [label="7:  Call _fun_break_scope::iterator_operator++ \n   n$14=_fun_break_scope::iterator_operator++(&it:break_scope::iterator&,&0$?%__sil_tmp__temp_return_n$13:break_scope::iterator*) [line 59, column 58]\n " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_7" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_5" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_8" [label="8:  Call _fun_break_scope::iterator_operator!= \n   _=*&vector:break_scope::vec [line 59, column 44]\n  n$16=_fun_break_scope::vec_end(&vector:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$13:break_scope::iterator*) [line 59, column 44]\n  n$17=_fun_break_scope::iterator_operator!=(&it:break_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$13:break_scope::iterator&) [line 59, column 38]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_8" [label="8:  Call _fun_break_scope::iterator_operator!= \n   _=*&vector:break_scope::vec [line 59, column 44]\n  n$19=_fun_break_scope::vec_end(&vector:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$16:break_scope::iterator*) [line 59, column 44]\n  n$20=_fun_break_scope::iterator_operator!=(&it:break_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$16:break_scope::iterator const &) [line 59, column 38]\n " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_8" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_9" ;
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_8" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_10" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_9" [label="9: Prune (true branch, for loop) \n   PRUNE(n$17, true); [line 59, column 38]\n " shape="invhouse"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_9" [label="9: Prune (true branch, for loop) \n   PRUNE(n$20, true); [line 59, column 38]\n " shape="invhouse"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_9" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_12" ;
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_9" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_13" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_10" [label="10: Prune (false branch, for loop) \n   PRUNE(!n$17, false); [line 59, column 38]\n " shape="invhouse"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_10" [label="10: Prune (false branch, for loop) \n   PRUNE(!n$20, false); [line 59, column 38]\n " shape="invhouse"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_10" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_4" ;
@@ -114,31 +114,31 @@ digraph cfg {
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_11" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_7" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_12" [label="12: Prune (true branch, if) \n   n$18=*&b:_Bool [line 60, column 9]\n  PRUNE(n$18, true); [line 60, column 9]\n " shape="invhouse"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_12" [label="12: Prune (true branch, if) \n   n$22=*&b:_Bool [line 60, column 9]\n  PRUNE(n$22, true); [line 60, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_12" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_16" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_13" [label="13: Prune (false branch, if) \n   n$18=*&b:_Bool [line 60, column 9]\n  PRUNE(!n$18, false); [line 60, column 9]\n " shape="invhouse"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_13" [label="13: Prune (false branch, if) \n   n$22=*&b:_Bool [line 60, column 9]\n  PRUNE(!n$22, false); [line 60, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_13" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_11" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_14" [label="14:  Destruction \n   _=*&x1:break_scope::X [line 63, column 5]\n  n$20=_fun_break_scope::X_~X(&x1:break_scope::X*) [line 63, column 5]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_14" [label="14:  Destruction \n   _=*&x1:break_scope::X [line 63, column 5]\n  n$24=_fun_break_scope::X_~X(&x1:break_scope::X*) [line 63, column 5]\n " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_14" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_11" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_15" [label="15:  Destruction \n   _=*&x1:break_scope::X [line 62, column 7]\n  n$22=_fun_break_scope::X_~X(&x1:break_scope::X*) [line 62, column 7]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_15" [label="15:  Destruction \n   _=*&x1:break_scope::X [line 62, column 7]\n  n$27=_fun_break_scope::X_~X(&x1:break_scope::X*) [line 62, column 7]\n " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_15" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_4" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_16" [label="16:  DeclStmt \n   n$23=_fun_break_scope::X_X(&x1:break_scope::X*) [line 61, column 9]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_16" [label="16:  DeclStmt \n   n$29=_fun_break_scope::X_X(&x1:break_scope::X*) [line 61, column 9]\n " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_16" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_15" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_17" [label="17:  DeclStmt \n   n$24=_fun_break_scope::vec_vec(&vector:break_scope::vec*) [line 58, column 7]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_17" [label="17:  DeclStmt \n   n$33=_fun_break_scope::vec_vec(&vector:break_scope::vec*) [line 58, column 7]\n " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_17" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_6" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_1" [label="1: Start break_scope::test_for_range\nFormals:  b:_Bool\nLocals:  __end:break_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$4:break_scope::iterator __begin:break_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$10:break_scope::iterator 0$?%__sil_tmp__temp_return_n$17:break_scope::iterator x2:break_scope::X x:break_scope::X 0$?%__sil_tmpSIL_materialize_temp__n$26:break_scope::X __range:break_scope::vec& x1:break_scope::X vector:break_scope::vec \n   DECLARE_LOCALS(&return,&__end,&0$?%__sil_tmpSIL_materialize_temp__n$4,&__begin,&0$?%__sil_tmpSIL_materialize_temp__n$10,&0$?%__sil_tmp__temp_return_n$17,&x2,&x,&0$?%__sil_tmpSIL_materialize_temp__n$26,&__range,&x1,&vector); [line 46, column 1]\n " color=yellow style=filled]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_1" [label="1: Start break_scope::test_for_range\nFormals:  b:_Bool\nLocals:  __end:break_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$7:break_scope::iterator __begin:break_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$13:break_scope::iterator 0$?%__sil_tmp__temp_return_n$21:break_scope::iterator x2:break_scope::X x:break_scope::X 0$?%__sil_tmpSIL_materialize_temp__n$37:break_scope::X const  __range:break_scope::vec& x1:break_scope::X vector:break_scope::vec \n   DECLARE_LOCALS(&return,&__end,&0$?%__sil_tmpSIL_materialize_temp__n$7,&__begin,&0$?%__sil_tmpSIL_materialize_temp__n$13,&0$?%__sil_tmp__temp_return_n$21,&x2,&x,&0$?%__sil_tmpSIL_materialize_temp__n$37,&__range,&x1,&vector); [line 46, column 1]\n " color=yellow style=filled]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_1" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_20" ;
@@ -153,28 +153,28 @@ digraph cfg {
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_4" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_8" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_5" [label="5:  DeclStmt \n   n$5=*&__range:break_scope::vec& [line 49, column 12]\n  _=*n$5:break_scope::vec [line 49, column 12]\n  n$8=_fun_break_scope::vec_end(n$5:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$4:break_scope::iterator*) [line 49, column 12]\n  n$9=_fun_break_scope::iterator_iterator(&__end:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$4:break_scope::iterator&) [line 49, column 12]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_5" [label="5:  DeclStmt \n   n$8=*&__range:break_scope::vec& [line 49, column 12]\n  _=*n$8:break_scope::vec [line 49, column 12]\n  n$11=_fun_break_scope::vec_end(n$8:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$7:break_scope::iterator*) [line 49, column 12]\n  n$12=_fun_break_scope::iterator_iterator(&__end:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$7:break_scope::iterator&) [line 49, column 12]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_5" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_4" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_6" [label="6:  DeclStmt \n   n$11=*&__range:break_scope::vec& [line 49, column 12]\n  _=*n$11:break_scope::vec [line 49, column 12]\n  n$14=_fun_break_scope::vec_begin(n$11:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$10:break_scope::iterator*) [line 49, column 12]\n  n$15=_fun_break_scope::iterator_iterator(&__begin:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$10:break_scope::iterator&) [line 49, column 12]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_6" [label="6:  DeclStmt \n   n$14=*&__range:break_scope::vec& [line 49, column 12]\n  _=*n$14:break_scope::vec [line 49, column 12]\n  n$17=_fun_break_scope::vec_begin(n$14:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$13:break_scope::iterator*) [line 49, column 12]\n  n$18=_fun_break_scope::iterator_iterator(&__begin:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$13:break_scope::iterator&) [line 49, column 12]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_6" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_5" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_7" [label="7:  Call _fun_break_scope::iterator_operator++ \n   n$18=_fun_break_scope::iterator_operator++(&__begin:break_scope::iterator&,&0$?%__sil_tmp__temp_return_n$17:break_scope::iterator*) [line 49, column 12]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_7" [label="7:  Call _fun_break_scope::iterator_operator++ \n   n$22=_fun_break_scope::iterator_operator++(&__begin:break_scope::iterator&,&0$?%__sil_tmp__temp_return_n$21:break_scope::iterator*) [line 49, column 12]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_7" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_4" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_8" [label="8:  Call _fun_break_scope::iterator_operator!= \n   n$19=_fun_break_scope::iterator_operator!=(&__begin:break_scope::iterator&,&__end:break_scope::iterator&) [line 49, column 12]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_8" [label="8:  Call _fun_break_scope::iterator_operator!= \n   n$24=_fun_break_scope::iterator_operator!=(&__begin:break_scope::iterator&,&__end:break_scope::iterator&) [line 49, column 12]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_8" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_9" ;
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_8" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_10" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_9" [label="9: Prune (true branch, for loop) \n   PRUNE(n$19, true); [line 49, column 12]\n " shape="invhouse"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_9" [label="9: Prune (true branch, for loop) \n   PRUNE(n$24, true); [line 49, column 12]\n " shape="invhouse"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_9" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_17" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_10" [label="10: Prune (false branch, for loop) \n   PRUNE(!n$19, false); [line 49, column 12]\n " shape="invhouse"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_10" [label="10: Prune (false branch, for loop) \n   PRUNE(!n$24, false); [line 49, column 12]\n " shape="invhouse"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_10" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_3" ;
@@ -182,27 +182,27 @@ digraph cfg {
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_11" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_7" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_12" [label="12: Prune (true branch, if) \n   n$20=*&b:_Bool [line 50, column 9]\n  PRUNE(n$20, true); [line 50, column 9]\n " shape="invhouse"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_12" [label="12: Prune (true branch, if) \n   n$27=*&b:_Bool [line 50, column 9]\n  PRUNE(n$27, true); [line 50, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_12" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_16" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_13" [label="13: Prune (false branch, if) \n   n$20=*&b:_Bool [line 50, column 9]\n  PRUNE(!n$20, false); [line 50, column 9]\n " shape="invhouse"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_13" [label="13: Prune (false branch, if) \n   n$27=*&b:_Bool [line 50, column 9]\n  PRUNE(!n$27, false); [line 50, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_13" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_11" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_14" [label="14:  Destruction \n   _=*&x2:break_scope::X [line 53, column 5]\n  n$22=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 53, column 5]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_14" [label="14:  Destruction \n   _=*&x2:break_scope::X [line 53, column 5]\n  n$29=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 53, column 5]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_14" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_11" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_15" [label="15:  Destruction \n   _=*&x2:break_scope::X [line 52, column 7]\n  n$24=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 52, column 7]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_15" [label="15:  Destruction \n   _=*&x2:break_scope::X [line 52, column 7]\n  n$32=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 52, column 7]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_15" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_3" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_16" [label="16:  DeclStmt \n   n$25=_fun_break_scope::X_X(&x2:break_scope::X*,&x:break_scope::X&) [line 51, column 14]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_16" [label="16:  DeclStmt \n   n$34=_fun_break_scope::X_X(&x2:break_scope::X*,&x:break_scope::X&) [line 51, column 14]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_16" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_15" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_17" [label="17:  DeclStmt \n   n$28=_fun_break_scope::iterator_operator*(&__begin:break_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$26:break_scope::X*) [line 49, column 12]\n  n$29=_fun_break_scope::X_X(&x:break_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$26:break_scope::X&) [line 49, column 12]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_17" [label="17:  DeclStmt \n   n$40=_fun_break_scope::iterator_operator*(&__begin:break_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$37:break_scope::X*) [line 49, column 12]\n  n$41=_fun_break_scope::X_X(&x:break_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$37:break_scope::X const &) [line 49, column 12]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_17" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_12" ;
@@ -211,11 +211,11 @@ digraph cfg {
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_18" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_6" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_19" [label="19:  DeclStmt \n   n$30=_fun_break_scope::X_X(&x1:break_scope::X*) [line 48, column 5]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_19" [label="19:  DeclStmt \n   n$43=_fun_break_scope::X_X(&x1:break_scope::X*) [line 48, column 5]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_19" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_18" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_20" [label="20:  DeclStmt \n   n$31=_fun_break_scope::vec_vec(&vector:break_scope::vec*) [line 47, column 7]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_20" [label="20:  DeclStmt \n   n$44=_fun_break_scope::vec_vec(&vector:break_scope::vec*) [line 47, column 7]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_20" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_19" ;
@@ -230,70 +230,70 @@ digraph cfg {
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_3" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_2" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_4" [label="4:  DeclStmt \n   n$4=_fun_break_scope::X_X(&x5:break_scope::X*) [line 129, column 5]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_4" [label="4:  DeclStmt \n   n$5=_fun_break_scope::X_X(&x5:break_scope::X*) [line 129, column 5]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_4" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_3" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_5" [label="5:  Switch_stmt \n   n$5=*&n:int [line 117, column 11]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_5" [label="5:  Switch_stmt \n   n$6=*&n:int [line 117, column 11]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_5" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_17" ;
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_5" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_18" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_6" [label="6:  Destruction \n   _=*&x4:break_scope::X [line 127, column 5]\n  n$7=_fun_break_scope::X_~X(&x4:break_scope::X*) [line 127, column 5]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_6" [label="6:  Destruction \n   _=*&x4:break_scope::X [line 127, column 5]\n  n$8=_fun_break_scope::X_~X(&x4:break_scope::X*) [line 127, column 5]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_6" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_4" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_7" [label="7:  DeclStmt \n   n$8=_fun_break_scope::X_X(&x4:break_scope::X*) [line 126, column 9]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_7" [label="7:  DeclStmt \n   n$10=_fun_break_scope::X_X(&x4:break_scope::X*) [line 126, column 9]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_7" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_6" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_8" [label="8: Prune (true branch, switch) \n   PRUNE((n$5 == 3), true); [line 125, column 5]\n " shape="invhouse"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_8" [label="8: Prune (true branch, switch) \n   PRUNE((n$6 == 3), true); [line 125, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_8" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_7" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_9" [label="9: Prune (false branch, switch) \n   PRUNE(!(n$5 == 3), false); [line 125, column 5]\n " shape="invhouse"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_9" [label="9: Prune (false branch, switch) \n   PRUNE(!(n$6 == 3), false); [line 125, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_9" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_4" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_10" [label="10:  Destruction \n   _=*&x3:break_scope::X [line 124, column 5]\n  n$10=_fun_break_scope::X_~X(&x3:break_scope::X*) [line 124, column 5]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_10" [label="10:  Destruction \n   _=*&x3:break_scope::X [line 124, column 5]\n  n$12=_fun_break_scope::X_~X(&x3:break_scope::X*) [line 124, column 5]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_10" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_7" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_11" [label="11:  Destruction \n   _=*&x3:break_scope::X [line 123, column 7]\n  n$12=_fun_break_scope::X_~X(&x3:break_scope::X*) [line 123, column 7]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_11" [label="11:  Destruction \n   _=*&x3:break_scope::X [line 123, column 7]\n  n$15=_fun_break_scope::X_~X(&x3:break_scope::X*) [line 123, column 7]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_11" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_4" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_12" [label="12:  DeclStmt \n   n$13=_fun_break_scope::X_X(&x3:break_scope::X*) [line 122, column 9]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_12" [label="12:  DeclStmt \n   n$17=_fun_break_scope::X_X(&x3:break_scope::X*) [line 122, column 9]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_12" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_11" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_13" [label="13: Prune (true branch, switch) \n   PRUNE((n$5 == 2), true); [line 121, column 5]\n " shape="invhouse"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_13" [label="13: Prune (true branch, switch) \n   PRUNE((n$6 == 2), true); [line 121, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_13" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_12" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_14" [label="14: Prune (false branch, switch) \n   PRUNE(!(n$5 == 2), false); [line 121, column 5]\n " shape="invhouse"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_14" [label="14: Prune (false branch, switch) \n   PRUNE(!(n$6 == 2), false); [line 121, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_14" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_8" ;
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_14" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_9" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_15" [label="15:  Destruction \n   _=*&x2:break_scope::X [line 120, column 5]\n  n$15=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 120, column 5]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_15" [label="15:  Destruction \n   _=*&x2:break_scope::X [line 120, column 5]\n  n$19=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 120, column 5]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_15" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_12" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_16" [label="16:  DeclStmt \n   n$16=_fun_break_scope::X_X(&x2:break_scope::X*) [line 119, column 9]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_16" [label="16:  DeclStmt \n   n$21=_fun_break_scope::X_X(&x2:break_scope::X*) [line 119, column 9]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_16" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_15" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_17" [label="17: Prune (true branch, switch) \n   PRUNE((n$5 == 1), true); [line 118, column 5]\n " shape="invhouse"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_17" [label="17: Prune (true branch, switch) \n   PRUNE((n$6 == 1), true); [line 118, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_17" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_16" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_18" [label="18: Prune (false branch, switch) \n   PRUNE(!(n$5 == 1), false); [line 118, column 5]\n " shape="invhouse"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_18" [label="18: Prune (false branch, switch) \n   PRUNE(!(n$6 == 1), false); [line 118, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_18" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_13" ;
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_18" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_14" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_19" [label="19:  DeclStmt \n   n$17=_fun_break_scope::X_X(&x1:break_scope::X*) [line 116, column 5]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_19" [label="19:  DeclStmt \n   n$23=_fun_break_scope::X_X(&x1:break_scope::X*) [line 116, column 5]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_19" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_5" ;
@@ -313,12 +313,12 @@ digraph cfg {
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_4" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_5" ;
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_4" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_6" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_5" [label="5: Prune (true branch, while) \n   n$2=*&a:_Bool [line 70, column 10]\n  PRUNE(n$2, true); [line 70, column 10]\n " shape="invhouse"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_5" [label="5: Prune (true branch, while) \n   n$3=*&a:_Bool [line 70, column 10]\n  PRUNE(n$3, true); [line 70, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_5" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_8" ;
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_5" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_9" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_6" [label="6: Prune (false branch, while) \n   n$2=*&a:_Bool [line 70, column 10]\n  PRUNE(!n$2, false); [line 70, column 10]\n " shape="invhouse"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_6" [label="6: Prune (false branch, while) \n   n$3=*&a:_Bool [line 70, column 10]\n  PRUNE(!n$3, false); [line 70, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_6" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_3" ;
@@ -326,35 +326,35 @@ digraph cfg {
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_7" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_4" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_8" [label="8: Prune (true branch, if) \n   n$3=*&b:_Bool [line 71, column 9]\n  PRUNE(n$3, true); [line 71, column 9]\n " shape="invhouse"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_8" [label="8: Prune (true branch, if) \n   n$5=*&b:_Bool [line 71, column 9]\n  PRUNE(n$5, true); [line 71, column 9]\n " shape="invhouse"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_8" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_12" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_9" [label="9: Prune (false branch, if) \n   n$3=*&b:_Bool [line 71, column 9]\n  PRUNE(!n$3, false); [line 71, column 9]\n " shape="invhouse"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_9" [label="9: Prune (false branch, if) \n   n$5=*&b:_Bool [line 71, column 9]\n  PRUNE(!n$5, false); [line 71, column 9]\n " shape="invhouse"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_9" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_14" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_10" [label="10:  Destruction \n   _=*&x2:break_scope::X [line 74, column 5]\n  n$5=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 74, column 5]\n " shape="box"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_10" [label="10:  Destruction \n   _=*&x2:break_scope::X [line 74, column 5]\n  n$7=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 74, column 5]\n " shape="box"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_10" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_7" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_11" [label="11:  Destruction \n   _=*&x2:break_scope::X [line 73, column 7]\n  n$7=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 73, column 7]\n " shape="box"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_11" [label="11:  Destruction \n   _=*&x2:break_scope::X [line 73, column 7]\n  n$10=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 73, column 7]\n " shape="box"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_11" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_3" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_12" [label="12:  DeclStmt \n   n$8=_fun_break_scope::X_X(&x2:break_scope::X*) [line 72, column 9]\n " shape="box"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_12" [label="12:  DeclStmt \n   n$12=_fun_break_scope::X_X(&x2:break_scope::X*) [line 72, column 9]\n " shape="box"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_12" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_11" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_13" [label="13:  Destruction \n   _=*&x4:break_scope::X [line 76, column 5]\n  n$10=_fun_break_scope::X_~X(&x4:break_scope::X*) [line 76, column 5]\n " shape="box"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_13" [label="13:  Destruction \n   _=*&x4:break_scope::X [line 76, column 5]\n  n$14=_fun_break_scope::X_~X(&x4:break_scope::X*) [line 76, column 5]\n " shape="box"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_13" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_7" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_14" [label="14:  DeclStmt \n   n$11=_fun_break_scope::X_X(&x4:break_scope::X*) [line 75, column 9]\n " shape="box"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_14" [label="14:  DeclStmt \n   n$16=_fun_break_scope::X_X(&x4:break_scope::X*) [line 75, column 9]\n " shape="box"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_14" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_13" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_15" [label="15:  DeclStmt \n   n$12=_fun_break_scope::X_X(&x1:break_scope::X*) [line 69, column 5]\n " shape="box"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_15" [label="15:  DeclStmt \n   n$19=_fun_break_scope::X_X(&x1:break_scope::X*) [line 69, column 5]\n " shape="box"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_15" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_4" ;
@@ -374,15 +374,15 @@ digraph cfg {
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_4" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_5" ;
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_4" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_6" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_5" [label="5: Prune (true branch, while) \n   n$2=*&a:_Bool [line 95, column 10]\n  PRUNE(n$2, true); [line 95, column 10]\n " shape="invhouse"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_5" [label="5: Prune (true branch, while) \n   n$3=*&a:_Bool [line 95, column 10]\n  PRUNE(n$3, true); [line 95, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_5" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_14" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_6" [label="6: Prune (false branch, while) \n   n$2=*&a:_Bool [line 95, column 10]\n  PRUNE(!n$2, false); [line 95, column 10]\n " shape="invhouse"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_6" [label="6: Prune (false branch, while) \n   n$3=*&a:_Bool [line 95, column 10]\n  PRUNE(!n$3, false); [line 95, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_6" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_3" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_7" [label="7:  Destruction \n   _=*&x2:break_scope::X [line 101, column 3]\n  n$4=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 101, column 3]\n " shape="box"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_7" [label="7:  Destruction \n   _=*&x2:break_scope::X [line 101, column 3]\n  n$5=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 101, column 3]\n " shape="box"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_7" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_4" ;
@@ -391,31 +391,31 @@ digraph cfg {
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_8" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_9" ;
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_8" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_10" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_9" [label="9: Prune (true branch, while) \n   n$5=*&b:_Bool [line 97, column 12]\n  PRUNE(n$5, true); [line 97, column 12]\n " shape="invhouse"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_9" [label="9: Prune (true branch, while) \n   n$7=*&b:_Bool [line 97, column 12]\n  PRUNE(n$7, true); [line 97, column 12]\n " shape="invhouse"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_9" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_13" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_10" [label="10: Prune (false branch, while) \n   n$5=*&b:_Bool [line 97, column 12]\n  PRUNE(!n$5, false); [line 97, column 12]\n " shape="invhouse"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_10" [label="10: Prune (false branch, while) \n   n$7=*&b:_Bool [line 97, column 12]\n  PRUNE(!n$7, false); [line 97, column 12]\n " shape="invhouse"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_10" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_7" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_11" [label="11:  Destruction \n   _=*&x3:break_scope::X [line 100, column 5]\n  n$7=_fun_break_scope::X_~X(&x3:break_scope::X*) [line 100, column 5]\n " shape="box"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_11" [label="11:  Destruction \n   _=*&x3:break_scope::X [line 100, column 5]\n  n$9=_fun_break_scope::X_~X(&x3:break_scope::X*) [line 100, column 5]\n " shape="box"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_11" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_8" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_12" [label="12:  Destruction \n   _=*&x3:break_scope::X [line 99, column 7]\n  n$9=_fun_break_scope::X_~X(&x3:break_scope::X*) [line 99, column 7]\n " shape="box"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_12" [label="12:  Destruction \n   _=*&x3:break_scope::X [line 99, column 7]\n  n$12=_fun_break_scope::X_~X(&x3:break_scope::X*) [line 99, column 7]\n " shape="box"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_12" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_7" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_13" [label="13:  DeclStmt \n   n$10=_fun_break_scope::X_X(&x3:break_scope::X*) [line 98, column 9]\n " shape="box"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_13" [label="13:  DeclStmt \n   n$14=_fun_break_scope::X_X(&x3:break_scope::X*) [line 98, column 9]\n " shape="box"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_13" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_12" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_14" [label="14:  DeclStmt \n   n$11=_fun_break_scope::X_X(&x2:break_scope::X*) [line 96, column 7]\n " shape="box"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_14" [label="14:  DeclStmt \n   n$16=_fun_break_scope::X_X(&x2:break_scope::X*) [line 96, column 7]\n " shape="box"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_14" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_8" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_15" [label="15:  DeclStmt \n   n$12=_fun_break_scope::X_X(&x1:break_scope::X*) [line 94, column 5]\n " shape="box"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_15" [label="15:  DeclStmt \n   n$18=_fun_break_scope::X_X(&x1:break_scope::X*) [line 94, column 5]\n " shape="box"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_15" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_4" ;
@@ -430,7 +430,7 @@ digraph cfg {
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_3" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_2" ;
-"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_4" [label="4:  DeclStmt \n   n$4=_fun_break_scope::X_X(&x3:break_scope::X*) [line 112, column 5]\n " shape="box"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_4" [label="4:  DeclStmt \n   n$5=_fun_break_scope::X_X(&x3:break_scope::X*) [line 112, column 5]\n " shape="box"]
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_4" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_3" ;
@@ -439,15 +439,15 @@ digraph cfg {
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_5" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_6" ;
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_5" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_7" ;
-"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_6" [label="6: Prune (true branch, while) \n   n$5=*&a:_Bool [line 106, column 10]\n  PRUNE(n$5, true); [line 106, column 10]\n " shape="invhouse"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_6" [label="6: Prune (true branch, while) \n   n$6=*&a:_Bool [line 106, column 10]\n  PRUNE(n$6, true); [line 106, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_6" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_12" ;
-"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_7" [label="7: Prune (false branch, while) \n   n$5=*&a:_Bool [line 106, column 10]\n  PRUNE(!n$5, false); [line 106, column 10]\n " shape="invhouse"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_7" [label="7: Prune (false branch, while) \n   n$6=*&a:_Bool [line 106, column 10]\n  PRUNE(!n$6, false); [line 106, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_7" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_4" ;
-"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_8" [label="8:  Destruction \n   _=*&x2:break_scope::X [line 111, column 3]\n  n$7=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 111, column 3]\n " shape="box"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_8" [label="8:  Destruction \n   _=*&x2:break_scope::X [line 111, column 3]\n  n$8=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 111, column 3]\n " shape="box"]
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_8" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_5" ;
@@ -456,19 +456,19 @@ digraph cfg {
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_9" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_10" ;
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_9" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_11" ;
-"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_10" [label="10: Prune (true branch, while) \n   n$8=*&b:_Bool [line 108, column 12]\n  PRUNE(n$8, true); [line 108, column 12]\n " shape="invhouse"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_10" [label="10: Prune (true branch, while) \n   n$10=*&b:_Bool [line 108, column 12]\n  PRUNE(n$10, true); [line 108, column 12]\n " shape="invhouse"]
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_10" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_8" ;
-"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_11" [label="11: Prune (false branch, while) \n   n$8=*&b:_Bool [line 108, column 12]\n  PRUNE(!n$8, false); [line 108, column 12]\n " shape="invhouse"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_11" [label="11: Prune (false branch, while) \n   n$10=*&b:_Bool [line 108, column 12]\n  PRUNE(!n$10, false); [line 108, column 12]\n " shape="invhouse"]
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_11" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_8" ;
-"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_12" [label="12:  DeclStmt \n   n$9=_fun_break_scope::X_X(&x2:break_scope::X*) [line 107, column 7]\n " shape="box"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_12" [label="12:  DeclStmt \n   n$15=_fun_break_scope::X_X(&x2:break_scope::X*) [line 107, column 7]\n " shape="box"]
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_12" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_9" ;
-"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_13" [label="13:  DeclStmt \n   n$10=_fun_break_scope::X_X(&x1:break_scope::X*) [line 105, column 5]\n " shape="box"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_13" [label="13:  DeclStmt \n   n$17=_fun_break_scope::X_X(&x1:break_scope::X*) [line 105, column 5]\n " shape="box"]
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_13" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_5" ;
@@ -540,11 +540,11 @@ digraph cfg {
 "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_2" [label="2: Exit break_scope::iterator_iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_3" [label="3:  Constructor Init \n   n$0=*&this:break_scope::iterator* [line 18, column 8]\n  n$1=*&__param_0:break_scope::iterator const & [line 18, column 8]\n  n$2=*n$1.vector:break_scope::vec const * [line 18, column 8]\n  *n$0.vector:break_scope::vec const *=n$2 [line 18, column 8]\n " shape="box"]
+"iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_3" [label="3:  Constructor Init \n   n$2=*&this:break_scope::iterator* [line 18, column 8]\n  n$3=*&__param_0:break_scope::iterator const & [line 18, column 8]\n  n$4=*n$3.vector:break_scope::vec const * [line 18, column 8]\n  *n$2.vector:break_scope::vec const *=n$4 [line 18, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_3" -> "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_2" ;
-"iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_4" [label="4:  Constructor Init \n   n$3=*&this:break_scope::iterator* [line 18, column 8]\n  n$4=*&__param_0:break_scope::iterator const & [line 18, column 8]\n  n$5=*n$4.position:int [line 18, column 8]\n  *n$3.position:int=n$5 [line 18, column 8]\n " shape="box"]
+"iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_4" [label="4:  Constructor Init \n   n$5=*&this:break_scope::iterator* [line 18, column 8]\n  n$6=*&__param_0:break_scope::iterator const & [line 18, column 8]\n  n$7=*n$6.position:int [line 18, column 8]\n  *n$5.position:int=n$7 [line 18, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_4" -> "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_3" ;
@@ -555,11 +555,11 @@ digraph cfg {
 "iterator#iterator#break_scope#{16869174875139255019}.6ab4697f81ed961d5f192c83dffe5de4_2" [label="2: Exit break_scope::iterator_iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#break_scope#{16869174875139255019}.6ab4697f81ed961d5f192c83dffe5de4_3" [label="3:  Constructor Init \n   n$0=*&this:break_scope::iterator* [line 22, column 52]\n  n$1=*&v:break_scope::vec const * [line 22, column 59]\n  *n$0.vector:break_scope::vec const *=n$1 [line 22, column 52]\n " shape="box"]
+"iterator#iterator#break_scope#{16869174875139255019}.6ab4697f81ed961d5f192c83dffe5de4_3" [label="3:  Constructor Init \n   n$2=*&this:break_scope::iterator* [line 22, column 52]\n  n$3=*&v:break_scope::vec const * [line 22, column 59]\n  *n$2.vector:break_scope::vec const *=n$3 [line 22, column 52]\n " shape="box"]
 	
 
 	 "iterator#iterator#break_scope#{16869174875139255019}.6ab4697f81ed961d5f192c83dffe5de4_3" -> "iterator#iterator#break_scope#{16869174875139255019}.6ab4697f81ed961d5f192c83dffe5de4_2" ;
-"iterator#iterator#break_scope#{16869174875139255019}.6ab4697f81ed961d5f192c83dffe5de4_4" [label="4:  Constructor Init \n   n$2=*&this:break_scope::iterator* [line 22, column 37]\n  n$3=*&pos:int [line 22, column 46]\n  *n$2.position:int=n$3 [line 22, column 37]\n " shape="box"]
+"iterator#iterator#break_scope#{16869174875139255019}.6ab4697f81ed961d5f192c83dffe5de4_4" [label="4:  Constructor Init \n   n$4=*&this:break_scope::iterator* [line 22, column 37]\n  n$5=*&pos:int [line 22, column 46]\n  *n$4.position:int=n$5 [line 22, column 37]\n " shape="box"]
 	
 
 	 "iterator#iterator#break_scope#{16869174875139255019}.6ab4697f81ed961d5f192c83dffe5de4_4" -> "iterator#iterator#break_scope#{16869174875139255019}.6ab4697f81ed961d5f192c83dffe5de4_3" ;
@@ -570,11 +570,11 @@ digraph cfg {
 "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_2" [label="2: Exit break_scope::iterator_iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_3" [label="3:  Constructor Init \n   n$0=*&this:break_scope::iterator* [line 18, column 8]\n  n$1=*&__param_0:break_scope::iterator& [line 18, column 8]\n  n$2=*n$1.vector:break_scope::vec const * [line 18, column 8]\n  *n$0.vector:break_scope::vec const *=n$2 [line 18, column 8]\n " shape="box"]
+"iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_3" [label="3:  Constructor Init \n   n$2=*&this:break_scope::iterator* [line 18, column 8]\n  n$3=*&__param_0:break_scope::iterator& [line 18, column 8]\n  n$4=*n$3.vector:break_scope::vec const * [line 18, column 8]\n  *n$2.vector:break_scope::vec const *=n$4 [line 18, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_3" -> "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_2" ;
-"iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_4" [label="4:  Constructor Init \n   n$3=*&this:break_scope::iterator* [line 18, column 8]\n  n$4=*&__param_0:break_scope::iterator& [line 18, column 8]\n  n$5=*n$4.position:int [line 18, column 8]\n  *n$3.position:int=n$5 [line 18, column 8]\n " shape="box"]
+"iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_4" [label="4:  Constructor Init \n   n$5=*&this:break_scope::iterator* [line 18, column 8]\n  n$6=*&__param_0:break_scope::iterator& [line 18, column 8]\n  n$7=*n$6.position:int [line 18, column 8]\n  *n$5.position:int=n$7 [line 18, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_4" -> "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_3" ;
@@ -602,11 +602,11 @@ digraph cfg {
 	
 
 	 "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_6" -> "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_8" ;
-"operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=1 [line 29, column 48]\n " shape="box"]
+"operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=1 [line 29, column 48]\n " shape="box"]
 	
 
 	 "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_7" -> "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_3" ;
-"operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=0 [line 29, column 48]\n " shape="box"]
+"operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=0 [line 29, column 48]\n " shape="box"]
 	
 
 	 "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_8" -> "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_3" ;
@@ -614,14 +614,14 @@ digraph cfg {
 	
 
 	 "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_9" -> "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_2" ;
-"operator*#iterator#break_scope#(4328339407583570703).cdad0941eaaed797f70482510d139870_1" [label="1: Start break_scope::iterator_operator*\nFormals:  this:break_scope::iterator* __return_param:break_scope::X*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 44, column 1]\n " color=yellow style=filled]
+"operator*#iterator#break_scope#(4328339407583570703).cdad0941eaaed797f70482510d139870_1" [label="1: Start break_scope::iterator_operator*\nFormals:  this:break_scope::iterator* __return_param:break_scope::X*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X const  \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 44, column 1]\n " color=yellow style=filled]
 	
 
 	 "operator*#iterator#break_scope#(4328339407583570703).cdad0941eaaed797f70482510d139870_1" -> "operator*#iterator#break_scope#(4328339407583570703).cdad0941eaaed797f70482510d139870_3" ;
 "operator*#iterator#break_scope#(4328339407583570703).cdad0941eaaed797f70482510d139870_2" [label="2: Exit break_scope::iterator_operator* \n  " color=yellow style=filled]
 	
 
-"operator*#iterator#break_scope#(4328339407583570703).cdad0941eaaed797f70482510d139870_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::X* [line 44, column 33]\n  n$2=*&this:break_scope::iterator const * [line 44, column 40]\n  n$3=*n$2.vector:break_scope::vec const * [line 44, column 40]\n  _=*n$3:break_scope::vec const  [line 44, column 40]\n  n$5=*&this:break_scope::iterator const * [line 44, column 52]\n  n$6=*n$5.position:int [line 44, column 52]\n  n$8=_fun_break_scope::vec_get(n$3:break_scope::vec const *,n$6:int,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X*) [line 44, column 40]\n  n$9=_fun_break_scope::X_X(n$0:break_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X&) [line 44, column 40]\n " shape="box"]
+"operator*#iterator#break_scope#(4328339407583570703).cdad0941eaaed797f70482510d139870_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::X* [line 44, column 33]\n  n$2=*&this:break_scope::iterator const * [line 44, column 40]\n  n$3=*n$2.vector:break_scope::vec const * [line 44, column 40]\n  _=*n$3:break_scope::vec const  [line 44, column 40]\n  n$5=*&this:break_scope::iterator const * [line 44, column 52]\n  n$6=*n$5.position:int [line 44, column 52]\n  n$8=_fun_break_scope::vec_get(n$3:break_scope::vec const *,n$6:int,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X*) [line 44, column 40]\n  n$9=_fun_break_scope::X_X(n$0:break_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X const &) [line 44, column 40]\n " shape="box"]
 	
 
 	 "operator*#iterator#break_scope#(4328339407583570703).cdad0941eaaed797f70482510d139870_3" -> "operator*#iterator#break_scope#(4328339407583570703).cdad0941eaaed797f70482510d139870_2" ;
@@ -636,7 +636,7 @@ digraph cfg {
 	
 
 	 "operator++#iterator#break_scope#(2766485846133390801).11d4c93e59bfd59c8af952e0b96f50cf_3" -> "operator++#iterator#break_scope#(2766485846133390801).11d4c93e59bfd59c8af952e0b96f50cf_2" ;
-"operator++#iterator#break_scope#(2766485846133390801).11d4c93e59bfd59c8af952e0b96f50cf_4" [label="4:  UnaryOperator \n   n$3=*&this:break_scope::iterator* [line 25, column 5]\n  n$4=*n$3.position:int [line 25, column 5]\n  *n$3.position:int=(n$4 + 1) [line 25, column 5]\n " shape="box"]
+"operator++#iterator#break_scope#(2766485846133390801).11d4c93e59bfd59c8af952e0b96f50cf_4" [label="4:  UnaryOperator \n   n$4=*&this:break_scope::iterator* [line 25, column 5]\n  n$5=*n$4.position:int [line 25, column 5]\n  *n$4.position:int=(n$5 + 1) [line 25, column 5]\n " shape="box"]
 	
 
 	 "operator++#iterator#break_scope#(2766485846133390801).11d4c93e59bfd59c8af952e0b96f50cf_4" -> "operator++#iterator#break_scope#(2766485846133390801).11d4c93e59bfd59c8af952e0b96f50cf_3" ;
@@ -647,7 +647,7 @@ digraph cfg {
 "vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_2" [label="2: Exit break_scope::vec_vec \n  " color=yellow style=filled]
 	
 
-"vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_3" [label="3:  Constructor Init \n   n$0=*&this:break_scope::vec* [line 35, column 3]\n  n$1=_fun_break_scope::X_X(n$0._data:break_scope::X[10*1](*)) [line 35, column 3]\n " shape="box"]
+"vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_3" [label="3:  Constructor Init \n   n$2=*&this:break_scope::vec* [line 35, column 3]\n  n$3=_fun_break_scope::X_X(n$2._data:break_scope::X[10*1](*)) [line 35, column 3]\n " shape="box"]
 	
 
 	 "vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_3" -> "vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_2" ;

infer/tests/codetoanalyze/cpp/frontend/destructors/call_destructor.cpp.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "f#3072121847520995784.879d673a5bab84df6d2f71ce7f834b14_2" [label="2: Exit f \n  " color=yellow style=filled]
 	
 
-"f#3072121847520995784.879d673a5bab84df6d2f71ce7f834b14_3" [label="3:  Call _fun_Person_~Person \n   n$0=*&p:Person* [line 15, column 21]\n  _=*n$0:Person [line 15, column 21]\n  n$2=_fun_Person_~Person(n$0:Person*) [line 15, column 21]\n " shape="box"]
+"f#3072121847520995784.879d673a5bab84df6d2f71ce7f834b14_3" [label="3:  Call _fun_Person_~Person \n   n$1=*&p:Person* [line 15, column 21]\n  _=*n$1:Person [line 15, column 21]\n  n$3=_fun_Person_~Person(n$1:Person*) [line 15, column 21]\n " shape="box"]
 	
 
 	 "f#3072121847520995784.879d673a5bab84df6d2f71ce7f834b14_3" -> "f#3072121847520995784.879d673a5bab84df6d2f71ce7f834b14_2" ;

infer/tests/codetoanalyze/cpp/frontend/destructors/call_on_delete.cpp.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "deleteInt#11507157942721721842.63c462d9916f225a70cc32ed39aaaf5f_2" [label="2: Exit deleteInt \n  " color=yellow style=filled]
 	
 
-"deleteInt#11507157942721721842.63c462d9916f225a70cc32ed39aaaf5f_3" [label="3:  Call delete \n   n$0=*&x:int* [line 16, column 33]\n  n$1=_fun___delete(n$0:int*) [line 16, column 26]\n " shape="box"]
+"deleteInt#11507157942721721842.63c462d9916f225a70cc32ed39aaaf5f_3" [label="3:  Call delete \n   n$1=*&x:int* [line 16, column 33]\n  n$2=_fun___delete(n$1:int*) [line 16, column 26]\n " shape="box"]
 	
 
 	 "deleteInt#11507157942721721842.63c462d9916f225a70cc32ed39aaaf5f_3" -> "deleteInt#11507157942721721842.63c462d9916f225a70cc32ed39aaaf5f_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "deleteX#8359832236310221055.8e97d527465f9865245eba503777c9c7_2" [label="2: Exit deleteX \n  " color=yellow style=filled]
 	
 
-"deleteX#8359832236310221055.8e97d527465f9865245eba503777c9c7_3" [label="3:  Call delete \n   n$0=*&x:X* [line 14, column 29]\n  n$1=_fun___delete(n$0:X*) [line 14, column 22]\n " shape="box"]
+"deleteX#8359832236310221055.8e97d527465f9865245eba503777c9c7_3" [label="3:  Call delete \n   n$1=*&x:X* [line 14, column 29]\n  n$2=_fun___delete(n$1:X*) [line 14, column 22]\n " shape="box"]
 	
 
 	 "deleteX#8359832236310221055.8e97d527465f9865245eba503777c9c7_3" -> "deleteX#8359832236310221055.8e97d527465f9865245eba503777c9c7_2" ;

infer/tests/codetoanalyze/cpp/frontend/destructors/continue_scope.cpp.dot

@@ -15,15 +15,15 @@ digraph cfg {
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_4" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_16" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_5" [label="5: Prune (true branch, do while) \n   n$2=*&a:_Bool [line 90, column 12]\n  PRUNE(n$2, true); [line 90, column 12]\n " shape="invhouse"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_5" [label="5: Prune (true branch, do while) \n   n$3=*&a:_Bool [line 90, column 12]\n  PRUNE(n$3, true); [line 90, column 12]\n " shape="invhouse"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_5" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_4" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_6" [label="6: Prune (false branch, do while) \n   n$2=*&a:_Bool [line 90, column 12]\n  PRUNE(!n$2, false); [line 90, column 12]\n " shape="invhouse"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_6" [label="6: Prune (false branch, do while) \n   n$3=*&a:_Bool [line 90, column 12]\n  PRUNE(!n$3, false); [line 90, column 12]\n " shape="invhouse"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_6" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_3" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_7" [label="7:  Destruction \n   _=*&x2:continue_scope::X [line 90, column 3]\n  n$4=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 90, column 3]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_7" [label="7:  Destruction \n   _=*&x2:continue_scope::X [line 90, column 3]\n  n$5=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 90, column 3]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_7" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_5" ;
@@ -32,45 +32,45 @@ digraph cfg {
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_8" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_7" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_9" [label="9: Prune (true branch, if) \n   n$5=*&b:_Bool [line 84, column 9]\n  PRUNE(n$5, true); [line 84, column 9]\n " shape="invhouse"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_9" [label="9: Prune (true branch, if) \n   n$7=*&b:_Bool [line 84, column 9]\n  PRUNE(n$7, true); [line 84, column 9]\n " shape="invhouse"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_9" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_13" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_10" [label="10: Prune (false branch, if) \n   n$5=*&b:_Bool [line 84, column 9]\n  PRUNE(!n$5, false); [line 84, column 9]\n " shape="invhouse"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_10" [label="10: Prune (false branch, if) \n   n$7=*&b:_Bool [line 84, column 9]\n  PRUNE(!n$7, false); [line 84, column 9]\n " shape="invhouse"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_10" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_15" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_11" [label="11:  Destruction \n   _=*&x3:continue_scope::X [line 87, column 5]\n  n$7=_fun_continue_scope::X_~X(&x3:continue_scope::X*) [line 87, column 5]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_11" [label="11:  Destruction \n   _=*&x3:continue_scope::X [line 87, column 5]\n  n$9=_fun_continue_scope::X_~X(&x3:continue_scope::X*) [line 87, column 5]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_11" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_8" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_12" [label="12:  Destruction \n   _=*&x3:continue_scope::X [line 86, column 7]\n  n$9=_fun_continue_scope::X_~X(&x3:continue_scope::X*) [line 86, column 7]\n  _=*&x2:continue_scope::X [line 86, column 7]\n  n$11=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 86, column 7]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_12" [label="12:  Destruction \n   _=*&x3:continue_scope::X [line 86, column 7]\n  n$12=_fun_continue_scope::X_~X(&x3:continue_scope::X*) [line 86, column 7]\n  _=*&x2:continue_scope::X [line 86, column 7]\n  n$14=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 86, column 7]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_12" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_5" ;
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_12" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_6" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_13" [label="13:  DeclStmt \n   n$12=_fun_continue_scope::X_X(&x3:continue_scope::X*) [line 85, column 9]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_13" [label="13:  DeclStmt \n   n$16=_fun_continue_scope::X_X(&x3:continue_scope::X*) [line 85, column 9]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_13" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_12" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_14" [label="14:  Destruction \n   _=*&x4:continue_scope::X [line 89, column 5]\n  n$14=_fun_continue_scope::X_~X(&x4:continue_scope::X*) [line 89, column 5]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_14" [label="14:  Destruction \n   _=*&x4:continue_scope::X [line 89, column 5]\n  n$18=_fun_continue_scope::X_~X(&x4:continue_scope::X*) [line 89, column 5]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_14" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_8" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_15" [label="15:  DeclStmt \n   n$15=_fun_continue_scope::X_X(&x4:continue_scope::X*) [line 88, column 9]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_15" [label="15:  DeclStmt \n   n$20=_fun_continue_scope::X_X(&x4:continue_scope::X*) [line 88, column 9]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_15" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_14" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_16" [label="16:  DeclStmt \n   n$16=_fun_continue_scope::X_X(&x2:continue_scope::X*) [line 83, column 7]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_16" [label="16:  DeclStmt \n   n$22=_fun_continue_scope::X_X(&x2:continue_scope::X*) [line 83, column 7]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_16" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_9" ;
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_16" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_10" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_17" [label="17:  DeclStmt \n   n$17=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 81, column 5]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_17" [label="17:  DeclStmt \n   n$24=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 81, column 5]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_17" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_4" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_1" [label="1: Start continue_scope::test_for\nFormals:  b:_Bool\nLocals:  x2:continue_scope::X it:continue_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$5:continue_scope::iterator 0$?%__sil_tmp__temp_return_n$11:continue_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$13:continue_scope::iterator x1:continue_scope::X vector:continue_scope::vec \n   DECLARE_LOCALS(&return,&x2,&it,&0$?%__sil_tmpSIL_materialize_temp__n$5,&0$?%__sil_tmp__temp_return_n$11,&0$?%__sil_tmpSIL_materialize_temp__n$13,&x1,&vector); [line 57, column 1]\n " color=yellow style=filled]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_1" [label="1: Start continue_scope::test_for\nFormals:  b:_Bool\nLocals:  x2:continue_scope::X it:continue_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$6:continue_scope::iterator 0$?%__sil_tmp__temp_return_n$13:continue_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$16:continue_scope::iterator const  x1:continue_scope::X vector:continue_scope::vec \n   DECLARE_LOCALS(&return,&x2,&it,&0$?%__sil_tmpSIL_materialize_temp__n$6,&0$?%__sil_tmp__temp_return_n$13,&0$?%__sil_tmpSIL_materialize_temp__n$16,&x1,&vector); [line 57, column 1]\n " color=yellow style=filled]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_1" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_17" ;
@@ -81,7 +81,7 @@ digraph cfg {
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_3" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_2" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_4" [label="4:  DeclStmt \n   n$4=_fun_continue_scope::X_X(&x2:continue_scope::X*) [line 65, column 5]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_4" [label="4:  DeclStmt \n   n$5=_fun_continue_scope::X_X(&x2:continue_scope::X*) [line 65, column 5]\n " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_4" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_3" ;
@@ -89,25 +89,25 @@ digraph cfg {
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_5" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_8" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_6" [label="6:  DeclStmt \n   _=*&vector:continue_scope::vec [line 59, column 22]\n  n$8=_fun_continue_scope::vec_begin(&vector:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$5:continue_scope::iterator*) [line 59, column 22]\n  n$9=_fun_continue_scope::iterator_iterator(&it:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$5:continue_scope::iterator&) [line 59, column 22]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_6" [label="6:  DeclStmt \n   _=*&vector:continue_scope::vec [line 59, column 22]\n  n$9=_fun_continue_scope::vec_begin(&vector:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$6:continue_scope::iterator*) [line 59, column 22]\n  n$10=_fun_continue_scope::iterator_iterator(&it:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$6:continue_scope::iterator&) [line 59, column 22]\n " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_6" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_5" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_7" [label="7:  Call _fun_continue_scope::iterator_operator++ \n   n$12=_fun_continue_scope::iterator_operator++(&it:continue_scope::iterator&,&0$?%__sil_tmp__temp_return_n$11:continue_scope::iterator*) [line 59, column 58]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_7" [label="7:  Call _fun_continue_scope::iterator_operator++ \n   n$14=_fun_continue_scope::iterator_operator++(&it:continue_scope::iterator&,&0$?%__sil_tmp__temp_return_n$13:continue_scope::iterator*) [line 59, column 58]\n " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_7" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_5" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_8" [label="8:  Call _fun_continue_scope::iterator_operator!= \n   _=*&vector:continue_scope::vec [line 59, column 44]\n  n$16=_fun_continue_scope::vec_end(&vector:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$13:continue_scope::iterator*) [line 59, column 44]\n  n$17=_fun_continue_scope::iterator_operator!=(&it:continue_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$13:continue_scope::iterator&) [line 59, column 38]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_8" [label="8:  Call _fun_continue_scope::iterator_operator!= \n   _=*&vector:continue_scope::vec [line 59, column 44]\n  n$19=_fun_continue_scope::vec_end(&vector:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$16:continue_scope::iterator*) [line 59, column 44]\n  n$20=_fun_continue_scope::iterator_operator!=(&it:continue_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$16:continue_scope::iterator const &) [line 59, column 38]\n " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_8" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_9" ;
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_8" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_10" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_9" [label="9: Prune (true branch, for loop) \n   PRUNE(n$17, true); [line 59, column 38]\n " shape="invhouse"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_9" [label="9: Prune (true branch, for loop) \n   PRUNE(n$20, true); [line 59, column 38]\n " shape="invhouse"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_9" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_12" ;
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_9" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_13" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_10" [label="10: Prune (false branch, for loop) \n   PRUNE(!n$17, false); [line 59, column 38]\n " shape="invhouse"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_10" [label="10: Prune (false branch, for loop) \n   PRUNE(!n$20, false); [line 59, column 38]\n " shape="invhouse"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_10" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_4" ;
@@ -115,31 +115,31 @@ digraph cfg {
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_11" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_7" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_12" [label="12: Prune (true branch, if) \n   n$18=*&b:_Bool [line 60, column 9]\n  PRUNE(n$18, true); [line 60, column 9]\n " shape="invhouse"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_12" [label="12: Prune (true branch, if) \n   n$22=*&b:_Bool [line 60, column 9]\n  PRUNE(n$22, true); [line 60, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_12" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_16" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_13" [label="13: Prune (false branch, if) \n   n$18=*&b:_Bool [line 60, column 9]\n  PRUNE(!n$18, false); [line 60, column 9]\n " shape="invhouse"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_13" [label="13: Prune (false branch, if) \n   n$22=*&b:_Bool [line 60, column 9]\n  PRUNE(!n$22, false); [line 60, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_13" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_11" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_14" [label="14:  Destruction \n   _=*&x1:continue_scope::X [line 63, column 5]\n  n$20=_fun_continue_scope::X_~X(&x1:continue_scope::X*) [line 63, column 5]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_14" [label="14:  Destruction \n   _=*&x1:continue_scope::X [line 63, column 5]\n  n$24=_fun_continue_scope::X_~X(&x1:continue_scope::X*) [line 63, column 5]\n " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_14" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_11" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_15" [label="15:  Destruction \n   _=*&x1:continue_scope::X [line 62, column 7]\n  n$22=_fun_continue_scope::X_~X(&x1:continue_scope::X*) [line 62, column 7]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_15" [label="15:  Destruction \n   _=*&x1:continue_scope::X [line 62, column 7]\n  n$27=_fun_continue_scope::X_~X(&x1:continue_scope::X*) [line 62, column 7]\n " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_15" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_7" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_16" [label="16:  DeclStmt \n   n$23=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 61, column 9]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_16" [label="16:  DeclStmt \n   n$29=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 61, column 9]\n " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_16" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_15" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_17" [label="17:  DeclStmt \n   n$24=_fun_continue_scope::vec_vec(&vector:continue_scope::vec*) [line 58, column 7]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_17" [label="17:  DeclStmt \n   n$33=_fun_continue_scope::vec_vec(&vector:continue_scope::vec*) [line 58, column 7]\n " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_17" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_6" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_1" [label="1: Start continue_scope::test_for_range\nFormals:  b:_Bool\nLocals:  __end:continue_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$4:continue_scope::iterator __begin:continue_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$10:continue_scope::iterator 0$?%__sil_tmp__temp_return_n$17:continue_scope::iterator x2:continue_scope::X x:continue_scope::X 0$?%__sil_tmpSIL_materialize_temp__n$26:continue_scope::X __range:continue_scope::vec& x1:continue_scope::X vector:continue_scope::vec \n   DECLARE_LOCALS(&return,&__end,&0$?%__sil_tmpSIL_materialize_temp__n$4,&__begin,&0$?%__sil_tmpSIL_materialize_temp__n$10,&0$?%__sil_tmp__temp_return_n$17,&x2,&x,&0$?%__sil_tmpSIL_materialize_temp__n$26,&__range,&x1,&vector); [line 46, column 1]\n " color=yellow style=filled]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_1" [label="1: Start continue_scope::test_for_range\nFormals:  b:_Bool\nLocals:  __end:continue_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$7:continue_scope::iterator __begin:continue_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$13:continue_scope::iterator 0$?%__sil_tmp__temp_return_n$21:continue_scope::iterator x2:continue_scope::X x:continue_scope::X 0$?%__sil_tmpSIL_materialize_temp__n$37:continue_scope::X const  __range:continue_scope::vec& x1:continue_scope::X vector:continue_scope::vec \n   DECLARE_LOCALS(&return,&__end,&0$?%__sil_tmpSIL_materialize_temp__n$7,&__begin,&0$?%__sil_tmpSIL_materialize_temp__n$13,&0$?%__sil_tmp__temp_return_n$21,&x2,&x,&0$?%__sil_tmpSIL_materialize_temp__n$37,&__range,&x1,&vector); [line 46, column 1]\n " color=yellow style=filled]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_1" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_20" ;
@@ -154,28 +154,28 @@ digraph cfg {
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_4" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_8" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_5" [label="5:  DeclStmt \n   n$5=*&__range:continue_scope::vec& [line 49, column 12]\n  _=*n$5:continue_scope::vec [line 49, column 12]\n  n$8=_fun_continue_scope::vec_end(n$5:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$4:continue_scope::iterator*) [line 49, column 12]\n  n$9=_fun_continue_scope::iterator_iterator(&__end:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$4:continue_scope::iterator&) [line 49, column 12]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_5" [label="5:  DeclStmt \n   n$8=*&__range:continue_scope::vec& [line 49, column 12]\n  _=*n$8:continue_scope::vec [line 49, column 12]\n  n$11=_fun_continue_scope::vec_end(n$8:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$7:continue_scope::iterator*) [line 49, column 12]\n  n$12=_fun_continue_scope::iterator_iterator(&__end:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$7:continue_scope::iterator&) [line 49, column 12]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_5" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_4" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_6" [label="6:  DeclStmt \n   n$11=*&__range:continue_scope::vec& [line 49, column 12]\n  _=*n$11:continue_scope::vec [line 49, column 12]\n  n$14=_fun_continue_scope::vec_begin(n$11:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$10:continue_scope::iterator*) [line 49, column 12]\n  n$15=_fun_continue_scope::iterator_iterator(&__begin:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$10:continue_scope::iterator&) [line 49, column 12]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_6" [label="6:  DeclStmt \n   n$14=*&__range:continue_scope::vec& [line 49, column 12]\n  _=*n$14:continue_scope::vec [line 49, column 12]\n  n$17=_fun_continue_scope::vec_begin(n$14:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$13:continue_scope::iterator*) [line 49, column 12]\n  n$18=_fun_continue_scope::iterator_iterator(&__begin:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$13:continue_scope::iterator&) [line 49, column 12]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_6" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_5" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_7" [label="7:  Call _fun_continue_scope::iterator_operator++ \n   n$18=_fun_continue_scope::iterator_operator++(&__begin:continue_scope::iterator&,&0$?%__sil_tmp__temp_return_n$17:continue_scope::iterator*) [line 49, column 12]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_7" [label="7:  Call _fun_continue_scope::iterator_operator++ \n   n$22=_fun_continue_scope::iterator_operator++(&__begin:continue_scope::iterator&,&0$?%__sil_tmp__temp_return_n$21:continue_scope::iterator*) [line 49, column 12]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_7" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_4" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_8" [label="8:  Call _fun_continue_scope::iterator_operator!= \n   n$19=_fun_continue_scope::iterator_operator!=(&__begin:continue_scope::iterator&,&__end:continue_scope::iterator&) [line 49, column 12]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_8" [label="8:  Call _fun_continue_scope::iterator_operator!= \n   n$24=_fun_continue_scope::iterator_operator!=(&__begin:continue_scope::iterator&,&__end:continue_scope::iterator&) [line 49, column 12]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_8" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_9" ;
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_8" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_10" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_9" [label="9: Prune (true branch, for loop) \n   PRUNE(n$19, true); [line 49, column 12]\n " shape="invhouse"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_9" [label="9: Prune (true branch, for loop) \n   PRUNE(n$24, true); [line 49, column 12]\n " shape="invhouse"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_9" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_17" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_10" [label="10: Prune (false branch, for loop) \n   PRUNE(!n$19, false); [line 49, column 12]\n " shape="invhouse"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_10" [label="10: Prune (false branch, for loop) \n   PRUNE(!n$24, false); [line 49, column 12]\n " shape="invhouse"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_10" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_3" ;
@@ -183,27 +183,27 @@ digraph cfg {
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_11" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_7" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_12" [label="12: Prune (true branch, if) \n   n$20=*&b:_Bool [line 50, column 9]\n  PRUNE(n$20, true); [line 50, column 9]\n " shape="invhouse"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_12" [label="12: Prune (true branch, if) \n   n$27=*&b:_Bool [line 50, column 9]\n  PRUNE(n$27, true); [line 50, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_12" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_16" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_13" [label="13: Prune (false branch, if) \n   n$20=*&b:_Bool [line 50, column 9]\n  PRUNE(!n$20, false); [line 50, column 9]\n " shape="invhouse"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_13" [label="13: Prune (false branch, if) \n   n$27=*&b:_Bool [line 50, column 9]\n  PRUNE(!n$27, false); [line 50, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_13" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_11" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_14" [label="14:  Destruction \n   _=*&x2:continue_scope::X [line 53, column 5]\n  n$22=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 53, column 5]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_14" [label="14:  Destruction \n   _=*&x2:continue_scope::X [line 53, column 5]\n  n$29=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 53, column 5]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_14" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_11" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_15" [label="15:  Destruction \n   _=*&x2:continue_scope::X [line 52, column 7]\n  n$24=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 52, column 7]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_15" [label="15:  Destruction \n   _=*&x2:continue_scope::X [line 52, column 7]\n  n$32=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 52, column 7]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_15" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_7" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_16" [label="16:  DeclStmt \n   n$25=_fun_continue_scope::X_X(&x2:continue_scope::X*,&x:continue_scope::X&) [line 51, column 14]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_16" [label="16:  DeclStmt \n   n$34=_fun_continue_scope::X_X(&x2:continue_scope::X*,&x:continue_scope::X&) [line 51, column 14]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_16" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_15" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_17" [label="17:  DeclStmt \n   n$28=_fun_continue_scope::iterator_operator*(&__begin:continue_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$26:continue_scope::X*) [line 49, column 12]\n  n$29=_fun_continue_scope::X_X(&x:continue_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$26:continue_scope::X&) [line 49, column 12]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_17" [label="17:  DeclStmt \n   n$40=_fun_continue_scope::iterator_operator*(&__begin:continue_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$37:continue_scope::X*) [line 49, column 12]\n  n$41=_fun_continue_scope::X_X(&x:continue_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$37:continue_scope::X const &) [line 49, column 12]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_17" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_12" ;
@@ -212,11 +212,11 @@ digraph cfg {
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_18" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_6" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_19" [label="19:  DeclStmt \n   n$30=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 48, column 5]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_19" [label="19:  DeclStmt \n   n$43=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 48, column 5]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_19" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_18" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_20" [label="20:  DeclStmt \n   n$31=_fun_continue_scope::vec_vec(&vector:continue_scope::vec*) [line 47, column 7]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_20" [label="20:  DeclStmt \n   n$44=_fun_continue_scope::vec_vec(&vector:continue_scope::vec*) [line 47, column 7]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_20" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_19" ;
@@ -236,12 +236,12 @@ digraph cfg {
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_4" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_5" ;
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_4" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_6" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_5" [label="5: Prune (true branch, while) \n   n$2=*&a:_Bool [line 70, column 10]\n  PRUNE(n$2, true); [line 70, column 10]\n " shape="invhouse"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_5" [label="5: Prune (true branch, while) \n   n$3=*&a:_Bool [line 70, column 10]\n  PRUNE(n$3, true); [line 70, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_5" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_8" ;
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_5" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_9" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_6" [label="6: Prune (false branch, while) \n   n$2=*&a:_Bool [line 70, column 10]\n  PRUNE(!n$2, false); [line 70, column 10]\n " shape="invhouse"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_6" [label="6: Prune (false branch, while) \n   n$3=*&a:_Bool [line 70, column 10]\n  PRUNE(!n$3, false); [line 70, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_6" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_3" ;
@@ -249,35 +249,35 @@ digraph cfg {
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_7" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_4" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_8" [label="8: Prune (true branch, if) \n   n$3=*&b:_Bool [line 71, column 9]\n  PRUNE(n$3, true); [line 71, column 9]\n " shape="invhouse"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_8" [label="8: Prune (true branch, if) \n   n$5=*&b:_Bool [line 71, column 9]\n  PRUNE(n$5, true); [line 71, column 9]\n " shape="invhouse"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_8" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_12" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_9" [label="9: Prune (false branch, if) \n   n$3=*&b:_Bool [line 71, column 9]\n  PRUNE(!n$3, false); [line 71, column 9]\n " shape="invhouse"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_9" [label="9: Prune (false branch, if) \n   n$5=*&b:_Bool [line 71, column 9]\n  PRUNE(!n$5, false); [line 71, column 9]\n " shape="invhouse"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_9" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_14" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_10" [label="10:  Destruction \n   _=*&x2:continue_scope::X [line 74, column 5]\n  n$5=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 74, column 5]\n " shape="box"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_10" [label="10:  Destruction \n   _=*&x2:continue_scope::X [line 74, column 5]\n  n$7=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 74, column 5]\n " shape="box"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_10" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_7" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_11" [label="11:  Destruction \n   _=*&x2:continue_scope::X [line 73, column 7]\n  n$7=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 73, column 7]\n " shape="box"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_11" [label="11:  Destruction \n   _=*&x2:continue_scope::X [line 73, column 7]\n  n$10=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 73, column 7]\n " shape="box"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_11" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_4" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_12" [label="12:  DeclStmt \n   n$8=_fun_continue_scope::X_X(&x2:continue_scope::X*) [line 72, column 9]\n " shape="box"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_12" [label="12:  DeclStmt \n   n$12=_fun_continue_scope::X_X(&x2:continue_scope::X*) [line 72, column 9]\n " shape="box"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_12" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_11" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_13" [label="13:  Destruction \n   _=*&x4:continue_scope::X [line 76, column 5]\n  n$10=_fun_continue_scope::X_~X(&x4:continue_scope::X*) [line 76, column 5]\n " shape="box"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_13" [label="13:  Destruction \n   _=*&x4:continue_scope::X [line 76, column 5]\n  n$14=_fun_continue_scope::X_~X(&x4:continue_scope::X*) [line 76, column 5]\n " shape="box"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_13" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_7" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_14" [label="14:  DeclStmt \n   n$11=_fun_continue_scope::X_X(&x4:continue_scope::X*) [line 75, column 9]\n " shape="box"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_14" [label="14:  DeclStmt \n   n$16=_fun_continue_scope::X_X(&x4:continue_scope::X*) [line 75, column 9]\n " shape="box"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_14" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_13" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_15" [label="15:  DeclStmt \n   n$12=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 69, column 5]\n " shape="box"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_15" [label="15:  DeclStmt \n   n$19=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 69, column 5]\n " shape="box"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_15" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_4" ;
@@ -297,15 +297,15 @@ digraph cfg {
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_4" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_5" ;
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_4" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_6" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_5" [label="5: Prune (true branch, while) \n   n$2=*&a:_Bool [line 95, column 10]\n  PRUNE(n$2, true); [line 95, column 10]\n " shape="invhouse"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_5" [label="5: Prune (true branch, while) \n   n$3=*&a:_Bool [line 95, column 10]\n  PRUNE(n$3, true); [line 95, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_5" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_14" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_6" [label="6: Prune (false branch, while) \n   n$2=*&a:_Bool [line 95, column 10]\n  PRUNE(!n$2, false); [line 95, column 10]\n " shape="invhouse"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_6" [label="6: Prune (false branch, while) \n   n$3=*&a:_Bool [line 95, column 10]\n  PRUNE(!n$3, false); [line 95, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_6" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_3" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_7" [label="7:  Destruction \n   _=*&x2:continue_scope::X [line 101, column 3]\n  n$4=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 101, column 3]\n " shape="box"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_7" [label="7:  Destruction \n   _=*&x2:continue_scope::X [line 101, column 3]\n  n$5=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 101, column 3]\n " shape="box"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_7" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_4" ;
@@ -314,31 +314,31 @@ digraph cfg {
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_8" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_9" ;
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_8" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_10" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_9" [label="9: Prune (true branch, while) \n   n$5=*&b:_Bool [line 97, column 12]\n  PRUNE(n$5, true); [line 97, column 12]\n " shape="invhouse"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_9" [label="9: Prune (true branch, while) \n   n$7=*&b:_Bool [line 97, column 12]\n  PRUNE(n$7, true); [line 97, column 12]\n " shape="invhouse"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_9" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_13" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_10" [label="10: Prune (false branch, while) \n   n$5=*&b:_Bool [line 97, column 12]\n  PRUNE(!n$5, false); [line 97, column 12]\n " shape="invhouse"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_10" [label="10: Prune (false branch, while) \n   n$7=*&b:_Bool [line 97, column 12]\n  PRUNE(!n$7, false); [line 97, column 12]\n " shape="invhouse"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_10" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_7" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_11" [label="11:  Destruction \n   _=*&x3:continue_scope::X [line 100, column 5]\n  n$7=_fun_continue_scope::X_~X(&x3:continue_scope::X*) [line 100, column 5]\n " shape="box"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_11" [label="11:  Destruction \n   _=*&x3:continue_scope::X [line 100, column 5]\n  n$9=_fun_continue_scope::X_~X(&x3:continue_scope::X*) [line 100, column 5]\n " shape="box"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_11" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_8" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_12" [label="12:  Destruction \n   _=*&x3:continue_scope::X [line 99, column 7]\n  n$9=_fun_continue_scope::X_~X(&x3:continue_scope::X*) [line 99, column 7]\n " shape="box"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_12" [label="12:  Destruction \n   _=*&x3:continue_scope::X [line 99, column 7]\n  n$12=_fun_continue_scope::X_~X(&x3:continue_scope::X*) [line 99, column 7]\n " shape="box"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_12" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_8" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_13" [label="13:  DeclStmt \n   n$10=_fun_continue_scope::X_X(&x3:continue_scope::X*) [line 98, column 9]\n " shape="box"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_13" [label="13:  DeclStmt \n   n$14=_fun_continue_scope::X_X(&x3:continue_scope::X*) [line 98, column 9]\n " shape="box"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_13" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_12" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_14" [label="14:  DeclStmt \n   n$11=_fun_continue_scope::X_X(&x2:continue_scope::X*) [line 96, column 7]\n " shape="box"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_14" [label="14:  DeclStmt \n   n$16=_fun_continue_scope::X_X(&x2:continue_scope::X*) [line 96, column 7]\n " shape="box"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_14" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_8" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_15" [label="15:  DeclStmt \n   n$12=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 94, column 5]\n " shape="box"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_15" [label="15:  DeclStmt \n   n$18=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 94, column 5]\n " shape="box"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_15" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_4" ;
@@ -353,7 +353,7 @@ digraph cfg {
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_3" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_2" ;
-"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_4" [label="4:  DeclStmt \n   n$4=_fun_continue_scope::X_X(&x3:continue_scope::X*) [line 112, column 5]\n " shape="box"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_4" [label="4:  DeclStmt \n   n$5=_fun_continue_scope::X_X(&x3:continue_scope::X*) [line 112, column 5]\n " shape="box"]
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_4" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_3" ;
@@ -362,15 +362,15 @@ digraph cfg {
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_5" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_6" ;
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_5" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_7" ;
-"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_6" [label="6: Prune (true branch, while) \n   n$5=*&a:_Bool [line 106, column 10]\n  PRUNE(n$5, true); [line 106, column 10]\n " shape="invhouse"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_6" [label="6: Prune (true branch, while) \n   n$6=*&a:_Bool [line 106, column 10]\n  PRUNE(n$6, true); [line 106, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_6" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_12" ;
-"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_7" [label="7: Prune (false branch, while) \n   n$5=*&a:_Bool [line 106, column 10]\n  PRUNE(!n$5, false); [line 106, column 10]\n " shape="invhouse"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_7" [label="7: Prune (false branch, while) \n   n$6=*&a:_Bool [line 106, column 10]\n  PRUNE(!n$6, false); [line 106, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_7" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_4" ;
-"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_8" [label="8:  Destruction \n   _=*&x2:continue_scope::X [line 111, column 3]\n  n$7=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 111, column 3]\n " shape="box"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_8" [label="8:  Destruction \n   _=*&x2:continue_scope::X [line 111, column 3]\n  n$8=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 111, column 3]\n " shape="box"]
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_8" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_5" ;
@@ -379,19 +379,19 @@ digraph cfg {
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_9" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_10" ;
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_9" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_11" ;
-"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_10" [label="10: Prune (true branch, while) \n   n$8=*&b:_Bool [line 108, column 12]\n  PRUNE(n$8, true); [line 108, column 12]\n " shape="invhouse"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_10" [label="10: Prune (true branch, while) \n   n$10=*&b:_Bool [line 108, column 12]\n  PRUNE(n$10, true); [line 108, column 12]\n " shape="invhouse"]
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_10" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_9" ;
-"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_11" [label="11: Prune (false branch, while) \n   n$8=*&b:_Bool [line 108, column 12]\n  PRUNE(!n$8, false); [line 108, column 12]\n " shape="invhouse"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_11" [label="11: Prune (false branch, while) \n   n$10=*&b:_Bool [line 108, column 12]\n  PRUNE(!n$10, false); [line 108, column 12]\n " shape="invhouse"]
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_11" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_8" ;
-"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_12" [label="12:  DeclStmt \n   n$9=_fun_continue_scope::X_X(&x2:continue_scope::X*) [line 107, column 7]\n " shape="box"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_12" [label="12:  DeclStmt \n   n$15=_fun_continue_scope::X_X(&x2:continue_scope::X*) [line 107, column 7]\n " shape="box"]
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_12" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_9" ;
-"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_13" [label="13:  DeclStmt \n   n$10=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 105, column 5]\n " shape="box"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_13" [label="13:  DeclStmt \n   n$17=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 105, column 5]\n " shape="box"]
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_13" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_5" ;
@@ -463,11 +463,11 @@ digraph cfg {
 "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_2" [label="2: Exit continue_scope::iterator_iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_3" [label="3:  Constructor Init \n   n$0=*&this:continue_scope::iterator* [line 18, column 8]\n  n$1=*&__param_0:continue_scope::iterator& [line 18, column 8]\n  n$2=*n$1.vector:continue_scope::vec const * [line 18, column 8]\n  *n$0.vector:continue_scope::vec const *=n$2 [line 18, column 8]\n " shape="box"]
+"iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_3" [label="3:  Constructor Init \n   n$2=*&this:continue_scope::iterator* [line 18, column 8]\n  n$3=*&__param_0:continue_scope::iterator& [line 18, column 8]\n  n$4=*n$3.vector:continue_scope::vec const * [line 18, column 8]\n  *n$2.vector:continue_scope::vec const *=n$4 [line 18, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_3" -> "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_2" ;
-"iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_4" [label="4:  Constructor Init \n   n$3=*&this:continue_scope::iterator* [line 18, column 8]\n  n$4=*&__param_0:continue_scope::iterator& [line 18, column 8]\n  n$5=*n$4.position:int [line 18, column 8]\n  *n$3.position:int=n$5 [line 18, column 8]\n " shape="box"]
+"iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_4" [label="4:  Constructor Init \n   n$5=*&this:continue_scope::iterator* [line 18, column 8]\n  n$6=*&__param_0:continue_scope::iterator& [line 18, column 8]\n  n$7=*n$6.position:int [line 18, column 8]\n  *n$5.position:int=n$7 [line 18, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_4" -> "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_3" ;
@@ -478,11 +478,11 @@ digraph cfg {
 "iterator#iterator#continue_scope#{17152205201271404012}.6fcfea00eca12936183691c85f57ca37_2" [label="2: Exit continue_scope::iterator_iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#continue_scope#{17152205201271404012}.6fcfea00eca12936183691c85f57ca37_3" [label="3:  Constructor Init \n   n$0=*&this:continue_scope::iterator* [line 22, column 52]\n  n$1=*&v:continue_scope::vec const * [line 22, column 59]\n  *n$0.vector:continue_scope::vec const *=n$1 [line 22, column 52]\n " shape="box"]
+"iterator#iterator#continue_scope#{17152205201271404012}.6fcfea00eca12936183691c85f57ca37_3" [label="3:  Constructor Init \n   n$2=*&this:continue_scope::iterator* [line 22, column 52]\n  n$3=*&v:continue_scope::vec const * [line 22, column 59]\n  *n$2.vector:continue_scope::vec const *=n$3 [line 22, column 52]\n " shape="box"]
 	
 
 	 "iterator#iterator#continue_scope#{17152205201271404012}.6fcfea00eca12936183691c85f57ca37_3" -> "iterator#iterator#continue_scope#{17152205201271404012}.6fcfea00eca12936183691c85f57ca37_2" ;
-"iterator#iterator#continue_scope#{17152205201271404012}.6fcfea00eca12936183691c85f57ca37_4" [label="4:  Constructor Init \n   n$2=*&this:continue_scope::iterator* [line 22, column 37]\n  n$3=*&pos:int [line 22, column 46]\n  *n$2.position:int=n$3 [line 22, column 37]\n " shape="box"]
+"iterator#iterator#continue_scope#{17152205201271404012}.6fcfea00eca12936183691c85f57ca37_4" [label="4:  Constructor Init \n   n$4=*&this:continue_scope::iterator* [line 22, column 37]\n  n$5=*&pos:int [line 22, column 46]\n  *n$4.position:int=n$5 [line 22, column 37]\n " shape="box"]
 	
 
 	 "iterator#iterator#continue_scope#{17152205201271404012}.6fcfea00eca12936183691c85f57ca37_4" -> "iterator#iterator#continue_scope#{17152205201271404012}.6fcfea00eca12936183691c85f57ca37_3" ;
@@ -493,11 +493,11 @@ digraph cfg {
 "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_2" [label="2: Exit continue_scope::iterator_iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_3" [label="3:  Constructor Init \n   n$0=*&this:continue_scope::iterator* [line 18, column 8]\n  n$1=*&__param_0:continue_scope::iterator const & [line 18, column 8]\n  n$2=*n$1.vector:continue_scope::vec const * [line 18, column 8]\n  *n$0.vector:continue_scope::vec const *=n$2 [line 18, column 8]\n " shape="box"]
+"iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_3" [label="3:  Constructor Init \n   n$2=*&this:continue_scope::iterator* [line 18, column 8]\n  n$3=*&__param_0:continue_scope::iterator const & [line 18, column 8]\n  n$4=*n$3.vector:continue_scope::vec const * [line 18, column 8]\n  *n$2.vector:continue_scope::vec const *=n$4 [line 18, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_3" -> "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_2" ;
-"iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_4" [label="4:  Constructor Init \n   n$3=*&this:continue_scope::iterator* [line 18, column 8]\n  n$4=*&__param_0:continue_scope::iterator const & [line 18, column 8]\n  n$5=*n$4.position:int [line 18, column 8]\n  *n$3.position:int=n$5 [line 18, column 8]\n " shape="box"]
+"iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_4" [label="4:  Constructor Init \n   n$5=*&this:continue_scope::iterator* [line 18, column 8]\n  n$6=*&__param_0:continue_scope::iterator const & [line 18, column 8]\n  n$7=*n$6.position:int [line 18, column 8]\n  *n$5.position:int=n$7 [line 18, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_4" -> "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_3" ;
@@ -525,11 +525,11 @@ digraph cfg {
 	
 
 	 "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_6" -> "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_8" ;
-"operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=1 [line 29, column 48]\n " shape="box"]
+"operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=1 [line 29, column 48]\n " shape="box"]
 	
 
 	 "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_7" -> "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_3" ;
-"operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=0 [line 29, column 48]\n " shape="box"]
+"operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=0 [line 29, column 48]\n " shape="box"]
 	
 
 	 "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_8" -> "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_3" ;
@@ -537,14 +537,14 @@ digraph cfg {
 	
 
 	 "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_9" -> "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_2" ;
-"operator*#iterator#continue_scope#(10976315504449545146).52feec5517a47e2a4f419770b171de17_1" [label="1: Start continue_scope::iterator_operator*\nFormals:  this:continue_scope::iterator* __return_param:continue_scope::X*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 44, column 1]\n " color=yellow style=filled]
+"operator*#iterator#continue_scope#(10976315504449545146).52feec5517a47e2a4f419770b171de17_1" [label="1: Start continue_scope::iterator_operator*\nFormals:  this:continue_scope::iterator* __return_param:continue_scope::X*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X const  \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 44, column 1]\n " color=yellow style=filled]
 	
 
 	 "operator*#iterator#continue_scope#(10976315504449545146).52feec5517a47e2a4f419770b171de17_1" -> "operator*#iterator#continue_scope#(10976315504449545146).52feec5517a47e2a4f419770b171de17_3" ;
 "operator*#iterator#continue_scope#(10976315504449545146).52feec5517a47e2a4f419770b171de17_2" [label="2: Exit continue_scope::iterator_operator* \n  " color=yellow style=filled]
 	
 
-"operator*#iterator#continue_scope#(10976315504449545146).52feec5517a47e2a4f419770b171de17_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::X* [line 44, column 33]\n  n$2=*&this:continue_scope::iterator const * [line 44, column 40]\n  n$3=*n$2.vector:continue_scope::vec const * [line 44, column 40]\n  _=*n$3:continue_scope::vec const  [line 44, column 40]\n  n$5=*&this:continue_scope::iterator const * [line 44, column 52]\n  n$6=*n$5.position:int [line 44, column 52]\n  n$8=_fun_continue_scope::vec_get(n$3:continue_scope::vec const *,n$6:int,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X*) [line 44, column 40]\n  n$9=_fun_continue_scope::X_X(n$0:continue_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X&) [line 44, column 40]\n " shape="box"]
+"operator*#iterator#continue_scope#(10976315504449545146).52feec5517a47e2a4f419770b171de17_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::X* [line 44, column 33]\n  n$2=*&this:continue_scope::iterator const * [line 44, column 40]\n  n$3=*n$2.vector:continue_scope::vec const * [line 44, column 40]\n  _=*n$3:continue_scope::vec const  [line 44, column 40]\n  n$5=*&this:continue_scope::iterator const * [line 44, column 52]\n  n$6=*n$5.position:int [line 44, column 52]\n  n$8=_fun_continue_scope::vec_get(n$3:continue_scope::vec const *,n$6:int,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X*) [line 44, column 40]\n  n$9=_fun_continue_scope::X_X(n$0:continue_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X const &) [line 44, column 40]\n " shape="box"]
 	
 
 	 "operator*#iterator#continue_scope#(10976315504449545146).52feec5517a47e2a4f419770b171de17_3" -> "operator*#iterator#continue_scope#(10976315504449545146).52feec5517a47e2a4f419770b171de17_2" ;
@@ -559,7 +559,7 @@ digraph cfg {
 	
 
 	 "operator++#iterator#continue_scope#(16434574593791982090).926de445b967c9119c5cf6eecba7a618_3" -> "operator++#iterator#continue_scope#(16434574593791982090).926de445b967c9119c5cf6eecba7a618_2" ;
-"operator++#iterator#continue_scope#(16434574593791982090).926de445b967c9119c5cf6eecba7a618_4" [label="4:  UnaryOperator \n   n$3=*&this:continue_scope::iterator* [line 25, column 5]\n  n$4=*n$3.position:int [line 25, column 5]\n  *n$3.position:int=(n$4 + 1) [line 25, column 5]\n " shape="box"]
+"operator++#iterator#continue_scope#(16434574593791982090).926de445b967c9119c5cf6eecba7a618_4" [label="4:  UnaryOperator \n   n$4=*&this:continue_scope::iterator* [line 25, column 5]\n  n$5=*n$4.position:int [line 25, column 5]\n  *n$4.position:int=(n$5 + 1) [line 25, column 5]\n " shape="box"]
 	
 
 	 "operator++#iterator#continue_scope#(16434574593791982090).926de445b967c9119c5cf6eecba7a618_4" -> "operator++#iterator#continue_scope#(16434574593791982090).926de445b967c9119c5cf6eecba7a618_3" ;
@@ -570,7 +570,7 @@ digraph cfg {
 "vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_2" [label="2: Exit continue_scope::vec_vec \n  " color=yellow style=filled]
 	
 
-"vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_3" [label="3:  Constructor Init \n   n$0=*&this:continue_scope::vec* [line 35, column 3]\n  n$1=_fun_continue_scope::X_X(n$0._data:continue_scope::X[10*1](*)) [line 35, column 3]\n " shape="box"]
+"vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_3" [label="3:  Constructor Init \n   n$2=*&this:continue_scope::vec* [line 35, column 3]\n  n$3=_fun_continue_scope::X_X(n$2._data:continue_scope::X[10*1](*)) [line 35, column 3]\n " shape="box"]
 	
 
 	 "vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_3" -> "vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_2" ;

infer/tests/codetoanalyze/cpp/frontend/destructors/destructor_bases.cpp.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_2" [label="2: Exit A_A \n  " color=yellow style=filled]
 	
 
-"A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_3" [label="3:  Constructor Init \n   n$0=*&this:A* [line 16, column 7]\n  n$1=_fun_T_T(n$0:A*) [line 16, column 3]\n " shape="box"]
+"A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_3" [label="3:  Constructor Init \n   n$2=*&this:A* [line 16, column 7]\n  n$3=_fun_T_T(n$2:A*) [line 16, column 3]\n " shape="box"]
 	
 
 	 "A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_3" -> "A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_2" ;
@@ -18,11 +18,11 @@ digraph cfg {
 "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_2" [label="2: Exit B_B \n  " color=yellow style=filled]
 	
 
-"B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_3" [label="3:  Constructor Init \n   n$0=*&this:B* [line 21, column 3]\n  n$1=_fun_A_A(n$0:B*) [line 21, column 3]\n " shape="box"]
+"B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_3" [label="3:  Constructor Init \n   n$2=*&this:B* [line 21, column 3]\n  n$3=_fun_A_A(n$2:B*) [line 21, column 3]\n " shape="box"]
 	
 
 	 "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_3" -> "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_2" ;
-"B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_4" [label="4:  Constructor Init \n   n$2=*&this:B* [line 21, column 7]\n  n$3=_fun_T_T(n$2:B*) [line 21, column 3]\n " shape="box"]
+"B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_4" [label="4:  Constructor Init \n   n$4=*&this:B* [line 21, column 7]\n  n$5=_fun_T_T(n$4:B*) [line 21, column 3]\n " shape="box"]
 	
 
 	 "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_4" -> "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_3" ;
@@ -40,19 +40,19 @@ digraph cfg {
 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_2" [label="2: Exit D_D \n  " color=yellow style=filled]
 	
 
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_3" [label="3:  Constructor Init \n   n$0=*&this:D* [line 32, column 3]\n  n$1=_fun_B_B(n$0.b:B*) [line 32, column 3]\n " shape="box"]
+"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_3" [label="3:  Constructor Init \n   n$2=*&this:D* [line 32, column 3]\n  n$3=_fun_B_B(n$2.b:B*) [line 32, column 3]\n " shape="box"]
 	
 
 	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_3" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_2" ;
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_4" [label="4:  Constructor Init \n   n$2=*&this:D* [line 32, column 3]\n  n$3=_fun_C_C(n$2:D*) [line 32, column 3]\n " shape="box"]
+"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_4" [label="4:  Constructor Init \n   n$4=*&this:D* [line 32, column 3]\n  n$5=_fun_C_C(n$4:D*) [line 32, column 3]\n " shape="box"]
 	
 
 	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_4" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_3" ;
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_5" [label="5:  Constructor Init \n   n$4=*&this:D* [line 32, column 3]\n  n$5=_fun_A_A(n$4:D*) [line 32, column 3]\n " shape="box"]
+"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_5" [label="5:  Constructor Init \n   n$6=*&this:D* [line 32, column 3]\n  n$7=_fun_A_A(n$6:D*) [line 32, column 3]\n " shape="box"]
 	
 
 	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_5" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_4" ;
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_6" [label="6:  Constructor Init \n   n$6=*&this:D* [line 32, column 7]\n  n$7=_fun_T_T(n$6:D*) [line 32, column 3]\n " shape="box"]
+"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_6" [label="6:  Constructor Init \n   n$8=*&this:D* [line 32, column 7]\n  n$9=_fun_T_T(n$8:D*) [line 32, column 3]\n " shape="box"]
 	
 
 	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_6" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_5" ;
@@ -63,23 +63,23 @@ digraph cfg {
 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_2" [label="2: Exit E_E \n  " color=yellow style=filled]
 	
 
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_3" [label="3:  Constructor Init \n   n$0=*&this:E* [line 37, column 3]\n  n$1=_fun_D_D(n$0:E*) [line 37, column 3]\n " shape="box"]
+"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_3" [label="3:  Constructor Init \n   n$2=*&this:E* [line 37, column 3]\n  n$3=_fun_D_D(n$2:E*) [line 37, column 3]\n " shape="box"]
 	
 
 	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_3" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_2" ;
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_4" [label="4:  Constructor Init \n   n$2=*&this:E* [line 37, column 3]\n  n$3=_fun_C_C(n$2:E*) [line 37, column 3]\n " shape="box"]
+"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_4" [label="4:  Constructor Init \n   n$4=*&this:E* [line 37, column 3]\n  n$5=_fun_C_C(n$4:E*) [line 37, column 3]\n " shape="box"]
 	
 
 	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_4" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_3" ;
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_5" [label="5:  Constructor Init \n   n$4=*&this:E* [line 37, column 3]\n  n$5=_fun_B_B(n$4:E*) [line 37, column 3]\n " shape="box"]
+"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_5" [label="5:  Constructor Init \n   n$6=*&this:E* [line 37, column 3]\n  n$7=_fun_B_B(n$6:E*) [line 37, column 3]\n " shape="box"]
 	
 
 	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_5" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_4" ;
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_6" [label="6:  Constructor Init \n   n$6=*&this:E* [line 37, column 3]\n  n$7=_fun_A_A(n$6:E*) [line 37, column 3]\n " shape="box"]
+"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_6" [label="6:  Constructor Init \n   n$8=*&this:E* [line 37, column 3]\n  n$9=_fun_A_A(n$8:E*) [line 37, column 3]\n " shape="box"]
 	
 
 	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_6" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_5" ;
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_7" [label="7:  Constructor Init \n   n$8=*&this:E* [line 37, column 7]\n  n$9=_fun_T_T(n$8:E*) [line 37, column 3]\n " shape="box"]
+"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_7" [label="7:  Constructor Init \n   n$10=*&this:E* [line 37, column 7]\n  n$11=_fun_T_T(n$10:E*) [line 37, column 3]\n " shape="box"]
 	
 
 	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_7" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_6" ;
@@ -90,23 +90,23 @@ digraph cfg {
 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_2" [label="2: Exit F_F \n  " color=yellow style=filled]
 	
 
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_3" [label="3:  Constructor Init \n   n$0=*&this:F* [line 42, column 3]\n  n$1=_fun_D_D(n$0:F*) [line 42, column 3]\n " shape="box"]
+"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_3" [label="3:  Constructor Init \n   n$2=*&this:F* [line 42, column 3]\n  n$3=_fun_D_D(n$2:F*) [line 42, column 3]\n " shape="box"]
 	
 
 	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_3" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_2" ;
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_4" [label="4:  Constructor Init \n   n$2=*&this:F* [line 42, column 3]\n  n$3=_fun_B_B(n$2:F*) [line 42, column 3]\n " shape="box"]
+"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_4" [label="4:  Constructor Init \n   n$4=*&this:F* [line 42, column 3]\n  n$5=_fun_B_B(n$4:F*) [line 42, column 3]\n " shape="box"]
 	
 
 	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_4" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_3" ;
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_5" [label="5:  Constructor Init \n   n$4=*&this:F* [line 42, column 3]\n  n$5=_fun_C_C(n$4:F*) [line 42, column 3]\n " shape="box"]
+"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_5" [label="5:  Constructor Init \n   n$6=*&this:F* [line 42, column 3]\n  n$7=_fun_C_C(n$6:F*) [line 42, column 3]\n " shape="box"]
 	
 
 	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_5" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_4" ;
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_6" [label="6:  Constructor Init \n   n$6=*&this:F* [line 42, column 3]\n  n$7=_fun_A_A(n$6:F*) [line 42, column 3]\n " shape="box"]
+"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_6" [label="6:  Constructor Init \n   n$8=*&this:F* [line 42, column 3]\n  n$9=_fun_A_A(n$8:F*) [line 42, column 3]\n " shape="box"]
 	
 
 	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_6" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_5" ;
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_7" [label="7:  Constructor Init \n   n$8=*&this:F* [line 42, column 7]\n  n$9=_fun_T_T(n$8:F*) [line 42, column 3]\n " shape="box"]
+"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_7" [label="7:  Constructor Init \n   n$10=*&this:F* [line 42, column 7]\n  n$11=_fun_T_T(n$10:F*) [line 42, column 3]\n " shape="box"]
 	
 
 	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_7" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_6" ;
@@ -149,11 +149,11 @@ digraph cfg {
 	
 
 	 "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_3" -> "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_2" ;
-"__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_4" [label="4:  Destruction \n   _=*&a:A [line 33, column 15]\n  n$8=_fun_A_~A(&a:A*) [line 33, column 15]\n " shape="box"]
+"__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_4" [label="4:  Destruction \n   _=*&a:A [line 33, column 15]\n  n$9=_fun_A_~A(&a:A*) [line 33, column 15]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_4" -> "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_3" ;
-"__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_5" [label="5:  DeclStmt \n   n$9=_fun_A_A(&a:A*) [line 33, column 12]\n " shape="box"]
+"__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_5" [label="5:  DeclStmt \n   n$11=_fun_A_A(&a:A*) [line 33, column 12]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_5" -> "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_4" ;

infer/tests/codetoanalyze/cpp/frontend/destructors/pseudo_destructor_expr.cpp.dot

@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "destroy<int_*>#14082686937760238422.8268959c48dc929d419568bc99a6b97b_3" -> "destroy<int_*>#14082686937760238422.8268959c48dc929d419568bc99a6b97b_2" ;
-"destroy<int_*>#14082686937760238422.8268959c48dc929d419568bc99a6b97b_4" [label="4:  Call _fun___infer_skip_function \n   n$0=_fun___infer_skip_function() [line 19, column 3]\n " shape="box"]
+"destroy<int_*>#14082686937760238422.8268959c48dc929d419568bc99a6b97b_4" [label="4:  Call _fun___infer_skip_function \n   n$1=_fun___infer_skip_function() [line 19, column 3]\n " shape="box"]
 	
 
 	 "destroy<int_*>#14082686937760238422.8268959c48dc929d419568bc99a6b97b_4" -> "destroy<int_*>#14082686937760238422.8268959c48dc929d419568bc99a6b97b_3" ;
@@ -26,11 +26,11 @@ digraph cfg {
 	
 
 	 "f#10188173399311638112.8cffce40f5525757e791edeba0985326_3" -> "f#10188173399311638112.8cffce40f5525757e791edeba0985326_2" ;
-"f#10188173399311638112.8cffce40f5525757e791edeba0985326_4" [label="4:  Call _fun___infer_skip_function \n   n$1=_fun___infer_skip_function() [line 13, column 3]\n " shape="box"]
+"f#10188173399311638112.8cffce40f5525757e791edeba0985326_4" [label="4:  Call _fun___infer_skip_function \n   n$2=_fun___infer_skip_function() [line 13, column 3]\n " shape="box"]
 	
 
 	 "f#10188173399311638112.8cffce40f5525757e791edeba0985326_4" -> "f#10188173399311638112.8cffce40f5525757e791edeba0985326_3" ;
-"f#10188173399311638112.8cffce40f5525757e791edeba0985326_5" [label="5:  DeclStmt \n   n$2=*&p:int* [line 12, column 12]\n  n$3=*n$2:int [line 12, column 11]\n  *&x:int=n$3 [line 12, column 3]\n " shape="box"]
+"f#10188173399311638112.8cffce40f5525757e791edeba0985326_5" [label="5:  DeclStmt \n   n$3=*&p:int* [line 12, column 12]\n  n$4=*n$3:int [line 12, column 11]\n  *&x:int=n$4 [line 12, column 3]\n " shape="box"]
 	
 
 	 "f#10188173399311638112.8cffce40f5525757e791edeba0985326_5" -> "f#10188173399311638112.8cffce40f5525757e791edeba0985326_4" ;
@@ -41,7 +41,7 @@ digraph cfg {
 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Call _fun_destroy<int_*> \n   n$0=_fun_destroy<int_*>(&t:int**) [line 25, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Call _fun_destroy<int_*> \n   n$1=_fun_destroy<int_*>(&t:int**) [line 25, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;

infer/tests/codetoanalyze/cpp/frontend/destructors/scope.cpp.dot

@@ -1,13 +1,13 @@
 /* @generated */
 digraph cfg {
-"callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_1" [label="1: Start destructor_scope::callgetZ\nFormals: \nLocals:  0$?%__sil_tmp__temp_return_n$1:destructor_scope::Z \n   DECLARE_LOCALS(&return,&0$?%__sil_tmp__temp_return_n$1); [line 84, column 1]\n " color=yellow style=filled]
+"callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_1" [label="1: Start destructor_scope::callgetZ\nFormals: \nLocals:  0$?%__sil_tmp__temp_return_n$2:destructor_scope::Z \n   DECLARE_LOCALS(&return,&0$?%__sil_tmp__temp_return_n$2); [line 84, column 1]\n " color=yellow style=filled]
 	
 
 	 "callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_1" -> "callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_3" ;
 "callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_2" [label="2: Exit destructor_scope::callgetZ \n  " color=yellow style=filled]
 	
 
-"callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_3" [label="3:  Call _fun_destructor_scope::getZ \n   n$2=_fun_destructor_scope::getZ(&0$?%__sil_tmp__temp_return_n$1:destructor_scope::Z*) [line 84, column 19]\n " shape="box"]
+"callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_3" [label="3:  Call _fun_destructor_scope::getZ \n   n$3=_fun_destructor_scope::getZ(&0$?%__sil_tmp__temp_return_n$2:destructor_scope::Z*) [line 84, column 19]\n " shape="box"]
 	
 
 	 "callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_3" -> "callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_2" ;
@@ -22,7 +22,7 @@ digraph cfg {
 	
 
 	 "getX#destructor_scope#11739464242911605656.40a1d0621360ad71d65c4cc39bf927eb_3" -> "getX#destructor_scope#11739464242911605656.40a1d0621360ad71d65c4cc39bf927eb_2" ;
-"getX#destructor_scope#11739464242911605656.40a1d0621360ad71d65c4cc39bf927eb_4" [label="4:  DeclStmt \n   n$4=_fun_destructor_scope::X_X(&x:destructor_scope::X*) [line 71, column 5]\n " shape="box"]
+"getX#destructor_scope#11739464242911605656.40a1d0621360ad71d65c4cc39bf927eb_4" [label="4:  DeclStmt \n   n$5=_fun_destructor_scope::X_X(&x:destructor_scope::X*) [line 71, column 5]\n " shape="box"]
 	
 
 	 "getX#destructor_scope#11739464242911605656.40a1d0621360ad71d65c4cc39bf927eb_4" -> "getX#destructor_scope#11739464242911605656.40a1d0621360ad71d65c4cc39bf927eb_3" ;
@@ -37,7 +37,7 @@ digraph cfg {
 	
 
 	 "getZ#destructor_scope#13110319947448813202.fe2bc6519a3d7998283b70bbacc3915e_3" -> "getZ#destructor_scope#13110319947448813202.fe2bc6519a3d7998283b70bbacc3915e_2" ;
-"getZ#destructor_scope#13110319947448813202.fe2bc6519a3d7998283b70bbacc3915e_4" [label="4:  DeclStmt \n   n$4=_fun_destructor_scope::Z_Z(&z:destructor_scope::Z*) [line 76, column 5]\n " shape="box"]
+"getZ#destructor_scope#13110319947448813202.fe2bc6519a3d7998283b70bbacc3915e_4" [label="4:  DeclStmt \n   n$5=_fun_destructor_scope::Z_Z(&z:destructor_scope::Z*) [line 76, column 5]\n " shape="box"]
 	
 
 	 "getZ#destructor_scope#13110319947448813202.fe2bc6519a3d7998283b70bbacc3915e_4" -> "getZ#destructor_scope#13110319947448813202.fe2bc6519a3d7998283b70bbacc3915e_3" ;
@@ -52,23 +52,23 @@ digraph cfg {
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_3" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_2" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_4" [label="4:  Destruction \n   _=*&y3:destructor_scope::Y [line 56, column 11]\n  n$7=_fun_destructor_scope::Y_~Y(&y3:destructor_scope::Y*) [line 56, column 11]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_4" [label="4:  Destruction \n   _=*&y3:destructor_scope::Y [line 56, column 11]\n  n$8=_fun_destructor_scope::Y_~Y(&y3:destructor_scope::Y*) [line 56, column 11]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_4" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_3" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_5" [label="5:  DeclStmt \n   n$8=_fun_destructor_scope::Y_Y(&y3:destructor_scope::Y*) [line 56, column 7]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_5" [label="5:  DeclStmt \n   n$10=_fun_destructor_scope::Y_Y(&y3:destructor_scope::Y*) [line 56, column 7]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_5" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_4" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_6" [label="6:  DeclStmt \n   n$9=_fun_destructor_scope::Y_Y(&y1:destructor_scope::Y*) [line 55, column 5]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_6" [label="6:  DeclStmt \n   n$11=_fun_destructor_scope::Y_Y(&y1:destructor_scope::Y*) [line 55, column 5]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_6" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_5" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_7" [label="7:  Destruction \n   _=*&y2:destructor_scope::Y [line 54, column 3]\n  n$11=_fun_destructor_scope::Y_~Y(&y2:destructor_scope::Y*) [line 54, column 3]\n  _=*&x2:destructor_scope::X [line 54, column 3]\n  n$13=_fun_destructor_scope::X_~X(&x2:destructor_scope::X*) [line 54, column 3]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_7" [label="7:  Destruction \n   _=*&y2:destructor_scope::Y [line 54, column 3]\n  n$13=_fun_destructor_scope::Y_~Y(&y2:destructor_scope::Y*) [line 54, column 3]\n  _=*&x2:destructor_scope::X [line 54, column 3]\n  n$15=_fun_destructor_scope::X_~X(&x2:destructor_scope::X*) [line 54, column 3]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_7" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_6" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_8" [label="8:  Destruction \n   _=*&x3:destructor_scope::X [line 53, column 5]\n  n$15=_fun_destructor_scope::X_~X(&x3:destructor_scope::X*) [line 53, column 5]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_8" [label="8:  Destruction \n   _=*&x3:destructor_scope::X [line 53, column 5]\n  n$18=_fun_destructor_scope::X_~X(&x3:destructor_scope::X*) [line 53, column 5]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_8" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_7" ;
@@ -76,19 +76,19 @@ digraph cfg {
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_9" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_8" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_10" [label="10: Prune (true branch, if) \n   n$16=*&b:_Bool [line 50, column 11]\n  PRUNE(n$16, true); [line 50, column 11]\n " shape="invhouse"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_10" [label="10: Prune (true branch, if) \n   n$20=*&b:_Bool [line 50, column 11]\n  PRUNE(n$20, true); [line 50, column 11]\n " shape="invhouse"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_10" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_12" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_11" [label="11: Prune (false branch, if) \n   n$16=*&b:_Bool [line 50, column 11]\n  PRUNE(!n$16, false); [line 50, column 11]\n " shape="invhouse"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_11" [label="11: Prune (false branch, if) \n   n$20=*&b:_Bool [line 50, column 11]\n  PRUNE(!n$20, false); [line 50, column 11]\n " shape="invhouse"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_11" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_9" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_12" [label="12:  Return Stmt \n   _=*&x3:destructor_scope::X [line 51, column 9]\n  n$18=_fun_destructor_scope::X_~X(&x3:destructor_scope::X*) [line 51, column 9]\n  _=*&y2:destructor_scope::Y [line 51, column 9]\n  n$20=_fun_destructor_scope::Y_~Y(&y2:destructor_scope::Y*) [line 51, column 9]\n  _=*&x2:destructor_scope::X [line 51, column 9]\n  n$22=_fun_destructor_scope::X_~X(&x2:destructor_scope::X*) [line 51, column 9]\n  _=*&s:destructor_scope::S [line 51, column 9]\n  n$24=_fun_destructor_scope::S_~S(&s:destructor_scope::S*) [line 51, column 9]\n  _=*&x1:destructor_scope::X [line 51, column 9]\n  n$26=_fun_destructor_scope::X_~X(&x1:destructor_scope::X*) [line 51, column 9]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_12" [label="12:  Return Stmt \n   _=*&x3:destructor_scope::X [line 51, column 9]\n  n$22=_fun_destructor_scope::X_~X(&x3:destructor_scope::X*) [line 51, column 9]\n  _=*&y2:destructor_scope::Y [line 51, column 9]\n  n$24=_fun_destructor_scope::Y_~Y(&y2:destructor_scope::Y*) [line 51, column 9]\n  _=*&x2:destructor_scope::X [line 51, column 9]\n  n$26=_fun_destructor_scope::X_~X(&x2:destructor_scope::X*) [line 51, column 9]\n  _=*&s:destructor_scope::S [line 51, column 9]\n  n$28=_fun_destructor_scope::S_~S(&s:destructor_scope::S*) [line 51, column 9]\n  _=*&x1:destructor_scope::X [line 51, column 9]\n  n$30=_fun_destructor_scope::X_~X(&x1:destructor_scope::X*) [line 51, column 9]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_12" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_2" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_13" [label="13:  DeclStmt \n   n$27=_fun_destructor_scope::X_X(&x3:destructor_scope::X*) [line 49, column 9]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_13" [label="13:  DeclStmt \n   n$35=_fun_destructor_scope::X_X(&x3:destructor_scope::X*) [line 49, column 9]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_13" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_10" ;
@@ -97,32 +97,32 @@ digraph cfg {
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_14" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_13" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_15" [label="15: Prune (true branch, if) \n   n$28=*&a:_Bool [line 45, column 9]\n  PRUNE(n$28, true); [line 45, column 9]\n " shape="invhouse"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_15" [label="15: Prune (true branch, if) \n   n$36=*&a:_Bool [line 45, column 9]\n  PRUNE(n$36, true); [line 45, column 9]\n " shape="invhouse"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_15" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_17" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_16" [label="16: Prune (false branch, if) \n   n$28=*&a:_Bool [line 45, column 9]\n  PRUNE(!n$28, false); [line 45, column 9]\n " shape="invhouse"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_16" [label="16: Prune (false branch, if) \n   n$36=*&a:_Bool [line 45, column 9]\n  PRUNE(!n$36, false); [line 45, column 9]\n " shape="invhouse"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_16" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_14" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_17" [label="17:  Return Stmt \n   _=*&y2:destructor_scope::Y [line 46, column 7]\n  n$30=_fun_destructor_scope::Y_~Y(&y2:destructor_scope::Y*) [line 46, column 7]\n  _=*&x2:destructor_scope::X [line 46, column 7]\n  n$32=_fun_destructor_scope::X_~X(&x2:destructor_scope::X*) [line 46, column 7]\n  _=*&s:destructor_scope::S [line 46, column 7]\n  n$34=_fun_destructor_scope::S_~S(&s:destructor_scope::S*) [line 46, column 7]\n  _=*&x1:destructor_scope::X [line 46, column 7]\n  n$36=_fun_destructor_scope::X_~X(&x1:destructor_scope::X*) [line 46, column 7]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_17" [label="17:  Return Stmt \n   _=*&y2:destructor_scope::Y [line 46, column 7]\n  n$38=_fun_destructor_scope::Y_~Y(&y2:destructor_scope::Y*) [line 46, column 7]\n  _=*&x2:destructor_scope::X [line 46, column 7]\n  n$40=_fun_destructor_scope::X_~X(&x2:destructor_scope::X*) [line 46, column 7]\n  _=*&s:destructor_scope::S [line 46, column 7]\n  n$42=_fun_destructor_scope::S_~S(&s:destructor_scope::S*) [line 46, column 7]\n  _=*&x1:destructor_scope::X [line 46, column 7]\n  n$44=_fun_destructor_scope::X_~X(&x1:destructor_scope::X*) [line 46, column 7]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_17" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_2" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_18" [label="18:  DeclStmt \n   n$37=_fun_destructor_scope::Y_Y(&y2:destructor_scope::Y*) [line 44, column 7]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_18" [label="18:  DeclStmt \n   n$49=_fun_destructor_scope::Y_Y(&y2:destructor_scope::Y*) [line 44, column 7]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_18" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_15" ;
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_18" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_16" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_19" [label="19:  DeclStmt \n   n$38=_fun_destructor_scope::X_X(&x2:destructor_scope::X*) [line 43, column 7]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_19" [label="19:  DeclStmt \n   n$50=_fun_destructor_scope::X_X(&x2:destructor_scope::X*) [line 43, column 7]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_19" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_18" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_20" [label="20:  DeclStmt \n   n$39=_fun_destructor_scope::S_S(&s:destructor_scope::S*) [line 41, column 5]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_20" [label="20:  DeclStmt \n   n$51=_fun_destructor_scope::S_S(&s:destructor_scope::S*) [line 41, column 5]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_20" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_19" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_21" [label="21:  DeclStmt \n   n$40=_fun_destructor_scope::X_X(&x1:destructor_scope::X*) [line 40, column 5]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_21" [label="21:  DeclStmt \n   n$52=_fun_destructor_scope::X_X(&x1:destructor_scope::X*) [line 40, column 5]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_21" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_20" ;
@@ -141,31 +141,31 @@ digraph cfg {
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_4" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_3" ;
-"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_5" [label="5: Prune (true branch, if) \n   n$2=*&a:_Bool [line 61, column 7]\n  PRUNE(n$2, true); [line 61, column 7]\n " shape="invhouse"]
+"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_5" [label="5: Prune (true branch, if) \n   n$3=*&a:_Bool [line 61, column 7]\n  PRUNE(n$3, true); [line 61, column 7]\n " shape="invhouse"]
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_5" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_8" ;
-"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_6" [label="6: Prune (false branch, if) \n   n$2=*&a:_Bool [line 61, column 7]\n  PRUNE(!n$2, false); [line 61, column 7]\n " shape="invhouse"]
+"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_6" [label="6: Prune (false branch, if) \n   n$3=*&a:_Bool [line 61, column 7]\n  PRUNE(!n$3, false); [line 61, column 7]\n " shape="invhouse"]
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_6" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_10" ;
-"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_7" [label="7:  Return Stmt \n   *&return:int=1 [line 63, column 5]\n  _=*&x2:destructor_scope::X [line 63, column 12]\n  n$4=_fun_destructor_scope::X_~X(&x2:destructor_scope::X*) [line 63, column 12]\n  _=*&x1:destructor_scope::X [line 63, column 12]\n  n$6=_fun_destructor_scope::X_~X(&x1:destructor_scope::X*) [line 63, column 12]\n " shape="box"]
+"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_7" [label="7:  Return Stmt \n   *&return:int=1 [line 63, column 5]\n  _=*&x2:destructor_scope::X [line 63, column 12]\n  n$5=_fun_destructor_scope::X_~X(&x2:destructor_scope::X*) [line 63, column 12]\n  _=*&x1:destructor_scope::X [line 63, column 12]\n  n$7=_fun_destructor_scope::X_~X(&x1:destructor_scope::X*) [line 63, column 12]\n " shape="box"]
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_7" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_2" ;
-"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_8" [label="8:  DeclStmt \n   n$7=_fun_destructor_scope::X_X(&x2:destructor_scope::X*) [line 62, column 7]\n " shape="box"]
+"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_8" [label="8:  DeclStmt \n   n$9=_fun_destructor_scope::X_X(&x2:destructor_scope::X*) [line 62, column 7]\n " shape="box"]
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_8" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_7" ;
-"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_9" [label="9:  Return Stmt \n   *&return:int=2 [line 66, column 5]\n  _=*&x3:destructor_scope::X [line 66, column 12]\n  n$9=_fun_destructor_scope::X_~X(&x3:destructor_scope::X*) [line 66, column 12]\n  _=*&x1:destructor_scope::X [line 66, column 12]\n  n$11=_fun_destructor_scope::X_~X(&x1:destructor_scope::X*) [line 66, column 12]\n " shape="box"]
+"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_9" [label="9:  Return Stmt \n   *&return:int=2 [line 66, column 5]\n  _=*&x3:destructor_scope::X [line 66, column 12]\n  n$11=_fun_destructor_scope::X_~X(&x3:destructor_scope::X*) [line 66, column 12]\n  _=*&x1:destructor_scope::X [line 66, column 12]\n  n$13=_fun_destructor_scope::X_~X(&x1:destructor_scope::X*) [line 66, column 12]\n " shape="box"]
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_9" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_2" ;
-"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_10" [label="10:  DeclStmt \n   n$12=_fun_destructor_scope::X_X(&x3:destructor_scope::X*) [line 65, column 7]\n " shape="box"]
+"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_10" [label="10:  DeclStmt \n   n$15=_fun_destructor_scope::X_X(&x3:destructor_scope::X*) [line 65, column 7]\n " shape="box"]
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_10" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_9" ;
-"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_11" [label="11:  DeclStmt \n   n$13=_fun_destructor_scope::X_X(&x1:destructor_scope::X*) [line 60, column 5]\n " shape="box"]
+"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_11" [label="11:  DeclStmt \n   n$17=_fun_destructor_scope::X_X(&x1:destructor_scope::X*) [line 60, column 5]\n " shape="box"]
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_11" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_5" ;
@@ -177,7 +177,7 @@ digraph cfg {
 "S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_2" [label="2: Exit destructor_scope::S_S \n  " color=yellow style=filled]
 	
 
-"S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_3" [label="3:  Constructor Init \n   n$0=*&this:destructor_scope::S* [line 21, column 8]\n  n$1=_fun_destructor_scope::X_X(n$0.x1:destructor_scope::X*) [line 21, column 8]\n " shape="box"]
+"S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_3" [label="3:  Constructor Init \n   n$2=*&this:destructor_scope::S* [line 21, column 8]\n  n$3=_fun_destructor_scope::X_X(n$2.x1:destructor_scope::X*) [line 21, column 8]\n " shape="box"]
 	
 
 	 "S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_3" -> "S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_2" ;
@@ -238,11 +238,11 @@ digraph cfg {
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_3" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_2" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_4" [label="4:  Destruction \n   _=*&y:destructor_scope::Y [line 36, column 3]\n  n$8=_fun_destructor_scope::Y_~Y(&y:destructor_scope::Y*) [line 36, column 3]\n  _=*&x:destructor_scope::X [line 36, column 3]\n  n$10=_fun_destructor_scope::X_~X(&x:destructor_scope::X*) [line 36, column 3]\n " shape="box"]
+"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_4" [label="4:  Destruction \n   _=*&y:destructor_scope::Y [line 36, column 3]\n  n$9=_fun_destructor_scope::Y_~Y(&y:destructor_scope::Y*) [line 36, column 3]\n  _=*&x:destructor_scope::X [line 36, column 3]\n  n$11=_fun_destructor_scope::X_~X(&x:destructor_scope::X*) [line 36, column 3]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_4" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_3" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_5" [label="5:  DeclStmt \n   n$11=_fun_destructor_scope::Y_Y(&y:destructor_scope::Y*) [line 35, column 7]\n " shape="box"]
+"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_5" [label="5:  DeclStmt \n   n$13=_fun_destructor_scope::Y_Y(&y:destructor_scope::Y*) [line 35, column 7]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_5" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_4" ;
@@ -250,19 +250,19 @@ digraph cfg {
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_6" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_5" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_7" [label="7: Prune (true branch, if) \n   n$12=*&this:destructor_scope::W* [line 33, column 9]\n  n$13=*n$12.b:_Bool [line 33, column 9]\n  PRUNE(n$13, true); [line 33, column 9]\n " shape="invhouse"]
+"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_7" [label="7: Prune (true branch, if) \n   n$14=*&this:destructor_scope::W* [line 33, column 9]\n  n$15=*n$14.b:_Bool [line 33, column 9]\n  PRUNE(n$15, true); [line 33, column 9]\n " shape="invhouse"]
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_7" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_9" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_8" [label="8: Prune (false branch, if) \n   n$12=*&this:destructor_scope::W* [line 33, column 9]\n  n$13=*n$12.b:_Bool [line 33, column 9]\n  PRUNE(!n$13, false); [line 33, column 9]\n " shape="invhouse"]
+"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_8" [label="8: Prune (false branch, if) \n   n$14=*&this:destructor_scope::W* [line 33, column 9]\n  n$15=*n$14.b:_Bool [line 33, column 9]\n  PRUNE(!n$15, false); [line 33, column 9]\n " shape="invhouse"]
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_8" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_6" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_9" [label="9:  Return Stmt \n   _=*&x:destructor_scope::X [line 34, column 7]\n  n$15=_fun_destructor_scope::X_~X(&x:destructor_scope::X*) [line 34, column 7]\n  n$16=*&this:destructor_scope::W* [line 34, column 7]\n  _=*n$16.s:destructor_scope::S [line 34, column 7]\n  n$22=_fun_destructor_scope::S_~S(n$16.s:destructor_scope::S*) [line 34, column 7]\n  _=*n$16.y:destructor_scope::Y [line 34, column 7]\n  n$20=_fun_destructor_scope::Y_~Y(n$16.y:destructor_scope::Y*) [line 34, column 7]\n  _=*n$16.x:destructor_scope::X [line 34, column 7]\n  n$18=_fun_destructor_scope::X_~X(n$16.x:destructor_scope::X*) [line 34, column 7]\n " shape="box"]
+"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_9" [label="9:  Return Stmt \n   _=*&x:destructor_scope::X [line 34, column 7]\n  n$17=_fun_destructor_scope::X_~X(&x:destructor_scope::X*) [line 34, column 7]\n  n$19=*&this:destructor_scope::W* [line 34, column 7]\n  _=*n$19.s:destructor_scope::S [line 34, column 7]\n  n$25=_fun_destructor_scope::S_~S(n$19.s:destructor_scope::S*) [line 34, column 7]\n  _=*n$19.y:destructor_scope::Y [line 34, column 7]\n  n$23=_fun_destructor_scope::Y_~Y(n$19.y:destructor_scope::Y*) [line 34, column 7]\n  _=*n$19.x:destructor_scope::X [line 34, column 7]\n  n$21=_fun_destructor_scope::X_~X(n$19.x:destructor_scope::X*) [line 34, column 7]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_9" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_2" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_10" [label="10:  DeclStmt \n   n$23=_fun_destructor_scope::X_X(&x:destructor_scope::X*) [line 32, column 7]\n " shape="box"]
+"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_10" [label="10:  DeclStmt \n   n$30=_fun_destructor_scope::X_X(&x:destructor_scope::X*) [line 32, column 7]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_10" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_7" ;

infer/tests/codetoanalyze/cpp/frontend/destructors/simple_decl.cpp.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_2" [label="2: Exit A___infer_inner_destructor_~A \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:A* [line 12, column 10]\n  *n$1.f:int=0 [line 12, column 10]\n " shape="box"]
+"__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_3" [label="3:  BinaryOperatorStmt: Assign \n   n$3=*&this:A* [line 12, column 10]\n  *n$3.f:int=0 [line 12, column 10]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_3" -> "__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_2" [label="2: Exit B___infer_inner_destructor_~B \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:B* [line 20, column 11]\n  *n$1.f:int=1 [line 20, column 11]\n " shape="box"]
+"__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_3" [label="3:  BinaryOperatorStmt: Assign \n   n$3=*&this:B* [line 20, column 11]\n  *n$3.f:int=1 [line 20, column 11]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_3" -> "__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_2" ;

infer/tests/codetoanalyze/cpp/frontend/globals/global_const1.cpp.dot

@@ -44,7 +44,7 @@ digraph cfg {
 	
 
 	 "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_3" -> "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_2" ;
-"test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_4" [label="4:  DeclStmt \n   n$1=*&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp>$v:int [line 20, column 15]\n  *&local:int=n$1 [line 20, column 3]\n " shape="box"]
+"test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_4" [label="4:  DeclStmt \n   n$2=*&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp>$v:int [line 20, column 15]\n  *&local:int=n$2 [line 20, column 3]\n " shape="box"]
 	
 
 	 "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_4" -> "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_3" ;

infer/tests/codetoanalyze/cpp/frontend/globals/global_const2.cpp.dot

@@ -20,11 +20,11 @@ digraph cfg {
 	
 
 	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_5" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_7" ;
-"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=2 [line 10, column 20]\n " shape="box"]
+"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=2 [line 10, column 20]\n " shape="box"]
 	
 
 	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_6" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" ;
-"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=3 [line 10, column 20]\n " shape="box"]
+"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=3 [line 10, column 20]\n " shape="box"]
 	
 
 	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_7" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" ;

infer/tests/codetoanalyze/cpp/frontend/include_header/include_templ.cpp.dot

@@ -7,11 +7,11 @@ digraph cfg {
 "div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_2" [label="2: Exit div0_B_A \n  " color=yellow style=filled]
 	
 
-"div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_3" [label="3:  Call _fun_B<A>_div0 \n   _=*&b:B<A> [line 20, column 3]\n  n$1=_fun_B<A>_div0(&b:B<A>&) [line 20, column 3]\n " shape="box"]
+"div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_3" [label="3:  Call _fun_B<A>_div0 \n   _=*&b:B<A> [line 20, column 3]\n  n$2=_fun_B<A>_div0(&b:B<A>&) [line 20, column 3]\n " shape="box"]
 	
 
 	 "div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_3" -> "div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_2" ;
-"div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_4" [label="4:  DeclStmt \n   n$2=_fun_B<A>_B(&b:B<A>*) [line 19, column 8]\n " shape="box"]
+"div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_4" [label="4:  DeclStmt \n   n$3=_fun_B<A>_B(&b:B<A>*) [line 19, column 8]\n " shape="box"]
 	
 
 	 "div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_4" -> "div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_3" ;
@@ -22,11 +22,11 @@ digraph cfg {
 "div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_2" [label="2: Exit div0_B_int \n  " color=yellow style=filled]
 	
 
-"div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_3" [label="3:  Call _fun_B<int>_div0 \n   _=*&b:B<int> [line 15, column 3]\n  n$1=_fun_B<int>_div0(&b:B<int>&) [line 15, column 3]\n " shape="box"]
+"div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_3" [label="3:  Call _fun_B<int>_div0 \n   _=*&b:B<int> [line 15, column 3]\n  n$2=_fun_B<int>_div0(&b:B<int>&) [line 15, column 3]\n " shape="box"]
 	
 
 	 "div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_3" -> "div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_2" ;
-"div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_4" [label="4:  DeclStmt \n   n$2=_fun_B<int>_B(&b:B<int>*) [line 14, column 10]\n " shape="box"]
+"div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_4" [label="4:  DeclStmt \n   n$3=_fun_B<int>_B(&b:B<int>*) [line 14, column 10]\n " shape="box"]
 	
 
 	 "div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_4" -> "div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_3" ;
@@ -59,7 +59,7 @@ digraph cfg {
 "div0_templ_A#15777392272986999827.c3e6f124c5921f718c539c423038b21a_2" [label="2: Exit div0_templ_A \n  " color=yellow style=filled]
 	
 
-"div0_templ_A#15777392272986999827.c3e6f124c5921f718c539c423038b21a_3" [label="3:  Call _fun_div0_templ<A> \n   n$0=_fun_div0_templ<A>() [line 25, column 22]\n " shape="box"]
+"div0_templ_A#15777392272986999827.c3e6f124c5921f718c539c423038b21a_3" [label="3:  Call _fun_div0_templ<A> \n   n$1=_fun_div0_templ<A>() [line 25, column 22]\n " shape="box"]
 	
 
 	 "div0_templ_A#15777392272986999827.c3e6f124c5921f718c539c423038b21a_3" -> "div0_templ_A#15777392272986999827.c3e6f124c5921f718c539c423038b21a_2" ;
@@ -70,7 +70,7 @@ digraph cfg {
 "div0_templ_int#6723189882400805523.156da066b41947aa58ec7afb9551dc47_2" [label="2: Exit div0_templ_int \n  " color=yellow style=filled]
 	
 
-"div0_templ_int#6723189882400805523.156da066b41947aa58ec7afb9551dc47_3" [label="3:  Call _fun_div0_templ<int> \n   n$0=_fun_div0_templ<int>() [line 23, column 25]\n " shape="box"]
+"div0_templ_int#6723189882400805523.156da066b41947aa58ec7afb9551dc47_3" [label="3:  Call _fun_div0_templ<int> \n   n$1=_fun_div0_templ<int>() [line 23, column 25]\n " shape="box"]
 	
 
 	 "div0_templ_int#6723189882400805523.156da066b41947aa58ec7afb9551dc47_3" -> "div0_templ_int#6723189882400805523.156da066b41947aa58ec7afb9551dc47_2" ;

infer/tests/codetoanalyze/cpp/frontend/initialization/inheriting_constructor.cpp.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   n$0=_fun_B_A(&b:B*,5:int) [line 18, column 16]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   n$1=_fun_B_A(&b:B*,5:int) [line 18, column 16]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -25,7 +25,7 @@ digraph cfg {
 "A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_2" [label="2: Exit B_A \n  " color=yellow style=filled]
 	
 
-"A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_3" [label="3:  Constructor Init \n   n$0=*&this:B* [line 15, column 12]\n  n$2=*&__param_0:int [line 15, column 12]\n  n$1=_fun_A_A(n$0:B*,n$2:int) [line 15, column 12]\n " shape="box"]
+"A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_3" [label="3:  Constructor Init \n   n$2=*&this:B* [line 15, column 12]\n  n$4=*&__param_0:int [line 15, column 12]\n  n$3=_fun_A_A(n$2:B*,n$4:int) [line 15, column 12]\n " shape="box"]
 	
 
 	 "A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_3" -> "A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_2" ;

infer/tests/codetoanalyze/cpp/frontend/initialization/init_list.cpp.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_2" [label="2: Exit init_list::list_init \n  " color=yellow style=filled]
 	
 
-"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_3" [label="3:  DeclStmt \n   *&ty[0].z:int=1 [line 50, column 14]\n  *&ty[0].x.a:int=2 [line 50, column 18]\n  *&ty[0].x.p:int*=null [line 50, column 18]\n  n$0=_fun_init_list::Y_Y(&ty[1]:init_list::Y*,&y:init_list::Y&) [line 50, column 33]\n  n$1=*&yref:init_list::Y& [line 50, column 36]\n  n$2=_fun_init_list::Y_Y(&ty[2]:init_list::Y*,n$1:init_list::Y&) [line 50, column 36]\n " shape="box"]
+"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_3" [label="3:  DeclStmt \n   *&ty[0].z:int=1 [line 50, column 14]\n  *&ty[0].x.a:int=2 [line 50, column 18]\n  *&ty[0].x.p:int*=null [line 50, column 18]\n  n$1=_fun_init_list::Y_Y(&ty[1]:init_list::Y*,&y:init_list::Y&) [line 50, column 33]\n  n$2=*&yref:init_list::Y& [line 50, column 36]\n  n$3=_fun_init_list::Y_Y(&ty[2]:init_list::Y*,n$2:init_list::Y&) [line 50, column 36]\n " shape="box"]
 	
 
 	 "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_3" -> "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_2" ;
@@ -15,7 +15,7 @@ digraph cfg {
 	
 
 	 "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_4" -> "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_3" ;
-"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_5" [label="5:  DeclStmt \n   n$3=_fun_init_list::Y_Y(&y:init_list::Y*) [line 48, column 5]\n " shape="box"]
+"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_5" [label="5:  DeclStmt \n   n$4=_fun_init_list::Y_Y(&y:init_list::Y*) [line 48, column 5]\n " shape="box"]
 	
 
 	 "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_5" -> "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_4" ;
@@ -34,7 +34,7 @@ digraph cfg {
 	
 
 	 "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_3" -> "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_2" ;
-"record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_4" [label="4:  DeclStmt \n   n$4=_fun_init_list::C_C(&c:init_list::C*,1:int,2:int,&x:init_list::X&) [line 43, column 5]\n " shape="box"]
+"record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_4" [label="4:  DeclStmt \n   n$5=_fun_init_list::C_C(&c:init_list::C*,1:int,2:int,&x:init_list::X&) [line 43, column 5]\n " shape="box"]
 	
 
 	 "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_4" -> "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_3" ;
@@ -42,7 +42,7 @@ digraph cfg {
 	
 
 	 "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_5" -> "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_4" ;
-"record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_6" [label="6:  DeclStmt \n   *&y1.z:int=1 [line 40, column 7]\n  n$5=_fun_init_list::X_X(&y1.x:init_list::X*,&x:init_list::X&) [line 40, column 11]\n " shape="box"]
+"record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_6" [label="6:  DeclStmt \n   *&y1.z:int=1 [line 40, column 7]\n  n$6=_fun_init_list::X_X(&y1.x:init_list::X*,&x:init_list::X&) [line 40, column 11]\n " shape="box"]
 	
 
 	 "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_6" -> "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_5" ;
@@ -80,7 +80,7 @@ digraph cfg {
 	
 
 	 "zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_3" -> "zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_2" ;
-"zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_4" [label="4:  DeclStmt \n   n$2=_fun_init_list::C_C(&c:init_list::C*) [line 35, column 5]\n " shape="box"]
+"zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_4" [label="4:  DeclStmt \n   n$3=_fun_init_list::C_C(&c:init_list::C*) [line 35, column 5]\n " shape="box"]
 	
 
 	 "zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_4" -> "zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_3" ;
@@ -95,11 +95,11 @@ digraph cfg {
 "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_2" [label="2: Exit init_list::C_C \n  " color=yellow style=filled]
 	
 
-"C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_3" [label="3:  Constructor Init \n   n$0=*&this:init_list::C* [line 24, column 43]\n  n$1=*&x:init_list::X const & [line 24, column 45]\n  n$2=_fun_init_list::X_X(n$0.x:init_list::X*,n$1:init_list::X const &) [line 24, column 43]\n " shape="box"]
+"C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_3" [label="3:  Constructor Init \n   n$2=*&this:init_list::C* [line 24, column 43]\n  n$3=*&x:init_list::X const & [line 24, column 45]\n  n$4=_fun_init_list::X_X(n$2.x:init_list::X*,n$3:init_list::X const &) [line 24, column 43]\n " shape="box"]
 	
 
 	 "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_3" -> "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_2" ;
-"C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_4" [label="4:  Constructor Init \n   n$3=*&this:init_list::C* [line 24, column 33]\n  n$4=*&a:int [line 24, column 35]\n  n$5=*&b:int [line 24, column 39]\n  *n$3.z:int=(n$4 + n$5) [line 24, column 33]\n " shape="box"]
+"C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_4" [label="4:  Constructor Init \n   n$5=*&this:init_list::C* [line 24, column 33]\n  n$6=*&a:int [line 24, column 35]\n  n$7=*&b:int [line 24, column 39]\n  *n$5.z:int=(n$6 + n$7) [line 24, column 33]\n " shape="box"]
 	
 
 	 "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_4" -> "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_3" ;
@@ -110,7 +110,7 @@ digraph cfg {
 "C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_2" [label="2: Exit init_list::C_C \n  " color=yellow style=filled]
 	
 
-"C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_3" [label="3:  Constructor Init \n   n$0=*&this:init_list::C* [line 21, column 6]\n  *n$0.x.a:int=0 [line 21, column 7]\n  *n$0.x.p:int*=null [line 21, column 7]\n " shape="box"]
+"C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_3" [label="3:  Constructor Init \n   n$2=*&this:init_list::C* [line 21, column 6]\n  *n$2.x.a:int=0 [line 21, column 7]\n  *n$2.x.p:int*=null [line 21, column 7]\n " shape="box"]
 	
 
 	 "C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_3" -> "C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_2" ;
@@ -121,11 +121,11 @@ digraph cfg {
 "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_2" [label="2: Exit init_list::X_X \n  " color=yellow style=filled]
 	
 
-"X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_3" [label="3:  Constructor Init \n   n$0=*&this:init_list::X* [line 10, column 8]\n  n$1=*&__param_0:init_list::X const & [line 10, column 8]\n  n$2=*n$1.p:int* [line 10, column 8]\n  *n$0.p:int*=n$2 [line 10, column 8]\n " shape="box"]
+"X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_3" [label="3:  Constructor Init \n   n$2=*&this:init_list::X* [line 10, column 8]\n  n$3=*&__param_0:init_list::X const & [line 10, column 8]\n  n$4=*n$3.p:int* [line 10, column 8]\n  *n$2.p:int*=n$4 [line 10, column 8]\n " shape="box"]
 	
 
 	 "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_3" -> "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_2" ;
-"X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_4" [label="4:  Constructor Init \n   n$3=*&this:init_list::X* [line 10, column 8]\n  n$4=*&__param_0:init_list::X const & [line 10, column 8]\n  n$5=*n$4.a:int [line 10, column 8]\n  *n$3.a:int=n$5 [line 10, column 8]\n " shape="box"]
+"X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_4" [label="4:  Constructor Init \n   n$5=*&this:init_list::X* [line 10, column 8]\n  n$6=*&__param_0:init_list::X const & [line 10, column 8]\n  n$7=*n$6.a:int [line 10, column 8]\n  *n$5.a:int=n$7 [line 10, column 8]\n " shape="box"]
 	
 
 	 "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_4" -> "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_3" ;
@@ -143,11 +143,11 @@ digraph cfg {
 "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_2" [label="2: Exit init_list::Y_Y \n  " color=yellow style=filled]
 	
 
-"Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_3" [label="3:  Constructor Init \n   n$0=*&this:init_list::Y* [line 14, column 8]\n  n$1=*&__param_0:init_list::Y const & [line 14, column 8]\n  n$2=_fun_init_list::X_X(n$0.x:init_list::X*,n$1.x:init_list::X&) [line 14, column 8]\n " shape="box"]
+"Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_3" [label="3:  Constructor Init \n   n$2=*&this:init_list::Y* [line 14, column 8]\n  n$3=*&__param_0:init_list::Y const & [line 14, column 8]\n  n$4=_fun_init_list::X_X(n$2.x:init_list::X*,n$3.x:init_list::X&) [line 14, column 8]\n " shape="box"]
 	
 
 	 "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_3" -> "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_2" ;
-"Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_4" [label="4:  Constructor Init \n   n$3=*&this:init_list::Y* [line 14, column 8]\n  n$4=*&__param_0:init_list::Y const & [line 14, column 8]\n  n$5=*n$4.z:int [line 14, column 8]\n  *n$3.z:int=n$5 [line 14, column 8]\n " shape="box"]
+"Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_4" [label="4:  Constructor Init \n   n$5=*&this:init_list::Y* [line 14, column 8]\n  n$6=*&__param_0:init_list::Y const & [line 14, column 8]\n  n$7=*n$6.z:int [line 14, column 8]\n  *n$5.z:int=n$7 [line 14, column 8]\n " shape="box"]
 	
 
 	 "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_4" -> "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_3" ;
@@ -158,7 +158,7 @@ digraph cfg {
 "Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_2" [label="2: Exit init_list::Y_Y \n  " color=yellow style=filled]
 	
 
-"Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_3" [label="3:  Constructor Init \n   n$0=*&this:init_list::Y* [line 14, column 8]\n  n$1=_fun_init_list::X_X(n$0.x:init_list::X*) [line 14, column 8]\n " shape="box"]
+"Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_3" [label="3:  Constructor Init \n   n$2=*&this:init_list::Y* [line 14, column 8]\n  n$3=_fun_init_list::X_X(n$2.x:init_list::X*) [line 14, column 8]\n " shape="box"]
 	
 
 	 "Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_3" -> "Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_2" ;

infer/tests/codetoanalyze/cpp/frontend/literals/scalar_value_init.cpp.dot

@@ -51,7 +51,7 @@ digraph cfg {
 "get<void>#8296845500290212976.bb4a1c12bef114b00039399debc79878_2" [label="2: Exit get<void> \n  " color=yellow style=filled]
 	
 
-"get<void>#8296845500290212976.bb4a1c12bef114b00039399debc79878_3" [label="3:  Return Stmt \n   *&return:void=-1 [line 14, column 3]\n " shape="box"]
+"get<void>#8296845500290212976.bb4a1c12bef114b00039399debc79878_3" [label="3:  Return Stmt \n   *&return:void=0 [line 14, column 3]\n " shape="box"]
 	
 
 	 "get<void>#8296845500290212976.bb4a1c12bef114b00039399debc79878_3" -> "get<void>#8296845500290212976.bb4a1c12bef114b00039399debc79878_2" ;
@@ -66,23 +66,23 @@ digraph cfg {
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   n$0=_fun_get<ENUM>() [line 22, column 12]\n  *&x:int=n$0 [line 22, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   n$1=_fun_get<ENUM>() [line 22, column 12]\n  *&x:int=n$1 [line 22, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  Call _fun_get<void> \n   n$1=_fun_get<void>() [line 21, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  Call _fun_get<void> \n   n$2=_fun_get<void>() [line 21, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   n$2=_fun_get<float_*>() [line 20, column 15]\n  *&fp:float*=n$2 [line 20, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   n$3=_fun_get<float_*>() [line 20, column 15]\n  *&fp:float*=n$3 [line 20, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" [label="7:  DeclStmt \n   n$3=_fun_get<float>() [line 19, column 13]\n  *&f:float=n$3 [line 19, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" [label="7:  DeclStmt \n   n$4=_fun_get<float>() [line 19, column 13]\n  *&f:float=n$4 [line 19, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" [label="8:  DeclStmt \n   n$4=_fun_get<int>() [line 18, column 11]\n  *&i:int=n$4 [line 18, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" [label="8:  DeclStmt \n   n$5=_fun_get<int>() [line 18, column 11]\n  *&i:int=n$5 [line 18, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" ;

infer/tests/codetoanalyze/cpp/frontend/loops/do_while.cpp.dot

@@ -15,15 +15,15 @@ digraph cfg {
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_4" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_13" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_5" [label="5: Prune (true branch, do while) \n   n$1=*&b:_Bool [line 21, column 12]\n  PRUNE(n$1, true); [line 21, column 12]\n " shape="invhouse"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_5" [label="5: Prune (true branch, do while) \n   n$2=*&b:_Bool [line 21, column 12]\n  PRUNE(n$2, true); [line 21, column 12]\n " shape="invhouse"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_5" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_4" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_6" [label="6: Prune (false branch, do while) \n   n$1=*&b:_Bool [line 21, column 12]\n  PRUNE(!n$1, false); [line 21, column 12]\n " shape="invhouse"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_6" [label="6: Prune (false branch, do while) \n   n$2=*&b:_Bool [line 21, column 12]\n  PRUNE(!n$2, false); [line 21, column 12]\n " shape="invhouse"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_6" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_3" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_7" [label="7:  BinaryOperatorStmt: Assign \n   n$2=*&x:int [line 20, column 9]\n  *&x:int=(n$2 + 4) [line 20, column 5]\n " shape="box"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_7" [label="7:  BinaryOperatorStmt: Assign \n   n$4=*&x:int [line 20, column 9]\n  *&x:int=(n$4 + 4) [line 20, column 5]\n " shape="box"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_7" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_5" ;
@@ -32,24 +32,24 @@ digraph cfg {
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_8" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_7" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_9" [label="9: Prune (true branch, if) \n   n$3=*&a:_Bool [line 14, column 9]\n  PRUNE(n$3, true); [line 14, column 9]\n " shape="invhouse"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_9" [label="9: Prune (true branch, if) \n   n$5=*&a:_Bool [line 14, column 9]\n  PRUNE(n$5, true); [line 14, column 9]\n " shape="invhouse"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_9" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_11" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_10" [label="10: Prune (false branch, if) \n   n$3=*&a:_Bool [line 14, column 9]\n  PRUNE(!n$3, false); [line 14, column 9]\n " shape="invhouse"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_10" [label="10: Prune (false branch, if) \n   n$5=*&a:_Bool [line 14, column 9]\n  PRUNE(!n$5, false); [line 14, column 9]\n " shape="invhouse"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_10" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_12" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_11" [label="11:  BinaryOperatorStmt: Assign \n   n$4=*&x:int [line 15, column 11]\n  *&x:int=(n$4 + 2) [line 15, column 7]\n " shape="box"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_11" [label="11:  BinaryOperatorStmt: Assign \n   n$9=*&x:int [line 15, column 11]\n  *&x:int=(n$9 + 2) [line 15, column 7]\n " shape="box"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_11" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_5" ;
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_11" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_6" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_12" [label="12:  BinaryOperatorStmt: Assign \n   n$5=*&x:int [line 18, column 11]\n  *&x:int=(n$5 + 3) [line 18, column 7]\n " shape="box"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_12" [label="12:  BinaryOperatorStmt: Assign \n   n$11=*&x:int [line 18, column 11]\n  *&x:int=(n$11 + 3) [line 18, column 7]\n " shape="box"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_12" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_8" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_13" [label="13:  BinaryOperatorStmt: Assign \n   n$6=*&x:int [line 13, column 9]\n  *&x:int=(n$6 + 1) [line 13, column 5]\n " shape="box"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_13" [label="13:  BinaryOperatorStmt: Assign \n   n$13=*&x:int [line 13, column 9]\n  *&x:int=(n$13 + 1) [line 13, column 5]\n " shape="box"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_13" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_9" ;

infer/tests/codetoanalyze/cpp/frontend/loops/foreach1.cpp.dot

@@ -24,11 +24,11 @@ digraph cfg {
 	
 
 	 "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_6" -> "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_8" ;
-"operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=1 [line 21, column 52]\n " shape="box"]
+"operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=1 [line 21, column 52]\n " shape="box"]
 	
 
 	 "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_7" -> "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_3" ;
-"operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=0 [line 21, column 52]\n " shape="box"]
+"operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=0 [line 21, column 52]\n " shape="box"]
 	
 
 	 "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_8" -> "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_3" ;
@@ -36,7 +36,7 @@ digraph cfg {
 	
 
 	 "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_9" -> "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_1" [label="1: Start test\nFormals: \nLocals:  __end:iterator 0$?%__sil_tmpSIL_materialize_temp__n$0:iterator __begin:iterator 0$?%__sil_tmpSIL_materialize_temp__n$6:iterator 0$?%__sil_tmp__temp_return_n$13:iterator 0$?%__sil_tmp__temp_construct_n$15:iterator 0$?%__sil_tmp__temp_construct_n$17:iterator temp:int value:int __range:vec& vector:vec \n   DECLARE_LOCALS(&return,&__end,&0$?%__sil_tmpSIL_materialize_temp__n$0,&__begin,&0$?%__sil_tmpSIL_materialize_temp__n$6,&0$?%__sil_tmp__temp_return_n$13,&0$?%__sil_tmp__temp_construct_n$15,&0$?%__sil_tmp__temp_construct_n$17,&temp,&value,&__range,&vector); [line 35, column 1]\n " color=yellow style=filled]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_1" [label="1: Start test\nFormals: \nLocals:  __end:iterator 0$?%__sil_tmpSIL_materialize_temp__n$3:iterator __begin:iterator 0$?%__sil_tmpSIL_materialize_temp__n$9:iterator 0$?%__sil_tmp__temp_return_n$17:iterator 0$?%__sil_tmp__temp_construct_n$19:iterator 0$?%__sil_tmp__temp_construct_n$21:iterator temp:int value:int __range:vec& vector:vec \n   DECLARE_LOCALS(&return,&__end,&0$?%__sil_tmpSIL_materialize_temp__n$3,&__begin,&0$?%__sil_tmpSIL_materialize_temp__n$9,&0$?%__sil_tmp__temp_return_n$17,&0$?%__sil_tmp__temp_construct_n$19,&0$?%__sil_tmp__temp_construct_n$21,&temp,&value,&__range,&vector); [line 35, column 1]\n " color=yellow style=filled]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_1" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_13" ;
@@ -47,36 +47,36 @@ digraph cfg {
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   n$1=*&__range:vec& [line 37, column 18]\n  _=*n$1:vec [line 37, column 18]\n  n$4=_fun_vec_end(n$1:vec&,&0$?%__sil_tmpSIL_materialize_temp__n$0:iterator*) [line 37, column 18]\n  n$5=_fun_iterator_iterator(&__end:iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$0:iterator&) [line 37, column 18]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   n$4=*&__range:vec& [line 37, column 18]\n  _=*n$4:vec [line 37, column 18]\n  n$7=_fun_vec_end(n$4:vec&,&0$?%__sil_tmpSIL_materialize_temp__n$3:iterator*) [line 37, column 18]\n  n$8=_fun_iterator_iterator(&__end:iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$3:iterator&) [line 37, column 18]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   n$7=*&__range:vec& [line 37, column 18]\n  _=*n$7:vec [line 37, column 18]\n  n$10=_fun_vec_begin(n$7:vec&,&0$?%__sil_tmpSIL_materialize_temp__n$6:iterator*) [line 37, column 18]\n  n$11=_fun_iterator_iterator(&__begin:iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$6:iterator&) [line 37, column 18]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   n$10=*&__range:vec& [line 37, column 18]\n  _=*n$10:vec [line 37, column 18]\n  n$13=_fun_vec_begin(n$10:vec&,&0$?%__sil_tmpSIL_materialize_temp__n$9:iterator*) [line 37, column 18]\n  n$14=_fun_iterator_iterator(&__begin:iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$9:iterator&) [line 37, column 18]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  Call _fun_iterator_operator++ \n   n$14=_fun_iterator_operator++(&__begin:iterator&,&0$?%__sil_tmp__temp_return_n$13:iterator*) [line 37, column 18]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  Call _fun_iterator_operator++ \n   n$18=_fun_iterator_operator++(&__begin:iterator&,&0$?%__sil_tmp__temp_return_n$17:iterator*) [line 37, column 18]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" [label="7:  Call _fun_operator!= \n   n$16=_fun_iterator_iterator(&0$?%__sil_tmp__temp_construct_n$15:iterator*,&__begin:iterator&) [line 37, column 18]\n  n$18=_fun_iterator_iterator(&0$?%__sil_tmp__temp_construct_n$17:iterator*,&__end:iterator&) [line 37, column 18]\n  n$19=_fun_operator!=(&0$?%__sil_tmp__temp_construct_n$15:iterator,&0$?%__sil_tmp__temp_construct_n$17:iterator) [line 37, column 18]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" [label="7:  Call _fun_operator!= \n   n$20=_fun_iterator_iterator(&0$?%__sil_tmp__temp_construct_n$19:iterator*,&__begin:iterator&) [line 37, column 18]\n  n$22=_fun_iterator_iterator(&0$?%__sil_tmp__temp_construct_n$21:iterator*,&__end:iterator&) [line 37, column 18]\n  n$23=_fun_operator!=(&0$?%__sil_tmp__temp_construct_n$19:iterator,&0$?%__sil_tmp__temp_construct_n$21:iterator) [line 37, column 18]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" ;
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_9" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" [label="8: Prune (true branch, for loop) \n   PRUNE(n$19, true); [line 37, column 18]\n " shape="invhouse"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" [label="8: Prune (true branch, for loop) \n   PRUNE(n$23, true); [line 37, column 18]\n " shape="invhouse"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_11" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_9" [label="9: Prune (false branch, for loop) \n   PRUNE(!n$19, false); [line 37, column 18]\n " shape="invhouse"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_9" [label="9: Prune (false branch, for loop) \n   PRUNE(!n$23, false); [line 37, column 18]\n " shape="invhouse"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_9" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_10" [label="10:  DeclStmt \n   n$20=*&value:int [line 38, column 16]\n  n$21=*&value:int [line 38, column 24]\n  *&temp:int=((n$20 * n$21) + 10) [line 38, column 5]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_10" [label="10:  DeclStmt \n   n$26=*&value:int [line 38, column 16]\n  n$27=*&value:int [line 38, column 24]\n  *&temp:int=((n$26 * n$27) + 10) [line 38, column 5]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_10" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_11" [label="11:  DeclStmt \n   n$22=_fun_iterator_operator*(&__begin:iterator&) [line 37, column 18]\n  *&value:int=n$22 [line 37, column 8]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_11" [label="11:  DeclStmt \n   n$29=_fun_iterator_operator*(&__begin:iterator&) [line 37, column 18]\n  *&value:int=n$29 [line 37, column 8]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_11" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_10" ;
@@ -84,7 +84,7 @@ digraph cfg {
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_12" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_13" [label="13:  DeclStmt \n   n$23=_fun_vec_vec(&vector:vec*,10:int) [line 36, column 7]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_13" [label="13:  DeclStmt \n   n$31=_fun_vec_vec(&vector:vec*,10:int) [line 36, column 7]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_13" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_12" ;
@@ -117,7 +117,7 @@ digraph cfg {
 "iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_2" [label="2: Exit iterator_iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_3" [label="3:  Constructor Init \n   n$0=*&this:iterator* [line 11, column 8]\n  n$1=*&__param_0:iterator const & [line 11, column 8]\n  n$2=*n$1.val:int [line 11, column 8]\n  *n$0.val:int=n$2 [line 11, column 8]\n " shape="box"]
+"iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_3" [label="3:  Constructor Init \n   n$2=*&this:iterator* [line 11, column 8]\n  n$3=*&__param_0:iterator const & [line 11, column 8]\n  n$4=*n$3.val:int [line 11, column 8]\n  *n$2.val:int=n$4 [line 11, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_3" -> "iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_2" ;
@@ -135,7 +135,7 @@ digraph cfg {
 "iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_2" [label="2: Exit iterator_iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_3" [label="3:  Constructor Init \n   n$0=*&this:iterator* [line 11, column 8]\n  n$1=*&__param_0:iterator& [line 11, column 8]\n  n$2=*n$1.val:int [line 11, column 8]\n  *n$0.val:int=n$2 [line 11, column 8]\n " shape="box"]
+"iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_3" [label="3:  Constructor Init \n   n$2=*&this:iterator* [line 11, column 8]\n  n$3=*&__param_0:iterator& [line 11, column 8]\n  n$4=*n$3.val:int [line 11, column 8]\n  *n$2.val:int=n$4 [line 11, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_3" -> "iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_2" ;
@@ -161,7 +161,7 @@ digraph cfg {
 	
 
 	 "operator++#iterator#(14034081864165661659).8f8d47641e87add0a7463df1d1fa7b15_3" -> "operator++#iterator#(14034081864165661659).8f8d47641e87add0a7463df1d1fa7b15_2" ;
-"operator++#iterator#(14034081864165661659).8f8d47641e87add0a7463df1d1fa7b15_4" [label="4:  BinaryOperatorStmt: AddAssign \n   n$3=*&this:iterator* [line 14, column 5]\n  n$4=*n$3.val:int [line 14, column 5]\n  *n$3.val:int=(n$4 + 1) [line 14, column 5]\n " shape="box"]
+"operator++#iterator#(14034081864165661659).8f8d47641e87add0a7463df1d1fa7b15_4" [label="4:  BinaryOperatorStmt: AddAssign \n   n$4=*&this:iterator* [line 14, column 5]\n  n$5=*n$4.val:int [line 14, column 5]\n  *n$4.val:int=(n$5 + 1) [line 14, column 5]\n " shape="box"]
 	
 
 	 "operator++#iterator#(14034081864165661659).8f8d47641e87add0a7463df1d1fa7b15_4" -> "operator++#iterator#(14034081864165661659).8f8d47641e87add0a7463df1d1fa7b15_3" ;
@@ -172,19 +172,19 @@ digraph cfg {
 "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_2" [label="2: Exit vec_vec \n  " color=yellow style=filled]
 	
 
-"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:vec* [line 26, column 5]\n  n$1=*&size:int [line 26, column 16]\n  *n$0.end_.val:int=n$1 [line 26, column 5]\n " shape="box"]
+"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:vec* [line 26, column 5]\n  n$2=*&size:int [line 26, column 16]\n  *n$1.end_.val:int=n$2 [line 26, column 5]\n " shape="box"]
 	
 
 	 "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_3" -> "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_2" ;
-"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:vec* [line 25, column 5]\n  *n$2.begin_.val:int=0 [line 25, column 5]\n " shape="box"]
+"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=*&this:vec* [line 25, column 5]\n  *n$3.begin_.val:int=0 [line 25, column 5]\n " shape="box"]
 	
 
 	 "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_4" -> "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_3" ;
-"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_5" [label="5:  Constructor Init \n   n$3=*&this:vec* [line 24, column 3]\n  n$4=_fun_iterator_iterator(n$3.end_:iterator*) [line 24, column 3]\n " shape="box"]
+"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_5" [label="5:  Constructor Init \n   n$4=*&this:vec* [line 24, column 3]\n  n$5=_fun_iterator_iterator(n$4.end_:iterator*) [line 24, column 3]\n " shape="box"]
 	
 
 	 "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_5" -> "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_4" ;
-"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_6" [label="6:  Constructor Init \n   n$5=*&this:vec* [line 24, column 3]\n  n$6=_fun_iterator_iterator(n$5.begin_:iterator*) [line 24, column 3]\n " shape="box"]
+"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_6" [label="6:  Constructor Init \n   n$6=*&this:vec* [line 24, column 3]\n  n$7=_fun_iterator_iterator(n$6.begin_:iterator*) [line 24, column 3]\n " shape="box"]
 	
 
 	 "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_6" -> "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_5" ;

infer/tests/codetoanalyze/cpp/frontend/nestedoperators/assign_in_condition.cpp.dot

@@ -15,16 +15,16 @@ digraph cfg {
 	
 
 	 "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_4" -> "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_3" ;
-"foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_5" [label="5:  BinaryOperatorStmt: Assign \n   n$0=*&p:int* [line 11, column 9]\n  *n$0:int=0 [line 11, column 8]\n " shape="box"]
+"foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_5" [label="5:  BinaryOperatorStmt: Assign \n   n$1=*&p:int* [line 11, column 9]\n  *n$1:int=0 [line 11, column 8]\n " shape="box"]
 	
 
 	 "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_5" -> "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_6" ;
 	 "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_5" -> "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_7" ;
-"foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_6" [label="6: Prune (true branch, if) \n   n$1=*n$0:int [line 11, column 7]\n  PRUNE(n$1, true); [line 11, column 7]\n " shape="invhouse"]
+"foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_6" [label="6: Prune (true branch, if) \n   n$2=*n$1:int [line 11, column 7]\n  PRUNE(n$2, true); [line 11, column 7]\n " shape="invhouse"]
 	
 
 	 "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_6" -> "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_8" ;
-"foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_7" [label="7: Prune (false branch, if) \n   n$1=*n$0:int [line 11, column 7]\n  PRUNE(!n$1, false); [line 11, column 7]\n " shape="invhouse"]
+"foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_7" [label="7: Prune (false branch, if) \n   n$2=*n$1:int [line 11, column 7]\n  PRUNE(!n$2, false); [line 11, column 7]\n " shape="invhouse"]
 	
 
 	 "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_7" -> "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_4" ;

infer/tests/codetoanalyze/cpp/frontend/nestedoperators/assign_with_increment.cpp.dot

@@ -7,19 +7,19 @@ digraph cfg {
 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   n$0=*&a:int [line 15, column 11]\n  *&a:int=(n$0 - 1) [line 15, column 11]\n  *&e:int=n$0 [line 15, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   n$1=*&a:int [line 15, column 11]\n  *&a:int=(n$1 - 1) [line 15, column 11]\n  *&e:int=n$1 [line 15, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   n$1=*&a:int [line 14, column 11]\n  *&a:int=(n$1 - 1) [line 14, column 11]\n  n$2=*&a:int [line 14, column 11]\n  *&d:int=n$2 [line 14, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   n$2=*&a:int [line 14, column 11]\n  *&a:int=(n$2 - 1) [line 14, column 11]\n  n$3=*&a:int [line 14, column 11]\n  *&d:int=n$3 [line 14, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   n$3=*&a:int [line 13, column 11]\n  *&a:int=(n$3 + 1) [line 13, column 11]\n  *&c:int=n$3 [line 13, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   n$4=*&a:int [line 13, column 11]\n  *&a:int=(n$4 + 1) [line 13, column 11]\n  *&c:int=n$4 [line 13, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   n$4=*&a:int [line 12, column 11]\n  *&a:int=(n$4 + 1) [line 12, column 11]\n  n$5=*&a:int [line 12, column 11]\n  *&b:int=n$5 [line 12, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   n$5=*&a:int [line 12, column 11]\n  *&a:int=(n$5 + 1) [line 12, column 11]\n  n$6=*&a:int [line 12, column 11]\n  *&b:int=n$6 [line 12, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" ;

infer/tests/codetoanalyze/cpp/frontend/nestedoperators/union.cpp.dot

@@ -22,11 +22,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$x:anonymous_struct_nestedoperators_union.cpp:10:1* [line 34, column 11]\n  n$1=*n$0.b:int [line 34, column 11]\n  *&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.g.w:int=n$1 [line 34, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$x:anonymous_struct_nestedoperators_union.cpp:10:1* [line 34, column 11]\n  n$2=*n$1.b:int [line 34, column 11]\n  *&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.g.w:int=n$2 [line 34, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.f:int [line 32, column 11]\n  *&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.g.u:int=n$2 [line 32, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$3=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.f:int [line 32, column 11]\n  *&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.g.u:int=n$3 [line 32, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -34,7 +34,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   n$3=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$x:anonymous_struct_nestedoperators_union.cpp:10:1* [line 30, column 3]\n  *n$3.a:int=1 [line 30, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   n$4=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$x:anonymous_struct_nestedoperators_union.cpp:10:1* [line 30, column 3]\n  *n$4.a:int=1 [line 30, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;

infer/tests/codetoanalyze/cpp/frontend/vectors/shuffle_vector.cpp

@@ -1,5 +1,5 @@
 /*
-1;95;0c * Copyright (c) 2017 - present Facebook, Inc.
+ * Copyright (c) 2017 - present Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD style license found in the

infer/tests/codetoanalyze/cpp/frontend/vectors/shuffle_vector.cpp.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "simple#17639603251097432993.e5c9feb95ecff69f23df6ce422f34819_2" [label="2: Exit simple \n  " color=yellow style=filled]
 	
 
-"simple#17639603251097432993.e5c9feb95ecff69f23df6ce422f34819_3" [label="3:  Return Stmt \n   n$0=_fun___infer_skip(&vec:void&) [line 12, column 44]\n  n$1=*-1:void [line 12, column 44]\n  *&return:void=n$1 [line 12, column 37]\n " shape="box"]
+"simple#17639603251097432993.e5c9feb95ecff69f23df6ce422f34819_3" [label="3:  Return Stmt \n   n$0=_fun___infer_skip(&vec:void&) [line 12, column 44]\n  n$1=*n$0:void [line 12, column 44]\n  *&return:void=n$1 [line 12, column 37]\n " shape="box"]
 	
 
 	 "simple#17639603251097432993.e5c9feb95ecff69f23df6ce422f34819_3" -> "simple#17639603251097432993.e5c9feb95ecff69f23df6ce422f34819_2" ;

infer/tests/codetoanalyze/cpp/shared/attributes/annotate.cpp.dot

@@ -130,11 +130,11 @@ digraph cfg {
 	
 
 	 "getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_3" -> "getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_2" ;
-"getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 91, column 3]\n  n$4=_fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 91, column 3]\n " shape="box"]
+"getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 91, column 3]\n  n$5=_fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 91, column 3]\n " shape="box"]
 	
 
 	 "getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_4" -> "getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_3" ;
-"getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_5" [label="5:  DeclStmt \n   n$6=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 90, column 23]\n  n$5=*&t:int* [line 90, column 23]\n " shape="box"]
+"getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_5" [label="5:  DeclStmt \n   n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 90, column 23]\n  n$6=*&t:int* [line 90, column 23]\n " shape="box"]
 	
 
 	 "getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_5" -> "getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_4" ;
@@ -149,11 +149,11 @@ digraph cfg {
 	
 
 	 "getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_3" -> "getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_2" ;
-"getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 97, column 3]\n  n$4=_fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 97, column 3]\n " shape="box"]
+"getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 97, column 3]\n  n$5=_fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 97, column 3]\n " shape="box"]
 	
 
 	 "getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_4" -> "getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_3" ;
-"getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_5" [label="5:  DeclStmt \n   n$6=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 96, column 23]\n  n$5=*&t:int* [line 96, column 23]\n " shape="box"]
+"getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_5" [label="5:  DeclStmt \n   n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 96, column 23]\n  n$6=*&t:int* [line 96, column 23]\n " shape="box"]
 	
 
 	 "getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_5" -> "getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_4" ;
@@ -168,11 +168,11 @@ digraph cfg {
 	
 
 	 "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_3" -> "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_2" ;
-"getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 104, column 3]\n  n$4=_fun_TranslateAsPtr<int>_setPtr(&t:int*&,&a:int*) [line 104, column 3]\n " shape="box"]
+"getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 104, column 3]\n  n$5=_fun_TranslateAsPtr<int>_setPtr(&t:int*&,&a:int*) [line 104, column 3]\n " shape="box"]
 	
 
 	 "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_4" -> "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_3" ;
-"getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_5" [label="5:  DeclStmt \n   n$6=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 103, column 23]\n  n$5=*&t:int* [line 103, column 23]\n " shape="box"]
+"getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_5" [label="5:  DeclStmt \n   n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 103, column 23]\n  n$6=*&t:int* [line 103, column 23]\n " shape="box"]
 	
 
 	 "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_5" -> "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_4" ;
@@ -191,11 +191,11 @@ digraph cfg {
 	
 
 	 "getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_3" -> "getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_2" ;
-"getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 129, column 3]\n  n$4=_fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 129, column 3]\n " shape="box"]
+"getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 129, column 3]\n  n$5=_fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 129, column 3]\n " shape="box"]
 	
 
 	 "getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_4" -> "getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_3" ;
-"getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_5" [label="5:  DeclStmt \n   n$6=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 128, column 23]\n  n$5=*&t:int* [line 128, column 23]\n " shape="box"]
+"getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_5" [label="5:  DeclStmt \n   n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 128, column 23]\n  n$6=*&t:int* [line 128, column 23]\n " shape="box"]
 	
 
 	 "getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_5" -> "getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_4" ;
@@ -210,11 +210,11 @@ digraph cfg {
 	
 
 	 "getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_3" -> "getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_2" ;
-"getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 135, column 3]\n  n$4=_fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 135, column 3]\n " shape="box"]
+"getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 135, column 3]\n  n$5=_fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 135, column 3]\n " shape="box"]
 	
 
 	 "getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_4" -> "getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_3" ;
-"getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_5" [label="5:  DeclStmt \n   n$6=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 134, column 23]\n  n$5=*&t:int* [line 134, column 23]\n " shape="box"]
+"getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_5" [label="5:  DeclStmt \n   n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 134, column 23]\n  n$6=*&t:int* [line 134, column 23]\n " shape="box"]
 	
 
 	 "getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_5" -> "getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_4" ;
@@ -229,11 +229,11 @@ digraph cfg {
 	
 
 	 "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_3" -> "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_2" ;
-"getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 142, column 3]\n  n$4=_fun_TranslateAsPtr<int>_setPtr(&t:int*&,&a:int*) [line 142, column 3]\n " shape="box"]
+"getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 142, column 3]\n  n$5=_fun_TranslateAsPtr<int>_setPtr(&t:int*&,&a:int*) [line 142, column 3]\n " shape="box"]
 	
 
 	 "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_4" -> "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_3" ;
-"getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_5" [label="5:  DeclStmt \n   n$6=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 141, column 23]\n  n$5=*&t:int* [line 141, column 23]\n " shape="box"]
+"getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_5" [label="5:  DeclStmt \n   n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 141, column 23]\n  n$6=*&t:int* [line 141, column 23]\n " shape="box"]
 	
 
 	 "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_5" -> "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_4" ;
@@ -248,15 +248,15 @@ digraph cfg {
 "operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_2" [label="2: Exit operator_star_null_deref1 \n  " color=yellow style=filled]
 	
 
-"operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_3" [label="3:  Return Stmt \n   n$0=*&t:int* [line 111, column 10]\n  n$1=*n$0:int [line 111, column 10]\n  *&return:int=n$1 [line 111, column 3]\n " shape="box"]
+"operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_3" [label="3:  Return Stmt \n   n$1=*&t:int* [line 111, column 10]\n  n$2=*n$1:int [line 111, column 10]\n  *&return:int=n$2 [line 111, column 3]\n " shape="box"]
 	
 
 	 "operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_3" -> "operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_2" ;
-"operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 110, column 3]\n  n$3=_fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 110, column 3]\n " shape="box"]
+"operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 110, column 3]\n  n$5=_fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 110, column 3]\n " shape="box"]
 	
 
 	 "operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_4" -> "operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_3" ;
-"operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_5" [label="5:  DeclStmt \n   n$5=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 109, column 23]\n  n$4=*&t:int* [line 109, column 23]\n " shape="box"]
+"operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_5" [label="5:  DeclStmt \n   n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 109, column 23]\n  n$6=*&t:int* [line 109, column 23]\n " shape="box"]
 	
 
 	 "operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_5" -> "operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_4" ;
@@ -271,11 +271,11 @@ digraph cfg {
 	
 
 	 "operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_3" -> "operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_2" ;
-"operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 116, column 3]\n  n$4=_fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 116, column 3]\n " shape="box"]
+"operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 116, column 3]\n  n$5=_fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 116, column 3]\n " shape="box"]
 	
 
 	 "operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_4" -> "operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_3" ;
-"operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_5" [label="5:  DeclStmt \n   n$6=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 115, column 23]\n  n$5=*&t:int* [line 115, column 23]\n " shape="box"]
+"operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_5" [label="5:  DeclStmt \n   n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 115, column 23]\n  n$6=*&t:int* [line 115, column 23]\n " shape="box"]
 	
 
 	 "operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_5" -> "operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_4" ;
@@ -290,11 +290,11 @@ digraph cfg {
 	
 
 	 "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_3" -> "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_2" ;
-"operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 123, column 3]\n  n$4=_fun_TranslateAsPtr<int>_setPtr(&t:int*&,&a:int*) [line 123, column 3]\n " shape="box"]
+"operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 123, column 3]\n  n$5=_fun_TranslateAsPtr<int>_setPtr(&t:int*&,&a:int*) [line 123, column 3]\n " shape="box"]
 	
 
 	 "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_4" -> "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_3" ;
-"operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_5" [label="5:  DeclStmt \n   n$6=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 122, column 23]\n  n$5=*&t:int* [line 122, column 23]\n " shape="box"]
+"operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_5" [label="5:  DeclStmt \n   n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 122, column 23]\n  n$6=*&t:int* [line 122, column 23]\n " shape="box"]
 	
 
 	 "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_5" -> "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_4" ;
@@ -305,7 +305,7 @@ digraph cfg {
 "TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_2" [label="2: Exit TranslateAsPtr<int>_TranslateAsPtr \n  " color=yellow style=filled]
 	
 
-"TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_3" [label="3:  Call _fun_TranslateAsPtr<int>_setPtr \n   n$0=*&this:int** [line 76, column 36]\n  _=*n$0:int* [line 76, column 36]\n  n$2=*&t:int* [line 76, column 43]\n  n$3=_fun_TranslateAsPtr<int>_setPtr(n$0:int**,n$2:int*) [line 76, column 36]\n " shape="box"]
+"TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_3" [label="3:  Call _fun_TranslateAsPtr<int>_setPtr \n   n$1=*&this:int** [line 76, column 36]\n  _=*n$1:int* [line 76, column 36]\n  n$3=*&t:int* [line 76, column 43]\n  n$4=_fun_TranslateAsPtr<int>_setPtr(n$1:int**,n$3:int*) [line 76, column 36]\n " shape="box"]
 	
 
 	 "TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_3" -> "TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_2" ;
@@ -351,7 +351,7 @@ digraph cfg {
 "setPtr#TranslateAsPtr<int>#(11427652750021041520).3f4d983a0a5cf5a43b2e4fd66c30c6a9_2" [label="2: Exit TranslateAsPtr<int>_setPtr \n  " color=yellow style=filled]
 	
 
-"setPtr#TranslateAsPtr<int>#(11427652750021041520).3f4d983a0a5cf5a43b2e4fd66c30c6a9_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:int** [line 86, column 34]\n  n$1=*&v:int* [line 86, column 43]\n  *n$0:void*=n$1 [line 86, column 23]\n " shape="box"]
+"setPtr#TranslateAsPtr<int>#(11427652750021041520).3f4d983a0a5cf5a43b2e4fd66c30c6a9_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:int** [line 86, column 34]\n  n$2=*&v:int* [line 86, column 43]\n  *n$1:void*=n$2 [line 86, column 23]\n " shape="box"]
 	
 
 	 "setPtr#TranslateAsPtr<int>#(11427652750021041520).3f4d983a0a5cf5a43b2e4fd66c30c6a9_3" -> "setPtr#TranslateAsPtr<int>#(11427652750021041520).3f4d983a0a5cf5a43b2e4fd66c30c6a9_2" ;

infer/tests/codetoanalyze/cpp/shared/conditional/binary_conditional.cpp.dot

@@ -1,6 +1,6 @@
 /* @generated */
 digraph cfg {
-"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_1" [label="1: Start binary_conditional::binaryConditional\nFormals: \nLocals:  x:binary_conditional::X 0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X 0$?%__sil_tmpSIL_temp_conditional___n$8:binary_conditional::X 0$?%__sil_tmpSIL_materialize_temp__n$4:binary_conditional::X a:binary_conditional::X \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_materialize_temp__n$5,&0$?%__sil_tmpSIL_temp_conditional___n$8,&0$?%__sil_tmpSIL_materialize_temp__n$4,&a); [line 22, column 1]\n " color=yellow style=filled]
+"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_1" [label="1: Start binary_conditional::binaryConditional\nFormals: \nLocals:  x:binary_conditional::X 0$?%__sil_tmpSIL_materialize_temp__n$6:binary_conditional::X 0$?%__sil_tmpSIL_temp_conditional___n$9:binary_conditional::X 0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X a:binary_conditional::X \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_materialize_temp__n$6,&0$?%__sil_tmpSIL_temp_conditional___n$9,&0$?%__sil_tmpSIL_materialize_temp__n$5,&a); [line 22, column 1]\n " color=yellow style=filled]
 	
 
 	 "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_1" -> "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_12" ;
@@ -15,40 +15,40 @@ digraph cfg {
 	
 
 	 "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_4" -> "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_11" ;
-"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_5" [label="5:  Call _fun_binary_conditional::X_operator_bool \n   _=*&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X [line 24, column 9]\n  n$10=_fun_binary_conditional::X_operator_bool(&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X&) [line 24, column 9]\n " shape="box"]
+"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_5" [label="5:  Call _fun_binary_conditional::X_operator_bool \n   _=*&0$?%__sil_tmpSIL_materialize_temp__n$6:binary_conditional::X [line 24, column 9]\n  n$11=_fun_binary_conditional::X_operator_bool(&0$?%__sil_tmpSIL_materialize_temp__n$6:binary_conditional::X&) [line 24, column 9]\n " shape="box"]
 	
 
 	 "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_5" -> "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_6" ;
 	 "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_5" -> "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_7" ;
-"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_6" [label="6: Prune (true branch, boolean exp) \n   PRUNE(n$10, true); [line 24, column 9]\n " shape="invhouse"]
+"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_6" [label="6: Prune (true branch, boolean exp) \n   PRUNE(n$11, true); [line 24, column 9]\n " shape="invhouse"]
 	
 
 	 "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_6" -> "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_8" ;
-"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_7" [label="7: Prune (false branch, boolean exp) \n   PRUNE(!n$10, false); [line 24, column 9]\n " shape="invhouse"]
+"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_7" [label="7: Prune (false branch, boolean exp) \n   PRUNE(!n$11, false); [line 24, column 9]\n " shape="invhouse"]
 	
 
 	 "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_7" -> "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_9" ;
-"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_8" [label="8:  ConditinalStmt Branch \n   n$11=_fun_binary_conditional::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$4:binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X&) [line 24, column 9]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$8:binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$4 [line 24, column 9]\n " shape="box"]
+"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_8" [label="8:  ConditionalStmt Branch \n   n$12=_fun_binary_conditional::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$6:binary_conditional::X&) [line 24, column 9]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$9:binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$5 [line 24, column 9]\n " shape="box"]
 	
 
 	 "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_8" -> "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_4" ;
-"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_9" [label="9:  ConditinalStmt Branch \n   n$12=_fun_binary_conditional::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$4:binary_conditional::X*,&a:binary_conditional::X&) [line 24, column 19]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$8:binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$4 [line 24, column 9]\n " shape="box"]
+"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_9" [label="9:  ConditionalStmt Branch \n   n$13=_fun_binary_conditional::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X*,&a:binary_conditional::X&) [line 24, column 19]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$9:binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$5 [line 24, column 9]\n " shape="box"]
 	
 
 	 "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_9" -> "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_4" ;
-"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_10" [label="10:  BinaryConditinalStmt Init \n   n$7=_fun_binary_conditional::getX(&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X*) [line 24, column 9]\n " shape="box"]
+"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_10" [label="10:  BinaryConditionalStmt Init \n   n$8=_fun_binary_conditional::getX(&0$?%__sil_tmpSIL_materialize_temp__n$6:binary_conditional::X*) [line 24, column 9]\n " shape="box"]
 	
 
 	 "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_10" -> "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_5" ;
-"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_11" [label="11:  DeclStmt \n   n$13=*&0$?%__sil_tmpSIL_temp_conditional___n$8:binary_conditional::X [line 24, column 9]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$4:binary_conditional::X=n$13 [line 24, column 9]\n  n$14=_fun_binary_conditional::X_X(&x:binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$4:binary_conditional::X&) [line 24, column 9]\n " shape="box"]
+"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_11" [label="11:  DeclStmt \n   n$14=*&0$?%__sil_tmpSIL_temp_conditional___n$9:binary_conditional::X [line 24, column 9]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X=n$14 [line 24, column 9]\n  n$15=_fun_binary_conditional::X_X(&x:binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X&) [line 24, column 9]\n " shape="box"]
 	
 
 	 "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_11" -> "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_3" ;
-"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_12" [label="12:  DeclStmt \n   n$15=_fun_binary_conditional::X_X(&a:binary_conditional::X*) [line 23, column 5]\n " shape="box"]
+"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_12" [label="12:  DeclStmt \n   n$16=_fun_binary_conditional::X_X(&a:binary_conditional::X*) [line 23, column 5]\n " shape="box"]
 	
 
 	 "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_12" -> "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_10" ;
-"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_1" [label="1: Start binary_conditional::conditional\nFormals: \nLocals:  x:binary_conditional::X 0$?%__sil_tmpSIL_temp_conditional___n$5:binary_conditional::X 0$?%__sil_tmp__temp_return_n$7:binary_conditional::X 0$?%__sil_tmpSIL_materialize_temp__n$10:binary_conditional::X 0$?%__sil_tmpSIL_materialize_temp__n$4:binary_conditional::X a:binary_conditional::X \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_temp_conditional___n$5,&0$?%__sil_tmp__temp_return_n$7,&0$?%__sil_tmpSIL_materialize_temp__n$10,&0$?%__sil_tmpSIL_materialize_temp__n$4,&a); [line 27, column 1]\n " color=yellow style=filled]
+"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_1" [label="1: Start binary_conditional::conditional\nFormals: \nLocals:  x:binary_conditional::X 0$?%__sil_tmpSIL_temp_conditional___n$6:binary_conditional::X 0$?%__sil_tmp__temp_return_n$8:binary_conditional::X 0$?%__sil_tmpSIL_materialize_temp__n$11:binary_conditional::X 0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X a:binary_conditional::X \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_temp_conditional___n$6,&0$?%__sil_tmp__temp_return_n$8,&0$?%__sil_tmpSIL_materialize_temp__n$11,&0$?%__sil_tmpSIL_materialize_temp__n$5,&a); [line 27, column 1]\n " color=yellow style=filled]
 	
 
 	 "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_1" -> "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_11" ;
@@ -63,32 +63,32 @@ digraph cfg {
 	
 
 	 "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_4" -> "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_10" ;
-"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_5" [label="5:  Call _fun_binary_conditional::X_operator_bool \n   n$8=_fun_binary_conditional::getX(&0$?%__sil_tmp__temp_return_n$7:binary_conditional::X*) [line 29, column 9]\n  n$9=_fun_binary_conditional::X_operator_bool(&0$?%__sil_tmp__temp_return_n$7:binary_conditional::X&) [line 29, column 9]\n " shape="box"]
+"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_5" [label="5:  Call _fun_binary_conditional::X_operator_bool \n   n$9=_fun_binary_conditional::getX(&0$?%__sil_tmp__temp_return_n$8:binary_conditional::X*) [line 29, column 9]\n  n$10=_fun_binary_conditional::X_operator_bool(&0$?%__sil_tmp__temp_return_n$8:binary_conditional::X&) [line 29, column 9]\n " shape="box"]
 	
 
 	 "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_5" -> "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_6" ;
 	 "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_5" -> "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_7" ;
-"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_6" [label="6: Prune (true branch, boolean exp) \n   PRUNE(n$9, true); [line 29, column 9]\n " shape="invhouse"]
+"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_6" [label="6: Prune (true branch, boolean exp) \n   PRUNE(n$10, true); [line 29, column 9]\n " shape="invhouse"]
 	
 
 	 "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_6" -> "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_8" ;
-"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_7" [label="7: Prune (false branch, boolean exp) \n   PRUNE(!n$9, false); [line 29, column 9]\n " shape="invhouse"]
+"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_7" [label="7: Prune (false branch, boolean exp) \n   PRUNE(!n$10, false); [line 29, column 9]\n " shape="invhouse"]
 	
 
 	 "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_7" -> "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_9" ;
-"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_8" [label="8:  ConditinalStmt Branch \n   n$12=_fun_binary_conditional::getX(&0$?%__sil_tmpSIL_materialize_temp__n$10:binary_conditional::X*) [line 29, column 18]\n  n$13=_fun_binary_conditional::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$4:binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$10:binary_conditional::X&) [line 29, column 18]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$4 [line 29, column 9]\n " shape="box"]
+"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_8" [label="8:  ConditionalStmt Branch \n   n$13=_fun_binary_conditional::getX(&0$?%__sil_tmpSIL_materialize_temp__n$11:binary_conditional::X*) [line 29, column 18]\n  n$14=_fun_binary_conditional::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$11:binary_conditional::X&) [line 29, column 18]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$6:binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$5 [line 29, column 9]\n " shape="box"]
 	
 
 	 "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_8" -> "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_4" ;
-"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_9" [label="9:  ConditinalStmt Branch \n   n$14=_fun_binary_conditional::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$4:binary_conditional::X*,&a:binary_conditional::X&) [line 29, column 27]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$4 [line 29, column 9]\n " shape="box"]
+"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_9" [label="9:  ConditionalStmt Branch \n   n$15=_fun_binary_conditional::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X*,&a:binary_conditional::X&) [line 29, column 27]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$6:binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$5 [line 29, column 9]\n " shape="box"]
 	
 
 	 "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_9" -> "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_4" ;
-"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_10" [label="10:  DeclStmt \n   n$15=*&0$?%__sil_tmpSIL_temp_conditional___n$5:binary_conditional::X [line 29, column 9]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$4:binary_conditional::X=n$15 [line 29, column 9]\n  n$16=_fun_binary_conditional::X_X(&x:binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$4:binary_conditional::X&) [line 29, column 9]\n " shape="box"]
+"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_10" [label="10:  DeclStmt \n   n$16=*&0$?%__sil_tmpSIL_temp_conditional___n$6:binary_conditional::X [line 29, column 9]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X=n$16 [line 29, column 9]\n  n$17=_fun_binary_conditional::X_X(&x:binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X&) [line 29, column 9]\n " shape="box"]
 	
 
 	 "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_10" -> "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_3" ;
-"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_11" [label="11:  DeclStmt \n   n$17=_fun_binary_conditional::X_X(&a:binary_conditional::X*) [line 28, column 5]\n " shape="box"]
+"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_11" [label="11:  DeclStmt \n   n$18=_fun_binary_conditional::X_X(&a:binary_conditional::X*) [line 28, column 5]\n " shape="box"]
 	
 
 	 "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_11" -> "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_5" ;
@@ -103,7 +103,7 @@ digraph cfg {
 	
 
 	 "getX#binary_conditional#7708042186122353096.ec6c66051810049a5e5688caadbf0f96_3" -> "getX#binary_conditional#7708042186122353096.ec6c66051810049a5e5688caadbf0f96_2" ;
-"getX#binary_conditional#7708042186122353096.ec6c66051810049a5e5688caadbf0f96_4" [label="4:  DeclStmt \n   n$4=_fun_binary_conditional::X_X(&x:binary_conditional::X*) [line 17, column 5]\n " shape="box"]
+"getX#binary_conditional#7708042186122353096.ec6c66051810049a5e5688caadbf0f96_4" [label="4:  DeclStmt \n   n$5=_fun_binary_conditional::X_X(&x:binary_conditional::X*) [line 17, column 5]\n " shape="box"]
 	
 
 	 "getX#binary_conditional#7708042186122353096.ec6c66051810049a5e5688caadbf0f96_4" -> "getX#binary_conditional#7708042186122353096.ec6c66051810049a5e5688caadbf0f96_3" ;

infer/tests/codetoanalyze/cpp/shared/conditional/lvalue_conditional.cpp.dot

@@ -1,6 +1,6 @@
 /* @generated */
 digraph cfg {
-"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_1" [label="1: Start assign_conditional\nFormals:  a:int\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$1:int& v2:int v1:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$1,&v2,&v1); [line 22, column 1]\n " color=yellow style=filled]
+"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_1" [label="1: Start assign_conditional\nFormals:  a:int\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$2:int& v2:int v1:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$2,&v2,&v1); [line 22, column 1]\n " color=yellow style=filled]
 	
 
 	 "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_1" -> "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_11" ;
@@ -15,23 +15,23 @@ digraph cfg {
 	
 
 	 "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_4" -> "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_9" ;
-"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_5" [label="5: Prune (true branch, boolean exp) \n   n$2=*&a:int [line 24, column 4]\n  PRUNE(n$2, true); [line 24, column 4]\n " shape="invhouse"]
+"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_5" [label="5: Prune (true branch, boolean exp) \n   n$3=*&a:int [line 24, column 4]\n  PRUNE(n$3, true); [line 24, column 4]\n " shape="invhouse"]
 	
 
 	 "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_5" -> "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_7" ;
-"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_6" [label="6: Prune (false branch, boolean exp) \n   n$2=*&a:int [line 24, column 4]\n  PRUNE(!n$2, false); [line 24, column 4]\n " shape="invhouse"]
+"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_6" [label="6: Prune (false branch, boolean exp) \n   n$3=*&a:int [line 24, column 4]\n  PRUNE(!n$3, false); [line 24, column 4]\n " shape="invhouse"]
 	
 
 	 "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_6" -> "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_8" ;
-"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int&=&v1 [line 24, column 4]\n " shape="box"]
+"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int&=&v1 [line 24, column 4]\n " shape="box"]
 	
 
 	 "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_7" -> "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_4" ;
-"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int&=&v2 [line 24, column 4]\n " shape="box"]
+"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int&=&v2 [line 24, column 4]\n " shape="box"]
 	
 
 	 "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_8" -> "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_4" ;
-"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_9" [label="9:  BinaryOperatorStmt: Assign \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int& [line 24, column 4]\n  *n$3:int=1 [line 24, column 3]\n " shape="box"]
+"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_9" [label="9:  BinaryOperatorStmt: Assign \n   n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int& [line 24, column 4]\n  *n$4:int=1 [line 24, column 3]\n " shape="box"]
 	
 
 	 "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_9" -> "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_3" ;
@@ -44,7 +44,7 @@ digraph cfg {
 	
 
 	 "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_11" -> "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_10" ;
-"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_1" [label="1: Start choose_lvalue\nFormals:  a:int\nLocals:  v3:int 0$?%__sil_tmpSIL_temp_conditional___n$1:int& v2:int v1:int \n   DECLARE_LOCALS(&return,&v3,&0$?%__sil_tmpSIL_temp_conditional___n$1,&v2,&v1); [line 10, column 1]\n " color=yellow style=filled]
+"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_1" [label="1: Start choose_lvalue\nFormals:  a:int\nLocals:  v3:int 0$?%__sil_tmpSIL_temp_conditional___n$2:int& v2:int v1:int \n   DECLARE_LOCALS(&return,&v3,&0$?%__sil_tmpSIL_temp_conditional___n$2,&v2,&v1); [line 10, column 1]\n " color=yellow style=filled]
 	
 
 	 "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_1" -> "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_11" ;
@@ -59,23 +59,23 @@ digraph cfg {
 	
 
 	 "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_4" -> "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_9" ;
-"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_5" [label="5: Prune (true branch, boolean exp) \n   n$2=*&a:int [line 12, column 12]\n  PRUNE(n$2, true); [line 12, column 12]\n " shape="invhouse"]
+"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_5" [label="5: Prune (true branch, boolean exp) \n   n$3=*&a:int [line 12, column 12]\n  PRUNE(n$3, true); [line 12, column 12]\n " shape="invhouse"]
 	
 
 	 "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_5" -> "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_7" ;
-"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_6" [label="6: Prune (false branch, boolean exp) \n   n$2=*&a:int [line 12, column 12]\n  PRUNE(!n$2, false); [line 12, column 12]\n " shape="invhouse"]
+"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_6" [label="6: Prune (false branch, boolean exp) \n   n$3=*&a:int [line 12, column 12]\n  PRUNE(!n$3, false); [line 12, column 12]\n " shape="invhouse"]
 	
 
 	 "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_6" -> "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_8" ;
-"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int&=&v1 [line 12, column 12]\n " shape="box"]
+"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int&=&v1 [line 12, column 12]\n " shape="box"]
 	
 
 	 "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_7" -> "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_4" ;
-"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int&=&v2 [line 12, column 12]\n " shape="box"]
+"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int&=&v2 [line 12, column 12]\n " shape="box"]
 	
 
 	 "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_8" -> "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_4" ;
-"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_9" [label="9:  DeclStmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int& [line 12, column 12]\n  n$4=*n$3:int [line 12, column 12]\n  *&v3:int=n$4 [line 12, column 3]\n " shape="box"]
+"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_9" [label="9:  DeclStmt \n   n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int& [line 12, column 12]\n  n$5=*n$4:int [line 12, column 12]\n  *&v3:int=n$5 [line 12, column 3]\n " shape="box"]
 	
 
 	 "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_9" -> "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_3" ;
@@ -88,7 +88,7 @@ digraph cfg {
 	
 
 	 "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_11" -> "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_10" ;
-"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_1" [label="1: Start choose_rvalue\nFormals:  a:int\nLocals:  v3:int 0$?%__sil_tmpSIL_temp_conditional___n$1:int v1:int \n   DECLARE_LOCALS(&return,&v3,&0$?%__sil_tmpSIL_temp_conditional___n$1,&v1); [line 16, column 1]\n " color=yellow style=filled]
+"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_1" [label="1: Start choose_rvalue\nFormals:  a:int\nLocals:  v3:int 0$?%__sil_tmpSIL_temp_conditional___n$2:int v1:int \n   DECLARE_LOCALS(&return,&v3,&0$?%__sil_tmpSIL_temp_conditional___n$2,&v1); [line 16, column 1]\n " color=yellow style=filled]
 	
 
 	 "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_1" -> "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_10" ;
@@ -103,23 +103,23 @@ digraph cfg {
 	
 
 	 "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_4" -> "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_9" ;
-"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_5" [label="5: Prune (true branch, boolean exp) \n   n$2=*&a:int [line 18, column 12]\n  PRUNE(n$2, true); [line 18, column 12]\n " shape="invhouse"]
+"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_5" [label="5: Prune (true branch, boolean exp) \n   n$3=*&a:int [line 18, column 12]\n  PRUNE(n$3, true); [line 18, column 12]\n " shape="invhouse"]
 	
 
 	 "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_5" -> "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_7" ;
-"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_6" [label="6: Prune (false branch, boolean exp) \n   n$2=*&a:int [line 18, column 12]\n  PRUNE(!n$2, false); [line 18, column 12]\n " shape="invhouse"]
+"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_6" [label="6: Prune (false branch, boolean exp) \n   n$3=*&a:int [line 18, column 12]\n  PRUNE(!n$3, false); [line 18, column 12]\n " shape="invhouse"]
 	
 
 	 "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_6" -> "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_8" ;
-"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_7" [label="7:  ConditinalStmt Branch \n   n$3=*&v1:int [line 18, column 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$3 [line 18, column 12]\n " shape="box"]
+"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_7" [label="7:  ConditionalStmt Branch \n   n$4=*&v1:int [line 18, column 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$4 [line 18, column 12]\n " shape="box"]
 	
 
 	 "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_7" -> "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_4" ;
-"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 18, column 12]\n " shape="box"]
+"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 18, column 12]\n " shape="box"]
 	
 
 	 "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_8" -> "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_4" ;
-"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_9" [label="9:  DeclStmt \n   n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 18, column 12]\n  *&v3:int=n$4 [line 18, column 3]\n " shape="box"]
+"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_9" [label="9:  DeclStmt \n   n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 18, column 12]\n  *&v3:int=n$5 [line 18, column 3]\n " shape="box"]
 	
 
 	 "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_9" -> "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_3" ;
@@ -216,7 +216,7 @@ digraph cfg {
 	
 
 	 "div1_temp_lvalue#14722162998333319062.760b52102ce508c3244378cf1bf06b6d_3" -> "div1_temp_lvalue#14722162998333319062.760b52102ce508c3244378cf1bf06b6d_2" ;
-"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_1" [label="1: Start div_temp_lvalue\nFormals:  a:int b:int\nLocals:  r:int const & 0$?%__sil_tmpSIL_temp_conditional___n$3:int 0$?%__sil_tmpSIL_materialize_temp__n$2:int \n   DECLARE_LOCALS(&return,&r,&0$?%__sil_tmpSIL_temp_conditional___n$3,&0$?%__sil_tmpSIL_materialize_temp__n$2); [line 28, column 1]\n " color=yellow style=filled]
+"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_1" [label="1: Start div_temp_lvalue\nFormals:  a:int b:int\nLocals:  r:int const & 0$?%__sil_tmpSIL_temp_conditional___n$4:int 0$?%__sil_tmpSIL_materialize_temp__n$3:int const  \n   DECLARE_LOCALS(&return,&r,&0$?%__sil_tmpSIL_temp_conditional___n$4,&0$?%__sil_tmpSIL_materialize_temp__n$3); [line 28, column 1]\n " color=yellow style=filled]
 	
 
 	 "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_1" -> "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_5" ;
@@ -232,23 +232,23 @@ digraph cfg {
 	
 
 	 "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_4" -> "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_9" ;
-"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_5" [label="5: Prune (true branch, boolean exp) \n   n$4=*&a:int [line 29, column 18]\n  PRUNE(n$4, true); [line 29, column 18]\n " shape="invhouse"]
+"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_5" [label="5: Prune (true branch, boolean exp) \n   n$5=*&a:int [line 29, column 18]\n  PRUNE(n$5, true); [line 29, column 18]\n " shape="invhouse"]
 	
 
 	 "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_5" -> "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_7" ;
-"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_6" [label="6: Prune (false branch, boolean exp) \n   n$4=*&a:int [line 29, column 18]\n  PRUNE(!n$4, false); [line 29, column 18]\n " shape="invhouse"]
+"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_6" [label="6: Prune (false branch, boolean exp) \n   n$5=*&a:int [line 29, column 18]\n  PRUNE(!n$5, false); [line 29, column 18]\n " shape="invhouse"]
 	
 
 	 "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_6" -> "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_8" ;
-"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_7" [label="7:  ConditinalStmt Branch \n   n$5=*&b:int [line 29, column 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=n$5 [line 29, column 18]\n " shape="box"]
+"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_7" [label="7:  ConditionalStmt Branch \n   n$6=*&b:int [line 29, column 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=n$6 [line 29, column 18]\n " shape="box"]
 	
 
 	 "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_7" -> "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_4" ;
-"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 29, column 18]\n " shape="box"]
+"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=1 [line 29, column 18]\n " shape="box"]
 	
 
 	 "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_8" -> "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_4" ;
-"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_9" [label="9:  DeclStmt \n   n$6=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 29, column 18]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$2:int=n$6 [line 29, column 18]\n  *&r:int&=&0$?%__sil_tmpSIL_materialize_temp__n$2 [line 29, column 3]\n " shape="box"]
+"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_9" [label="9:  DeclStmt \n   n$7=*&0$?%__sil_tmpSIL_temp_conditional___n$4:int [line 29, column 18]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$3:int=n$7 [line 29, column 18]\n  *&r:int const &=&0$?%__sil_tmpSIL_materialize_temp__n$3 [line 29, column 3]\n " shape="box"]
 	
 
 	 "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_9" -> "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_3" ;

infer/tests/codetoanalyze/cpp/shared/constructors/constructor_array.cpp.dot

@@ -1,6 +1,6 @@
 /* @generated */
 digraph cfg {
-"array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_1" [label="1: Start array_of_person\nFormals: \nLocals:  arr:Person[10*4] 0$?%__sil_tmpSIL_materialize_temp__n$1:Person 0$?%__sil_tmpSIL_materialize_temp__n$4:Person 0$?%__sil_tmpSIL_materialize_temp__n$7:Person \n   DECLARE_LOCALS(&return,&arr,&0$?%__sil_tmpSIL_materialize_temp__n$1,&0$?%__sil_tmpSIL_materialize_temp__n$4,&0$?%__sil_tmpSIL_materialize_temp__n$7); [line 17, column 1]\n " color=yellow style=filled]
+"array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_1" [label="1: Start array_of_person\nFormals: \nLocals:  arr:Person[10*4] 0$?%__sil_tmpSIL_materialize_temp__n$2:Person 0$?%__sil_tmpSIL_materialize_temp__n$5:Person 0$?%__sil_tmpSIL_materialize_temp__n$8:Person \n   DECLARE_LOCALS(&return,&arr,&0$?%__sil_tmpSIL_materialize_temp__n$2,&0$?%__sil_tmpSIL_materialize_temp__n$5,&0$?%__sil_tmpSIL_materialize_temp__n$8); [line 17, column 1]\n " color=yellow style=filled]
 	
 
 	 "array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_1" -> "array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_4" ;
@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_3" -> "array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_2" ;
-"array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_4" [label="4:  DeclStmt \n   n$2=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$1:Person*) [line 18, column 21]\n  n$3=_fun_Person_Person(&arr[0]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$1:Person&) [line 18, column 21]\n  n$5=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$4:Person*) [line 18, column 31]\n  n$6=_fun_Person_Person(&arr[1]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$4:Person&) [line 18, column 31]\n  n$8=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$7:Person*) [line 18, column 41]\n  n$9=_fun_Person_Person(&arr[2]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$7:Person&) [line 18, column 41]\n " shape="box"]
+"array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_4" [label="4:  DeclStmt \n   n$3=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$2:Person*) [line 18, column 21]\n  n$4=_fun_Person_Person(&arr[0]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$2:Person&) [line 18, column 21]\n  n$6=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$5:Person*) [line 18, column 31]\n  n$7=_fun_Person_Person(&arr[1]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$5:Person&) [line 18, column 31]\n  n$9=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$8:Person*) [line 18, column 41]\n  n$10=_fun_Person_Person(&arr[2]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$8:Person&) [line 18, column 41]\n " shape="box"]
 	
 
 	 "array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_4" -> "array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_3" ;
@@ -22,7 +22,7 @@ digraph cfg {
 "initialization_c_style#16495589501342328206.0d90448020e72c05f693b9221dac03f8_2" [label="2: Exit initialization_c_style \n  " color=yellow style=filled]
 	
 
-"initialization_c_style#16495589501342328206.0d90448020e72c05f693b9221dac03f8_3" [label="3:  DeclStmt \n   n$0=_fun_Z_Z(&z2:Z*) [line 34, column 12]\n " shape="box"]
+"initialization_c_style#16495589501342328206.0d90448020e72c05f693b9221dac03f8_3" [label="3:  DeclStmt \n   n$1=_fun_Z_Z(&z2:Z*) [line 34, column 12]\n " shape="box"]
 	
 
 	 "initialization_c_style#16495589501342328206.0d90448020e72c05f693b9221dac03f8_3" -> "initialization_c_style#16495589501342328206.0d90448020e72c05f693b9221dac03f8_2" ;
@@ -37,19 +37,19 @@ digraph cfg {
 "initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_2" [label="2: Exit initialization_mixed_styles_not_handled_correctly \n  " color=yellow style=filled]
 	
 
-"initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_3" [label="3:  DeclStmt \n   n$0=_fun_Z_Z(&z2:Z*) [line 42, column 12]\n " shape="box"]
+"initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_3" [label="3:  DeclStmt \n   n$1=_fun_Z_Z(&z2:Z*) [line 42, column 12]\n " shape="box"]
 	
 
 	 "initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_3" -> "initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_2" ;
-"initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_4" [label="4:  DeclStmt \n   *&z[0].a:int=1 [line 41, column 20]\n  *&z[0].b:int=2 [line 41, column 20]\n  n$1=_fun_Z_Z(&z[1]:Z*,&old:Z&) [line 41, column 28]\n " shape="box"]
+"initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_4" [label="4:  DeclStmt \n   *&z[0].a:int=1 [line 41, column 20]\n  *&z[0].b:int=2 [line 41, column 20]\n  n$2=_fun_Z_Z(&z[1]:Z*,&old:Z&) [line 41, column 28]\n " shape="box"]
 	
 
 	 "initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_4" -> "initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_3" ;
-"initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_5" [label="5:  DeclStmt \n   n$2=_fun_Z_Z(&old:Z*) [line 40, column 12]\n " shape="box"]
+"initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_5" [label="5:  DeclStmt \n   n$3=_fun_Z_Z(&old:Z*) [line 40, column 12]\n " shape="box"]
 	
 
 	 "initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_5" -> "initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_4" ;
-"matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_1" [label="1: Start matrix_of_person\nFormals: \nLocals:  arr:Person[2*4][2*8] 0$?%__sil_tmpSIL_materialize_temp__n$1:Person 0$?%__sil_tmpSIL_materialize_temp__n$4:Person 0$?%__sil_tmpSIL_materialize_temp__n$7:Person 0$?%__sil_tmpSIL_materialize_temp__n$10:Person \n   DECLARE_LOCALS(&return,&arr,&0$?%__sil_tmpSIL_materialize_temp__n$1,&0$?%__sil_tmpSIL_materialize_temp__n$4,&0$?%__sil_tmpSIL_materialize_temp__n$7,&0$?%__sil_tmpSIL_materialize_temp__n$10); [line 22, column 1]\n " color=yellow style=filled]
+"matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_1" [label="1: Start matrix_of_person\nFormals: \nLocals:  arr:Person[2*4][2*8] 0$?%__sil_tmpSIL_materialize_temp__n$2:Person 0$?%__sil_tmpSIL_materialize_temp__n$5:Person 0$?%__sil_tmpSIL_materialize_temp__n$8:Person 0$?%__sil_tmpSIL_materialize_temp__n$11:Person \n   DECLARE_LOCALS(&return,&arr,&0$?%__sil_tmpSIL_materialize_temp__n$2,&0$?%__sil_tmpSIL_materialize_temp__n$5,&0$?%__sil_tmpSIL_materialize_temp__n$8,&0$?%__sil_tmpSIL_materialize_temp__n$11); [line 22, column 1]\n " color=yellow style=filled]
 	
 
 	 "matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_1" -> "matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_4" ;
@@ -60,7 +60,7 @@ digraph cfg {
 	
 
 	 "matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_3" -> "matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_2" ;
-"matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_4" [label="4:  DeclStmt \n   n$2=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$1:Person*) [line 23, column 23]\n  n$3=_fun_Person_Person(&arr[0][0]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$1:Person&) [line 23, column 23]\n  n$5=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$4:Person*) [line 23, column 33]\n  n$6=_fun_Person_Person(&arr[0][1]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$4:Person&) [line 23, column 33]\n  n$8=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$7:Person*) [line 23, column 43]\n  n$9=_fun_Person_Person(&arr[1][0]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$7:Person&) [line 23, column 43]\n  n$11=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$10:Person*) [line 23, column 53]\n  n$12=_fun_Person_Person(&arr[1][1]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$10:Person&) [line 23, column 53]\n " shape="box"]
+"matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_4" [label="4:  DeclStmt \n   n$3=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$2:Person*) [line 23, column 23]\n  n$4=_fun_Person_Person(&arr[0][0]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$2:Person&) [line 23, column 23]\n  n$6=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$5:Person*) [line 23, column 33]\n  n$7=_fun_Person_Person(&arr[0][1]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$5:Person&) [line 23, column 33]\n  n$9=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$8:Person*) [line 23, column 43]\n  n$10=_fun_Person_Person(&arr[1][0]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$8:Person&) [line 23, column 43]\n  n$12=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$11:Person*) [line 23, column 53]\n  n$13=_fun_Person_Person(&arr[1][1]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$11:Person&) [line 23, column 53]\n " shape="box"]
 	
 
 	 "matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_4" -> "matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_3" ;
@@ -78,7 +78,7 @@ digraph cfg {
 "Person#Person#{13294170998561185799}.33e91269ce59e5b361de941ed03c6643_2" [label="2: Exit Person_Person \n  " color=yellow style=filled]
 	
 
-"Person#Person#{13294170998561185799}.33e91269ce59e5b361de941ed03c6643_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:Person* [line 12, column 19]\n  n$1=*&i:int [line 12, column 23]\n  *n$0.x:int=n$1 [line 12, column 19]\n " shape="box"]
+"Person#Person#{13294170998561185799}.33e91269ce59e5b361de941ed03c6643_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:Person* [line 12, column 19]\n  n$2=*&i:int [line 12, column 23]\n  *n$1.x:int=n$2 [line 12, column 19]\n " shape="box"]
 	
 
 	 "Person#Person#{13294170998561185799}.33e91269ce59e5b361de941ed03c6643_3" -> "Person#Person#{13294170998561185799}.33e91269ce59e5b361de941ed03c6643_2" ;
@@ -89,7 +89,7 @@ digraph cfg {
 "Person#Person#{14928211719836437323|constexpr}.702b3fbc6c128973c192111cbb802edd_2" [label="2: Exit Person_Person \n  " color=yellow style=filled]
 	
 
-"Person#Person#{14928211719836437323|constexpr}.702b3fbc6c128973c192111cbb802edd_3" [label="3:  Constructor Init \n   n$0=*&this:Person* [line 10, column 7]\n  n$1=*&__param_0:Person& [line 10, column 7]\n  n$2=*n$1.x:int [line 10, column 7]\n  *n$0.x:int=n$2 [line 10, column 7]\n " shape="box"]
+"Person#Person#{14928211719836437323|constexpr}.702b3fbc6c128973c192111cbb802edd_3" [label="3:  Constructor Init \n   n$2=*&this:Person* [line 10, column 7]\n  n$3=*&__param_0:Person& [line 10, column 7]\n  n$4=*n$3.x:int [line 10, column 7]\n  *n$2.x:int=n$4 [line 10, column 7]\n " shape="box"]
 	
 
 	 "Person#Person#{14928211719836437323|constexpr}.702b3fbc6c128973c192111cbb802edd_3" -> "Person#Person#{14928211719836437323|constexpr}.702b3fbc6c128973c192111cbb802edd_2" ;
@@ -107,11 +107,11 @@ digraph cfg {
 "Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_2" [label="2: Exit Z_Z \n  " color=yellow style=filled]
 	
 
-"Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_3" [label="3:  Constructor Init \n   n$0=*&this:Z* [line 27, column 8]\n  n$1=*&__param_0:Z const & [line 27, column 8]\n  n$2=*n$1.b:int [line 27, column 8]\n  *n$0.b:int=n$2 [line 27, column 8]\n " shape="box"]
+"Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_3" [label="3:  Constructor Init \n   n$2=*&this:Z* [line 27, column 8]\n  n$3=*&__param_0:Z const & [line 27, column 8]\n  n$4=*n$3.b:int [line 27, column 8]\n  *n$2.b:int=n$4 [line 27, column 8]\n " shape="box"]
 	
 
 	 "Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_3" -> "Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_2" ;
-"Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_4" [label="4:  Constructor Init \n   n$3=*&this:Z* [line 27, column 8]\n  n$4=*&__param_0:Z const & [line 27, column 8]\n  n$5=*n$4.a:int [line 27, column 8]\n  *n$3.a:int=n$5 [line 27, column 8]\n " shape="box"]
+"Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_4" [label="4:  Constructor Init \n   n$5=*&this:Z* [line 27, column 8]\n  n$6=*&__param_0:Z const & [line 27, column 8]\n  n$7=*n$6.a:int [line 27, column 8]\n  *n$5.a:int=n$7 [line 27, column 8]\n " shape="box"]
 	
 
 	 "Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_4" -> "Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_3" ;

infer/tests/codetoanalyze/cpp/shared/constructors/constructor_default_arg.cpp.dot

@@ -7,15 +7,15 @@ digraph cfg {
 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   n$0=_fun_X_X(&x3:X*,0:int,1:int) [line 23, column 5]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   n$1=_fun_X_X(&x3:X*,0:int,1:int) [line 23, column 5]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   n$1=_fun_X_X(&x2:X*,1:int,0:int) [line 22, column 5]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   n$2=_fun_X_X(&x2:X*,1:int,0:int) [line 22, column 5]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   n$2=_fun_X_X(&x1:X*,0:int,0:int) [line 21, column 5]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   n$3=_fun_X_X(&x1:X*,0:int,0:int) [line 21, column 5]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;
@@ -26,7 +26,7 @@ digraph cfg {
 "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_2" [label="2: Exit X_X \n  " color=yellow style=filled]
 	
 
-"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:X* [line 18, column 22]\n  n$1=*&a:int [line 18, column 26]\n  n$2=*&b:int [line 18, column 30]\n  *n$0.f:int=(n$1 + n$2) [line 18, column 22]\n " shape="box"]
+"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:X* [line 18, column 22]\n  n$2=*&a:int [line 18, column 26]\n  n$3=*&b:int [line 18, column 30]\n  *n$1.f:int=(n$2 + n$3) [line 18, column 22]\n " shape="box"]
 	
 
 	 "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_3" -> "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_2" ;

infer/tests/codetoanalyze/cpp/shared/constructors/constructor_init.cpp.dot

@@ -11,11 +11,11 @@ digraph cfg {
 	
 
 	 "delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_3" -> "delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_2" ;
-"delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_4" [label="4:  DeclStmt \n   n$3=*&b.f:int [line 50, column 15]\n  *&v:int=(1 / n$3) [line 50, column 3]\n " shape="box"]
+"delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_4" [label="4:  DeclStmt \n   n$4=*&b.f:int [line 50, column 15]\n  *&v:int=(1 / n$4) [line 50, column 3]\n " shape="box"]
 	
 
 	 "delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_4" -> "delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_3" ;
-"delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_5" [label="5:  DeclStmt \n   n$4=_fun_B_B(&b:B*,-1:int,0:int) [line 49, column 5]\n " shape="box"]
+"delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_5" [label="5:  DeclStmt \n   n$5=_fun_B_B(&b:B*,-1:int,0:int) [line 49, column 5]\n " shape="box"]
 	
 
 	 "delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_5" -> "delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_4" ;
@@ -30,11 +30,11 @@ digraph cfg {
 	
 
 	 "delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_3" -> "delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_2" ;
-"delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_4" [label="4:  DeclStmt \n   n$3=*&b.f2:int [line 44, column 15]\n  *&v:int=(1 / n$3) [line 44, column 3]\n " shape="box"]
+"delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_4" [label="4:  DeclStmt \n   n$4=*&b.f2:int [line 44, column 15]\n  *&v:int=(1 / n$4) [line 44, column 3]\n " shape="box"]
 	
 
 	 "delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_4" -> "delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_3" ;
-"delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_5" [label="5:  DeclStmt \n   n$4=_fun_B_B(&b:B*,-1:int,1:int) [line 43, column 5]\n " shape="box"]
+"delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_5" [label="5:  DeclStmt \n   n$5=_fun_B_B(&b:B*,-1:int,1:int) [line 43, column 5]\n " shape="box"]
 	
 
 	 "delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_5" -> "delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_4" ;
@@ -49,7 +49,7 @@ digraph cfg {
 	
 
 	 "f2_div0#7534053771484990951.dd0b0233a011b5600e68aef2c840bcef_3" -> "f2_div0#7534053771484990951.dd0b0233a011b5600e68aef2c840bcef_2" ;
-"f2_div0#7534053771484990951.dd0b0233a011b5600e68aef2c840bcef_4" [label="4:  DeclStmt \n   n$3=_fun_B_B(&b:B*,0:int) [line 28, column 5]\n " shape="box"]
+"f2_div0#7534053771484990951.dd0b0233a011b5600e68aef2c840bcef_4" [label="4:  DeclStmt \n   n$4=_fun_B_B(&b:B*,0:int) [line 28, column 5]\n " shape="box"]
 	
 
 	 "f2_div0#7534053771484990951.dd0b0233a011b5600e68aef2c840bcef_4" -> "f2_div0#7534053771484990951.dd0b0233a011b5600e68aef2c840bcef_3" ;
@@ -64,7 +64,7 @@ digraph cfg {
 	
 
 	 "f_div0#425664895438337450.ac4424ba5cea731e26a9fe2fb1b0b687_3" -> "f_div0#425664895438337450.ac4424ba5cea731e26a9fe2fb1b0b687_2" ;
-"f_div0#425664895438337450.ac4424ba5cea731e26a9fe2fb1b0b687_4" [label="4:  DeclStmt \n   n$3=_fun_B_B(&b:B*,0:int) [line 33, column 5]\n " shape="box"]
+"f_div0#425664895438337450.ac4424ba5cea731e26a9fe2fb1b0b687_4" [label="4:  DeclStmt \n   n$4=_fun_B_B(&b:B*,0:int) [line 33, column 5]\n " shape="box"]
 	
 
 	 "f_div0#425664895438337450.ac4424ba5cea731e26a9fe2fb1b0b687_4" -> "f_div0#425664895438337450.ac4424ba5cea731e26a9fe2fb1b0b687_3" ;
@@ -79,19 +79,19 @@ digraph cfg {
 	
 
 	 "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_3" -> "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_2" ;
-"f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_4" [label="4:  DeclStmt \n   n$4=*&b.t.v:int [line 58, column 16]\n  *&v3:int=(1 / n$4) [line 58, column 3]\n " shape="box"]
+"f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_4" [label="4:  DeclStmt \n   n$5=*&b.t.v:int [line 58, column 16]\n  *&v3:int=(1 / n$5) [line 58, column 3]\n " shape="box"]
 	
 
 	 "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_4" -> "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_3" ;
-"f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_5" [label="5:  DeclStmt \n   n$5=*&b.f2:int [line 57, column 16]\n  *&v2:int=(1 / n$5) [line 57, column 3]\n " shape="box"]
+"f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_5" [label="5:  DeclStmt \n   n$6=*&b.f2:int [line 57, column 16]\n  *&v2:int=(1 / n$6) [line 57, column 3]\n " shape="box"]
 	
 
 	 "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_5" -> "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_4" ;
-"f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_6" [label="6:  DeclStmt \n   n$6=*&b.f:int [line 56, column 15]\n  *&v:int=(1 / n$6) [line 56, column 3]\n " shape="box"]
+"f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_6" [label="6:  DeclStmt \n   n$7=*&b.f:int [line 56, column 15]\n  *&v:int=(1 / n$7) [line 56, column 3]\n " shape="box"]
 	
 
 	 "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_6" -> "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_5" ;
-"f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_7" [label="7:  DeclStmt \n   n$7=_fun_B_B(&b:B*,1:int) [line 55, column 5]\n " shape="box"]
+"f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_7" [label="7:  DeclStmt \n   n$8=_fun_B_B(&b:B*,1:int) [line 55, column 5]\n " shape="box"]
 	
 
 	 "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_7" -> "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_6" ;
@@ -106,7 +106,7 @@ digraph cfg {
 	
 
 	 "t_div0#3531430030893775324.a762c245df414e083e61674c93898055_3" -> "t_div0#3531430030893775324.a762c245df414e083e61674c93898055_2" ;
-"t_div0#3531430030893775324.a762c245df414e083e61674c93898055_4" [label="4:  DeclStmt \n   n$3=_fun_B_B(&b:B*,0:int) [line 38, column 5]\n " shape="box"]
+"t_div0#3531430030893775324.a762c245df414e083e61674c93898055_4" [label="4:  DeclStmt \n   n$4=_fun_B_B(&b:B*,0:int) [line 38, column 5]\n " shape="box"]
 	
 
 	 "t_div0#3531430030893775324.a762c245df414e083e61674c93898055_4" -> "t_div0#3531430030893775324.a762c245df414e083e61674c93898055_3" ;
@@ -117,7 +117,7 @@ digraph cfg {
 "A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_2" [label="2: Exit A_A \n  " color=yellow style=filled]
 	
 
-"A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_3" [label="3:  Constructor Init \n   n$0=*&this:A* [line 12, column 14]\n  n$1=*&f:int [line 12, column 16]\n  *n$0.f:int=n$1 [line 12, column 14]\n " shape="box"]
+"A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_3" [label="3:  Constructor Init \n   n$2=*&this:A* [line 12, column 14]\n  n$3=*&f:int [line 12, column 16]\n  *n$2.f:int=n$3 [line 12, column 14]\n " shape="box"]
 	
 
 	 "A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_3" -> "A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_2" ;
@@ -128,15 +128,15 @@ digraph cfg {
 "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_2" [label="2: Exit B_B \n  " color=yellow style=filled]
 	
 
-"B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_3" [label="3:  Constructor Init \n   n$0=*&this:B* [line 22, column 27]\n  n$1=*&a:int [line 22, column 29]\n  n$2=_fun_B::T_T(n$0.t:B::T*,n$1:int) [line 22, column 27]\n " shape="box"]
+"B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_3" [label="3:  Constructor Init \n   n$2=*&this:B* [line 22, column 27]\n  n$3=*&a:int [line 22, column 29]\n  n$4=_fun_B::T_T(n$2.t:B::T*,n$3:int) [line 22, column 27]\n " shape="box"]
 	
 
 	 "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_3" -> "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_2" ;
-"B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_4" [label="4:  Constructor Init \n   n$3=*&this:B* [line 22, column 20]\n  n$4=*&a:int [line 22, column 23]\n  *n$3.f2:int=n$4 [line 22, column 20]\n " shape="box"]
+"B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_4" [label="4:  Constructor Init \n   n$5=*&this:B* [line 22, column 20]\n  n$6=*&a:int [line 22, column 23]\n  *n$5.f2:int=n$6 [line 22, column 20]\n " shape="box"]
 	
 
 	 "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_4" -> "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_3" ;
-"B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_5" [label="5:  Constructor Init \n   n$5=*&this:B* [line 22, column 14]\n  n$6=*&a:int [line 22, column 16]\n  n$7=_fun_A_A(n$5:B*,n$6:int) [line 22, column 14]\n " shape="box"]
+"B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_5" [label="5:  Constructor Init \n   n$7=*&this:B* [line 22, column 14]\n  n$8=*&a:int [line 22, column 16]\n  n$9=_fun_A_A(n$7:B*,n$8:int) [line 22, column 14]\n " shape="box"]
 	
 
 	 "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_5" -> "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_4" ;
@@ -147,11 +147,11 @@ digraph cfg {
 "B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_2" [label="2: Exit B_B \n  " color=yellow style=filled]
 	
 
-"B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:B* [line 24, column 32]\n  n$1=*&b:int [line 24, column 37]\n  *n$0.f2:int=n$1 [line 24, column 32]\n " shape="box"]
+"B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:B* [line 24, column 32]\n  n$2=*&b:int [line 24, column 37]\n  *n$1.f2:int=n$2 [line 24, column 32]\n " shape="box"]
 	
 
 	 "B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_3" -> "B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_2" ;
-"B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_4" [label="4:  Constructor Init \n   n$2=*&this:B* [line 24, column 21]\n  n$3=*&a:int [line 24, column 23]\n  n$4=*&b:int [line 24, column 27]\n  n$5=_fun_B_B(n$2:B*,(n$3 + n$4):int) [line 24, column 21]\n " shape="box"]
+"B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_4" [label="4:  Constructor Init \n   n$3=*&this:B* [line 24, column 21]\n  n$4=*&a:int [line 24, column 23]\n  n$5=*&b:int [line 24, column 27]\n  n$6=_fun_B_B(n$3:B*,(n$4 + n$5):int) [line 24, column 21]\n " shape="box"]
 	
 
 	 "B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_4" -> "B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_3" ;
@@ -162,7 +162,7 @@ digraph cfg {
 "T#T#B#{10782891829941482898}.2f080fd8e7f17199a0e7ff14c49d6dba_2" [label="2: Exit B::T_T \n  " color=yellow style=filled]
 	
 
-"T#T#B#{10782891829941482898}.2f080fd8e7f17199a0e7ff14c49d6dba_3" [label="3:  Constructor Init \n   n$0=*&this:B::T* [line 18, column 16]\n  n$1=*&v:int [line 18, column 18]\n  *n$0.v:int=n$1 [line 18, column 16]\n " shape="box"]
+"T#T#B#{10782891829941482898}.2f080fd8e7f17199a0e7ff14c49d6dba_3" [label="3:  Constructor Init \n   n$2=*&this:B::T* [line 18, column 16]\n  n$3=*&v:int [line 18, column 18]\n  *n$2.v:int=n$3 [line 18, column 16]\n " shape="box"]
 	
 
 	 "T#T#B#{10782891829941482898}.2f080fd8e7f17199a0e7ff14c49d6dba_3" -> "T#T#B#{10782891829941482898}.2f080fd8e7f17199a0e7ff14c49d6dba_2" ;

infer/tests/codetoanalyze/cpp/shared/constructors/constructor_new.cpp.dot

@@ -1,6 +1,6 @@
 /* @generated */
 digraph cfg {
-"array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_1" [label="1: Start constructor_new::array_of_class_with_not_constant_size\nFormals: \nLocals:  tarray:constructor_new::Person* 0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&tarray,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 90, column 1]\n " color=yellow style=filled]
+"array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_1" [label="1: Start constructor_new::array_of_class_with_not_constant_size\nFormals: \nLocals:  tarray:constructor_new::Person* 0$?%__sil_tmpSIL_temp_conditional___n$1:int \n   DECLARE_LOCALS(&return,&tarray,&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 90, column 1]\n " color=yellow style=filled]
 	
 
 	 "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_1" -> "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_4" ;
@@ -11,28 +11,28 @@ digraph cfg {
 	
 
 	 "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_3" -> "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_9" ;
-"array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_4" [label="4:  BinaryOperatorStmt: EQ \n   n$1=_fun_constructor_new::getValue(5:int) [line 91, column 31]\n " shape="box"]
+"array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_4" [label="4:  BinaryOperatorStmt: EQ \n   n$2=_fun_constructor_new::getValue(5:int) [line 91, column 31]\n " shape="box"]
 	
 
 	 "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_4" -> "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_5" ;
 	 "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_4" -> "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_6" ;
-"array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_5" [label="5: Prune (true branch, boolean exp) \n   PRUNE((n$1 == 5), true); [line 91, column 31]\n " shape="invhouse"]
+"array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_5" [label="5: Prune (true branch, boolean exp) \n   PRUNE((n$2 == 5), true); [line 91, column 31]\n " shape="invhouse"]
 	
 
 	 "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_5" -> "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_7" ;
-"array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_6" [label="6: Prune (false branch, boolean exp) \n   PRUNE(!(n$1 == 5), false); [line 91, column 31]\n " shape="invhouse"]
+"array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_6" [label="6: Prune (false branch, boolean exp) \n   PRUNE(!(n$2 == 5), false); [line 91, column 31]\n " shape="invhouse"]
 	
 
 	 "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_6" -> "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_8" ;
-"array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=5 [line 91, column 31]\n " shape="box"]
+"array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=5 [line 91, column 31]\n " shape="box"]
 	
 
 	 "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_7" -> "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_3" ;
-"array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=3 [line 91, column 31]\n " shape="box"]
+"array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=3 [line 91, column 31]\n " shape="box"]
 	
 
 	 "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_8" -> "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_3" ;
-"array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_9" [label="9:  DeclStmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 91, column 31]\n  n$3=_fun___new_array((sizeof(t=constructor_new::Person) * n$2):unsigned long) [line 91, column 20]\n  *&tarray:constructor_new::Person*=n$3 [line 91, column 3]\n " shape="box"]
+"array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_9" [label="9:  DeclStmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 91, column 31]\n  n$4=_fun___new_array((sizeof(t=constructor_new::Person) * n$3):unsigned long) [line 91, column 20]\n  *&tarray:constructor_new::Person*=n$4 [line 91, column 3]\n " shape="box"]
 	
 
 	 "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_9" -> "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_2" ;
@@ -43,7 +43,7 @@ digraph cfg {
 "array_of_person_with_constant_size#constructor_new#10198805942353567956.2cf0ba8d0780ec60bbcca4089ec2aee6_2" [label="2: Exit constructor_new::array_of_person_with_constant_size \n  " color=yellow style=filled]
 	
 
-"array_of_person_with_constant_size#constructor_new#10198805942353567956.2cf0ba8d0780ec60bbcca4089ec2aee6_3" [label="3:  DeclStmt \n   n$0=_fun___new_array((sizeof(t=constructor_new::Person) * 10):unsigned long) [line 95, column 62]\n  n$1=_fun_constructor_new::Person_Person(n$0[0]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  n$2=_fun_constructor_new::Person_Person(n$0[1]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  n$3=_fun_constructor_new::Person_Person(n$0[2]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  n$4=_fun_constructor_new::Person_Person(n$0[3]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  n$5=_fun_constructor_new::Person_Person(n$0[4]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  n$6=_fun_constructor_new::Person_Person(n$0[5]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  n$7=_fun_constructor_new::Person_Person(n$0[6]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  n$8=_fun_constructor_new::Person_Person(n$0[7]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  n$9=_fun_constructor_new::Person_Person(n$0[8]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  n$10=_fun_constructor_new::Person_Person(n$0[9]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  *&tarray:constructor_new::Person*=n$0 [line 95, column 45]\n " shape="box"]
+"array_of_person_with_constant_size#constructor_new#10198805942353567956.2cf0ba8d0780ec60bbcca4089ec2aee6_3" [label="3:  DeclStmt \n   n$1=_fun___new_array((sizeof(t=constructor_new::Person) * 10):unsigned long) [line 95, column 62]\n  n$2=_fun_constructor_new::Person_Person(n$1[0]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  n$3=_fun_constructor_new::Person_Person(n$1[1]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  n$4=_fun_constructor_new::Person_Person(n$1[2]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  n$5=_fun_constructor_new::Person_Person(n$1[3]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  n$6=_fun_constructor_new::Person_Person(n$1[4]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  n$7=_fun_constructor_new::Person_Person(n$1[5]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  n$8=_fun_constructor_new::Person_Person(n$1[6]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  n$9=_fun_constructor_new::Person_Person(n$1[7]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  n$10=_fun_constructor_new::Person_Person(n$1[8]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  n$11=_fun_constructor_new::Person_Person(n$1[9]:constructor_new::Person[_*_](*)) [line 95, column 66]\n  *&tarray:constructor_new::Person*=n$1 [line 95, column 45]\n " shape="box"]
 	
 
 	 "array_of_person_with_constant_size#constructor_new#10198805942353567956.2cf0ba8d0780ec60bbcca4089ec2aee6_3" -> "array_of_person_with_constant_size#constructor_new#10198805942353567956.2cf0ba8d0780ec60bbcca4089ec2aee6_2" ;
@@ -58,7 +58,7 @@ digraph cfg {
 	
 
 	 "constructor_1_arg_new_div0#constructor_new#798841234716809588.2c010a7c7293e961b9ed8149c3f3debe_3" -> "constructor_1_arg_new_div0#constructor_new#798841234716809588.2c010a7c7293e961b9ed8149c3f3debe_2" ;
-"constructor_1_arg_new_div0#constructor_new#798841234716809588.2c010a7c7293e961b9ed8149c3f3debe_4" [label="4:  DeclStmt \n   n$2=_fun___new(sizeof(t=constructor_new::Person):unsigned long) [line 30, column 15]\n  n$3=_fun_constructor_new::Person_Person(n$2:constructor_new::Person*,5:int) [line 30, column 19]\n  *&p:constructor_new::Person*=n$2 [line 30, column 3]\n " shape="box"]
+"constructor_1_arg_new_div0#constructor_new#798841234716809588.2c010a7c7293e961b9ed8149c3f3debe_4" [label="4:  DeclStmt \n   n$3=_fun___new(sizeof(t=constructor_new::Person):unsigned long) [line 30, column 15]\n  n$4=_fun_constructor_new::Person_Person(n$3:constructor_new::Person*,5:int) [line 30, column 19]\n  *&p:constructor_new::Person*=n$3 [line 30, column 3]\n " shape="box"]
 	
 
 	 "constructor_1_arg_new_div0#constructor_new#798841234716809588.2c010a7c7293e961b9ed8149c3f3debe_4" -> "constructor_1_arg_new_div0#constructor_new#798841234716809588.2c010a7c7293e961b9ed8149c3f3debe_3" ;
@@ -73,11 +73,11 @@ digraph cfg {
 	
 
 	 "constructor_3_args_new_div0#constructor_new#13438839859480315932.2122014ebac449e6fb981ba75ba0617e_3" -> "constructor_3_args_new_div0#constructor_new#13438839859480315932.2122014ebac449e6fb981ba75ba0617e_2" ;
-"constructor_3_args_new_div0#constructor_new#13438839859480315932.2122014ebac449e6fb981ba75ba0617e_4" [label="4:  DeclStmt \n   n$2=_fun___new(sizeof(t=constructor_new::Person):unsigned long) [line 35, column 15]\n  n$3=_fun_constructor_new::Person_Person(n$2:constructor_new::Person*,5:int,6:int,7:int) [line 35, column 19]\n  *&p:constructor_new::Person*=n$2 [line 35, column 3]\n " shape="box"]
+"constructor_3_args_new_div0#constructor_new#13438839859480315932.2122014ebac449e6fb981ba75ba0617e_4" [label="4:  DeclStmt \n   n$3=_fun___new(sizeof(t=constructor_new::Person):unsigned long) [line 35, column 15]\n  n$4=_fun_constructor_new::Person_Person(n$3:constructor_new::Person*,5:int,6:int,7:int) [line 35, column 19]\n  *&p:constructor_new::Person*=n$3 [line 35, column 3]\n " shape="box"]
 	
 
 	 "constructor_3_args_new_div0#constructor_new#13438839859480315932.2122014ebac449e6fb981ba75ba0617e_4" -> "constructor_3_args_new_div0#constructor_new#13438839859480315932.2122014ebac449e6fb981ba75ba0617e_3" ;
-"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_1" [label="1: Start constructor_new::constructor_nodes\nFormals: \nLocals:  p:constructor_new::Person* 0$?%__sil_tmpSIL_temp_conditional___n$3:int z:int \n   DECLARE_LOCALS(&return,&p,&0$?%__sil_tmpSIL_temp_conditional___n$3,&z); [line 71, column 1]\n " color=yellow style=filled]
+"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_1" [label="1: Start constructor_new::constructor_nodes\nFormals: \nLocals:  p:constructor_new::Person* 0$?%__sil_tmpSIL_temp_conditional___n$4:int z:int \n   DECLARE_LOCALS(&return,&p,&0$?%__sil_tmpSIL_temp_conditional___n$4,&z); [line 71, column 1]\n " color=yellow style=filled]
 	
 
 	 "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_1" -> "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_11" ;
@@ -92,28 +92,28 @@ digraph cfg {
 	
 
 	 "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_4" -> "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_10" ;
-"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_5" [label="5:  Call _fun_constructor_new::getValue \n   n$4=_fun_constructor_new::getValue(0:int) [line 73, column 26]\n " shape="box"]
+"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_5" [label="5:  Call _fun_constructor_new::getValue \n   n$5=_fun_constructor_new::getValue(0:int) [line 73, column 26]\n " shape="box"]
 	
 
 	 "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_5" -> "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_6" ;
 	 "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_5" -> "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_7" ;
-"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_6" [label="6: Prune (true branch, boolean exp) \n   PRUNE(n$4, true); [line 73, column 26]\n " shape="invhouse"]
+"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_6" [label="6: Prune (true branch, boolean exp) \n   PRUNE(n$5, true); [line 73, column 26]\n " shape="invhouse"]
 	
 
 	 "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_6" -> "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_8" ;
-"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_7" [label="7: Prune (false branch, boolean exp) \n   PRUNE(!n$4, false); [line 73, column 26]\n " shape="invhouse"]
+"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_7" [label="7: Prune (false branch, boolean exp) \n   PRUNE(!n$5, false); [line 73, column 26]\n " shape="invhouse"]
 	
 
 	 "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_7" -> "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_9" ;
-"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_8" [label="8:  ConditinalStmt Branch \n   n$5=_fun_constructor_new::getValue(1:int) [line 73, column 40]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=n$5 [line 73, column 26]\n " shape="box"]
+"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_8" [label="8:  ConditionalStmt Branch \n   n$6=_fun_constructor_new::getValue(1:int) [line 73, column 40]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=n$6 [line 73, column 26]\n " shape="box"]
 	
 
 	 "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_8" -> "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_4" ;
-"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_9" [label="9:  ConditinalStmt Branch \n   n$6=*&z:int [line 73, column 58]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=(1 + n$6) [line 73, column 26]\n " shape="box"]
+"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_9" [label="9:  ConditionalStmt Branch \n   n$7=*&z:int [line 73, column 58]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=(1 + n$7) [line 73, column 26]\n " shape="box"]
 	
 
 	 "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_9" -> "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_4" ;
-"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_10" [label="10:  DeclStmt \n   n$2=_fun___new(sizeof(t=constructor_new::Person):unsigned long) [line 73, column 15]\n  n$7=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 73, column 26]\n  n$8=_fun_constructor_new::Person_Person(n$2:constructor_new::Person*,n$7:int) [line 73, column 19]\n  *&p:constructor_new::Person*=n$2 [line 73, column 3]\n " shape="box"]
+"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_10" [label="10:  DeclStmt \n   n$3=_fun___new(sizeof(t=constructor_new::Person):unsigned long) [line 73, column 15]\n  n$8=*&0$?%__sil_tmpSIL_temp_conditional___n$4:int [line 73, column 26]\n  n$9=_fun_constructor_new::Person_Person(n$3:constructor_new::Person*,n$8:int) [line 73, column 19]\n  *&p:constructor_new::Person*=n$3 [line 73, column 3]\n " shape="box"]
 	
 
 	 "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_10" -> "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_3" ;
@@ -132,7 +132,7 @@ digraph cfg {
 	
 
 	 "float_init_number#constructor_new#3988440966025503299.b1d13528d0a983c1943c8fdd13e58be6_3" -> "float_init_number#constructor_new#3988440966025503299.b1d13528d0a983c1943c8fdd13e58be6_2" ;
-"float_init_number#constructor_new#3988440966025503299.b1d13528d0a983c1943c8fdd13e58be6_4" [label="4:  DeclStmt \n   n$2=_fun___new(sizeof(t=float):unsigned long) [line 45, column 15]\n  *n$2:float=5.4 [line 45, column 15]\n  *&x1:float*=n$2 [line 45, column 3]\n " shape="box"]
+"float_init_number#constructor_new#3988440966025503299.b1d13528d0a983c1943c8fdd13e58be6_4" [label="4:  DeclStmt \n   n$3=_fun___new(sizeof(t=float):unsigned long) [line 45, column 15]\n  *n$3:float=5.4 [line 45, column 15]\n  *&x1:float*=n$3 [line 45, column 3]\n " shape="box"]
 	
 
 	 "float_init_number#constructor_new#3988440966025503299.b1d13528d0a983c1943c8fdd13e58be6_4" -> "float_init_number#constructor_new#3988440966025503299.b1d13528d0a983c1943c8fdd13e58be6_3" ;
@@ -147,7 +147,7 @@ digraph cfg {
 	
 
 	 "getValue#constructor_new#15577065010748217440.6aa0942189125cc8fd36b278b0742cd2_3" -> "getValue#constructor_new#15577065010748217440.6aa0942189125cc8fd36b278b0742cd2_2" ;
-"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_1" [label="1: Start constructor_new::int_array\nFormals: \nLocals:  x2:int* 0$?%__sil_tmpSIL_temp_conditional___n$6:int \n   DECLARE_LOCALS(&return,&x2,&0$?%__sil_tmpSIL_temp_conditional___n$6); [line 77, column 1]\n " color=yellow style=filled]
+"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_1" [label="1: Start constructor_new::int_array\nFormals: \nLocals:  x2:int* 0$?%__sil_tmpSIL_temp_conditional___n$7:int \n   DECLARE_LOCALS(&return,&x2,&0$?%__sil_tmpSIL_temp_conditional___n$7); [line 77, column 1]\n " color=yellow style=filled]
 	
 
 	 "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_1" -> "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_7" ;
@@ -158,11 +158,11 @@ digraph cfg {
 	
 
 	 "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_3" -> "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_2" ;
-"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_4" [label="4:  BinaryOperatorStmt: Assign \n   n$4=*&x2:int* [line 80, column 3]\n  *n$4[1]:int=2 [line 80, column 3]\n " shape="box"]
+"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_4" [label="4:  BinaryOperatorStmt: Assign \n   n$5=*&x2:int* [line 80, column 3]\n  *n$5[1]:int=2 [line 80, column 3]\n " shape="box"]
 	
 
 	 "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_4" -> "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_3" ;
-"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_5" [label="5:  BinaryOperatorStmt: Assign \n   n$5=*&x2:int* [line 79, column 3]\n  *n$5[0]:int=1 [line 79, column 3]\n " shape="box"]
+"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_5" [label="5:  BinaryOperatorStmt: Assign \n   n$6=*&x2:int* [line 79, column 3]\n  *n$6[0]:int=1 [line 79, column 3]\n " shape="box"]
 	
 
 	 "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_5" -> "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_4" ;
@@ -170,28 +170,28 @@ digraph cfg {
 	
 
 	 "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_6" -> "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_12" ;
-"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_7" [label="7:  Call _fun_constructor_new::getValue \n   n$7=_fun_constructor_new::getValue(5:int) [line 78, column 21]\n " shape="box"]
+"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_7" [label="7:  Call _fun_constructor_new::getValue \n   n$8=_fun_constructor_new::getValue(5:int) [line 78, column 21]\n " shape="box"]
 	
 
 	 "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_7" -> "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_8" ;
 	 "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_7" -> "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_9" ;
-"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_8" [label="8: Prune (true branch, boolean exp) \n   PRUNE(n$7, true); [line 78, column 21]\n " shape="invhouse"]
+"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_8" [label="8: Prune (true branch, boolean exp) \n   PRUNE(n$8, true); [line 78, column 21]\n " shape="invhouse"]
 	
 
 	 "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_8" -> "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_10" ;
-"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_9" [label="9: Prune (false branch, boolean exp) \n   PRUNE(!n$7, false); [line 78, column 21]\n " shape="invhouse"]
+"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_9" [label="9: Prune (false branch, boolean exp) \n   PRUNE(!n$8, false); [line 78, column 21]\n " shape="invhouse"]
 	
 
 	 "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_9" -> "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_11" ;
-"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_10" [label="10:  ConditinalStmt Branch \n   n$8=_fun_constructor_new::getValue(5:int) [line 78, column 35]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=n$8 [line 78, column 21]\n " shape="box"]
+"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_10" [label="10:  ConditionalStmt Branch \n   n$9=_fun_constructor_new::getValue(5:int) [line 78, column 35]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=n$9 [line 78, column 21]\n " shape="box"]
 	
 
 	 "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_10" -> "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_6" ;
-"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=3 [line 78, column 21]\n " shape="box"]
+"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_11" [label="11:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=3 [line 78, column 21]\n " shape="box"]
 	
 
 	 "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_11" -> "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_6" ;
-"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_12" [label="12:  DeclStmt \n   n$9=*&0$?%__sil_tmpSIL_temp_conditional___n$6:int [line 78, column 21]\n  n$10=_fun___new_array((sizeof(t=int) * n$9):unsigned long) [line 78, column 13]\n  *&x2:int*=n$10 [line 78, column 3]\n " shape="box"]
+"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_12" [label="12:  DeclStmt \n   n$10=*&0$?%__sil_tmpSIL_temp_conditional___n$7:int [line 78, column 21]\n  n$11=_fun___new_array((sizeof(t=int) * n$10):unsigned long) [line 78, column 13]\n  *&x2:int*=n$11 [line 78, column 3]\n " shape="box"]
 	
 
 	 "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_12" -> "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_5" ;
@@ -206,7 +206,7 @@ digraph cfg {
 	
 
 	 "int_array_init#constructor_new#14099932616230884357.69a63438c3aee293029f068d373c29c3_3" -> "int_array_init#constructor_new#14099932616230884357.69a63438c3aee293029f068d373c29c3_2" ;
-"int_array_init#constructor_new#14099932616230884357.69a63438c3aee293029f068d373c29c3_4" [label="4:  DeclStmt \n   n$10=_fun___new_array((sizeof(t=int) * 100):unsigned long) [line 85, column 14]\n  *n$10[0]:int=1 [line 85, column 26]\n  *n$10[1]:int=2 [line 85, column 26]\n  *n$10[2]:int=3 [line 85, column 26]\n  *n$10[3]:int=4 [line 85, column 26]\n  *n$10[4]:int=5 [line 85, column 26]\n  *n$10[5]:int=6 [line 85, column 26]\n  *n$10[6]:int=7 [line 85, column 26]\n  *n$10[7]:int=8 [line 85, column 26]\n  *n$10[8]:int=9 [line 85, column 26]\n  *n$10[9]:int=10 [line 85, column 26]\n  *&arr:int*=n$10 [line 85, column 3]\n " shape="box"]
+"int_array_init#constructor_new#14099932616230884357.69a63438c3aee293029f068d373c29c3_4" [label="4:  DeclStmt \n   n$11=_fun___new_array((sizeof(t=int) * 100):unsigned long) [line 85, column 14]\n  *n$11[0]:int=1 [line 85, column 26]\n  *n$11[1]:int=2 [line 85, column 26]\n  *n$11[2]:int=3 [line 85, column 26]\n  *n$11[3]:int=4 [line 85, column 26]\n  *n$11[4]:int=5 [line 85, column 26]\n  *n$11[5]:int=6 [line 85, column 26]\n  *n$11[6]:int=7 [line 85, column 26]\n  *n$11[7]:int=8 [line 85, column 26]\n  *n$11[8]:int=9 [line 85, column 26]\n  *n$11[9]:int=10 [line 85, column 26]\n  *&arr:int*=n$11 [line 85, column 3]\n " shape="box"]
 	
 
 	 "int_array_init#constructor_new#14099932616230884357.69a63438c3aee293029f068d373c29c3_4" -> "int_array_init#constructor_new#14099932616230884357.69a63438c3aee293029f068d373c29c3_3" ;
@@ -221,7 +221,7 @@ digraph cfg {
 	
 
 	 "int_init_empty#constructor_new#15413029864213743197.d5b807871fe4ea10e898a381f0edef4d_3" -> "int_init_empty#constructor_new#15413029864213743197.d5b807871fe4ea10e898a381f0edef4d_2" ;
-"int_init_empty#constructor_new#15413029864213743197.d5b807871fe4ea10e898a381f0edef4d_4" [label="4:  DeclStmt \n   n$2=_fun___new(sizeof(t=int):unsigned long) [line 50, column 13]\n  *n$2:int=0 [line 50, column 21]\n  *&x1:int*=n$2 [line 50, column 3]\n " shape="box"]
+"int_init_empty#constructor_new#15413029864213743197.d5b807871fe4ea10e898a381f0edef4d_4" [label="4:  DeclStmt \n   n$3=_fun___new(sizeof(t=int):unsigned long) [line 50, column 13]\n  *n$3:int=0 [line 50, column 21]\n  *&x1:int*=n$3 [line 50, column 3]\n " shape="box"]
 	
 
 	 "int_init_empty#constructor_new#15413029864213743197.d5b807871fe4ea10e898a381f0edef4d_4" -> "int_init_empty#constructor_new#15413029864213743197.d5b807871fe4ea10e898a381f0edef4d_3" ;
@@ -251,11 +251,11 @@ digraph cfg {
 	
 
 	 "int_init_empty_list_new#constructor_new#18093274870234850959.e77c2840901e6e789e52d55ac81db88f_3" -> "int_init_empty_list_new#constructor_new#18093274870234850959.e77c2840901e6e789e52d55ac81db88f_2" ;
-"int_init_empty_list_new#constructor_new#18093274870234850959.e77c2840901e6e789e52d55ac81db88f_4" [label="4:  DeclStmt \n   n$2=_fun___new(sizeof(t=int):unsigned long) [line 60, column 13]\n  *n$2:int=0 [line 60, column 13]\n  *&x1:int*=n$2 [line 60, column 3]\n " shape="box"]
+"int_init_empty_list_new#constructor_new#18093274870234850959.e77c2840901e6e789e52d55ac81db88f_4" [label="4:  DeclStmt \n   n$3=_fun___new(sizeof(t=int):unsigned long) [line 60, column 13]\n  *n$3:int=0 [line 60, column 13]\n  *&x1:int*=n$3 [line 60, column 3]\n " shape="box"]
 	
 
 	 "int_init_empty_list_new#constructor_new#18093274870234850959.e77c2840901e6e789e52d55ac81db88f_4" -> "int_init_empty_list_new#constructor_new#18093274870234850959.e77c2840901e6e789e52d55ac81db88f_3" ;
-"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_1" [label="1: Start constructor_new::int_init_nodes\nFormals: \nLocals:  x:int* 0$?%__sil_tmpSIL_temp_conditional___n$3:int y:int* z:int \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_temp_conditional___n$3,&y,&z); [line 64, column 1]\n " color=yellow style=filled]
+"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_1" [label="1: Start constructor_new::int_init_nodes\nFormals: \nLocals:  x:int* 0$?%__sil_tmpSIL_temp_conditional___n$4:int y:int* z:int \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_temp_conditional___n$4,&y,&z); [line 64, column 1]\n " color=yellow style=filled]
 	
 
 	 "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_1" -> "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_12" ;
@@ -270,32 +270,32 @@ digraph cfg {
 	
 
 	 "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_4" -> "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_10" ;
-"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_5" [label="5:  Call _fun_constructor_new::getValue \n   n$4=_fun_constructor_new::getValue(0:int) [line 67, column 20]\n " shape="box"]
+"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_5" [label="5:  Call _fun_constructor_new::getValue \n   n$5=_fun_constructor_new::getValue(0:int) [line 67, column 20]\n " shape="box"]
 	
 
 	 "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_5" -> "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_6" ;
 	 "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_5" -> "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_7" ;
-"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_6" [label="6: Prune (true branch, boolean exp) \n   PRUNE(n$4, true); [line 67, column 20]\n " shape="invhouse"]
+"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_6" [label="6: Prune (true branch, boolean exp) \n   PRUNE(n$5, true); [line 67, column 20]\n " shape="invhouse"]
 	
 
 	 "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_6" -> "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_8" ;
-"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_7" [label="7: Prune (false branch, boolean exp) \n   PRUNE(!n$4, false); [line 67, column 20]\n " shape="invhouse"]
+"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_7" [label="7: Prune (false branch, boolean exp) \n   PRUNE(!n$5, false); [line 67, column 20]\n " shape="invhouse"]
 	
 
 	 "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_7" -> "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_9" ;
-"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_8" [label="8:  ConditinalStmt Branch \n   n$5=_fun_constructor_new::getValue(1:int) [line 67, column 34]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=n$5 [line 67, column 20]\n " shape="box"]
+"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_8" [label="8:  ConditionalStmt Branch \n   n$6=_fun_constructor_new::getValue(1:int) [line 67, column 34]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=n$6 [line 67, column 20]\n " shape="box"]
 	
 
 	 "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_8" -> "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_4" ;
-"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_9" [label="9:  ConditinalStmt Branch \n   n$6=*&y:int* [line 67, column 53]\n  n$7=*n$6:int [line 67, column 52]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=(1 + n$7) [line 67, column 20]\n " shape="box"]
+"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_9" [label="9:  ConditionalStmt Branch \n   n$7=*&y:int* [line 67, column 53]\n  n$8=*n$7:int [line 67, column 52]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=(1 + n$8) [line 67, column 20]\n " shape="box"]
 	
 
 	 "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_9" -> "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_4" ;
-"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_10" [label="10:  DeclStmt \n   n$2=_fun___new(sizeof(t=int):unsigned long) [line 67, column 12]\n  n$8=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 67, column 20]\n  *n$2:int=n$8 [line 67, column 12]\n  *&x:int*=n$2 [line 67, column 3]\n " shape="box"]
+"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_10" [label="10:  DeclStmt \n   n$3=_fun___new(sizeof(t=int):unsigned long) [line 67, column 12]\n  n$9=*&0$?%__sil_tmpSIL_temp_conditional___n$4:int [line 67, column 20]\n  *n$3:int=n$9 [line 67, column 12]\n  *&x:int*=n$3 [line 67, column 3]\n " shape="box"]
 	
 
 	 "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_10" -> "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_3" ;
-"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_11" [label="11:  DeclStmt \n   n$9=_fun___new(sizeof(t=int):unsigned long) [line 66, column 12]\n  n$10=_fun_constructor_new::getValue(4:int) [line 66, column 20]\n  *n$9:int=n$10 [line 66, column 12]\n  *&y:int*=n$9 [line 66, column 3]\n " shape="box"]
+"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_11" [label="11:  DeclStmt \n   n$10=_fun___new(sizeof(t=int):unsigned long) [line 66, column 12]\n  n$11=_fun_constructor_new::getValue(4:int) [line 66, column 20]\n  *n$10:int=n$11 [line 66, column 12]\n  *&y:int*=n$10 [line 66, column 3]\n " shape="box"]
 	
 
 	 "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_11" -> "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_5" ;
@@ -314,7 +314,7 @@ digraph cfg {
 	
 
 	 "int_init_number#constructor_new#16564762083428359974.2a1c04c2e924068dd02b097712efe518_3" -> "int_init_number#constructor_new#16564762083428359974.2a1c04c2e924068dd02b097712efe518_2" ;
-"int_init_number#constructor_new#16564762083428359974.2a1c04c2e924068dd02b097712efe518_4" [label="4:  DeclStmt \n   n$2=_fun___new(sizeof(t=int):unsigned long) [line 40, column 13]\n  *n$2:int=5 [line 40, column 13]\n  *&x1:int*=n$2 [line 40, column 3]\n " shape="box"]
+"int_init_number#constructor_new#16564762083428359974.2a1c04c2e924068dd02b097712efe518_4" [label="4:  DeclStmt \n   n$3=_fun___new(sizeof(t=int):unsigned long) [line 40, column 13]\n  *n$3:int=5 [line 40, column 13]\n  *&x1:int*=n$3 [line 40, column 3]\n " shape="box"]
 	
 
 	 "int_init_number#constructor_new#16564762083428359974.2a1c04c2e924068dd02b097712efe518_4" -> "int_init_number#constructor_new#16564762083428359974.2a1c04c2e924068dd02b097712efe518_3" ;
@@ -325,11 +325,11 @@ digraph cfg {
 "matrix_of_person#constructor_new#930045482638918044.730172056e08027af32de0bd9a490291_2" [label="2: Exit constructor_new::matrix_of_person \n  " color=yellow style=filled]
 	
 
-"matrix_of_person#constructor_new#930045482638918044.730172056e08027af32de0bd9a490291_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&tarray:constructor_new::Person** [line 100, column 3]\n  n$1=_fun___new_array((sizeof(t=constructor_new::Person) * 10):unsigned long) [line 100, column 15]\n  n$2=_fun_constructor_new::Person_Person(n$1[0]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  n$3=_fun_constructor_new::Person_Person(n$1[1]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  n$4=_fun_constructor_new::Person_Person(n$1[2]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  n$5=_fun_constructor_new::Person_Person(n$1[3]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  n$6=_fun_constructor_new::Person_Person(n$1[4]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  n$7=_fun_constructor_new::Person_Person(n$1[5]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  n$8=_fun_constructor_new::Person_Person(n$1[6]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  n$9=_fun_constructor_new::Person_Person(n$1[7]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  n$10=_fun_constructor_new::Person_Person(n$1[8]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  n$11=_fun_constructor_new::Person_Person(n$1[9]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  *n$0[0]:constructor_new::Person*=n$1 [line 100, column 3]\n " shape="box"]
+"matrix_of_person#constructor_new#930045482638918044.730172056e08027af32de0bd9a490291_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&tarray:constructor_new::Person** [line 100, column 3]\n  n$2=_fun___new_array((sizeof(t=constructor_new::Person) * 10):unsigned long) [line 100, column 15]\n  n$3=_fun_constructor_new::Person_Person(n$2[0]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  n$4=_fun_constructor_new::Person_Person(n$2[1]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  n$5=_fun_constructor_new::Person_Person(n$2[2]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  n$6=_fun_constructor_new::Person_Person(n$2[3]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  n$7=_fun_constructor_new::Person_Person(n$2[4]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  n$8=_fun_constructor_new::Person_Person(n$2[5]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  n$9=_fun_constructor_new::Person_Person(n$2[6]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  n$10=_fun_constructor_new::Person_Person(n$2[7]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  n$11=_fun_constructor_new::Person_Person(n$2[8]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  n$12=_fun_constructor_new::Person_Person(n$2[9]:constructor_new::Person[_*_](*)) [line 100, column 19]\n  *n$1[0]:constructor_new::Person*=n$2 [line 100, column 3]\n " shape="box"]
 	
 
 	 "matrix_of_person#constructor_new#930045482638918044.730172056e08027af32de0bd9a490291_3" -> "matrix_of_person#constructor_new#930045482638918044.730172056e08027af32de0bd9a490291_2" ;
-"matrix_of_person#constructor_new#930045482638918044.730172056e08027af32de0bd9a490291_4" [label="4:  DeclStmt \n   n$12=_fun___new_array((sizeof(t=constructor_new::Person*) * 10):unsigned long) [line 99, column 21]\n  *&tarray:constructor_new::Person**=n$12 [line 99, column 3]\n " shape="box"]
+"matrix_of_person#constructor_new#930045482638918044.730172056e08027af32de0bd9a490291_4" [label="4:  DeclStmt \n   n$13=_fun___new_array((sizeof(t=constructor_new::Person*) * 10):unsigned long) [line 99, column 21]\n  *&tarray:constructor_new::Person**=n$13 [line 99, column 3]\n " shape="box"]
 	
 
 	 "matrix_of_person#constructor_new#930045482638918044.730172056e08027af32de0bd9a490291_4" -> "matrix_of_person#constructor_new#930045482638918044.730172056e08027af32de0bd9a490291_3" ;
@@ -340,15 +340,15 @@ digraph cfg {
 "Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_2" [label="2: Exit constructor_new::Person_Person \n  " color=yellow style=filled]
 	
 
-"Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:constructor_new::Person* [line 20, column 5]\n  n$1=*&k:int [line 20, column 9]\n  *n$0.z:int=n$1 [line 20, column 5]\n " shape="box"]
+"Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:constructor_new::Person* [line 20, column 5]\n  n$2=*&k:int [line 20, column 9]\n  *n$1.z:int=n$2 [line 20, column 5]\n " shape="box"]
 	
 
 	 "Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_3" -> "Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_2" ;
-"Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:constructor_new::Person* [line 19, column 5]\n  n$3=*&j:int [line 19, column 9]\n  *n$2.y:int=n$3 [line 19, column 5]\n " shape="box"]
+"Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=*&this:constructor_new::Person* [line 19, column 5]\n  n$4=*&j:int [line 19, column 9]\n  *n$3.y:int=n$4 [line 19, column 5]\n " shape="box"]
 	
 
 	 "Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_4" -> "Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_3" ;
-"Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_5" [label="5:  BinaryOperatorStmt: Assign \n   n$4=*&this:constructor_new::Person* [line 18, column 5]\n  n$5=*&i:int [line 18, column 9]\n  *n$4.x:int=n$5 [line 18, column 5]\n " shape="box"]
+"Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_5" [label="5:  BinaryOperatorStmt: Assign \n   n$5=*&this:constructor_new::Person* [line 18, column 5]\n  n$6=*&i:int [line 18, column 9]\n  *n$5.x:int=n$6 [line 18, column 5]\n " shape="box"]
 	
 
 	 "Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_5" -> "Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_4" ;
@@ -359,7 +359,7 @@ digraph cfg {
 "Person#Person#constructor_new#{6016517870629270534}.75bb70b834543e18977cd4fa8f8022a7_2" [label="2: Exit constructor_new::Person_Person \n  " color=yellow style=filled]
 	
 
-"Person#Person#constructor_new#{6016517870629270534}.75bb70b834543e18977cd4fa8f8022a7_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:constructor_new::Person* [line 15, column 19]\n  n$1=*&i:int [line 15, column 23]\n  *n$0.x:int=n$1 [line 15, column 19]\n " shape="box"]
+"Person#Person#constructor_new#{6016517870629270534}.75bb70b834543e18977cd4fa8f8022a7_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:constructor_new::Person* [line 15, column 19]\n  n$2=*&i:int [line 15, column 23]\n  *n$1.x:int=n$2 [line 15, column 19]\n " shape="box"]
 	
 
 	 "Person#Person#constructor_new#{6016517870629270534}.75bb70b834543e18977cd4fa8f8022a7_3" -> "Person#Person#constructor_new#{6016517870629270534}.75bb70b834543e18977cd4fa8f8022a7_2" ;
@@ -370,7 +370,7 @@ digraph cfg {
 "Person#Person#constructor_new#{6016547557443232231}.129098d47d79a7d06a2d6927fa32f467_2" [label="2: Exit constructor_new::Person_Person \n  " color=yellow style=filled]
 	
 
-"Person#Person#constructor_new#{6016547557443232231}.129098d47d79a7d06a2d6927fa32f467_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:constructor_new::Person* [line 14, column 14]\n  *n$0.x:int=0 [line 14, column 14]\n " shape="box"]
+"Person#Person#constructor_new#{6016547557443232231}.129098d47d79a7d06a2d6927fa32f467_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:constructor_new::Person* [line 14, column 14]\n  *n$1.x:int=0 [line 14, column 14]\n " shape="box"]
 	
 
 	 "Person#Person#constructor_new#{6016547557443232231}.129098d47d79a7d06a2d6927fa32f467_3" -> "Person#Person#constructor_new#{6016547557443232231}.129098d47d79a7d06a2d6927fa32f467_2" ;

infer/tests/codetoanalyze/cpp/shared/constructors/constructor_struct_init_list.cpp.dot

@@ -1,13 +1,13 @@
 /* @generated */
 digraph cfg {
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_1" [label="1: Start test\nFormals: \nLocals:  p:Person 0$?%__sil_tmpSIL_init_list__n$0:Insets \n   DECLARE_LOCALS(&return,&p,&0$?%__sil_tmpSIL_init_list__n$0); [line 17, column 1]\n " color=yellow style=filled]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_1" [label="1: Start test\nFormals: \nLocals:  p:Person 0$?%__sil_tmpSIL_init_list__n$1:Insets \n   DECLARE_LOCALS(&return,&p,&0$?%__sil_tmpSIL_init_list__n$1); [line 17, column 1]\n " color=yellow style=filled]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_1" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   *&0$?%__sil_tmpSIL_init_list__n$0.top:int=0 [line 17, column 25]\n  *&0$?%__sil_tmpSIL_init_list__n$0.left:int=0 [line 17, column 25]\n  *&0$?%__sil_tmpSIL_init_list__n$0.bottom:int=0 [line 17, column 25]\n  *&0$?%__sil_tmpSIL_init_list__n$0.right:int=0 [line 17, column 25]\n  n$1=_fun_Person_Person(&p:Person*,&0$?%__sil_tmpSIL_init_list__n$0:Insets) [line 17, column 22]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   *&0$?%__sil_tmpSIL_init_list__n$1.top:int=0 [line 17, column 25]\n  *&0$?%__sil_tmpSIL_init_list__n$1.left:int=0 [line 17, column 25]\n  *&0$?%__sil_tmpSIL_init_list__n$1.bottom:int=0 [line 17, column 25]\n  *&0$?%__sil_tmpSIL_init_list__n$1.right:int=0 [line 17, column 25]\n  n$2=_fun_Person_Person(&p:Person*,&0$?%__sil_tmpSIL_init_list__n$1:Insets) [line 17, column 22]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "Person#Person#{5857402560744521252}.6ef0efc697f825c2030746b71de7fd56_2" [label="2: Exit Person_Person \n  " color=yellow style=filled]
 	
 
-"Person#Person#{5857402560744521252}.6ef0efc697f825c2030746b71de7fd56_3" [label="3:  Constructor Init \n   n$0=*&this:Person* [line 14, column 28]\n  n$1=*&l:Insets const & [line 14, column 32]\n  n$2=*n$1.top:int [line 14, column 32]\n  *n$0.age:int=n$2 [line 14, column 28]\n " shape="box"]
+"Person#Person#{5857402560744521252}.6ef0efc697f825c2030746b71de7fd56_3" [label="3:  Constructor Init \n   n$2=*&this:Person* [line 14, column 28]\n  n$3=*&l:Insets const & [line 14, column 32]\n  n$4=*n$3.top:int [line 14, column 32]\n  *n$2.age:int=n$4 [line 14, column 28]\n " shape="box"]
 	
 
 	 "Person#Person#{5857402560744521252}.6ef0efc697f825c2030746b71de7fd56_3" -> "Person#Person#{5857402560744521252}.6ef0efc697f825c2030746b71de7fd56_2" ;

infer/tests/codetoanalyze/cpp/shared/constructors/constructor_with_body.cpp.dot

@@ -7,11 +7,11 @@ digraph cfg {
 "test_div0#constructor_with_body#14177342253516869661.07f5b28b5e0b5cf0bd1b639da4232d5e_2" [label="2: Exit constructor_with_body::test_div0 \n  " color=yellow style=filled]
 	
 
-"test_div0#constructor_with_body#14177342253516869661.07f5b28b5e0b5cf0bd1b639da4232d5e_3" [label="3:  Call _fun_constructor_with_body::X_div \n   _=*&x:constructor_with_body::X [line 32, column 3]\n  n$1=_fun_constructor_with_body::X_div(&x:constructor_with_body::X&) [line 32, column 3]\n " shape="box"]
+"test_div0#constructor_with_body#14177342253516869661.07f5b28b5e0b5cf0bd1b639da4232d5e_3" [label="3:  Call _fun_constructor_with_body::X_div \n   _=*&x:constructor_with_body::X [line 32, column 3]\n  n$2=_fun_constructor_with_body::X_div(&x:constructor_with_body::X&) [line 32, column 3]\n " shape="box"]
 	
 
 	 "test_div0#constructor_with_body#14177342253516869661.07f5b28b5e0b5cf0bd1b639da4232d5e_3" -> "test_div0#constructor_with_body#14177342253516869661.07f5b28b5e0b5cf0bd1b639da4232d5e_2" ;
-"test_div0#constructor_with_body#14177342253516869661.07f5b28b5e0b5cf0bd1b639da4232d5e_4" [label="4:  DeclStmt \n   n$2=_fun_constructor_with_body::X_X(&x:constructor_with_body::X*,-2:int,2:int) [line 31, column 5]\n " shape="box"]
+"test_div0#constructor_with_body#14177342253516869661.07f5b28b5e0b5cf0bd1b639da4232d5e_4" [label="4:  DeclStmt \n   n$3=_fun_constructor_with_body::X_X(&x:constructor_with_body::X*,-2:int,2:int) [line 31, column 5]\n " shape="box"]
 	
 
 	 "test_div0#constructor_with_body#14177342253516869661.07f5b28b5e0b5cf0bd1b639da4232d5e_4" -> "test_div0#constructor_with_body#14177342253516869661.07f5b28b5e0b5cf0bd1b639da4232d5e_3" ;
@@ -22,11 +22,11 @@ digraph cfg {
 "test_div0_default_constructor#constructor_with_body#13388399293672727772.2d6a8a159f30a2a66b86eb8aec3b9543_2" [label="2: Exit constructor_with_body::test_div0_default_constructor \n  " color=yellow style=filled]
 	
 
-"test_div0_default_constructor#constructor_with_body#13388399293672727772.2d6a8a159f30a2a66b86eb8aec3b9543_3" [label="3:  Call _fun_constructor_with_body::X_div \n   _=*&x:constructor_with_body::X [line 37, column 3]\n  n$1=_fun_constructor_with_body::X_div(&x:constructor_with_body::X&) [line 37, column 3]\n " shape="box"]
+"test_div0_default_constructor#constructor_with_body#13388399293672727772.2d6a8a159f30a2a66b86eb8aec3b9543_3" [label="3:  Call _fun_constructor_with_body::X_div \n   _=*&x:constructor_with_body::X [line 37, column 3]\n  n$2=_fun_constructor_with_body::X_div(&x:constructor_with_body::X&) [line 37, column 3]\n " shape="box"]
 	
 
 	 "test_div0_default_constructor#constructor_with_body#13388399293672727772.2d6a8a159f30a2a66b86eb8aec3b9543_3" -> "test_div0_default_constructor#constructor_with_body#13388399293672727772.2d6a8a159f30a2a66b86eb8aec3b9543_2" ;
-"test_div0_default_constructor#constructor_with_body#13388399293672727772.2d6a8a159f30a2a66b86eb8aec3b9543_4" [label="4:  DeclStmt \n   n$2=_fun_constructor_with_body::X_X(&x:constructor_with_body::X*) [line 36, column 5]\n " shape="box"]
+"test_div0_default_constructor#constructor_with_body#13388399293672727772.2d6a8a159f30a2a66b86eb8aec3b9543_4" [label="4:  DeclStmt \n   n$3=_fun_constructor_with_body::X_X(&x:constructor_with_body::X*) [line 36, column 5]\n " shape="box"]
 	
 
 	 "test_div0_default_constructor#constructor_with_body#13388399293672727772.2d6a8a159f30a2a66b86eb8aec3b9543_4" -> "test_div0_default_constructor#constructor_with_body#13388399293672727772.2d6a8a159f30a2a66b86eb8aec3b9543_3" ;
@@ -37,11 +37,11 @@ digraph cfg {
 "test_div1#constructor_with_body#14807027065269407206.e5673561e7edf9eb35b296211ab8d37d_2" [label="2: Exit constructor_with_body::test_div1 \n  " color=yellow style=filled]
 	
 
-"test_div1#constructor_with_body#14807027065269407206.e5673561e7edf9eb35b296211ab8d37d_3" [label="3:  Call _fun_constructor_with_body::X_div \n   _=*&x:constructor_with_body::X [line 42, column 3]\n  n$1=_fun_constructor_with_body::X_div(&x:constructor_with_body::X&) [line 42, column 3]\n " shape="box"]
+"test_div1#constructor_with_body#14807027065269407206.e5673561e7edf9eb35b296211ab8d37d_3" [label="3:  Call _fun_constructor_with_body::X_div \n   _=*&x:constructor_with_body::X [line 42, column 3]\n  n$2=_fun_constructor_with_body::X_div(&x:constructor_with_body::X&) [line 42, column 3]\n " shape="box"]
 	
 
 	 "test_div1#constructor_with_body#14807027065269407206.e5673561e7edf9eb35b296211ab8d37d_3" -> "test_div1#constructor_with_body#14807027065269407206.e5673561e7edf9eb35b296211ab8d37d_2" ;
-"test_div1#constructor_with_body#14807027065269407206.e5673561e7edf9eb35b296211ab8d37d_4" [label="4:  DeclStmt \n   n$2=_fun_constructor_with_body::X_X(&x:constructor_with_body::X*,0:int,1:int) [line 41, column 5]\n " shape="box"]
+"test_div1#constructor_with_body#14807027065269407206.e5673561e7edf9eb35b296211ab8d37d_4" [label="4:  DeclStmt \n   n$3=_fun_constructor_with_body::X_X(&x:constructor_with_body::X*,0:int,1:int) [line 41, column 5]\n " shape="box"]
 	
 
 	 "test_div1#constructor_with_body#14807027065269407206.e5673561e7edf9eb35b296211ab8d37d_4" -> "test_div1#constructor_with_body#14807027065269407206.e5673561e7edf9eb35b296211ab8d37d_3" ;
@@ -52,7 +52,7 @@ digraph cfg {
 "X#X#constructor_with_body#{16871729092574880817}.54f479ca84639d148c4b988a7530253a_2" [label="2: Exit constructor_with_body::X_X \n  " color=yellow style=filled]
 	
 
-"X#X#constructor_with_body#{16871729092574880817}.54f479ca84639d148c4b988a7530253a_3" [label="3:  Call _fun_constructor_with_body::X_init \n   n$0=*&this:constructor_with_body::X* [line 17, column 9]\n  _=*n$0:constructor_with_body::X [line 17, column 9]\n  n$2=_fun_constructor_with_body::X_init(n$0:constructor_with_body::X*) [line 17, column 9]\n " shape="box"]
+"X#X#constructor_with_body#{16871729092574880817}.54f479ca84639d148c4b988a7530253a_3" [label="3:  Call _fun_constructor_with_body::X_init \n   n$1=*&this:constructor_with_body::X* [line 17, column 9]\n  _=*n$1:constructor_with_body::X [line 17, column 9]\n  n$3=_fun_constructor_with_body::X_init(n$1:constructor_with_body::X*) [line 17, column 9]\n " shape="box"]
 	
 
 	 "X#X#constructor_with_body#{16871729092574880817}.54f479ca84639d148c4b988a7530253a_3" -> "X#X#constructor_with_body#{16871729092574880817}.54f479ca84639d148c4b988a7530253a_2" ;
@@ -63,15 +63,15 @@ digraph cfg {
 "X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_2" [label="2: Exit constructor_with_body::X_X \n  " color=yellow style=filled]
 	
 
-"X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:constructor_with_body::X* [line 27, column 3]\n  n$1=*&c:int [line 27, column 7]\n  *n$0.f:int=n$1 [line 27, column 3]\n " shape="box"]
+"X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:constructor_with_body::X* [line 27, column 3]\n  n$2=*&c:int [line 27, column 7]\n  *n$1.f:int=n$2 [line 27, column 3]\n " shape="box"]
 	
 
 	 "X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_3" -> "X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_2" ;
-"X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_4" [label="4:  Call _fun_constructor_with_body::X_init \n   n$2=*&this:constructor_with_body::X* [line 26, column 3]\n  _=*n$2:constructor_with_body::X [line 26, column 3]\n  n$4=_fun_constructor_with_body::X_init(n$2:constructor_with_body::X*) [line 26, column 3]\n " shape="box"]
+"X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_4" [label="4:  Call _fun_constructor_with_body::X_init \n   n$3=*&this:constructor_with_body::X* [line 26, column 3]\n  _=*n$3:constructor_with_body::X [line 26, column 3]\n  n$5=_fun_constructor_with_body::X_init(n$3:constructor_with_body::X*) [line 26, column 3]\n " shape="box"]
 	
 
 	 "X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_4" -> "X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_3" ;
-"X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_5" [label="5:  DeclStmt \n   n$5=*&a:int [line 25, column 11]\n  n$6=*&b:int [line 25, column 15]\n  *&c:int=(n$5 + n$6) [line 25, column 3]\n " shape="box"]
+"X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_5" [label="5:  DeclStmt \n   n$6=*&a:int [line 25, column 11]\n  n$7=*&b:int [line 25, column 15]\n  *&c:int=(n$6 + n$7) [line 25, column 3]\n " shape="box"]
 	
 
 	 "X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_5" -> "X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_4" ;
@@ -93,7 +93,7 @@ digraph cfg {
 "init#X#constructor_with_body#(11920920673411078151).40e39840a696bef95297e1afb2f57392_2" [label="2: Exit constructor_with_body::X_init \n  " color=yellow style=filled]
 	
 
-"init#X#constructor_with_body#(11920920673411078151).40e39840a696bef95297e1afb2f57392_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:constructor_with_body::X* [line 14, column 17]\n  *n$0.f:int=0 [line 14, column 17]\n " shape="box"]
+"init#X#constructor_with_body#(11920920673411078151).40e39840a696bef95297e1afb2f57392_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:constructor_with_body::X* [line 14, column 17]\n  *n$1.f:int=0 [line 14, column 17]\n " shape="box"]
 	
 
 	 "init#X#constructor_with_body#(11920920673411078151).40e39840a696bef95297e1afb2f57392_3" -> "init#X#constructor_with_body#(11920920673411078151).40e39840a696bef95297e1afb2f57392_2" ;

infer/tests/codetoanalyze/cpp/shared/constructors/copy_array_field.cpp.dot

@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_3" -> "no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_2" ;
-"no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_4" [label="4:  DeclStmt \n   n$2=_fun_copy_array_field::X_X(&x2:copy_array_field::X*,&x1:copy_array_field::X&) [line 26, column 10]\n " shape="box"]
+"no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_4" [label="4:  DeclStmt \n   n$3=_fun_copy_array_field::X_X(&x2:copy_array_field::X*,&x1:copy_array_field::X&) [line 26, column 10]\n " shape="box"]
 	
 
 	 "no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_4" -> "no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_3" ;
@@ -19,7 +19,7 @@ digraph cfg {
 	
 
 	 "no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_5" -> "no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_4" ;
-"no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_6" [label="6:  DeclStmt \n   n$3=_fun_copy_array_field::X_X(&x1:copy_array_field::X*) [line 24, column 5]\n " shape="box"]
+"no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_6" [label="6:  DeclStmt \n   n$4=_fun_copy_array_field::X_X(&x1:copy_array_field::X*) [line 24, column 5]\n " shape="box"]
 	
 
 	 "no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_6" -> "no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_5" ;
@@ -38,7 +38,7 @@ digraph cfg {
 	
 
 	 "npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_3" -> "npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_2" ;
-"npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_4" [label="4:  DeclStmt \n   n$2=_fun_copy_array_field::X_X(&x2:copy_array_field::X*,&x1:copy_array_field::X&) [line 18, column 10]\n " shape="box"]
+"npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_4" [label="4:  DeclStmt \n   n$3=_fun_copy_array_field::X_X(&x2:copy_array_field::X*,&x1:copy_array_field::X&) [line 18, column 10]\n " shape="box"]
 	
 
 	 "npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_4" -> "npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_3" ;
@@ -46,7 +46,7 @@ digraph cfg {
 	
 
 	 "npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_5" -> "npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_4" ;
-"npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_6" [label="6:  DeclStmt \n   n$3=_fun_copy_array_field::X_X(&x1:copy_array_field::X*) [line 16, column 5]\n " shape="box"]
+"npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_6" [label="6:  DeclStmt \n   n$4=_fun_copy_array_field::X_X(&x1:copy_array_field::X*) [line 16, column 5]\n " shape="box"]
 	
 
 	 "npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_6" -> "npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_5" ;
@@ -64,11 +64,11 @@ digraph cfg {
 "X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_2" [label="2: Exit copy_array_field::X_X \n  " color=yellow style=filled]
 	
 
-"X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_3" [label="3:  Constructor Init \n   n$0=*&this:copy_array_field::X* [line 10, column 8]\n  *n$0.x:int=-1 [line 10, column 8]\n " shape="box"]
+"X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_3" [label="3:  Constructor Init \n   n$2=*&this:copy_array_field::X* [line 10, column 8]\n  *n$2.x:void=n$3 [line 10, column 8]\n " shape="box"]
 	
 
 	 "X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_3" -> "X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_2" ;
-"X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_4" [label="4:  Constructor Init \n   n$1=*&this:copy_array_field::X* [line 10, column 8]\n  n$2=*&__param_0:copy_array_field::X const & [line 10, column 8]\n  n$3=*n$2.p:int* [line 10, column 8]\n  *n$1.p:int*=n$3 [line 10, column 8]\n " shape="box"]
+"X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_4" [label="4:  Constructor Init \n   n$4=*&this:copy_array_field::X* [line 10, column 8]\n  n$5=*&__param_0:copy_array_field::X const & [line 10, column 8]\n  n$6=*n$5.p:int* [line 10, column 8]\n  *n$4.p:int*=n$6 [line 10, column 8]\n " shape="box"]
 	
 
 	 "X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_4" -> "X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_3" ;

infer/tests/codetoanalyze/cpp/shared/constructors/copy_move_constructor.cpp.dot

@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_3" -> "copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_2" ;
-"copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_4" [label="4:  DeclStmt \n   n$5=_fun_copy_move_constructor::X_X(&x2:copy_move_constructor::X*,&x1:copy_move_constructor::X&) [line 44, column 10]\n " shape="box"]
+"copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_4" [label="4:  DeclStmt \n   n$6=_fun_copy_move_constructor::X_X(&x2:copy_move_constructor::X*,&x1:copy_move_constructor::X&) [line 44, column 10]\n " shape="box"]
 	
 
 	 "copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_4" -> "copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_3" ;
@@ -19,11 +19,11 @@ digraph cfg {
 	
 
 	 "copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_5" -> "copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_4" ;
-"copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_6" [label="6:  DeclStmt \n   n$6=_fun_copy_move_constructor::X_X(&x1:copy_move_constructor::X*) [line 42, column 5]\n " shape="box"]
+"copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_6" [label="6:  DeclStmt \n   n$7=_fun_copy_move_constructor::X_X(&x1:copy_move_constructor::X*) [line 42, column 5]\n " shape="box"]
 	
 
 	 "copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_6" -> "copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_5" ;
-"copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_1" [label="1: Start copy_move_constructor::copyX_moveX_div1\nFormals: \nLocals:  d2:int 0$?%__sil_tmpSIL_materialize_temp__n$6:copy_move_constructor::X d1:int x2:copy_move_constructor::X x1:copy_move_constructor::X \n   DECLARE_LOCALS(&return,&d2,&0$?%__sil_tmpSIL_materialize_temp__n$6,&d1,&x2,&x1); [line 65, column 1]\n " color=yellow style=filled]
+"copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_1" [label="1: Start copy_move_constructor::copyX_moveX_div1\nFormals: \nLocals:  d2:int 0$?%__sil_tmpSIL_materialize_temp__n$7:copy_move_constructor::X d1:int x2:copy_move_constructor::X x1:copy_move_constructor::X \n   DECLARE_LOCALS(&return,&d2,&0$?%__sil_tmpSIL_materialize_temp__n$7,&d1,&x2,&x1); [line 65, column 1]\n " color=yellow style=filled]
 	
 
 	 "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_1" -> "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_8" ;
@@ -34,15 +34,15 @@ digraph cfg {
 	
 
 	 "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_3" -> "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_2" ;
-"copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_4" [label="4:  DeclStmt \n   n$8=_fun_copy_move_constructor::getX(1:int,&0$?%__sil_tmpSIL_materialize_temp__n$6:copy_move_constructor::X*) [line 70, column 16]\n  n$9=*&0$?%__sil_tmpSIL_materialize_temp__n$6.f:int [line 70, column 16]\n  *&d2:int=(1 / n$9) [line 70, column 3]\n " shape="box"]
+"copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_4" [label="4:  DeclStmt \n   n$9=_fun_copy_move_constructor::getX(1:int,&0$?%__sil_tmpSIL_materialize_temp__n$7:copy_move_constructor::X*) [line 70, column 16]\n  n$10=*&0$?%__sil_tmpSIL_materialize_temp__n$7.f:int [line 70, column 16]\n  *&d2:int=(1 / n$10) [line 70, column 3]\n " shape="box"]
 	
 
 	 "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_4" -> "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_3" ;
-"copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_5" [label="5:  DeclStmt \n   n$10=*&x2.f:int [line 69, column 16]\n  *&d1:int=(1 / n$10) [line 69, column 3]\n " shape="box"]
+"copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_5" [label="5:  DeclStmt \n   n$11=*&x2.f:int [line 69, column 16]\n  *&d1:int=(1 / n$11) [line 69, column 3]\n " shape="box"]
 	
 
 	 "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_5" -> "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_4" ;
-"copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_6" [label="6:  DeclStmt \n   n$11=_fun_copy_move_constructor::X_X(&x2:copy_move_constructor::X*,&x1:copy_move_constructor::X&) [line 68, column 10]\n " shape="box"]
+"copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_6" [label="6:  DeclStmt \n   n$12=_fun_copy_move_constructor::X_X(&x2:copy_move_constructor::X*,&x1:copy_move_constructor::X&) [line 68, column 10]\n " shape="box"]
 	
 
 	 "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_6" -> "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_5" ;
@@ -50,7 +50,7 @@ digraph cfg {
 	
 
 	 "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_7" -> "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_6" ;
-"copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_8" [label="8:  DeclStmt \n   n$12=_fun_copy_move_constructor::X_X(&x1:copy_move_constructor::X*) [line 66, column 5]\n " shape="box"]
+"copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_8" [label="8:  DeclStmt \n   n$13=_fun_copy_move_constructor::X_X(&x1:copy_move_constructor::X*) [line 66, column 5]\n " shape="box"]
 	
 
 	 "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_8" -> "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_7" ;
@@ -65,7 +65,7 @@ digraph cfg {
 	
 
 	 "copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_3" -> "copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_2" ;
-"copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_4" [label="4:  DeclStmt \n   n$5=_fun_copy_move_constructor::Y_Y(&y2:copy_move_constructor::Y*,&y1:copy_move_constructor::Y&) [line 53, column 10]\n " shape="box"]
+"copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_4" [label="4:  DeclStmt \n   n$6=_fun_copy_move_constructor::Y_Y(&y2:copy_move_constructor::Y*,&y1:copy_move_constructor::Y&) [line 53, column 10]\n " shape="box"]
 	
 
 	 "copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_4" -> "copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_3" ;
@@ -73,11 +73,11 @@ digraph cfg {
 	
 
 	 "copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_5" -> "copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_4" ;
-"copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_6" [label="6:  DeclStmt \n   n$6=_fun_copy_move_constructor::Y_Y(&y1:copy_move_constructor::Y*) [line 51, column 5]\n " shape="box"]
+"copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_6" [label="6:  DeclStmt \n   n$7=_fun_copy_move_constructor::Y_Y(&y1:copy_move_constructor::Y*) [line 51, column 5]\n " shape="box"]
 	
 
 	 "copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_6" -> "copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_5" ;
-"copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_1" [label="1: Start copy_move_constructor::copyY_moveY_div1\nFormals: \nLocals:  d2:int 0$?%__sil_tmpSIL_materialize_temp__n$6:copy_move_constructor::Y d1:int y2:copy_move_constructor::Y y1:copy_move_constructor::Y \n   DECLARE_LOCALS(&return,&d2,&0$?%__sil_tmpSIL_materialize_temp__n$6,&d1,&y2,&y1); [line 74, column 1]\n " color=yellow style=filled]
+"copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_1" [label="1: Start copy_move_constructor::copyY_moveY_div1\nFormals: \nLocals:  d2:int 0$?%__sil_tmpSIL_materialize_temp__n$7:copy_move_constructor::Y d1:int y2:copy_move_constructor::Y y1:copy_move_constructor::Y \n   DECLARE_LOCALS(&return,&d2,&0$?%__sil_tmpSIL_materialize_temp__n$7,&d1,&y2,&y1); [line 74, column 1]\n " color=yellow style=filled]
 	
 
 	 "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_1" -> "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_8" ;
@@ -88,15 +88,15 @@ digraph cfg {
 	
 
 	 "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_3" -> "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_2" ;
-"copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_4" [label="4:  DeclStmt \n   n$8=_fun_copy_move_constructor::getY(2:int,&0$?%__sil_tmpSIL_materialize_temp__n$6:copy_move_constructor::Y*) [line 79, column 16]\n  n$9=*&0$?%__sil_tmpSIL_materialize_temp__n$6.f:int [line 79, column 16]\n  *&d2:int=(1 / n$9) [line 79, column 3]\n " shape="box"]
+"copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_4" [label="4:  DeclStmt \n   n$9=_fun_copy_move_constructor::getY(2:int,&0$?%__sil_tmpSIL_materialize_temp__n$7:copy_move_constructor::Y*) [line 79, column 16]\n  n$10=*&0$?%__sil_tmpSIL_materialize_temp__n$7.f:int [line 79, column 16]\n  *&d2:int=(1 / n$10) [line 79, column 3]\n " shape="box"]
 	
 
 	 "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_4" -> "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_3" ;
-"copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_5" [label="5:  DeclStmt \n   n$10=*&y2.f:int [line 78, column 16]\n  *&d1:int=(1 / n$10) [line 78, column 3]\n " shape="box"]
+"copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_5" [label="5:  DeclStmt \n   n$11=*&y2.f:int [line 78, column 16]\n  *&d1:int=(1 / n$11) [line 78, column 3]\n " shape="box"]
 	
 
 	 "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_5" -> "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_4" ;
-"copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_6" [label="6:  DeclStmt \n   n$11=_fun_copy_move_constructor::Y_Y(&y2:copy_move_constructor::Y*,&y1:copy_move_constructor::Y&) [line 77, column 10]\n " shape="box"]
+"copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_6" [label="6:  DeclStmt \n   n$12=_fun_copy_move_constructor::Y_Y(&y2:copy_move_constructor::Y*,&y1:copy_move_constructor::Y&) [line 77, column 10]\n " shape="box"]
 	
 
 	 "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_6" -> "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_5" ;
@@ -104,7 +104,7 @@ digraph cfg {
 	
 
 	 "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_7" -> "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_6" ;
-"copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_8" [label="8:  DeclStmt \n   n$12=_fun_copy_move_constructor::Y_Y(&y1:copy_move_constructor::Y*) [line 75, column 5]\n " shape="box"]
+"copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_8" [label="8:  DeclStmt \n   n$13=_fun_copy_move_constructor::Y_Y(&y1:copy_move_constructor::Y*) [line 75, column 5]\n " shape="box"]
 	
 
 	 "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_8" -> "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_7" ;
@@ -119,11 +119,11 @@ digraph cfg {
 	
 
 	 "getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_3" -> "getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_2" ;
-"getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_4" [label="4:  BinaryOperatorStmt: Assign \n   n$4=*&f:int [line 31, column 9]\n  *&x.f:int=n$4 [line 31, column 3]\n " shape="box"]
+"getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_4" [label="4:  BinaryOperatorStmt: Assign \n   n$5=*&f:int [line 31, column 9]\n  *&x.f:int=n$5 [line 31, column 3]\n " shape="box"]
 	
 
 	 "getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_4" -> "getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_3" ;
-"getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_5" [label="5:  DeclStmt \n   n$5=_fun_copy_move_constructor::X_X(&x:copy_move_constructor::X*) [line 30, column 5]\n " shape="box"]
+"getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_5" [label="5:  DeclStmt \n   n$6=_fun_copy_move_constructor::X_X(&x:copy_move_constructor::X*) [line 30, column 5]\n " shape="box"]
 	
 
 	 "getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_5" -> "getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_4" ;
@@ -138,11 +138,11 @@ digraph cfg {
 	
 
 	 "getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_3" -> "getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_2" ;
-"getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_4" [label="4:  BinaryOperatorStmt: Assign \n   n$4=*&f:int [line 37, column 9]\n  *&y.f:int=n$4 [line 37, column 3]\n " shape="box"]
+"getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_4" [label="4:  BinaryOperatorStmt: Assign \n   n$5=*&f:int [line 37, column 9]\n  *&y.f:int=n$5 [line 37, column 3]\n " shape="box"]
 	
 
 	 "getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_4" -> "getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_3" ;
-"getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_5" [label="5:  DeclStmt \n   n$5=_fun_copy_move_constructor::Y_Y(&y:copy_move_constructor::Y*) [line 36, column 5]\n " shape="box"]
+"getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_5" [label="5:  DeclStmt \n   n$6=_fun_copy_move_constructor::Y_Y(&y:copy_move_constructor::Y*) [line 36, column 5]\n " shape="box"]
 	
 
 	 "getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_5" -> "getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_4" ;
@@ -168,7 +168,7 @@ digraph cfg {
 	
 
 	 "moveY_div0#copy_move_constructor#15307842160732522395.eee7693240d3ce27d5c30f34d771cb57_3" -> "moveY_div0#copy_move_constructor#15307842160732522395.eee7693240d3ce27d5c30f34d771cb57_2" ;
-"moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_1" [label="1: Start copy_move_constructor::moveY_moveY_copyY_div0\nFormals: \nLocals:  y2:copy_move_constructor::Y y1:copy_move_constructor::Y 0$?%__sil_tmpSIL_materialize_temp__n$6:copy_move_constructor::Y \n   DECLARE_LOCALS(&return,&y2,&y1,&0$?%__sil_tmpSIL_materialize_temp__n$6); [line 59, column 1]\n " color=yellow style=filled]
+"moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_1" [label="1: Start copy_move_constructor::moveY_moveY_copyY_div0\nFormals: \nLocals:  y2:copy_move_constructor::Y y1:copy_move_constructor::Y 0$?%__sil_tmpSIL_materialize_temp__n$7:copy_move_constructor::Y const  \n   DECLARE_LOCALS(&return,&y2,&y1,&0$?%__sil_tmpSIL_materialize_temp__n$7); [line 59, column 1]\n " color=yellow style=filled]
 	
 
 	 "moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_1" -> "moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_5" ;
@@ -179,11 +179,11 @@ digraph cfg {
 	
 
 	 "moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_3" -> "moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_2" ;
-"moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_4" [label="4:  DeclStmt \n   n$5=_fun_copy_move_constructor::Y_Y(&y2:copy_move_constructor::Y*,&y1:copy_move_constructor::Y&) [line 61, column 10]\n " shape="box"]
+"moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_4" [label="4:  DeclStmt \n   n$6=_fun_copy_move_constructor::Y_Y(&y2:copy_move_constructor::Y*,&y1:copy_move_constructor::Y&) [line 61, column 10]\n " shape="box"]
 	
 
 	 "moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_4" -> "moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_3" ;
-"moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_5" [label="5:  DeclStmt \n   n$8=_fun_copy_move_constructor::getY(2:int,&0$?%__sil_tmpSIL_materialize_temp__n$6:copy_move_constructor::Y*) [line 60, column 10]\n  n$9=_fun_copy_move_constructor::Y_Y(&y1:copy_move_constructor::Y*,&0$?%__sil_tmpSIL_materialize_temp__n$6:copy_move_constructor::Y&) [line 60, column 10]\n " shape="box"]
+"moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_5" [label="5:  DeclStmt \n   n$9=_fun_copy_move_constructor::getY(2:int,&0$?%__sil_tmpSIL_materialize_temp__n$7:copy_move_constructor::Y*) [line 60, column 10]\n  n$10=_fun_copy_move_constructor::Y_Y(&y1:copy_move_constructor::Y*,&0$?%__sil_tmpSIL_materialize_temp__n$7:copy_move_constructor::Y const &) [line 60, column 10]\n " shape="box"]
 	
 
 	 "moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_5" -> "moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_4" ;
@@ -194,7 +194,7 @@ digraph cfg {
 "X#X#copy_move_constructor#{10174102600918728520|constexpr}.7f1f4443383b6eabdf400de956c7f6af_2" [label="2: Exit copy_move_constructor::X_X \n  " color=yellow style=filled]
 	
 
-"X#X#copy_move_constructor#{10174102600918728520|constexpr}.7f1f4443383b6eabdf400de956c7f6af_3" [label="3:  Constructor Init \n   n$0=*&this:copy_move_constructor::X* [line 15, column 8]\n  n$1=*&__param_0:copy_move_constructor::X& [line 15, column 8]\n  n$2=*n$1.f:int [line 15, column 8]\n  *n$0.f:int=n$2 [line 15, column 8]\n " shape="box"]
+"X#X#copy_move_constructor#{10174102600918728520|constexpr}.7f1f4443383b6eabdf400de956c7f6af_3" [label="3:  Constructor Init \n   n$2=*&this:copy_move_constructor::X* [line 15, column 8]\n  n$3=*&__param_0:copy_move_constructor::X& [line 15, column 8]\n  n$4=*n$3.f:int [line 15, column 8]\n  *n$2.f:int=n$4 [line 15, column 8]\n " shape="box"]
 	
 
 	 "X#X#copy_move_constructor#{10174102600918728520|constexpr}.7f1f4443383b6eabdf400de956c7f6af_3" -> "X#X#copy_move_constructor#{10174102600918728520|constexpr}.7f1f4443383b6eabdf400de956c7f6af_2" ;
@@ -212,7 +212,7 @@ digraph cfg {
 "X#X#copy_move_constructor#{11461885598838954204|constexpr}.8b245330f9990df6f1e3d0622b3e7433_2" [label="2: Exit copy_move_constructor::X_X \n  " color=yellow style=filled]
 	
 
-"X#X#copy_move_constructor#{11461885598838954204|constexpr}.8b245330f9990df6f1e3d0622b3e7433_3" [label="3:  Constructor Init \n   n$0=*&this:copy_move_constructor::X* [line 15, column 8]\n  n$1=*&__param_0:copy_move_constructor::X const & [line 15, column 8]\n  n$2=*n$1.f:int [line 15, column 8]\n  *n$0.f:int=n$2 [line 15, column 8]\n " shape="box"]
+"X#X#copy_move_constructor#{11461885598838954204|constexpr}.8b245330f9990df6f1e3d0622b3e7433_3" [label="3:  Constructor Init \n   n$2=*&this:copy_move_constructor::X* [line 15, column 8]\n  n$3=*&__param_0:copy_move_constructor::X const & [line 15, column 8]\n  n$4=*n$3.f:int [line 15, column 8]\n  *n$2.f:int=n$4 [line 15, column 8]\n " shape="box"]
 	
 
 	 "X#X#copy_move_constructor#{11461885598838954204|constexpr}.8b245330f9990df6f1e3d0622b3e7433_3" -> "X#X#copy_move_constructor#{11461885598838954204|constexpr}.8b245330f9990df6f1e3d0622b3e7433_2" ;
@@ -230,7 +230,7 @@ digraph cfg {
 "Y#Y#copy_move_constructor#{18272181401462210540}.6215678d929da0a4d67ea5f3b952308e_2" [label="2: Exit copy_move_constructor::Y_Y \n  " color=yellow style=filled]
 	
 
-"Y#Y#copy_move_constructor#{18272181401462210540}.6215678d929da0a4d67ea5f3b952308e_3" [label="3:  Constructor Init \n   n$0=*&this:copy_move_constructor::Y* [line 26, column 20]\n  n$1=*&y:copy_move_constructor::Y const & [line 26, column 22]\n  n$2=*n$1.f:int [line 26, column 22]\n  *n$0.f:int=(n$2 - 1) [line 26, column 20]\n " shape="box"]
+"Y#Y#copy_move_constructor#{18272181401462210540}.6215678d929da0a4d67ea5f3b952308e_3" [label="3:  Constructor Init \n   n$2=*&this:copy_move_constructor::Y* [line 26, column 20]\n  n$3=*&y:copy_move_constructor::Y const & [line 26, column 22]\n  n$4=*n$3.f:int [line 26, column 22]\n  *n$2.f:int=(n$4 - 1) [line 26, column 20]\n " shape="box"]
 	
 
 	 "Y#Y#copy_move_constructor#{18272181401462210540}.6215678d929da0a4d67ea5f3b952308e_3" -> "Y#Y#copy_move_constructor#{18272181401462210540}.6215678d929da0a4d67ea5f3b952308e_2" ;
@@ -241,7 +241,7 @@ digraph cfg {
 "Y#Y#copy_move_constructor#{2644368372854768795|constexpr}.992ebae8b36e68c2e1b5e338a4c29705_2" [label="2: Exit copy_move_constructor::Y_Y \n  " color=yellow style=filled]
 	
 
-"Y#Y#copy_move_constructor#{2644368372854768795|constexpr}.992ebae8b36e68c2e1b5e338a4c29705_3" [label="3:  Constructor Init \n   n$0=*&this:copy_move_constructor::Y* [line 24, column 3]\n  n$1=*&y:copy_move_constructor::Y const & [line 24, column 3]\n  n$2=*n$1.f:int [line 24, column 3]\n  *n$0.f:int=n$2 [line 24, column 3]\n " shape="box"]
+"Y#Y#copy_move_constructor#{2644368372854768795|constexpr}.992ebae8b36e68c2e1b5e338a4c29705_3" [label="3:  Constructor Init \n   n$2=*&this:copy_move_constructor::Y* [line 24, column 3]\n  n$3=*&y:copy_move_constructor::Y const & [line 24, column 3]\n  n$4=*n$3.f:int [line 24, column 3]\n  *n$2.f:int=n$4 [line 24, column 3]\n " shape="box"]
 	
 
 	 "Y#Y#copy_move_constructor#{2644368372854768795|constexpr}.992ebae8b36e68c2e1b5e338a4c29705_3" -> "Y#Y#copy_move_constructor#{2644368372854768795|constexpr}.992ebae8b36e68c2e1b5e338a4c29705_2" ;

infer/tests/codetoanalyze/cpp/shared/constructors/default_field_init.cpp.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   n$0=_fun_Y_Y(&y:Y*) [line 25, column 17]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   n$1=_fun_Y_Y(&y:Y*) [line 25, column 17]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
@@ -18,15 +18,15 @@ digraph cfg {
 "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_2" [label="2: Exit X_X \n  " color=yellow style=filled]
 	
 
-"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_3" [label="3:  Constructor Init \n   n$0=*&this:X* [line 13, column 8]\n  *n$0.c:int=0 [line 13, column 8]\n " shape="box"]
+"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_3" [label="3:  Constructor Init \n   n$2=*&this:X* [line 13, column 8]\n  *n$2.c:int=0 [line 13, column 8]\n " shape="box"]
 	
 
 	 "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_3" -> "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_2" ;
-"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_4" [label="4:  Constructor Init \n   n$1=*&this:X* [line 12, column 8]\n  *n$1.b:int=-2 [line 12, column 8]\n " shape="box"]
+"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_4" [label="4:  Constructor Init \n   n$3=*&this:X* [line 12, column 8]\n  *n$3.b:int=-2 [line 12, column 8]\n " shape="box"]
 	
 
 	 "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_4" -> "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_3" ;
-"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_5" [label="5:  Constructor Init \n   n$2=*&this:X* [line 16, column 21]\n  n$3=*&a:int [line 16, column 23]\n  n$4=*&b:int [line 16, column 27]\n  *n$2.a:int=(n$3 + n$4) [line 16, column 21]\n " shape="box"]
+"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_5" [label="5:  Constructor Init \n   n$4=*&this:X* [line 16, column 21]\n  n$5=*&a:int [line 16, column 23]\n  n$6=*&b:int [line 16, column 27]\n  *n$4.a:int=(n$5 + n$6) [line 16, column 21]\n " shape="box"]
 	
 
 	 "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_5" -> "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_4" ;
@@ -37,15 +37,15 @@ digraph cfg {
 "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_2" [label="2: Exit X_X \n  " color=yellow style=filled]
 	
 
-"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_3" [label="3:  Constructor Init \n   n$0=*&this:X* [line 13, column 8]\n  *n$0.c:int=0 [line 13, column 8]\n " shape="box"]
+"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_3" [label="3:  Constructor Init \n   n$2=*&this:X* [line 13, column 8]\n  *n$2.c:int=0 [line 13, column 8]\n " shape="box"]
 	
 
 	 "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_3" -> "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_2" ;
-"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_4" [label="4:  Constructor Init \n   n$1=*&this:X* [line 12, column 8]\n  *n$1.b:int=-2 [line 12, column 8]\n " shape="box"]
+"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_4" [label="4:  Constructor Init \n   n$3=*&this:X* [line 12, column 8]\n  *n$3.b:int=-2 [line 12, column 8]\n " shape="box"]
 	
 
 	 "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_4" -> "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_3" ;
-"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_5" [label="5:  Constructor Init \n   n$2=*&this:X* [line 11, column 11]\n  *n$2.a:int=-1 [line 11, column 11]\n " shape="box"]
+"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_5" [label="5:  Constructor Init \n   n$4=*&this:X* [line 11, column 11]\n  *n$4.a:int=-1 [line 11, column 11]\n " shape="box"]
 	
 
 	 "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_5" -> "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_4" ;
@@ -56,15 +56,15 @@ digraph cfg {
 "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_2" [label="2: Exit Y_Y \n  " color=yellow style=filled]
 	
 
-"Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_3" [label="3:  Constructor Init \n   n$0=*&this:Y* [line 19, column 8]\n  n$1=_fun_X_X(n$0.x3:X*) [line 19, column 8]\n " shape="box"]
+"Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_3" [label="3:  Constructor Init \n   n$2=*&this:Y* [line 19, column 8]\n  n$3=_fun_X_X(n$2.x3:X*) [line 19, column 8]\n " shape="box"]
 	
 
 	 "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_3" -> "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_2" ;
-"Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_4" [label="4:  Constructor Init \n   n$2=*&this:Y* [line 21, column 7]\n  n$3=_fun_X_X(n$2.x2:X*) [line 21, column 7]\n " shape="box"]
+"Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_4" [label="4:  Constructor Init \n   n$4=*&this:Y* [line 21, column 7]\n  n$5=_fun_X_X(n$4.x2:X*) [line 21, column 7]\n " shape="box"]
 	
 
 	 "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_4" -> "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_3" ;
-"Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_5" [label="5:  Constructor Init \n   n$4=*&this:Y* [line 20, column 7]\n  n$5=_fun_X_X(n$4.x1:X*,1:int,2:int) [line 20, column 7]\n " shape="box"]
+"Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_5" [label="5:  Constructor Init \n   n$6=*&this:Y* [line 20, column 7]\n  n$7=_fun_X_X(n$6.x1:X*,1:int,2:int) [line 20, column 7]\n " shape="box"]
 	
 
 	 "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_5" -> "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_4" ;

infer/tests/codetoanalyze/cpp/shared/constructors/std_init_list.cpp.dot

@@ -1,13 +1,13 @@
 /* @generated */
 digraph cfg {
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  x:X 0$?%__sil_tmpSIL_materialize_temp__n$0:int const [5*4] const  \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 24, column 1]\n " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  x:X 0$?%__sil_tmpSIL_materialize_temp__n$1:int const [5*4] const  \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 24, column 1]\n " color=yellow style=filled]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$0[0]:int=1 [line 24, column 20]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0[1]:int=2 [line 24, column 20]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0[2]:int=3 [line 24, column 20]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0[3]:int=4 [line 24, column 20]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0[4]:int=5 [line 24, column 20]\n  n$1=_fun___infer_skip_function(&0$?%__sil_tmpSIL_materialize_temp__n$0:int const [5*4] const ) [line 24, column 20]\n  n$2=_fun_X_X(&x:X*,n$1:std::initializer_list<int>) [line 24, column 20]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$1[0]:int=1 [line 24, column 20]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$1[1]:int=2 [line 24, column 20]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$1[2]:int=3 [line 24, column 20]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$1[3]:int=4 [line 24, column 20]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$1[4]:int=5 [line 24, column 20]\n  n$2=_fun___infer_skip_function(&0$?%__sil_tmpSIL_materialize_temp__n$1:int const [5*4] const ) [line 24, column 20]\n  n$3=_fun_X_X(&x:X*,n$2:std::initializer_list<int>) [line 24, column 20]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -22,28 +22,28 @@ digraph cfg {
 	
 
 	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_3" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_6" ;
-"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_4" [label="4:  DeclStmt \n   n$0=*&list:std::initializer_list<int>& [line 15, column 19]\n  _=*n$0:std::initializer_list<int> [line 15, column 19]\n  n$2=_fun_std::initializer_list<int>_begin(n$0:std::initializer_list<int>&) [line 15, column 19]\n  *&i:int const *=n$2 [line 15, column 10]\n " shape="box"]
+"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_4" [label="4:  DeclStmt \n   n$1=*&list:std::initializer_list<int>& [line 15, column 19]\n  _=*n$1:std::initializer_list<int> [line 15, column 19]\n  n$3=_fun_std::initializer_list<int>_begin(n$1:std::initializer_list<int>&) [line 15, column 19]\n  *&i:int const *=n$3 [line 15, column 10]\n " shape="box"]
 	
 
 	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_4" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_3" ;
-"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_5" [label="5:  UnaryOperator \n   n$3=*&i:int const * [line 15, column 50]\n  *&i:int const *=(n$3 + 1) [line 15, column 50]\n " shape="box"]
+"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_5" [label="5:  UnaryOperator \n   n$4=*&i:int const * [line 15, column 50]\n  *&i:int const *=(n$4 + 1) [line 15, column 50]\n " shape="box"]
 	
 
 	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_5" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_3" ;
-"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_6" [label="6:  BinaryOperatorStmt: NE \n   n$4=*&i:int const * [line 15, column 33]\n  n$5=*&list:std::initializer_list<int>& [line 15, column 38]\n  _=*n$5:std::initializer_list<int> [line 15, column 38]\n  n$7=_fun_std::initializer_list<int>_end(n$5:std::initializer_list<int>&) [line 15, column 38]\n " shape="box"]
+"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_6" [label="6:  BinaryOperatorStmt: NE \n   n$5=*&i:int const * [line 15, column 33]\n  n$6=*&list:std::initializer_list<int>& [line 15, column 38]\n  _=*n$6:std::initializer_list<int> [line 15, column 38]\n  n$8=_fun_std::initializer_list<int>_end(n$6:std::initializer_list<int>&) [line 15, column 38]\n " shape="box"]
 	
 
 	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_6" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_7" ;
 	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_6" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_8" ;
-"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_7" [label="7: Prune (true branch, for loop) \n   PRUNE((n$4 != n$7), true); [line 15, column 33]\n " shape="invhouse"]
+"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_7" [label="7: Prune (true branch, for loop) \n   PRUNE((n$5 != n$8), true); [line 15, column 33]\n " shape="invhouse"]
 	
 
 	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_7" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_9" ;
-"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_8" [label="8: Prune (false branch, for loop) \n   PRUNE(!(n$4 != n$7), false); [line 15, column 33]\n " shape="invhouse"]
+"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_8" [label="8: Prune (false branch, for loop) \n   PRUNE(!(n$5 != n$8), false); [line 15, column 33]\n " shape="invhouse"]
 	
 
 	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_8" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_2" ;
-"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_9" [label="9:  BinaryOperatorStmt: Assign \n   n$8=*&this:X* [line 16, column 7]\n  n$9=*&this:X* [line 16, column 13]\n  n$10=*n$9.sum:int [line 16, column 13]\n  n$11=*&i:int const * [line 16, column 20]\n  n$12=*n$11:int [line 16, column 19]\n  *n$8.sum:int=(n$10 + n$12) [line 16, column 7]\n " shape="box"]
+"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_9" [label="9:  BinaryOperatorStmt: Assign \n   n$10=*&this:X* [line 16, column 7]\n  n$11=*&this:X* [line 16, column 13]\n  n$12=*n$11.sum:int [line 16, column 13]\n  n$13=*&i:int const * [line 16, column 20]\n  n$14=*n$13:int [line 16, column 19]\n  *n$10.sum:int=(n$12 + n$14) [line 16, column 7]\n " shape="box"]
 	
 
 	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_9" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_5" ;

infer/tests/codetoanalyze/cpp/shared/constructors/temp_object.cpp.dot

@@ -1,6 +1,6 @@
 /* @generated */
 digraph cfg {
-"assign_temp_div0#temp_object#6618523570396537240.fa2055065ca23850cee50c855993cd3a_1" [label="1: Start temp_object::assign_temp_div0\nFormals: \nLocals:  x:temp_object::X 0$?%__sil_tmpSIL_materialize_temp__n$4:temp_object::X const  \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_materialize_temp__n$4); [line 28, column 1]\n " color=yellow style=filled]
+"assign_temp_div0#temp_object#6618523570396537240.fa2055065ca23850cee50c855993cd3a_1" [label="1: Start temp_object::assign_temp_div0\nFormals: \nLocals:  x:temp_object::X 0$?%__sil_tmpSIL_materialize_temp__n$5:temp_object::X const  \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_materialize_temp__n$5); [line 28, column 1]\n " color=yellow style=filled]
 	
 
 	 "assign_temp_div0#temp_object#6618523570396537240.fa2055065ca23850cee50c855993cd3a_1" -> "assign_temp_div0#temp_object#6618523570396537240.fa2055065ca23850cee50c855993cd3a_4" ;
@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "assign_temp_div0#temp_object#6618523570396537240.fa2055065ca23850cee50c855993cd3a_3" -> "assign_temp_div0#temp_object#6618523570396537240.fa2055065ca23850cee50c855993cd3a_2" ;
-"assign_temp_div0#temp_object#6618523570396537240.fa2055065ca23850cee50c855993cd3a_4" [label="4:  DeclStmt \n   n$5=_fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$4:temp_object::X const *,0:int,1:int) [line 29, column 9]\n  n$6=_fun_temp_object::X_X(&x:temp_object::X*,&0$?%__sil_tmpSIL_materialize_temp__n$4:temp_object::X const &) [line 29, column 9]\n " shape="box"]
+"assign_temp_div0#temp_object#6618523570396537240.fa2055065ca23850cee50c855993cd3a_4" [label="4:  DeclStmt \n   n$6=_fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$5:temp_object::X const *,0:int,1:int) [line 29, column 9]\n  n$7=_fun_temp_object::X_X(&x:temp_object::X*,&0$?%__sil_tmpSIL_materialize_temp__n$5:temp_object::X const &) [line 29, column 9]\n " shape="box"]
 	
 
 	 "assign_temp_div0#temp_object#6618523570396537240.fa2055065ca23850cee50c855993cd3a_4" -> "assign_temp_div0#temp_object#6618523570396537240.fa2055065ca23850cee50c855993cd3a_3" ;
@@ -121,7 +121,7 @@ digraph cfg {
 "X#X#temp_object#{5376484276992466061}.a1cfaf9ee9d8c713d3d1751acbb77f32_2" [label="2: Exit temp_object::X_X \n  " color=yellow style=filled]
 	
 
-"X#X#temp_object#{5376484276992466061}.a1cfaf9ee9d8c713d3d1751acbb77f32_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:temp_object::X* [line 16, column 19]\n  n$1=*&x:temp_object::X const & [line 16, column 23]\n  n$2=*n$1.f:int [line 16, column 23]\n  *n$0.f:int=n$2 [line 16, column 19]\n " shape="box"]
+"X#X#temp_object#{5376484276992466061}.a1cfaf9ee9d8c713d3d1751acbb77f32_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:temp_object::X* [line 16, column 19]\n  n$2=*&x:temp_object::X const & [line 16, column 23]\n  n$3=*n$2.f:int [line 16, column 23]\n  *n$1.f:int=n$3 [line 16, column 19]\n " shape="box"]
 	
 
 	 "X#X#temp_object#{5376484276992466061}.a1cfaf9ee9d8c713d3d1751acbb77f32_3" -> "X#X#temp_object#{5376484276992466061}.a1cfaf9ee9d8c713d3d1751acbb77f32_2" ;
@@ -132,7 +132,7 @@ digraph cfg {
 "X#X#temp_object#{8598480124712426466}.7071c692af425a15518693ebe50ba781_2" [label="2: Exit temp_object::X_X \n  " color=yellow style=filled]
 	
 
-"X#X#temp_object#{8598480124712426466}.7071c692af425a15518693ebe50ba781_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:temp_object::X* [line 14, column 21]\n  n$1=*&a:int [line 14, column 25]\n  *n$0.f:int=n$1 [line 14, column 21]\n " shape="box"]
+"X#X#temp_object#{8598480124712426466}.7071c692af425a15518693ebe50ba781_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:temp_object::X* [line 14, column 21]\n  n$2=*&a:int [line 14, column 25]\n  *n$1.f:int=n$2 [line 14, column 21]\n " shape="box"]
 	
 
 	 "X#X#temp_object#{8598480124712426466}.7071c692af425a15518693ebe50ba781_3" -> "X#X#temp_object#{8598480124712426466}.7071c692af425a15518693ebe50ba781_2" ;
@@ -143,7 +143,7 @@ digraph cfg {
 "X#X#temp_object#{9561113765655638015}.59d66724d587fdb6aca1a26e1f705f23_2" [label="2: Exit temp_object::X_X \n  " color=yellow style=filled]
 	
 
-"X#X#temp_object#{9561113765655638015}.59d66724d587fdb6aca1a26e1f705f23_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:temp_object::X* [line 13, column 14]\n  n$1=*&a:int [line 13, column 18]\n  *n$0.f:int=n$1 [line 13, column 14]\n " shape="box"]
+"X#X#temp_object#{9561113765655638015}.59d66724d587fdb6aca1a26e1f705f23_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:temp_object::X* [line 13, column 14]\n  n$2=*&a:int [line 13, column 18]\n  *n$1.f:int=n$2 [line 13, column 14]\n " shape="box"]
 	
 
 	 "X#X#temp_object#{9561113765655638015}.59d66724d587fdb6aca1a26e1f705f23_3" -> "X#X#temp_object#{9561113765655638015}.59d66724d587fdb6aca1a26e1f705f23_2" ;

infer/tests/codetoanalyze/cpp/shared/exceptions/Exceptions.cpp.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "call_deref_with_null#4611966425999531792.6346543307e9a799421a89e451b917c2_2" [label="2: Exit call_deref_with_null \n  " color=yellow style=filled]
 	
 
-"call_deref_with_null#4611966425999531792.6346543307e9a799421a89e451b917c2_3" [label="3:  Call _fun_deref_null \n   n$0=_fun_deref_null(null:int*) [line 24, column 30]\n " shape="box"]
+"call_deref_with_null#4611966425999531792.6346543307e9a799421a89e451b917c2_3" [label="3:  Call _fun_deref_null \n   n$1=_fun_deref_null(null:int*) [line 24, column 30]\n " shape="box"]
 	
 
 	 "call_deref_with_null#4611966425999531792.6346543307e9a799421a89e451b917c2_3" -> "call_deref_with_null#4611966425999531792.6346543307e9a799421a89e451b917c2_2" ;
@@ -26,20 +26,20 @@ digraph cfg {
 	
 
 	 "deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_4" -> "deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_3" ;
-"deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_5" [label="5:  BinaryOperatorStmt: EQ \n   n$2=*&p:int* [line 11, column 7]\n " shape="box"]
+"deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_5" [label="5:  BinaryOperatorStmt: EQ \n   n$3=*&p:int* [line 11, column 7]\n " shape="box"]
 	
 
 	 "deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_5" -> "deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_6" ;
 	 "deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_5" -> "deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_7" ;
-"deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_6" [label="6: Prune (true branch, if) \n   PRUNE((n$2 == null), true); [line 11, column 7]\n " shape="invhouse"]
+"deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_6" [label="6: Prune (true branch, if) \n   PRUNE((n$3 == null), true); [line 11, column 7]\n " shape="invhouse"]
 	
 
 	 "deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_6" -> "deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_8" ;
-"deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$2 == null), false); [line 11, column 7]\n " shape="invhouse"]
+"deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$3 == null), false); [line 11, column 7]\n " shape="invhouse"]
 	
 
 	 "deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_7" -> "deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_4" ;
-"deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_8" [label="8:  ObjCCPPThrow \n   n$3=_fun___infer_objc_cpp_throw(\"Null pointer!\":char const *) [line 12, column 5]\n " shape="box"]
+"deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_8" [label="8:  ObjCCPPThrow \n   n$5=_fun___infer_objc_cpp_throw(\"Null pointer!\":char const *) [line 12, column 5]\n " shape="box"]
 	
 
 	 "deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_8" -> "deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_4" ;
@@ -50,7 +50,7 @@ digraph cfg {
 "deref_null#11536394632240553702.ea4eed042da22ab7ceb619ec1b7f73bb_2" [label="2: Exit deref_null \n  " color=yellow style=filled]
 	
 
-"deref_null#11536394632240553702.ea4eed042da22ab7ceb619ec1b7f73bb_3" [label="3:  Return Stmt \n   n$0=*&p:int* [line 19, column 13]\n  n$1=*n$0:int [line 19, column 12]\n  *&return:int=n$1 [line 19, column 5]\n " shape="box"]
+"deref_null#11536394632240553702.ea4eed042da22ab7ceb619ec1b7f73bb_3" [label="3:  Return Stmt \n   n$4=*&p:int* [line 19, column 13]\n  n$5=*n$4:int [line 19, column 12]\n  *&return:int=n$5 [line 19, column 5]\n " shape="box"]
 	
 
 	 "deref_null#11536394632240553702.ea4eed042da22ab7ceb619ec1b7f73bb_3" -> "deref_null#11536394632240553702.ea4eed042da22ab7ceb619ec1b7f73bb_2" ;
@@ -61,7 +61,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   n$0=_fun_deref(null:int*) [line 28, column 12]\n  *&return:int=n$0 [line 28, column 5]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   n$4=_fun_deref(null:int*) [line 28, column 12]\n  *&return:int=n$4 [line 28, column 5]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

infer/tests/codetoanalyze/cpp/shared/lambda/lambda1.cpp.dot

@@ -1,17 +1,17 @@
 /* @generated */
 digraph cfg {
-"bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_1" [label="1: Start bar\nFormals: \nLocals:  func:bar::lambda_shared_lambda_lambda1.cpp:11:15 0$?%__sil_tmpSIL_materialize_temp__n$3:bar::lambda_shared_lambda_lambda1.cpp:11:15 \n   DECLARE_LOCALS(&return,&func,&0$?%__sil_tmpSIL_materialize_temp__n$3); [line 10, column 1]\n " color=yellow style=filled]
+"bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_1" [label="1: Start bar\nFormals: \nLocals:  func:bar::lambda_shared_lambda_lambda1.cpp:11:15 0$?%__sil_tmpSIL_materialize_temp__n$5:bar::lambda_shared_lambda_lambda1.cpp:11:15 \n   DECLARE_LOCALS(&return,&func,&0$?%__sil_tmpSIL_materialize_temp__n$5); [line 10, column 1]\n " color=yellow style=filled]
 	
 
 	 "bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_1" -> "bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_4" ;
 "bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_2" [label="2: Exit bar \n  " color=yellow style=filled]
 	
 
-"bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_3" [label="3:  Return Stmt \n   n$0=_fun_bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()(&func:bar::lambda_shared_lambda_lambda1.cpp:11:15&) [line 15, column 14]\n  *&return:int=(7 / n$0) [line 15, column 3]\n  _=*&func:bar::lambda_shared_lambda_lambda1.cpp:11:15 [line 15, column 19]\n  n$2=_fun_bar::lambda_shared_lambda_lambda1.cpp:11:15_~(&func:bar::lambda_shared_lambda_lambda1.cpp:11:15*) [line 15, column 19]\n " shape="box"]
+"bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_3" [label="3:  Return Stmt \n   n$1=_fun_bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()(&func:bar::lambda_shared_lambda_lambda1.cpp:11:15&) [line 15, column 14]\n  *&return:int=(7 / n$1) [line 15, column 3]\n  _=*&func:bar::lambda_shared_lambda_lambda1.cpp:11:15 [line 15, column 19]\n  n$3=_fun_bar::lambda_shared_lambda_lambda1.cpp:11:15_~(&func:bar::lambda_shared_lambda_lambda1.cpp:11:15*) [line 15, column 19]\n " shape="box"]
 	
 
 	 "bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_3" -> "bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_2" ;
-"bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$3:bar::lambda_shared_lambda_lambda1.cpp:11:15=(_fun_bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()) [line 11, column 15]\n  n$4=_fun_bar::lambda_shared_lambda_lambda1.cpp:11:15_(&func:bar::lambda_shared_lambda_lambda1.cpp:11:15*,&0$?%__sil_tmpSIL_materialize_temp__n$3:bar::lambda_shared_lambda_lambda1.cpp:11:15&) [line 11, column 15]\n " shape="box"]
+"bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$5:bar::lambda_shared_lambda_lambda1.cpp:11:15=(_fun_bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()) [line 11, column 15]\n  n$6=_fun_bar::lambda_shared_lambda_lambda1.cpp:11:15_(&func:bar::lambda_shared_lambda_lambda1.cpp:11:15*,&0$?%__sil_tmpSIL_materialize_temp__n$5:bar::lambda_shared_lambda_lambda1.cpp:11:15&) [line 11, column 15]\n " shape="box"]
 	
 
 	 "bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_4" -> "bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_3" ;
@@ -26,7 +26,7 @@ digraph cfg {
 	
 
 	 "capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_3" -> "capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_2" ;
-"capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_4" [label="4:  Call _fun_capture_by_ref::lambda_shared_lambda_lambda1.cpp:38:3_operator() \n   n$1=_fun_capture_by_ref::lambda_shared_lambda_lambda1.cpp:38:3_operator()((_fun_capture_by_ref::lambda_shared_lambda_lambda1.cpp:38:3_operator(),&x):capture_by_ref::lambda_shared_lambda_lambda1.cpp:38:3) [line 38, column 3]\n " shape="box"]
+"capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_4" [label="4:  Call _fun_capture_by_ref::lambda_shared_lambda_lambda1.cpp:38:3_operator() \n   n$3=_fun_capture_by_ref::lambda_shared_lambda_lambda1.cpp:38:3_operator()((_fun_capture_by_ref::lambda_shared_lambda_lambda1.cpp:38:3_operator(),&x):capture_by_ref::lambda_shared_lambda_lambda1.cpp:38:3) [line 38, column 3]\n " shape="box"]
 	
 
 	 "capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_4" -> "capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_3" ;
@@ -34,37 +34,37 @@ digraph cfg {
 	
 
 	 "capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_5" -> "capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_4" ;
-"foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_1" [label="1: Start foo\nFormals: \nLocals:  y:foo::lambda_shared_lambda_lambda1.cpp:20:12 0$?%__sil_tmpSIL_materialize_temp__n$5:foo::lambda_shared_lambda_lambda1.cpp:20:12 unused:foo::lambda_shared_lambda_lambda1.cpp:19:17 0$?%__sil_tmpSIL_materialize_temp__n$7:foo::lambda_shared_lambda_lambda1.cpp:19:17 \n   DECLARE_LOCALS(&return,&y,&0$?%__sil_tmpSIL_materialize_temp__n$5,&unused,&0$?%__sil_tmpSIL_materialize_temp__n$7); [line 18, column 1]\n " color=yellow style=filled]
+"foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_1" [label="1: Start foo\nFormals: \nLocals:  y:foo::lambda_shared_lambda_lambda1.cpp:20:12 0$?%__sil_tmpSIL_materialize_temp__n$7:foo::lambda_shared_lambda_lambda1.cpp:20:12 unused:foo::lambda_shared_lambda_lambda1.cpp:19:17 0$?%__sil_tmpSIL_materialize_temp__n$9:foo::lambda_shared_lambda_lambda1.cpp:19:17 \n   DECLARE_LOCALS(&return,&y,&0$?%__sil_tmpSIL_materialize_temp__n$7,&unused,&0$?%__sil_tmpSIL_materialize_temp__n$9); [line 18, column 1]\n " color=yellow style=filled]
 	
 
 	 "foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_1" -> "foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_5" ;
 "foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_2" [label="2: Exit foo \n  " color=yellow style=filled]
 	
 
-"foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_3" [label="3:  Return Stmt \n   n$0=_fun_foo::lambda_shared_lambda_lambda1.cpp:20:12_operator()(&y:foo::lambda_shared_lambda_lambda1.cpp:20:12&,3:int) [line 21, column 19]\n  *&return:int=(5 / (4 - n$0)) [line 21, column 3]\n  _=*&y:foo::lambda_shared_lambda_lambda1.cpp:20:12 [line 21, column 23]\n  n$2=_fun_foo::lambda_shared_lambda_lambda1.cpp:20:12_~(&y:foo::lambda_shared_lambda_lambda1.cpp:20:12*) [line 21, column 23]\n  _=*&unused:foo::lambda_shared_lambda_lambda1.cpp:19:17 [line 21, column 23]\n  n$4=_fun_foo::lambda_shared_lambda_lambda1.cpp:19:17_~(&unused:foo::lambda_shared_lambda_lambda1.cpp:19:17*) [line 21, column 23]\n " shape="box"]
+"foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_3" [label="3:  Return Stmt \n   n$1=_fun_foo::lambda_shared_lambda_lambda1.cpp:20:12_operator()(&y:foo::lambda_shared_lambda_lambda1.cpp:20:12&,3:int) [line 21, column 19]\n  *&return:int=(5 / (4 - n$1)) [line 21, column 3]\n  _=*&y:foo::lambda_shared_lambda_lambda1.cpp:20:12 [line 21, column 23]\n  n$3=_fun_foo::lambda_shared_lambda_lambda1.cpp:20:12_~(&y:foo::lambda_shared_lambda_lambda1.cpp:20:12*) [line 21, column 23]\n  _=*&unused:foo::lambda_shared_lambda_lambda1.cpp:19:17 [line 21, column 23]\n  n$5=_fun_foo::lambda_shared_lambda_lambda1.cpp:19:17_~(&unused:foo::lambda_shared_lambda_lambda1.cpp:19:17*) [line 21, column 23]\n " shape="box"]
 	
 
 	 "foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_3" -> "foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_2" ;
-"foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$5:foo::lambda_shared_lambda_lambda1.cpp:20:12=(_fun_foo::lambda_shared_lambda_lambda1.cpp:20:12_operator()) [line 20, column 12]\n  n$6=_fun_foo::lambda_shared_lambda_lambda1.cpp:20:12_(&y:foo::lambda_shared_lambda_lambda1.cpp:20:12*,&0$?%__sil_tmpSIL_materialize_temp__n$5:foo::lambda_shared_lambda_lambda1.cpp:20:12&) [line 20, column 12]\n " shape="box"]
+"foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$7:foo::lambda_shared_lambda_lambda1.cpp:20:12=(_fun_foo::lambda_shared_lambda_lambda1.cpp:20:12_operator()) [line 20, column 12]\n  n$8=_fun_foo::lambda_shared_lambda_lambda1.cpp:20:12_(&y:foo::lambda_shared_lambda_lambda1.cpp:20:12*,&0$?%__sil_tmpSIL_materialize_temp__n$7:foo::lambda_shared_lambda_lambda1.cpp:20:12&) [line 20, column 12]\n " shape="box"]
 	
 
 	 "foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_4" -> "foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_3" ;
-"foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_5" [label="5:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$7:foo::lambda_shared_lambda_lambda1.cpp:19:17=(_fun_foo::lambda_shared_lambda_lambda1.cpp:19:17_operator()) [line 19, column 17]\n  n$8=_fun_foo::lambda_shared_lambda_lambda1.cpp:19:17_(&unused:foo::lambda_shared_lambda_lambda1.cpp:19:17*,&0$?%__sil_tmpSIL_materialize_temp__n$7:foo::lambda_shared_lambda_lambda1.cpp:19:17&) [line 19, column 17]\n " shape="box"]
+"foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_5" [label="5:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$9:foo::lambda_shared_lambda_lambda1.cpp:19:17=(_fun_foo::lambda_shared_lambda_lambda1.cpp:19:17_operator()) [line 19, column 17]\n  n$10=_fun_foo::lambda_shared_lambda_lambda1.cpp:19:17_(&unused:foo::lambda_shared_lambda_lambda1.cpp:19:17*,&0$?%__sil_tmpSIL_materialize_temp__n$9:foo::lambda_shared_lambda_lambda1.cpp:19:17&) [line 19, column 17]\n " shape="box"]
 	
 
 	 "foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_5" -> "foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_4" ;
-"fooOK#5521302935427608539.9c36ec052efdd50972817d895666852a_1" [label="1: Start fooOK\nFormals: \nLocals:  y:fooOK::lambda_shared_lambda_lambda1.cpp:26:12 0$?%__sil_tmpSIL_materialize_temp__n$3:fooOK::lambda_shared_lambda_lambda1.cpp:26:12 \n   DECLARE_LOCALS(&return,&y,&0$?%__sil_tmpSIL_materialize_temp__n$3); [line 24, column 1]\n " color=yellow style=filled]
+"fooOK#5521302935427608539.9c36ec052efdd50972817d895666852a_1" [label="1: Start fooOK\nFormals: \nLocals:  y:fooOK::lambda_shared_lambda_lambda1.cpp:26:12 0$?%__sil_tmpSIL_materialize_temp__n$5:fooOK::lambda_shared_lambda_lambda1.cpp:26:12 \n   DECLARE_LOCALS(&return,&y,&0$?%__sil_tmpSIL_materialize_temp__n$5); [line 24, column 1]\n " color=yellow style=filled]
 	
 
 	 "fooOK#5521302935427608539.9c36ec052efdd50972817d895666852a_1" -> "fooOK#5521302935427608539.9c36ec052efdd50972817d895666852a_4" ;
 "fooOK#5521302935427608539.9c36ec052efdd50972817d895666852a_2" [label="2: Exit fooOK \n  " color=yellow style=filled]
 	
 
-"fooOK#5521302935427608539.9c36ec052efdd50972817d895666852a_3" [label="3:  Return Stmt \n   n$0=_fun_fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator()(&y:fooOK::lambda_shared_lambda_lambda1.cpp:26:12&,3:int) [line 27, column 19]\n  *&return:int=(5 / (4 - n$0)) [line 27, column 3]\n  _=*&y:fooOK::lambda_shared_lambda_lambda1.cpp:26:12 [line 27, column 23]\n  n$2=_fun_fooOK::lambda_shared_lambda_lambda1.cpp:26:12_~(&y:fooOK::lambda_shared_lambda_lambda1.cpp:26:12*) [line 27, column 23]\n " shape="box"]
+"fooOK#5521302935427608539.9c36ec052efdd50972817d895666852a_3" [label="3:  Return Stmt \n   n$1=_fun_fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator()(&y:fooOK::lambda_shared_lambda_lambda1.cpp:26:12&,3:int) [line 27, column 19]\n  *&return:int=(5 / (4 - n$1)) [line 27, column 3]\n  _=*&y:fooOK::lambda_shared_lambda_lambda1.cpp:26:12 [line 27, column 23]\n  n$3=_fun_fooOK::lambda_shared_lambda_lambda1.cpp:26:12_~(&y:fooOK::lambda_shared_lambda_lambda1.cpp:26:12*) [line 27, column 23]\n " shape="box"]
 	
 
 	 "fooOK#5521302935427608539.9c36ec052efdd50972817d895666852a_3" -> "fooOK#5521302935427608539.9c36ec052efdd50972817d895666852a_2" ;
-"fooOK#5521302935427608539.9c36ec052efdd50972817d895666852a_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$3:fooOK::lambda_shared_lambda_lambda1.cpp:26:12=(_fun_fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator()) [line 26, column 12]\n  n$4=_fun_fooOK::lambda_shared_lambda_lambda1.cpp:26:12_(&y:fooOK::lambda_shared_lambda_lambda1.cpp:26:12*,&0$?%__sil_tmpSIL_materialize_temp__n$3:fooOK::lambda_shared_lambda_lambda1.cpp:26:12&) [line 26, column 12]\n " shape="box"]
+"fooOK#5521302935427608539.9c36ec052efdd50972817d895666852a_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$5:fooOK::lambda_shared_lambda_lambda1.cpp:26:12=(_fun_fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator()) [line 26, column 12]\n  n$6=_fun_fooOK::lambda_shared_lambda_lambda1.cpp:26:12_(&y:fooOK::lambda_shared_lambda_lambda1.cpp:26:12*,&0$?%__sil_tmpSIL_materialize_temp__n$5:fooOK::lambda_shared_lambda_lambda1.cpp:26:12&) [line 26, column 12]\n " shape="box"]
 	
 
 	 "fooOK#5521302935427608539.9c36ec052efdd50972817d895666852a_4" -> "fooOK#5521302935427608539.9c36ec052efdd50972817d895666852a_3" ;
@@ -79,7 +79,7 @@ digraph cfg {
 	
 
 	 "init_capture1#11582985675627962568.58b9ce334267f411dc5e1c70bd53eb81_3" -> "init_capture1#11582985675627962568.58b9ce334267f411dc5e1c70bd53eb81_4" ;
-"init_capture1#11582985675627962568.58b9ce334267f411dc5e1c70bd53eb81_4" [label="4:  Return Stmt \n   n$0=_fun_init_capture1::lambda_shared_lambda_lambda1.cpp:43:10_operator()((_fun_init_capture1::lambda_shared_lambda_lambda1.cpp:43:10_operator(),&i):init_capture1::lambda_shared_lambda_lambda1.cpp:43:10) [line 43, column 10]\n  *&return:int=n$0 [line 43, column 3]\n " shape="box"]
+"init_capture1#11582985675627962568.58b9ce334267f411dc5e1c70bd53eb81_4" [label="4:  Return Stmt \n   n$1=_fun_init_capture1::lambda_shared_lambda_lambda1.cpp:43:10_operator()((_fun_init_capture1::lambda_shared_lambda_lambda1.cpp:43:10_operator(),&i):init_capture1::lambda_shared_lambda_lambda1.cpp:43:10) [line 43, column 10]\n  *&return:int=n$1 [line 43, column 3]\n " shape="box"]
 	
 
 	 "init_capture1#11582985675627962568.58b9ce334267f411dc5e1c70bd53eb81_4" -> "init_capture1#11582985675627962568.58b9ce334267f411dc5e1c70bd53eb81_2" ;
@@ -98,11 +98,11 @@ digraph cfg {
 	
 
 	 "init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_4" -> "init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_3" ;
-"init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_5" [label="5:  DeclStmt \n   n$0=*&i:int [line 49, column 16]\n  *&a:int=n$0 [line 49, column 10]\n " shape="box"]
+"init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_5" [label="5:  DeclStmt \n   n$1=*&i:int [line 49, column 16]\n  *&a:int=n$1 [line 49, column 10]\n " shape="box"]
 	
 
 	 "init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_5" -> "init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_4" ;
-"init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_6" [label="6:  Return Stmt \n   n$1=_fun_init_capture2::lambda_shared_lambda_lambda1.cpp:49:10_operator()((_fun_init_capture2::lambda_shared_lambda_lambda1.cpp:49:10_operator(),&a,&b,&c):init_capture2::lambda_shared_lambda_lambda1.cpp:49:10) [line 49, column 10]\n  *&return:int=n$1 [line 49, column 3]\n " shape="box"]
+"init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_6" [label="6:  Return Stmt \n   n$2=_fun_init_capture2::lambda_shared_lambda_lambda1.cpp:49:10_operator()((_fun_init_capture2::lambda_shared_lambda_lambda1.cpp:49:10_operator(),&a,&b,&c):init_capture2::lambda_shared_lambda_lambda1.cpp:49:10) [line 49, column 10]\n  *&return:int=n$2 [line 49, column 3]\n " shape="box"]
 	
 
 	 "init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_6" -> "init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_2" ;
@@ -117,7 +117,7 @@ digraph cfg {
 "normal_capture#5533029764254319855.11493b249dddd657790695e287170b84_2" [label="2: Exit normal_capture \n  " color=yellow style=filled]
 	
 
-"normal_capture#5533029764254319855.11493b249dddd657790695e287170b84_3" [label="3:  Return Stmt \n   n$1=*&x:int [line 33, column 10]\n  n$0=*&y:int [line 33, column 10]\n  n$2=_fun_normal_capture::lambda_shared_lambda_lambda1.cpp:33:10_operator()((_fun_normal_capture::lambda_shared_lambda_lambda1.cpp:33:10_operator(),(n$1 &x:int),(n$0 &y:int)):normal_capture::lambda_shared_lambda_lambda1.cpp:33:10) [line 33, column 10]\n  *&return:int=n$2 [line 33, column 3]\n " shape="box"]
+"normal_capture#5533029764254319855.11493b249dddd657790695e287170b84_3" [label="3:  Return Stmt \n   n$2=*&x:int [line 33, column 10]\n  n$1=*&y:int [line 33, column 10]\n  n$3=_fun_normal_capture::lambda_shared_lambda_lambda1.cpp:33:10_operator()((_fun_normal_capture::lambda_shared_lambda_lambda1.cpp:33:10_operator(),(n$2 &x:int),(n$1 &y:int)):normal_capture::lambda_shared_lambda_lambda1.cpp:33:10) [line 33, column 10]\n  *&return:int=n$3 [line 33, column 3]\n " shape="box"]
 	
 
 	 "normal_capture#5533029764254319855.11493b249dddd657790695e287170b84_3" -> "normal_capture#5533029764254319855.11493b249dddd657790695e287170b84_2" ;
@@ -164,7 +164,7 @@ digraph cfg {
 "#lambda_shared_lambda_lambda1.cpp:55:19#capture_this_explicit#Capture#{15581681824770184595|constexp.ec00a7d90451e0c7680026716c904b92_2" [label="2: Exit Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:55:19_ \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:55:19#capture_this_explicit#Capture#{15581681824770184595|constexp.ec00a7d90451e0c7680026716c904b92_3" [label="3:  Constructor Init \n   n$0=*&this:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:55:19* [line 55, column 19]\n  n$1=*&__param_0:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:55:19& [line 55, column 19]\n  n$2=*n$1.:Capture* [line 55, column 19]\n  *n$0.:Capture*=n$2 [line 55, column 19]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:55:19#capture_this_explicit#Capture#{15581681824770184595|constexp.ec00a7d90451e0c7680026716c904b92_3" [label="3:  Constructor Init \n   n$2=*&this:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:55:19* [line 55, column 19]\n  n$3=*&__param_0:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:55:19& [line 55, column 19]\n  n$4=*n$3.:Capture* [line 55, column 19]\n  *n$2.:Capture*=n$4 [line 55, column 19]\n " shape="box"]
 	
 
 	 "#lambda_shared_lambda_lambda1.cpp:55:19#capture_this_explicit#Capture#{15581681824770184595|constexp.ec00a7d90451e0c7680026716c904b92_3" -> "#lambda_shared_lambda_lambda1.cpp:55:19#capture_this_explicit#Capture#{15581681824770184595|constexp.ec00a7d90451e0c7680026716c904b92_2" ;
@@ -175,7 +175,7 @@ digraph cfg {
 "#lambda_shared_lambda_lambda1.cpp:59:19#capture_star_this#Capture#{9456129203468966420|constexpr}.4865d22cd69692723766b951221a21d1_2" [label="2: Exit Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:59:19_ \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:59:19#capture_star_this#Capture#{9456129203468966420|constexpr}.4865d22cd69692723766b951221a21d1_3" [label="3:  Constructor Init \n   n$0=*&this:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:59:19* [line 59, column 19]\n  n$1=*&__param_0:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:59:19& [line 59, column 19]\n  n$2=_fun_Capture_Capture(n$0.:Capture*,n$1.:Capture&) [line 59, column 19]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:59:19#capture_star_this#Capture#{9456129203468966420|constexpr}.4865d22cd69692723766b951221a21d1_3" [label="3:  Constructor Init \n   n$2=*&this:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:59:19* [line 59, column 19]\n  n$3=*&__param_0:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:59:19& [line 59, column 19]\n  n$4=_fun_Capture_Capture(n$2.:Capture*,n$3.:Capture&) [line 59, column 19]\n " shape="box"]
 	
 
 	 "#lambda_shared_lambda_lambda1.cpp:59:19#capture_star_this#Capture#{9456129203468966420|constexpr}.4865d22cd69692723766b951221a21d1_3" -> "#lambda_shared_lambda_lambda1.cpp:59:19#capture_star_this#Capture#{9456129203468966420|constexpr}.4865d22cd69692723766b951221a21d1_2" ;
@@ -186,7 +186,7 @@ digraph cfg {
 "#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_equal#Capture#{16013381636753347826|conste.6afb74b89c25ee911bcc35939b7dddc6_2" [label="2: Exit Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:65:19_ \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_equal#Capture#{16013381636753347826|conste.6afb74b89c25ee911bcc35939b7dddc6_3" [label="3:  Constructor Init \n   n$0=*&this:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:65:19* [line 65, column 19]\n  n$1=*&__param_0:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:65:19& [line 65, column 19]\n  n$2=*n$1.:Capture* [line 65, column 19]\n  *n$0.:Capture*=n$2 [line 65, column 19]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_equal#Capture#{16013381636753347826|conste.6afb74b89c25ee911bcc35939b7dddc6_3" [label="3:  Constructor Init \n   n$2=*&this:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:65:19* [line 65, column 19]\n  n$3=*&__param_0:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:65:19& [line 65, column 19]\n  n$4=*n$3.:Capture* [line 65, column 19]\n  *n$2.:Capture*=n$4 [line 65, column 19]\n " shape="box"]
 	
 
 	 "#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_equal#Capture#{16013381636753347826|conste.6afb74b89c25ee911bcc35939b7dddc6_3" -> "#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_equal#Capture#{16013381636753347826|conste.6afb74b89c25ee911bcc35939b7dddc6_2" ;
@@ -197,7 +197,7 @@ digraph cfg {
 "#lambda_shared_lambda_lambda1.cpp:69:19#capture_this_with_auto#Capture#{10854495330849287568|constex.8d1ac582b7a23cd3c32a1a4b8e266cf3_2" [label="2: Exit Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:69:19_ \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:69:19#capture_this_with_auto#Capture#{10854495330849287568|constex.8d1ac582b7a23cd3c32a1a4b8e266cf3_3" [label="3:  Constructor Init \n   n$0=*&this:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:69:19* [line 69, column 19]\n  n$1=*&__param_0:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:69:19& [line 69, column 19]\n  n$2=*n$1.:Capture* [line 69, column 19]\n  *n$0.:Capture*=n$2 [line 69, column 19]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:69:19#capture_this_with_auto#Capture#{10854495330849287568|constex.8d1ac582b7a23cd3c32a1a4b8e266cf3_3" [label="3:  Constructor Init \n   n$2=*&this:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:69:19* [line 69, column 19]\n  n$3=*&__param_0:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:69:19& [line 69, column 19]\n  n$4=*n$3.:Capture* [line 69, column 19]\n  *n$2.:Capture*=n$4 [line 69, column 19]\n " shape="box"]
 	
 
 	 "#lambda_shared_lambda_lambda1.cpp:69:19#capture_this_with_auto#Capture#{10854495330849287568|constex.8d1ac582b7a23cd3c32a1a4b8e266cf3_3" -> "#lambda_shared_lambda_lambda1.cpp:69:19#capture_this_with_auto#Capture#{10854495330849287568|constex.8d1ac582b7a23cd3c32a1a4b8e266cf3_2" ;
@@ -215,7 +215,7 @@ digraph cfg {
 "Capture#Capture#{15371931494294124755|constexpr}.9ede96f2e081983279c43accbd64cbd2_2" [label="2: Exit Capture_Capture \n  " color=yellow style=filled]
 	
 
-"capture_star_this#Capture#(2506493005619132138).63fd6aa2a7efbd48dc1a62c0c2bd2161_1" [label="1: Start Capture_capture_star_this\nFormals:  this:Capture*\nLocals:  lambda:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:59:19 0$?%__sil_tmpSIL_materialize_temp__n$2:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:59:19 \n   DECLARE_LOCALS(&return,&lambda,&0$?%__sil_tmpSIL_materialize_temp__n$2); [line 58, column 3]\n " color=yellow style=filled]
+"capture_star_this#Capture#(2506493005619132138).63fd6aa2a7efbd48dc1a62c0c2bd2161_1" [label="1: Start Capture_capture_star_this\nFormals:  this:Capture*\nLocals:  lambda:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:59:19 0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:59:19 \n   DECLARE_LOCALS(&return,&lambda,&0$?%__sil_tmpSIL_materialize_temp__n$3); [line 58, column 3]\n " color=yellow style=filled]
 	
 
 	 "capture_star_this#Capture#(2506493005619132138).63fd6aa2a7efbd48dc1a62c0c2bd2161_1" -> "capture_star_this#Capture#(2506493005619132138).63fd6aa2a7efbd48dc1a62c0c2bd2161_4" ;
@@ -226,11 +226,11 @@ digraph cfg {
 	
 
 	 "capture_star_this#Capture#(2506493005619132138).63fd6aa2a7efbd48dc1a62c0c2bd2161_3" -> "capture_star_this#Capture#(2506493005619132138).63fd6aa2a7efbd48dc1a62c0c2bd2161_2" ;
-"capture_star_this#Capture#(2506493005619132138).63fd6aa2a7efbd48dc1a62c0c2bd2161_4" [label="4:  DeclStmt \n   n$3=*&this:Capture* [line 59, column 19]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$2:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:59:19=(_fun_Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:59:19_operator(),(n$3 &this:Capture*)) [line 59, column 19]\n  n$4=_fun_Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:59:19_(&lambda:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:59:19*,&0$?%__sil_tmpSIL_materialize_temp__n$2:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:59:19&) [line 59, column 19]\n " shape="box"]
+"capture_star_this#Capture#(2506493005619132138).63fd6aa2a7efbd48dc1a62c0c2bd2161_4" [label="4:  DeclStmt \n   n$4=*&this:Capture* [line 59, column 19]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:59:19=(_fun_Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:59:19_operator(),(n$4 &this:Capture*)) [line 59, column 19]\n  n$5=_fun_Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:59:19_(&lambda:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:59:19*,&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:59:19&) [line 59, column 19]\n " shape="box"]
 	
 
 	 "capture_star_this#Capture#(2506493005619132138).63fd6aa2a7efbd48dc1a62c0c2bd2161_4" -> "capture_star_this#Capture#(2506493005619132138).63fd6aa2a7efbd48dc1a62c0c2bd2161_3" ;
-"capture_this_explicit#Capture#(13194085360619722149).2dba35a78268b10ad413414cc832a8f0_1" [label="1: Start Capture_capture_this_explicit\nFormals:  this:Capture*\nLocals:  lambda:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:55:19 0$?%__sil_tmpSIL_materialize_temp__n$2:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:55:19 \n   DECLARE_LOCALS(&return,&lambda,&0$?%__sil_tmpSIL_materialize_temp__n$2); [line 54, column 3]\n " color=yellow style=filled]
+"capture_this_explicit#Capture#(13194085360619722149).2dba35a78268b10ad413414cc832a8f0_1" [label="1: Start Capture_capture_this_explicit\nFormals:  this:Capture*\nLocals:  lambda:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:55:19 0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:55:19 \n   DECLARE_LOCALS(&return,&lambda,&0$?%__sil_tmpSIL_materialize_temp__n$3); [line 54, column 3]\n " color=yellow style=filled]
 	
 
 	 "capture_this_explicit#Capture#(13194085360619722149).2dba35a78268b10ad413414cc832a8f0_1" -> "capture_this_explicit#Capture#(13194085360619722149).2dba35a78268b10ad413414cc832a8f0_4" ;
@@ -241,11 +241,11 @@ digraph cfg {
 	
 
 	 "capture_this_explicit#Capture#(13194085360619722149).2dba35a78268b10ad413414cc832a8f0_3" -> "capture_this_explicit#Capture#(13194085360619722149).2dba35a78268b10ad413414cc832a8f0_2" ;
-"capture_this_explicit#Capture#(13194085360619722149).2dba35a78268b10ad413414cc832a8f0_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$2:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:55:19=(_fun_Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:55:19_operator(),&this) [line 55, column 19]\n  n$3=_fun_Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:55:19_(&lambda:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:55:19*,&0$?%__sil_tmpSIL_materialize_temp__n$2:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:55:19&) [line 55, column 19]\n " shape="box"]
+"capture_this_explicit#Capture#(13194085360619722149).2dba35a78268b10ad413414cc832a8f0_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:55:19=(_fun_Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:55:19_operator(),&this) [line 55, column 19]\n  n$4=_fun_Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:55:19_(&lambda:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:55:19*,&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:55:19&) [line 55, column 19]\n " shape="box"]
 	
 
 	 "capture_this_explicit#Capture#(13194085360619722149).2dba35a78268b10ad413414cc832a8f0_4" -> "capture_this_explicit#Capture#(13194085360619722149).2dba35a78268b10ad413414cc832a8f0_3" ;
-"capture_this_with_auto#Capture#(15696525048884093218).38be242109186a45cc282c38962c68e2_1" [label="1: Start Capture_capture_this_with_auto\nFormals:  this:Capture*\nLocals:  lambda:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:69:19 0$?%__sil_tmpSIL_materialize_temp__n$2:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:69:19 \n   DECLARE_LOCALS(&return,&lambda,&0$?%__sil_tmpSIL_materialize_temp__n$2); [line 68, column 3]\n " color=yellow style=filled]
+"capture_this_with_auto#Capture#(15696525048884093218).38be242109186a45cc282c38962c68e2_1" [label="1: Start Capture_capture_this_with_auto\nFormals:  this:Capture*\nLocals:  lambda:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:69:19 0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:69:19 \n   DECLARE_LOCALS(&return,&lambda,&0$?%__sil_tmpSIL_materialize_temp__n$3); [line 68, column 3]\n " color=yellow style=filled]
 	
 
 	 "capture_this_with_auto#Capture#(15696525048884093218).38be242109186a45cc282c38962c68e2_1" -> "capture_this_with_auto#Capture#(15696525048884093218).38be242109186a45cc282c38962c68e2_4" ;
@@ -256,11 +256,11 @@ digraph cfg {
 	
 
 	 "capture_this_with_auto#Capture#(15696525048884093218).38be242109186a45cc282c38962c68e2_3" -> "capture_this_with_auto#Capture#(15696525048884093218).38be242109186a45cc282c38962c68e2_2" ;
-"capture_this_with_auto#Capture#(15696525048884093218).38be242109186a45cc282c38962c68e2_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$2:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:69:19=(_fun_Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:69:19_operator(),&this) [line 69, column 19]\n  n$3=_fun_Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:69:19_(&lambda:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:69:19*,&0$?%__sil_tmpSIL_materialize_temp__n$2:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:69:19&) [line 69, column 19]\n " shape="box"]
+"capture_this_with_auto#Capture#(15696525048884093218).38be242109186a45cc282c38962c68e2_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:69:19=(_fun_Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:69:19_operator(),&this) [line 69, column 19]\n  n$4=_fun_Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:69:19_(&lambda:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:69:19*,&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:69:19&) [line 69, column 19]\n " shape="box"]
 	
 
 	 "capture_this_with_auto#Capture#(15696525048884093218).38be242109186a45cc282c38962c68e2_4" -> "capture_this_with_auto#Capture#(15696525048884093218).38be242109186a45cc282c38962c68e2_3" ;
-"capture_this_with_equal#Capture#(805776379555510952).ecd73e9a4e2bef0d060a242b61508f10_1" [label="1: Start Capture_capture_this_with_equal\nFormals:  this:Capture*\nLocals:  lambda:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:65:19 0$?%__sil_tmpSIL_materialize_temp__n$2:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:65:19 \n   DECLARE_LOCALS(&return,&lambda,&0$?%__sil_tmpSIL_materialize_temp__n$2); [line 64, column 3]\n " color=yellow style=filled]
+"capture_this_with_equal#Capture#(805776379555510952).ecd73e9a4e2bef0d060a242b61508f10_1" [label="1: Start Capture_capture_this_with_equal\nFormals:  this:Capture*\nLocals:  lambda:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:65:19 0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:65:19 \n   DECLARE_LOCALS(&return,&lambda,&0$?%__sil_tmpSIL_materialize_temp__n$3); [line 64, column 3]\n " color=yellow style=filled]
 	
 
 	 "capture_this_with_equal#Capture#(805776379555510952).ecd73e9a4e2bef0d060a242b61508f10_1" -> "capture_this_with_equal#Capture#(805776379555510952).ecd73e9a4e2bef0d060a242b61508f10_4" ;
@@ -271,7 +271,7 @@ digraph cfg {
 	
 
 	 "capture_this_with_equal#Capture#(805776379555510952).ecd73e9a4e2bef0d060a242b61508f10_3" -> "capture_this_with_equal#Capture#(805776379555510952).ecd73e9a4e2bef0d060a242b61508f10_2" ;
-"capture_this_with_equal#Capture#(805776379555510952).ecd73e9a4e2bef0d060a242b61508f10_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$2:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:65:19=(_fun_Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:65:19_operator(),&this) [line 65, column 19]\n  n$3=_fun_Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:65:19_(&lambda:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:65:19*,&0$?%__sil_tmpSIL_materialize_temp__n$2:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:65:19&) [line 65, column 19]\n " shape="box"]
+"capture_this_with_equal#Capture#(805776379555510952).ecd73e9a4e2bef0d060a242b61508f10_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:65:19=(_fun_Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:65:19_operator(),&this) [line 65, column 19]\n  n$4=_fun_Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:65:19_(&lambda:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:65:19*,&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:65:19&) [line 65, column 19]\n " shape="box"]
 	
 
 	 "capture_this_with_equal#Capture#(805776379555510952).ecd73e9a4e2bef0d060a242b61508f10_4" -> "capture_this_with_equal#Capture#(805776379555510952).ecd73e9a4e2bef0d060a242b61508f10_3" ;
@@ -341,7 +341,7 @@ digraph cfg {
 "operator()#lambda_shared_lambda_lambda1.cpp:38:3#capture_by_ref#(17277454583786497390).c47500379c80a95b2ce7b5f569b32788_2" [label="2: Exit capture_by_ref::lambda_shared_lambda_lambda1.cpp:38:3_operator() \n  " color=yellow style=filled]
 	
 
-"operator()#lambda_shared_lambda_lambda1.cpp:38:3#capture_by_ref#(17277454583786497390).c47500379c80a95b2ce7b5f569b32788_3" [label="3:  UnaryOperator \n   n$0=*&x:int [line 38, column 12]\n  *&x:int=(n$0 + 1) [line 38, column 12]\n " shape="box"]
+"operator()#lambda_shared_lambda_lambda1.cpp:38:3#capture_by_ref#(17277454583786497390).c47500379c80a95b2ce7b5f569b32788_3" [label="3:  UnaryOperator \n   n$1=*&x:int [line 38, column 12]\n  *&x:int=(n$1 + 1) [line 38, column 12]\n " shape="box"]
 	
 
 	 "operator()#lambda_shared_lambda_lambda1.cpp:38:3#capture_by_ref#(17277454583786497390).c47500379c80a95b2ce7b5f569b32788_3" -> "operator()#lambda_shared_lambda_lambda1.cpp:38:3#capture_by_ref#(17277454583786497390).c47500379c80a95b2ce7b5f569b32788_2" ;

infer/tests/codetoanalyze/cpp/shared/methods/byvals.cpp.dot

@@ -194,11 +194,11 @@ digraph cfg {
 "PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_2" [label="2: Exit pass_by_val::PlainStruct_PlainStruct \n  " color=yellow style=filled]
 	
 
-"PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_3" [label="3:  Constructor Init \n   n$0=*&this:pass_by_val::PlainStruct* [line 13, column 8]\n  n$1=*&__param_0:pass_by_val::PlainStruct const & [line 13, column 8]\n  n$2=*n$1.y:int* [line 13, column 8]\n  *n$0.y:int*=n$2 [line 13, column 8]\n " shape="box"]
+"PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_3" [label="3:  Constructor Init \n   n$2=*&this:pass_by_val::PlainStruct* [line 13, column 8]\n  n$3=*&__param_0:pass_by_val::PlainStruct const & [line 13, column 8]\n  n$4=*n$3.y:int* [line 13, column 8]\n  *n$2.y:int*=n$4 [line 13, column 8]\n " shape="box"]
 	
 
 	 "PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_3" -> "PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_2" ;
-"PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_4" [label="4:  Constructor Init \n   n$3=*&this:pass_by_val::PlainStruct* [line 13, column 8]\n  n$4=*&__param_0:pass_by_val::PlainStruct const & [line 13, column 8]\n  n$5=*n$4.x:int [line 13, column 8]\n  *n$3.x:int=n$5 [line 13, column 8]\n " shape="box"]
+"PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_4" [label="4:  Constructor Init \n   n$5=*&this:pass_by_val::PlainStruct* [line 13, column 8]\n  n$6=*&__param_0:pass_by_val::PlainStruct const & [line 13, column 8]\n  n$7=*n$6.x:int [line 13, column 8]\n  *n$5.x:int=n$7 [line 13, column 8]\n " shape="box"]
 	
 
 	 "PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_4" -> "PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_3" ;

infer/tests/codetoanalyze/cpp/shared/methods/conversion_operator.cpp.dot

@@ -15,28 +15,28 @@ digraph cfg {
 	
 
 	 "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_4" -> "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_3" ;
-"branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_5" [label="5:  Call _fun_conversion_operator::X_operator_bool \n   _=*&x:conversion_operator::X [line 36, column 7]\n  n$5=_fun_conversion_operator::X_operator_bool(&x:conversion_operator::X&) [line 36, column 7]\n " shape="box"]
+"branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_5" [label="5:  Call _fun_conversion_operator::X_operator_bool \n   _=*&x:conversion_operator::X [line 36, column 7]\n  n$6=_fun_conversion_operator::X_operator_bool(&x:conversion_operator::X&) [line 36, column 7]\n " shape="box"]
 	
 
 	 "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_5" -> "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_6" ;
 	 "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_5" -> "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_7" ;
-"branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_6" [label="6: Prune (true branch, if) \n   PRUNE(n$5, true); [line 36, column 7]\n " shape="invhouse"]
+"branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_6" [label="6: Prune (true branch, if) \n   PRUNE(n$6, true); [line 36, column 7]\n " shape="invhouse"]
 	
 
 	 "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_6" -> "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_9" ;
-"branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_7" [label="7: Prune (false branch, if) \n   PRUNE(!n$5, false); [line 36, column 7]\n " shape="invhouse"]
+"branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_7" [label="7: Prune (false branch, if) \n   PRUNE(!n$6, false); [line 36, column 7]\n " shape="invhouse"]
 	
 
 	 "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_7" -> "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_4" ;
-"branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_8" [label="8:  Return Stmt \n   n$6=*&v:int [line 38, column 16]\n  *&return:int=(1 / n$6) [line 38, column 5]\n  _=*&x:conversion_operator::X [line 38, column 16]\n  n$8=_fun_conversion_operator::X_~X(&x:conversion_operator::X*) [line 38, column 16]\n " shape="box"]
+"branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_8" [label="8:  Return Stmt \n   n$7=*&v:int [line 38, column 16]\n  *&return:int=(1 / n$7) [line 38, column 5]\n  _=*&x:conversion_operator::X [line 38, column 16]\n  n$9=_fun_conversion_operator::X_~X(&x:conversion_operator::X*) [line 38, column 16]\n " shape="box"]
 	
 
 	 "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_8" -> "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_2" ;
-"branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_9" [label="9:  DeclStmt \n   _=*&x:conversion_operator::X [line 37, column 13]\n  n$10=_fun_conversion_operator::X_operator_int(&x:conversion_operator::X&) [line 37, column 13]\n  *&v:int=n$10 [line 37, column 5]\n " shape="box"]
+"branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_9" [label="9:  DeclStmt \n   _=*&x:conversion_operator::X [line 37, column 13]\n  n$12=_fun_conversion_operator::X_operator_int(&x:conversion_operator::X&) [line 37, column 13]\n  *&v:int=n$12 [line 37, column 5]\n " shape="box"]
 	
 
 	 "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_9" -> "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_8" ;
-"branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_10" [label="10:  DeclStmt \n   n$11=_fun_conversion_operator::X_X(&x:conversion_operator::X*,0:int,1:_Bool) [line 35, column 5]\n " shape="box"]
+"branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_10" [label="10:  DeclStmt \n   n$15=_fun_conversion_operator::X_X(&x:conversion_operator::X*,0:int,1:_Bool) [line 35, column 5]\n " shape="box"]
 	
 
 	 "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_10" -> "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_5" ;
@@ -55,28 +55,28 @@ digraph cfg {
 	
 
 	 "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_4" -> "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_3" ;
-"branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_5" [label="5:  Call _fun_conversion_operator::X_operator_bool \n   _=*&x:conversion_operator::X [line 65, column 7]\n  n$5=_fun_conversion_operator::X_operator_bool(&x:conversion_operator::X&) [line 65, column 7]\n " shape="box"]
+"branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_5" [label="5:  Call _fun_conversion_operator::X_operator_bool \n   _=*&x:conversion_operator::X [line 65, column 7]\n  n$6=_fun_conversion_operator::X_operator_bool(&x:conversion_operator::X&) [line 65, column 7]\n " shape="box"]
 	
 
 	 "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_5" -> "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_6" ;
 	 "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_5" -> "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_7" ;
-"branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_6" [label="6: Prune (true branch, if) \n   PRUNE(n$5, true); [line 65, column 7]\n " shape="invhouse"]
+"branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_6" [label="6: Prune (true branch, if) \n   PRUNE(n$6, true); [line 65, column 7]\n " shape="invhouse"]
 	
 
 	 "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_6" -> "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_9" ;
-"branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_7" [label="7: Prune (false branch, if) \n   PRUNE(!n$5, false); [line 65, column 7]\n " shape="invhouse"]
+"branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_7" [label="7: Prune (false branch, if) \n   PRUNE(!n$6, false); [line 65, column 7]\n " shape="invhouse"]
 	
 
 	 "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_7" -> "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_4" ;
-"branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_8" [label="8:  Return Stmt \n   n$6=*&v:int [line 67, column 16]\n  *&return:int=(1 / n$6) [line 67, column 5]\n  _=*&x:conversion_operator::X [line 67, column 16]\n  n$8=_fun_conversion_operator::X_~X(&x:conversion_operator::X*) [line 67, column 16]\n " shape="box"]
+"branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_8" [label="8:  Return Stmt \n   n$7=*&v:int [line 67, column 16]\n  *&return:int=(1 / n$7) [line 67, column 5]\n  _=*&x:conversion_operator::X [line 67, column 16]\n  n$9=_fun_conversion_operator::X_~X(&x:conversion_operator::X*) [line 67, column 16]\n " shape="box"]
 	
 
 	 "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_8" -> "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_2" ;
-"branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_9" [label="9:  DeclStmt \n   _=*&x:conversion_operator::X [line 66, column 13]\n  n$10=_fun_conversion_operator::X_operator_int(&x:conversion_operator::X&) [line 66, column 13]\n  *&v:int=n$10 [line 66, column 5]\n " shape="box"]
+"branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_9" [label="9:  DeclStmt \n   _=*&x:conversion_operator::X [line 66, column 13]\n  n$12=_fun_conversion_operator::X_operator_int(&x:conversion_operator::X&) [line 66, column 13]\n  *&v:int=n$12 [line 66, column 5]\n " shape="box"]
 	
 
 	 "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_9" -> "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_8" ;
-"branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_10" [label="10:  DeclStmt \n   n$11=_fun_conversion_operator::X_X(&x:conversion_operator::X*,1:int,1:_Bool) [line 64, column 5]\n " shape="box"]
+"branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_10" [label="10:  DeclStmt \n   n$15=_fun_conversion_operator::X_X(&x:conversion_operator::X*,1:int,1:_Bool) [line 64, column 5]\n " shape="box"]
 	
 
 	 "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_10" -> "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_5" ;
@@ -95,39 +95,39 @@ digraph cfg {
 	
 
 	 "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_4" -> "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_3" ;
-"branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_5" [label="5:  Call _fun_conversion_operator::X_operator_bool \n   _=*&x:conversion_operator::X [line 56, column 7]\n  n$5=_fun_conversion_operator::X_operator_bool(&x:conversion_operator::X&) [line 56, column 7]\n " shape="box"]
+"branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_5" [label="5:  Call _fun_conversion_operator::X_operator_bool \n   _=*&x:conversion_operator::X [line 56, column 7]\n  n$6=_fun_conversion_operator::X_operator_bool(&x:conversion_operator::X&) [line 56, column 7]\n " shape="box"]
 	
 
 	 "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_5" -> "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_6" ;
 	 "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_5" -> "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_7" ;
-"branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_6" [label="6: Prune (true branch, if) \n   PRUNE(n$5, true); [line 56, column 7]\n " shape="invhouse"]
+"branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_6" [label="6: Prune (true branch, if) \n   PRUNE(n$6, true); [line 56, column 7]\n " shape="invhouse"]
 	
 
 	 "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_6" -> "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_9" ;
-"branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_7" [label="7: Prune (false branch, if) \n   PRUNE(!n$5, false); [line 56, column 7]\n " shape="invhouse"]
+"branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_7" [label="7: Prune (false branch, if) \n   PRUNE(!n$6, false); [line 56, column 7]\n " shape="invhouse"]
 	
 
 	 "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_7" -> "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_4" ;
-"branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_8" [label="8:  Return Stmt \n   n$6=*&v:int [line 58, column 16]\n  *&return:int=(1 / n$6) [line 58, column 5]\n  _=*&x:conversion_operator::X [line 58, column 16]\n  n$8=_fun_conversion_operator::X_~X(&x:conversion_operator::X*) [line 58, column 16]\n " shape="box"]
+"branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_8" [label="8:  Return Stmt \n   n$7=*&v:int [line 58, column 16]\n  *&return:int=(1 / n$7) [line 58, column 5]\n  _=*&x:conversion_operator::X [line 58, column 16]\n  n$9=_fun_conversion_operator::X_~X(&x:conversion_operator::X*) [line 58, column 16]\n " shape="box"]
 	
 
 	 "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_8" -> "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_2" ;
-"branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_9" [label="9:  DeclStmt \n   _=*&x:conversion_operator::X [line 57, column 13]\n  n$10=_fun_conversion_operator::X_operator_int(&x:conversion_operator::X&) [line 57, column 13]\n  *&v:int=n$10 [line 57, column 5]\n " shape="box"]
+"branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_9" [label="9:  DeclStmt \n   _=*&x:conversion_operator::X [line 57, column 13]\n  n$12=_fun_conversion_operator::X_operator_int(&x:conversion_operator::X&) [line 57, column 13]\n  *&v:int=n$12 [line 57, column 5]\n " shape="box"]
 	
 
 	 "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_9" -> "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_8" ;
-"branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_10" [label="10:  DeclStmt \n   n$11=_fun_conversion_operator::X_X(&x:conversion_operator::X*,0:int,0:_Bool) [line 55, column 5]\n " shape="box"]
+"branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_10" [label="10:  DeclStmt \n   n$15=_fun_conversion_operator::X_X(&x:conversion_operator::X*,0:int,0:_Bool) [line 55, column 5]\n " shape="box"]
 	
 
 	 "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_10" -> "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_5" ;
-"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_1" [label="1: Start conversion_operator::y_branch_div0\nFormals: \nLocals:  0$?%__sil_tmp__temp_construct_n$0:conversion_operator::X 0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X 0$?%__sil_tmp__temp_construct_n$7:conversion_operator::X 0$?%__sil_tmpSIL_materialize_temp__n$8:conversion_operator::X v:int 0$?%__sil_tmp__temp_construct_n$15:conversion_operator::X 0$?%__sil_tmpSIL_materialize_temp__n$16:conversion_operator::X y:conversion_operator::Y \n   DECLARE_LOCALS(&return,&0$?%__sil_tmp__temp_construct_n$0,&0$?%__sil_tmpSIL_materialize_temp__n$1,&0$?%__sil_tmp__temp_construct_n$7,&0$?%__sil_tmpSIL_materialize_temp__n$8,&v,&0$?%__sil_tmp__temp_construct_n$15,&0$?%__sil_tmpSIL_materialize_temp__n$16,&y); [line 43, column 1]\n " color=yellow style=filled]
+"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_1" [label="1: Start conversion_operator::y_branch_div0\nFormals: \nLocals:  0$?%__sil_tmp__temp_construct_n$0:conversion_operator::X 0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X const  0$?%__sil_tmp__temp_construct_n$8:conversion_operator::X 0$?%__sil_tmpSIL_materialize_temp__n$9:conversion_operator::X const  v:int 0$?%__sil_tmp__temp_construct_n$17:conversion_operator::X 0$?%__sil_tmpSIL_materialize_temp__n$18:conversion_operator::X const  y:conversion_operator::Y \n   DECLARE_LOCALS(&return,&0$?%__sil_tmp__temp_construct_n$0,&0$?%__sil_tmpSIL_materialize_temp__n$1,&0$?%__sil_tmp__temp_construct_n$8,&0$?%__sil_tmpSIL_materialize_temp__n$9,&v,&0$?%__sil_tmp__temp_construct_n$17,&0$?%__sil_tmpSIL_materialize_temp__n$18,&y); [line 43, column 1]\n " color=yellow style=filled]
 	
 
 	 "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_1" -> "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_12" ;
 "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_2" [label="2: Exit conversion_operator::y_branch_div0 \n  " color=yellow style=filled]
 	
 
-"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_3" [label="3:  Return Stmt \n   _=*&y:conversion_operator::Y [line 51, column 13]\n  n$4=_fun_conversion_operator::Y_operator_X(&y:conversion_operator::Y&,&0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X*) [line 51, column 13]\n  n$5=_fun_conversion_operator::X_X(&0$?%__sil_tmp__temp_construct_n$0:conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X&) [line 51, column 10]\n  n$6=_fun_conversion_operator::X_operator_int(&0$?%__sil_tmp__temp_construct_n$0:conversion_operator::X&) [line 51, column 10]\n  *&return:int=n$6 [line 51, column 3]\n " shape="box"]
+"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_3" [label="3:  Return Stmt \n   _=*&y:conversion_operator::Y [line 51, column 13]\n  n$4=_fun_conversion_operator::Y_operator_X(&y:conversion_operator::Y&,&0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X*) [line 51, column 13]\n  n$5=_fun_conversion_operator::X_X(&0$?%__sil_tmp__temp_construct_n$0:conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X const &) [line 51, column 10]\n  n$6=_fun_conversion_operator::X_operator_int(&0$?%__sil_tmp__temp_construct_n$0:conversion_operator::X&) [line 51, column 10]\n  *&return:int=n$6 [line 51, column 3]\n " shape="box"]
 	
 
 	 "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_3" -> "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_2" ;
@@ -135,24 +135,24 @@ digraph cfg {
 	
 
 	 "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_4" -> "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_3" ;
-"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_5" [label="5:  Call _fun_conversion_operator::X_operator_bool \n   _=*&y:conversion_operator::Y [line 47, column 10]\n  n$11=_fun_conversion_operator::Y_operator_X(&y:conversion_operator::Y&,&0$?%__sil_tmpSIL_materialize_temp__n$8:conversion_operator::X*) [line 47, column 10]\n  n$12=_fun_conversion_operator::X_X(&0$?%__sil_tmp__temp_construct_n$7:conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$8:conversion_operator::X&) [line 47, column 7]\n  n$13=_fun_conversion_operator::X_operator_bool(&0$?%__sil_tmp__temp_construct_n$7:conversion_operator::X&) [line 47, column 7]\n " shape="box"]
+"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_5" [label="5:  Call _fun_conversion_operator::X_operator_bool \n   _=*&y:conversion_operator::Y [line 47, column 10]\n  n$12=_fun_conversion_operator::Y_operator_X(&y:conversion_operator::Y&,&0$?%__sil_tmpSIL_materialize_temp__n$9:conversion_operator::X*) [line 47, column 10]\n  n$13=_fun_conversion_operator::X_X(&0$?%__sil_tmp__temp_construct_n$8:conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$9:conversion_operator::X const &) [line 47, column 7]\n  n$14=_fun_conversion_operator::X_operator_bool(&0$?%__sil_tmp__temp_construct_n$8:conversion_operator::X&) [line 47, column 7]\n " shape="box"]
 	
 
 	 "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_5" -> "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_6" ;
 	 "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_5" -> "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_7" ;
-"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_6" [label="6: Prune (true branch, if) \n   PRUNE(n$13, true); [line 47, column 7]\n " shape="invhouse"]
+"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_6" [label="6: Prune (true branch, if) \n   PRUNE(n$14, true); [line 47, column 7]\n " shape="invhouse"]
 	
 
 	 "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_6" -> "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_9" ;
-"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_7" [label="7: Prune (false branch, if) \n   PRUNE(!n$13, false); [line 47, column 7]\n " shape="invhouse"]
+"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_7" [label="7: Prune (false branch, if) \n   PRUNE(!n$14, false); [line 47, column 7]\n " shape="invhouse"]
 	
 
 	 "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_7" -> "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_4" ;
-"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_8" [label="8:  Return Stmt \n   n$14=*&v:int [line 49, column 16]\n  *&return:int=(1 / n$14) [line 49, column 5]\n " shape="box"]
+"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_8" [label="8:  Return Stmt \n   n$15=*&v:int [line 49, column 16]\n  *&return:int=(1 / n$15) [line 49, column 5]\n " shape="box"]
 	
 
 	 "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_8" -> "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_2" ;
-"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_9" [label="9:  DeclStmt \n   _=*&y:conversion_operator::Y [line 48, column 16]\n  n$19=_fun_conversion_operator::Y_operator_X(&y:conversion_operator::Y&,&0$?%__sil_tmpSIL_materialize_temp__n$16:conversion_operator::X*) [line 48, column 16]\n  n$20=_fun_conversion_operator::X_X(&0$?%__sil_tmp__temp_construct_n$15:conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$16:conversion_operator::X&) [line 48, column 13]\n  n$21=_fun_conversion_operator::X_operator_int(&0$?%__sil_tmp__temp_construct_n$15:conversion_operator::X&) [line 48, column 13]\n  *&v:int=n$21 [line 48, column 5]\n " shape="box"]
+"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_9" [label="9:  DeclStmt \n   _=*&y:conversion_operator::Y [line 48, column 16]\n  n$21=_fun_conversion_operator::Y_operator_X(&y:conversion_operator::Y&,&0$?%__sil_tmpSIL_materialize_temp__n$18:conversion_operator::X*) [line 48, column 16]\n  n$22=_fun_conversion_operator::X_X(&0$?%__sil_tmp__temp_construct_n$17:conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$18:conversion_operator::X const &) [line 48, column 13]\n  n$23=_fun_conversion_operator::X_operator_int(&0$?%__sil_tmp__temp_construct_n$17:conversion_operator::X&) [line 48, column 13]\n  *&v:int=n$23 [line 48, column 5]\n " shape="box"]
 	
 
 	 "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_9" -> "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_8" ;
@@ -164,7 +164,7 @@ digraph cfg {
 	
 
 	 "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_11" -> "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_10" ;
-"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_12" [label="12:  DeclStmt \n   n$22=_fun_conversion_operator::Y_Y(&y:conversion_operator::Y*) [line 44, column 5]\n " shape="box"]
+"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_12" [label="12:  DeclStmt \n   n$26=_fun_conversion_operator::Y_Y(&y:conversion_operator::Y*) [line 44, column 5]\n " shape="box"]
 	
 
 	 "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_12" -> "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_11" ;
@@ -175,11 +175,11 @@ digraph cfg {
 "X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_2" [label="2: Exit conversion_operator::X_X \n  " color=yellow style=filled]
 	
 
-"X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:conversion_operator::X* [line 23, column 5]\n  n$1=*&x:conversion_operator::X const & [line 23, column 10]\n  n$2=*n$1.b_:_Bool [line 23, column 10]\n  *n$0.b_:_Bool=n$2 [line 23, column 5]\n " shape="box"]
+"X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:conversion_operator::X* [line 23, column 5]\n  n$2=*&x:conversion_operator::X const & [line 23, column 10]\n  n$3=*n$2.b_:_Bool [line 23, column 10]\n  *n$1.b_:_Bool=n$3 [line 23, column 5]\n " shape="box"]
 	
 
 	 "X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_3" -> "X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_2" ;
-"X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=*&this:conversion_operator::X* [line 22, column 5]\n  n$4=*&x:conversion_operator::X const & [line 22, column 10]\n  n$5=*n$4.f_:int [line 22, column 10]\n  *n$3.f_:int=n$5 [line 22, column 5]\n " shape="box"]
+"X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_4" [label="4:  BinaryOperatorStmt: Assign \n   n$4=*&this:conversion_operator::X* [line 22, column 5]\n  n$5=*&x:conversion_operator::X const & [line 22, column 10]\n  n$6=*n$5.f_:int [line 22, column 10]\n  *n$4.f_:int=n$6 [line 22, column 5]\n " shape="box"]
 	
 
 	 "X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_4" -> "X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_3" ;
@@ -190,11 +190,11 @@ digraph cfg {
 "X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_2" [label="2: Exit conversion_operator::X_X \n  " color=yellow style=filled]
 	
 
-"X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:conversion_operator::X* [line 19, column 5]\n  n$1=*&b:_Bool [line 19, column 10]\n  *n$0.b_:_Bool=n$1 [line 19, column 5]\n " shape="box"]
+"X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:conversion_operator::X* [line 19, column 5]\n  n$2=*&b:_Bool [line 19, column 10]\n  *n$1.b_:_Bool=n$2 [line 19, column 5]\n " shape="box"]
 	
 
 	 "X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_3" -> "X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_2" ;
-"X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:conversion_operator::X* [line 18, column 5]\n  n$3=*&f:int [line 18, column 10]\n  *n$2.f_:int=n$3 [line 18, column 5]\n " shape="box"]
+"X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=*&this:conversion_operator::X* [line 18, column 5]\n  n$4=*&f:int [line 18, column 10]\n  *n$3.f_:int=n$4 [line 18, column 5]\n " shape="box"]
 	
 
 	 "X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_4" -> "X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_3" ;

infer/tests/codetoanalyze/cpp/shared/methods/default_parameters.cpp.dot

@@ -7,15 +7,15 @@ digraph cfg {
 "call_method_with_default_parameters#7436997991634263214.eaaed1a0020d12e677ebd0f9049f2e4a_2" [label="2: Exit call_method_with_default_parameters \n  " color=yellow style=filled]
 	
 
-"call_method_with_default_parameters#7436997991634263214.eaaed1a0020d12e677ebd0f9049f2e4a_3" [label="3:  Call _fun_A_fun_default \n   n$0=*&a_ptr:A* [line 20, column 3]\n  _=*n$0:A [line 20, column 3]\n  n$2=_fun_A_fun_default(n$0:A*,1:int,10:int,20:int) [line 20, column 3]\n " shape="box"]
+"call_method_with_default_parameters#7436997991634263214.eaaed1a0020d12e677ebd0f9049f2e4a_3" [label="3:  Call _fun_A_fun_default \n   n$1=*&a_ptr:A* [line 20, column 3]\n  _=*n$1:A [line 20, column 3]\n  n$3=_fun_A_fun_default(n$1:A*,1:int,10:int,20:int) [line 20, column 3]\n " shape="box"]
 	
 
 	 "call_method_with_default_parameters#7436997991634263214.eaaed1a0020d12e677ebd0f9049f2e4a_3" -> "call_method_with_default_parameters#7436997991634263214.eaaed1a0020d12e677ebd0f9049f2e4a_2" ;
-"call_method_with_default_parameters#7436997991634263214.eaaed1a0020d12e677ebd0f9049f2e4a_4" [label="4:  Call _fun_A_fun_default \n   n$3=*&a_ptr:A* [line 19, column 3]\n  _=*n$3:A [line 19, column 3]\n  n$5=_fun_A_fun_default(n$3:A*,1:int,2:int,20:int) [line 19, column 3]\n " shape="box"]
+"call_method_with_default_parameters#7436997991634263214.eaaed1a0020d12e677ebd0f9049f2e4a_4" [label="4:  Call _fun_A_fun_default \n   n$4=*&a_ptr:A* [line 19, column 3]\n  _=*n$4:A [line 19, column 3]\n  n$6=_fun_A_fun_default(n$4:A*,1:int,2:int,20:int) [line 19, column 3]\n " shape="box"]
 	
 
 	 "call_method_with_default_parameters#7436997991634263214.eaaed1a0020d12e677ebd0f9049f2e4a_4" -> "call_method_with_default_parameters#7436997991634263214.eaaed1a0020d12e677ebd0f9049f2e4a_3" ;
-"call_method_with_default_parameters#7436997991634263214.eaaed1a0020d12e677ebd0f9049f2e4a_5" [label="5:  Call _fun_A_fun_default \n   n$6=*&a_ptr:A* [line 18, column 3]\n  _=*n$6:A [line 18, column 3]\n  n$8=_fun_A_fun_default(n$6:A*,1:int,2:int,3:int) [line 18, column 3]\n " shape="box"]
+"call_method_with_default_parameters#7436997991634263214.eaaed1a0020d12e677ebd0f9049f2e4a_5" [label="5:  Call _fun_A_fun_default \n   n$7=*&a_ptr:A* [line 18, column 3]\n  _=*n$7:A [line 18, column 3]\n  n$9=_fun_A_fun_default(n$7:A*,1:int,2:int,3:int) [line 18, column 3]\n " shape="box"]
 	
 
 	 "call_method_with_default_parameters#7436997991634263214.eaaed1a0020d12e677ebd0f9049f2e4a_5" -> "call_method_with_default_parameters#7436997991634263214.eaaed1a0020d12e677ebd0f9049f2e4a_4" ;

infer/tests/codetoanalyze/cpp/shared/methods/dereference_this.cpp.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Call _fun_A_method \n   n$0=*&a_ptr:A* [line 25, column 3]\n  _=*n$0:A [line 25, column 3]\n  n$2=_fun_A_method(n$0:A*) [line 25, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Call _fun_A_method \n   n$1=*&a_ptr:A* [line 25, column 3]\n  _=*n$1:A [line 25, column 3]\n  n$3=_fun_A_method(n$1:A*) [line 25, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "init#A#(11888841587519675340).79bf6a1702f6a90708acc2d560532750_2" [label="2: Exit A_init \n  " color=yellow style=filled]
 	
 
-"init#A#(11888841587519675340).79bf6a1702f6a90708acc2d560532750_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:A* [line 14, column 24]\n  n$1=*&val:int [line 14, column 32]\n  *n$0.field:int=n$1 [line 14, column 24]\n " shape="box"]
+"init#A#(11888841587519675340).79bf6a1702f6a90708acc2d560532750_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:A* [line 14, column 24]\n  n$2=*&val:int [line 14, column 32]\n  *n$1.field:int=n$2 [line 14, column 24]\n " shape="box"]
 	
 
 	 "init#A#(11888841587519675340).79bf6a1702f6a90708acc2d560532750_3" -> "init#A#(11888841587519675340).79bf6a1702f6a90708acc2d560532750_2" ;
@@ -33,7 +33,7 @@ digraph cfg {
 	
 
 	 "method#A#(5340410962252776012).be8cb65bc6e38d687825fbc80265a66c_3" -> "method#A#(5340410962252776012).be8cb65bc6e38d687825fbc80265a66c_2" ;
-"method#A#(5340410962252776012).be8cb65bc6e38d687825fbc80265a66c_4" [label="4:  Call _fun_A_init \n   n$2=*&this:A* [line 19, column 3]\n  _=*n$2:A [line 19, column 3]\n  n$4=_fun_A_init(n$2:A*,10:int) [line 19, column 3]\n " shape="box"]
+"method#A#(5340410962252776012).be8cb65bc6e38d687825fbc80265a66c_4" [label="4:  Call _fun_A_init \n   n$3=*&this:A* [line 19, column 3]\n  _=*n$3:A [line 19, column 3]\n  n$5=_fun_A_init(n$3:A*,10:int) [line 19, column 3]\n " shape="box"]
 	
 
 	 "method#A#(5340410962252776012).be8cb65bc6e38d687825fbc80265a66c_4" -> "method#A#(5340410962252776012).be8cb65bc6e38d687825fbc80265a66c_3" ;

infer/tests/codetoanalyze/cpp/shared/methods/inline_method.cpp.dot

@@ -7,11 +7,11 @@ digraph cfg {
 "test_call#15378839304774239070.15b3496769d2a65d506975ce94efc03a_2" [label="2: Exit test_call \n  " color=yellow style=filled]
 	
 
-"test_call#15378839304774239070.15b3496769d2a65d506975ce94efc03a_3" [label="3:  Call _fun_A::AIn_fun \n   n$0=*&a_ptr:A* [line 26, column 3]\n  n$1=*n$0.in:A::AIn* [line 26, column 3]\n  _=*n$1:A::AIn [line 26, column 3]\n  n$3=_fun_A::AIn_fun(n$1:A::AIn*) [line 26, column 3]\n " shape="box"]
+"test_call#15378839304774239070.15b3496769d2a65d506975ce94efc03a_3" [label="3:  Call _fun_A::AIn_fun \n   n$1=*&a_ptr:A* [line 26, column 3]\n  n$2=*n$1.in:A::AIn* [line 26, column 3]\n  _=*n$2:A::AIn [line 26, column 3]\n  n$4=_fun_A::AIn_fun(n$2:A::AIn*) [line 26, column 3]\n " shape="box"]
 	
 
 	 "test_call#15378839304774239070.15b3496769d2a65d506975ce94efc03a_3" -> "test_call#15378839304774239070.15b3496769d2a65d506975ce94efc03a_2" ;
-"test_call#15378839304774239070.15b3496769d2a65d506975ce94efc03a_4" [label="4:  Call _fun_A_fun \n   n$4=*&a_ptr:A* [line 25, column 3]\n  _=*n$4:A [line 25, column 3]\n  n$6=_fun_A_fun(n$4:A*) [line 25, column 3]\n " shape="box"]
+"test_call#15378839304774239070.15b3496769d2a65d506975ce94efc03a_4" [label="4:  Call _fun_A_fun \n   n$5=*&a_ptr:A* [line 25, column 3]\n  _=*n$5:A [line 25, column 3]\n  n$7=_fun_A_fun(n$5:A*) [line 25, column 3]\n " shape="box"]
 	
 
 	 "test_call#15378839304774239070.15b3496769d2a65d506975ce94efc03a_4" -> "test_call#15378839304774239070.15b3496769d2a65d506975ce94efc03a_3" ;

infer/tests/codetoanalyze/cpp/shared/methods/overloading.cpp.dot

@@ -7,11 +7,11 @@ digraph cfg {
 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Call _fun_A_fun \n   n$0=*&a_ptr:A* [line 24, column 3]\n  _=*n$0:A [line 24, column 3]\n  n$2=_fun_A_fun(n$0:A*,1:int,2:int,3:int) [line 24, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Call _fun_A_fun \n   n$1=*&a_ptr:A* [line 24, column 3]\n  _=*n$1:A [line 24, column 3]\n  n$3=_fun_A_fun(n$1:A*,1:int,2:int,3:int) [line 24, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  Call _fun_A_fun \n   n$3=*&a_ptr:A* [line 23, column 3]\n  _=*n$3:A [line 23, column 3]\n  n$5=_fun_A_fun(n$3:A*,1:int,2:int) [line 23, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  Call _fun_A_fun \n   n$4=*&a_ptr:A* [line 23, column 3]\n  _=*n$4:A [line 23, column 3]\n  n$6=_fun_A_fun(n$4:A*,1:int,2:int) [line 23, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;

infer/tests/codetoanalyze/cpp/shared/methods/return_struct.cpp.dot

@@ -1,6 +1,6 @@
 /* @generated */
 digraph cfg {
-"test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_1" [label="1: Start test\nFormals:  a:A*\nLocals:  x:X 0$?%__sil_tmpSIL_materialize_temp__n$3:X \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_materialize_temp__n$3); [line 21, column 1]\n " color=yellow style=filled]
+"test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_1" [label="1: Start test\nFormals:  a:A*\nLocals:  x:X 0$?%__sil_tmpSIL_materialize_temp__n$4:X \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_materialize_temp__n$4); [line 21, column 1]\n " color=yellow style=filled]
 	
 
 	 "test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_1" -> "test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_4" ;
@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_3" -> "test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_2" ;
-"test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_4" [label="4:  DeclStmt \n   n$4=*&a:A* [line 22, column 9]\n  _=*n$4:A [line 22, column 9]\n  n$7=_fun_A_get(n$4:A*,1:int,&0$?%__sil_tmpSIL_materialize_temp__n$3:X*) [line 22, column 9]\n  n$8=_fun_X_X(&x:X*,&0$?%__sil_tmpSIL_materialize_temp__n$3:X&) [line 22, column 9]\n " shape="box"]
+"test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_4" [label="4:  DeclStmt \n   n$5=*&a:A* [line 22, column 9]\n  _=*n$5:A [line 22, column 9]\n  n$8=_fun_A_get(n$5:A*,1:int,&0$?%__sil_tmpSIL_materialize_temp__n$4:X*) [line 22, column 9]\n  n$9=_fun_X_X(&x:X*,&0$?%__sil_tmpSIL_materialize_temp__n$4:X&) [line 22, column 9]\n " shape="box"]
 	
 
 	 "test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_4" -> "test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_3" ;
@@ -22,7 +22,7 @@ digraph cfg {
 "X#X#{4662457305382278389|constexpr}.7a0af4be288b205dc1c04f6801938150_2" [label="2: Exit X_X \n  " color=yellow style=filled]
 	
 
-"X#X#{4662457305382278389|constexpr}.7a0af4be288b205dc1c04f6801938150_3" [label="3:  Constructor Init \n   n$0=*&this:X* [line 10, column 8]\n  n$1=*&__param_0:X& [line 10, column 8]\n  n$2=*n$1.f:int [line 10, column 8]\n  *n$0.f:int=n$2 [line 10, column 8]\n " shape="box"]
+"X#X#{4662457305382278389|constexpr}.7a0af4be288b205dc1c04f6801938150_3" [label="3:  Constructor Init \n   n$2=*&this:X* [line 10, column 8]\n  n$3=*&__param_0:X& [line 10, column 8]\n  n$4=*n$3.f:int [line 10, column 8]\n  *n$2.f:int=n$4 [line 10, column 8]\n " shape="box"]
 	
 
 	 "X#X#{4662457305382278389|constexpr}.7a0af4be288b205dc1c04f6801938150_3" -> "X#X#{4662457305382278389|constexpr}.7a0af4be288b205dc1c04f6801938150_2" ;
@@ -44,7 +44,7 @@ digraph cfg {
 	
 
 	 "get#A#(1761444600576643509).c838940fa5c6fe767006cf7dd748d7f6_3" -> "get#A#(1761444600576643509).c838940fa5c6fe767006cf7dd748d7f6_2" ;
-"get#A#(1761444600576643509).c838940fa5c6fe767006cf7dd748d7f6_4" [label="4:  DeclStmt \n   n$4=_fun_X_X(&x:X*) [line 16, column 7]\n " shape="box"]
+"get#A#(1761444600576643509).c838940fa5c6fe767006cf7dd748d7f6_4" [label="4:  DeclStmt \n   n$5=_fun_X_X(&x:X*) [line 16, column 7]\n " shape="box"]
 	
 
 	 "get#A#(1761444600576643509).c838940fa5c6fe767006cf7dd748d7f6_4" -> "get#A#(1761444600576643509).c838940fa5c6fe767006cf7dd748d7f6_3" ;

infer/tests/codetoanalyze/cpp/shared/methods/static.cpp.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "div0_class#4984704850372216251.260ce38d809793fc3e38787f8d1eb4d6_2" [label="2: Exit div0_class \n  " color=yellow style=filled]
 	
 
-"div0_class#4984704850372216251.260ce38d809793fc3e38787f8d1eb4d6_3" [label="3:  Call _fun_A_fun \n   n$0=_fun_A_fun(0:int) [line 17, column 21]\n " shape="box"]
+"div0_class#4984704850372216251.260ce38d809793fc3e38787f8d1eb4d6_3" [label="3:  Call _fun_A_fun \n   n$2=_fun_A_fun(0:int) [line 17, column 21]\n " shape="box"]
 	
 
 	 "div0_class#4984704850372216251.260ce38d809793fc3e38787f8d1eb4d6_3" -> "div0_class#4984704850372216251.260ce38d809793fc3e38787f8d1eb4d6_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "div0_instance#13376949534750090437.51640b59fd921707822fcc45f2fde64d_2" [label="2: Exit div0_instance \n  " color=yellow style=filled]
 	
 
-"div0_instance#13376949534750090437.51640b59fd921707822fcc45f2fde64d_3" [label="3:  Call _fun_A_fun \n   n$0=*&a:A* [line 21, column 3]\n  n$1=_fun_A_fun(0:int) [line 21, column 3]\n " shape="box"]
+"div0_instance#13376949534750090437.51640b59fd921707822fcc45f2fde64d_3" [label="3:  Call _fun_A_fun \n   n$1=*&a:A* [line 21, column 3]\n  n$3=_fun_A_fun(0:int) [line 21, column 3]\n " shape="box"]
 	
 
 	 "div0_instance#13376949534750090437.51640b59fd921707822fcc45f2fde64d_3" -> "div0_instance#13376949534750090437.51640b59fd921707822fcc45f2fde64d_2" ;

infer/tests/codetoanalyze/cpp/shared/methods/virtual_methods.cpp.dot

@@ -7,11 +7,11 @@ digraph cfg {
 "call_virtual_destructor#6847397116347440235.d267757a410b72cac399f5e3d0ee0f45_2" [label="2: Exit call_virtual_destructor \n  " color=yellow style=filled]
 	
 
-"call_virtual_destructor#6847397116347440235.d267757a410b72cac399f5e3d0ee0f45_3" [label="3:  Call delete \n   n$0=*&trgl:Polygon* [line 72, column 10]\n  n$1=_fun___delete(n$0:Polygon*) [line 72, column 3]\n " shape="box"]
+"call_virtual_destructor#6847397116347440235.d267757a410b72cac399f5e3d0ee0f45_3" [label="3:  Call delete \n   n$1=*&trgl:Polygon* [line 72, column 10]\n  n$2=_fun___delete(n$1:Polygon*) [line 72, column 3]\n " shape="box"]
 	
 
 	 "call_virtual_destructor#6847397116347440235.d267757a410b72cac399f5e3d0ee0f45_3" -> "call_virtual_destructor#6847397116347440235.d267757a410b72cac399f5e3d0ee0f45_2" ;
-"call_virtual_destructor#6847397116347440235.d267757a410b72cac399f5e3d0ee0f45_4" [label="4:  DeclStmt \n   n$2=_fun___new(sizeof(t=Triangle):unsigned long) [line 71, column 19]\n  n$3=_fun_Triangle_Triangle(n$2:Triangle*) [line 71, column 23]\n  *&trgl:Triangle*=n$2 [line 71, column 3]\n " shape="box"]
+"call_virtual_destructor#6847397116347440235.d267757a410b72cac399f5e3d0ee0f45_4" [label="4:  DeclStmt \n   n$3=_fun___new(sizeof(t=Triangle):unsigned long) [line 71, column 19]\n  n$4=_fun_Triangle_Triangle(n$3:Triangle*) [line 71, column 23]\n  *&trgl:Triangle*=n$3 [line 71, column 3]\n " shape="box"]
 	
 
 	 "call_virtual_destructor#6847397116347440235.d267757a410b72cac399f5e3d0ee0f45_4" -> "call_virtual_destructor#6847397116347440235.d267757a410b72cac399f5e3d0ee0f45_3" ;
@@ -30,7 +30,7 @@ digraph cfg {
 	
 
 	 "poly_area#4209622570361008343.816833144841084a7fd6071bbff4c354_4" -> "poly_area#4209622570361008343.816833144841084a7fd6071bbff4c354_3" ;
-"poly_area#4209622570361008343.816833144841084a7fd6071bbff4c354_5" [label="5:  DeclStmt \n   n$5=_fun_Polygon_Polygon(&poly:Polygon*) [line 54, column 11]\n " shape="box"]
+"poly_area#4209622570361008343.816833144841084a7fd6071bbff4c354_5" [label="5:  DeclStmt \n   n$6=_fun_Polygon_Polygon(&poly:Polygon*) [line 54, column 11]\n " shape="box"]
 	
 
 	 "poly_area#4209622570361008343.816833144841084a7fd6071bbff4c354_5" -> "poly_area#4209622570361008343.816833144841084a7fd6071bbff4c354_4" ;
@@ -45,7 +45,7 @@ digraph cfg {
 	
 
 	 "rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_3" -> "rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_2" ;
-"rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_4" [label="4:  Call _fun_Polygon_set_values \n   n$5=*&ppoly1:Polygon* [line 41, column 3]\n  _=*n$5:Polygon [line 41, column 3]\n  n$7=_fun_Polygon_set_values(n$5:Polygon*,4:int,5:int) [line 41, column 3]\n " shape="box"]
+"rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_4" [label="4:  Call _fun_Polygon_set_values \n   n$6=*&ppoly1:Polygon* [line 41, column 3]\n  _=*n$6:Polygon [line 41, column 3]\n  n$8=_fun_Polygon_set_values(n$6:Polygon*,4:int,5:int) [line 41, column 3]\n " shape="box"]
 	
 
 	 "rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_4" -> "rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_3" ;
@@ -53,7 +53,7 @@ digraph cfg {
 	
 
 	 "rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_5" -> "rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_4" ;
-"rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_6" [label="6:  DeclStmt \n   n$8=_fun_Rectangle_Rectangle(&rect:Rectangle*) [line 39, column 13]\n " shape="box"]
+"rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_6" [label="6:  DeclStmt \n   n$9=_fun_Rectangle_Rectangle(&rect:Rectangle*) [line 39, column 13]\n " shape="box"]
 	
 
 	 "rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_6" -> "rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_5" ;
@@ -68,7 +68,7 @@ digraph cfg {
 	
 
 	 "tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_3" -> "tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_2" ;
-"tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_4" [label="4:  Call _fun_Polygon_set_values \n   n$7=*&ppoly2:Polygon* [line 49, column 3]\n  _=*n$7:Polygon [line 49, column 3]\n  n$9=_fun_Polygon_set_values(n$7:Polygon*,4:int,5:int) [line 49, column 3]\n " shape="box"]
+"tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_4" [label="4:  Call _fun_Polygon_set_values \n   n$8=*&ppoly2:Polygon* [line 49, column 3]\n  _=*n$8:Polygon [line 49, column 3]\n  n$10=_fun_Polygon_set_values(n$8:Polygon*,4:int,5:int) [line 49, column 3]\n " shape="box"]
 	
 
 	 "tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_4" -> "tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_3" ;
@@ -76,11 +76,11 @@ digraph cfg {
 	
 
 	 "tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_5" -> "tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_4" ;
-"tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_6" [label="6:  DeclStmt \n   n$10=_fun_Polygon_Polygon(&poly:Polygon*) [line 47, column 11]\n " shape="box"]
+"tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_6" [label="6:  DeclStmt \n   n$11=_fun_Polygon_Polygon(&poly:Polygon*) [line 47, column 11]\n " shape="box"]
 	
 
 	 "tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_6" -> "tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_5" ;
-"tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_7" [label="7:  DeclStmt \n   n$11=_fun_Triangle_Triangle(&trgl:Triangle*) [line 46, column 12]\n " shape="box"]
+"tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_7" [label="7:  DeclStmt \n   n$12=_fun_Triangle_Triangle(&trgl:Triangle*) [line 46, column 12]\n " shape="box"]
 	
 
 	 "tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_7" -> "tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_6" ;
@@ -95,7 +95,7 @@ digraph cfg {
 	
 
 	 "tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_3" -> "tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_2" ;
-"tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_4" [label="4:  Call _fun_Polygon_set_values \n   n$7=*&ppoly2:Polygon* [line 63, column 3]\n  _=*n$7:Polygon [line 63, column 3]\n  n$9=_fun_Polygon_set_values(n$7:Polygon*,4:int,5:int) [line 63, column 3]\n " shape="box"]
+"tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_4" [label="4:  Call _fun_Polygon_set_values \n   n$8=*&ppoly2:Polygon* [line 63, column 3]\n  _=*n$8:Polygon [line 63, column 3]\n  n$10=_fun_Polygon_set_values(n$8:Polygon*,4:int,5:int) [line 63, column 3]\n " shape="box"]
 	
 
 	 "tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_4" -> "tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_3" ;
@@ -103,11 +103,11 @@ digraph cfg {
 	
 
 	 "tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_5" -> "tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_4" ;
-"tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_6" [label="6:  DeclStmt \n   n$10=_fun_Polygon_Polygon(&poly:Polygon*) [line 61, column 11]\n " shape="box"]
+"tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_6" [label="6:  DeclStmt \n   n$11=_fun_Polygon_Polygon(&poly:Polygon*) [line 61, column 11]\n " shape="box"]
 	
 
 	 "tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_6" -> "tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_5" ;
-"tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_7" [label="7:  DeclStmt \n   n$11=_fun_Triangle_Triangle(&trgl:Triangle*) [line 60, column 12]\n " shape="box"]
+"tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_7" [label="7:  DeclStmt \n   n$12=_fun_Triangle_Triangle(&trgl:Triangle*) [line 60, column 12]\n " shape="box"]
 	
 
 	 "tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_7" -> "tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_6" ;
@@ -125,7 +125,7 @@ digraph cfg {
 "Rectangle#Rectangle#{548993796743293985}.386f89cceb4c14e4fc014bcc1ec86f4b_2" [label="2: Exit Rectangle_Rectangle \n  " color=yellow style=filled]
 	
 
-"Rectangle#Rectangle#{548993796743293985}.386f89cceb4c14e4fc014bcc1ec86f4b_3" [label="3:  Constructor Init \n   n$0=*&this:Rectangle* [line 23, column 7]\n  n$1=_fun_Polygon_Polygon(n$0:Rectangle*) [line 23, column 7]\n " shape="box"]
+"Rectangle#Rectangle#{548993796743293985}.386f89cceb4c14e4fc014bcc1ec86f4b_3" [label="3:  Constructor Init \n   n$2=*&this:Rectangle* [line 23, column 7]\n  n$3=_fun_Polygon_Polygon(n$2:Rectangle*) [line 23, column 7]\n " shape="box"]
 	
 
 	 "Rectangle#Rectangle#{548993796743293985}.386f89cceb4c14e4fc014bcc1ec86f4b_3" -> "Rectangle#Rectangle#{548993796743293985}.386f89cceb4c14e4fc014bcc1ec86f4b_2" ;
@@ -136,7 +136,7 @@ digraph cfg {
 "Triangle#Triangle#{15421032765127472541}.26bfd28d102273793a62fe013a50a7d1_2" [label="2: Exit Triangle_Triangle \n  " color=yellow style=filled]
 	
 
-"Triangle#Triangle#{15421032765127472541}.26bfd28d102273793a62fe013a50a7d1_3" [label="3:  Constructor Init \n   n$0=*&this:Triangle* [line 29, column 7]\n  n$1=_fun_Polygon_Polygon(n$0:Triangle*) [line 29, column 7]\n " shape="box"]
+"Triangle#Triangle#{15421032765127472541}.26bfd28d102273793a62fe013a50a7d1_3" [label="3:  Constructor Init \n   n$2=*&this:Triangle* [line 29, column 7]\n  n$3=_fun_Polygon_Polygon(n$2:Triangle*) [line 29, column 7]\n " shape="box"]
 	
 
 	 "Triangle#Triangle#{15421032765127472541}.26bfd28d102273793a62fe013a50a7d1_3" -> "Triangle#Triangle#{15421032765127472541}.26bfd28d102273793a62fe013a50a7d1_2" ;
@@ -184,7 +184,7 @@ digraph cfg {
 	
 
 	 "area#Triangle#(14534668876010564879).b2c96bbb8f170e9d12180637dc0d6da3_3" -> "area#Triangle#(14534668876010564879).b2c96bbb8f170e9d12180637dc0d6da3_2" ;
-"area#Triangle#(14534668876010564879).b2c96bbb8f170e9d12180637dc0d6da3_4" [label="4:  DeclStmt \n   n$1=*&this:Triangle* [line 33, column 13]\n  n$2=*n$1.width:int [line 33, column 13]\n  n$3=*&this:Triangle* [line 33, column 21]\n  n$4=*n$3.height:int [line 33, column 21]\n  *&x:int=(n$2 * n$4) [line 33, column 5]\n " shape="box"]
+"area#Triangle#(14534668876010564879).b2c96bbb8f170e9d12180637dc0d6da3_4" [label="4:  DeclStmt \n   n$2=*&this:Triangle* [line 33, column 13]\n  n$3=*n$2.width:int [line 33, column 13]\n  n$4=*&this:Triangle* [line 33, column 21]\n  n$5=*n$4.height:int [line 33, column 21]\n  *&x:int=(n$3 * n$5) [line 33, column 5]\n " shape="box"]
 	
 
 	 "area#Triangle#(14534668876010564879).b2c96bbb8f170e9d12180637dc0d6da3_4" -> "area#Triangle#(14534668876010564879).b2c96bbb8f170e9d12180637dc0d6da3_3" ;
@@ -195,11 +195,11 @@ digraph cfg {
 "set_values#Polygon#(2698446688876490094).f9216ba6d3085c8bce59aeddec27f348_2" [label="2: Exit Polygon_set_values \n  " color=yellow style=filled]
 	
 
-"set_values#Polygon#(2698446688876490094).f9216ba6d3085c8bce59aeddec27f348_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:Polygon* [line 18, column 5]\n  n$1=*&b:int [line 18, column 14]\n  *n$0.height:int=n$1 [line 18, column 5]\n " shape="box"]
+"set_values#Polygon#(2698446688876490094).f9216ba6d3085c8bce59aeddec27f348_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:Polygon* [line 18, column 5]\n  n$2=*&b:int [line 18, column 14]\n  *n$1.height:int=n$2 [line 18, column 5]\n " shape="box"]
 	
 
 	 "set_values#Polygon#(2698446688876490094).f9216ba6d3085c8bce59aeddec27f348_3" -> "set_values#Polygon#(2698446688876490094).f9216ba6d3085c8bce59aeddec27f348_2" ;
-"set_values#Polygon#(2698446688876490094).f9216ba6d3085c8bce59aeddec27f348_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:Polygon* [line 17, column 5]\n  n$3=*&a:int [line 17, column 13]\n  *n$2.width:int=n$3 [line 17, column 5]\n " shape="box"]
+"set_values#Polygon#(2698446688876490094).f9216ba6d3085c8bce59aeddec27f348_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=*&this:Polygon* [line 17, column 5]\n  n$4=*&a:int [line 17, column 13]\n  *n$3.width:int=n$4 [line 17, column 5]\n " shape="box"]
 	
 
 	 "set_values#Polygon#(2698446688876490094).f9216ba6d3085c8bce59aeddec27f348_4" -> "set_values#Polygon#(2698446688876490094).f9216ba6d3085c8bce59aeddec27f348_3" ;

infer/tests/codetoanalyze/cpp/shared/namespace/function.cpp.dot

@@ -77,7 +77,7 @@ digraph cfg {
 "using_div0#15267107907897398237.0f32134dc9668df527885e12e16348fe_2" [label="2: Exit using_div0 \n  " color=yellow style=filled]
 	
 
-"using_div0#15267107907897398237.0f32134dc9668df527885e12e16348fe_3" [label="3:  Return Stmt \n   n$0=_fun_f3::C_ret_zero() [line 35, column 14]\n  *&return:int=(1 / n$0) [line 35, column 3]\n " shape="box"]
+"using_div0#15267107907897398237.0f32134dc9668df527885e12e16348fe_3" [label="3:  Return Stmt \n   n$1=_fun_f3::C_ret_zero() [line 35, column 14]\n  *&return:int=(1 / n$1) [line 35, column 3]\n " shape="box"]
 	
 
 	 "using_div0#15267107907897398237.0f32134dc9668df527885e12e16348fe_3" -> "using_div0#15267107907897398237.0f32134dc9668df527885e12e16348fe_2" ;

infer/tests/codetoanalyze/cpp/shared/namespace/namespace.cpp.dot

@@ -11,15 +11,15 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&#GB<codetoanalyze/cpp/shared/namespace/namespace.cpp>$bar::pi:double [line 57, column 7]\n  *&j:double=n$0 [line 57, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&#GB<codetoanalyze/cpp/shared/namespace/namespace.cpp>$bar::pi:double [line 57, column 7]\n  *&j:double=n$1 [line 57, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$1=_fun_bar::value() [line 56, column 7]\n  *&i:int=n$1 [line 56, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=_fun_bar::value() [line 56, column 7]\n  *&i:int=n$2 [line 56, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   n$2=_fun_foo::value() [line 55, column 7]\n  *&i:int=n$2 [line 55, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   n$3=_fun_foo::value() [line 55, column 7]\n  *&i:int=n$3 [line 55, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
@@ -27,23 +27,23 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  Call _fun_foo::Rectangle_set_values \n   _=*&rect2:foo::Rectangle [line 52, column 3]\n  n$4=_fun_foo::Rectangle_set_values(&rect2:foo::Rectangle&,7:int,10:int) [line 52, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  Call _fun_foo::Rectangle_set_values \n   _=*&rect2:foo::Rectangle [line 52, column 3]\n  n$5=_fun_foo::Rectangle_set_values(&rect2:foo::Rectangle&,7:int,10:int) [line 52, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   n$5=_fun_foo::Rectangle_Rectangle(&rect2:foo::Rectangle*) [line 51, column 18]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   n$6=_fun_foo::Rectangle_Rectangle(&rect2:foo::Rectangle*) [line 51, column 18]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  Call _fun_bar::Rectangle_set_values \n   _=*&rect1:bar::Rectangle [line 49, column 3]\n  n$7=_fun_bar::Rectangle_set_values(&rect1:bar::Rectangle&,3:int,4:int) [line 49, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  Call _fun_bar::Rectangle_set_values \n   _=*&rect1:bar::Rectangle [line 49, column 3]\n  n$8=_fun_bar::Rectangle_set_values(&rect1:bar::Rectangle&,3:int,4:int) [line 49, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   n$8=_fun_bar::Rectangle_Rectangle(&rect1:bar::Rectangle*) [line 48, column 18]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   n$9=_fun_bar::Rectangle_Rectangle(&rect1:bar::Rectangle*) [line 48, column 18]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  DeclStmt \n   n$9=_fun_foo::my_record_(&x:foo::my_record*) [line 46, column 18]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  DeclStmt \n   n$10=_fun_foo::my_record_(&x:foo::my_record*) [line 46, column 18]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;

infer/tests/codetoanalyze/cpp/shared/nestedoperators/var_decl_inside_for.cpp.dot

@@ -15,24 +15,24 @@ digraph cfg {
 	
 
 	 "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_4" -> "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_3" ;
-"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_5" [label="5:  UnaryOperator \n   n$0=*&i:int [line 19, column 31]\n  *&i:int=(n$0 - 1) [line 19, column 31]\n " shape="box"]
+"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_5" [label="5:  UnaryOperator \n   n$1=*&i:int [line 19, column 31]\n  *&i:int=(n$1 - 1) [line 19, column 31]\n " shape="box"]
 	
 
 	 "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_5" -> "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_3" ;
-"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_6" [label="6: Prune (true branch, for loop) \n   n$1=*&x:int [line 19, column 24]\n  PRUNE(n$1, true); [line 19, column 24]\n " shape="invhouse"]
+"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_6" [label="6: Prune (true branch, for loop) \n   n$2=*&x:int [line 19, column 24]\n  PRUNE(n$2, true); [line 19, column 24]\n " shape="invhouse"]
 	
 
 	 "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_6" -> "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_9" ;
-"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_7" [label="7: Prune (false branch, for loop) \n   n$1=*&x:int [line 19, column 24]\n  PRUNE(!n$1, false); [line 19, column 24]\n " shape="invhouse"]
+"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_7" [label="7: Prune (false branch, for loop) \n   n$2=*&x:int [line 19, column 24]\n  PRUNE(!n$2, false); [line 19, column 24]\n " shape="invhouse"]
 	
 
 	 "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_7" -> "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_2" ;
-"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_8" [label="8:  DeclStmt \n   n$2=*&i:int [line 19, column 28]\n  *&x:int=n$2 [line 19, column 20]\n " shape="box"]
+"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_8" [label="8:  DeclStmt \n   n$3=*&i:int [line 19, column 28]\n  *&x:int=n$3 [line 19, column 20]\n " shape="box"]
 	
 
 	 "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_8" -> "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_6" ;
 	 "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_8" -> "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_7" ;
-"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_9" [label="9:  BinaryOperatorStmt: AddAssign \n   n$3=*&x:int [line 20, column 15]\n  n$4=*&result:int [line 20, column 5]\n  *&result:int=(n$4 + n$3) [line 20, column 5]\n " shape="box"]
+"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_9" [label="9:  BinaryOperatorStmt: AddAssign \n   n$5=*&x:int [line 20, column 15]\n  n$6=*&result:int [line 20, column 5]\n  *&result:int=(n$6 + n$5) [line 20, column 5]\n " shape="box"]
 	
 
 	 "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_9" -> "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_5" ;
@@ -55,15 +55,15 @@ digraph cfg {
 	
 
 	 "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_4" -> "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_3" ;
-"simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_5" [label="5:  UnaryOperator \n   n$0=*&i:int [line 12, column 30]\n  *&i:int=(n$0 + 1) [line 12, column 30]\n " shape="box"]
+"simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_5" [label="5:  UnaryOperator \n   n$1=*&i:int [line 12, column 30]\n  *&i:int=(n$1 + 1) [line 12, column 30]\n " shape="box"]
 	
 
 	 "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_5" -> "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_3" ;
-"simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_6" [label="6: Prune (true branch, for loop) \n   n$1=*&x:int [line 12, column 23]\n  PRUNE(n$1, true); [line 12, column 23]\n " shape="invhouse"]
+"simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_6" [label="6: Prune (true branch, for loop) \n   n$2=*&x:int [line 12, column 23]\n  PRUNE(n$2, true); [line 12, column 23]\n " shape="invhouse"]
 	
 
 	 "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_6" -> "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_9" ;
-"simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_7" [label="7: Prune (false branch, for loop) \n   n$1=*&x:int [line 12, column 23]\n  PRUNE(!n$1, false); [line 12, column 23]\n " shape="invhouse"]
+"simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_7" [label="7: Prune (false branch, for loop) \n   n$2=*&x:int [line 12, column 23]\n  PRUNE(!n$2, false); [line 12, column 23]\n " shape="invhouse"]
 	
 
 	 "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_7" -> "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_2" ;
@@ -72,7 +72,7 @@ digraph cfg {
 
 	 "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_8" -> "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_6" ;
 	 "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_8" -> "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_7" ;
-"simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_9" [label="9:  BinaryOperatorStmt: AddAssign \n   n$2=*&x:int [line 13, column 15]\n  n$3=*&result:int [line 13, column 5]\n  *&result:int=(n$3 + n$2) [line 13, column 5]\n " shape="box"]
+"simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_9" [label="9:  BinaryOperatorStmt: AddAssign \n   n$4=*&x:int [line 13, column 15]\n  n$5=*&result:int [line 13, column 5]\n  *&result:int=(n$5 + n$4) [line 13, column 5]\n " shape="box"]
 	
 
 	 "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_9" -> "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_5" ;

infer/tests/codetoanalyze/cpp/shared/nestedoperators/var_decl_inside_if.cpp.dot

@@ -1,6 +1,6 @@
 /* @generated */
 digraph cfg {
-"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_1" [label="1: Start conditional_init_div0\nFormals: \nLocals:  a:int 0$?%__sil_tmpSIL_temp_conditional___n$1:int \n   DECLARE_LOCALS(&return,&a,&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 42, column 1]\n " color=yellow style=filled]
+"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_1" [label="1: Start conditional_init_div0\nFormals: \nLocals:  a:int 0$?%__sil_tmpSIL_temp_conditional___n$2:int \n   DECLARE_LOCALS(&return,&a,&0$?%__sil_tmpSIL_temp_conditional___n$2); [line 42, column 1]\n " color=yellow style=filled]
 	
 
 	 "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_1" -> "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_8" ;
@@ -16,11 +16,11 @@ digraph cfg {
 	
 
 	 "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_4" -> "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_2" ;
-"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_5" [label="5: Prune (true branch, if) \n   n$0=*&a:int [line 43, column 11]\n  PRUNE(n$0, true); [line 43, column 11]\n " shape="invhouse"]
+"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_5" [label="5: Prune (true branch, if) \n   n$1=*&a:int [line 43, column 11]\n  PRUNE(n$1, true); [line 43, column 11]\n " shape="invhouse"]
 	
 
 	 "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_5" -> "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_13" ;
-"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_6" [label="6: Prune (false branch, if) \n   n$0=*&a:int [line 43, column 11]\n  PRUNE(!n$0, false); [line 43, column 11]\n " shape="invhouse"]
+"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_6" [label="6: Prune (false branch, if) \n   n$1=*&a:int [line 43, column 11]\n  PRUNE(!n$1, false); [line 43, column 11]\n " shape="invhouse"]
 	
 
 	 "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_6" -> "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_3" ;
@@ -36,20 +36,20 @@ digraph cfg {
 	
 
 	 "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_9" -> "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_11" ;
-"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_10" [label="10:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 43, column 15]\n " shape="box"]
+"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_10" [label="10:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 43, column 15]\n " shape="box"]
 	
 
 	 "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_10" -> "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_7" ;
-"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=0 [line 43, column 15]\n " shape="box"]
+"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_11" [label="11:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=0 [line 43, column 15]\n " shape="box"]
 	
 
 	 "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_11" -> "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_7" ;
-"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_12" [label="12:  DeclStmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 43, column 15]\n  *&a:int=n$2 [line 43, column 7]\n " shape="box"]
+"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_12" [label="12:  DeclStmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 43, column 15]\n  *&a:int=n$3 [line 43, column 7]\n " shape="box"]
 	
 
 	 "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_12" -> "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_5" ;
 	 "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_12" -> "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_6" ;
-"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_13" [label="13:  Return Stmt \n   n$3=*&a:int [line 44, column 17]\n  *&return:int=(1 / (n$3 - 1)) [line 44, column 5]\n " shape="box"]
+"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_13" [label="13:  Return Stmt \n   n$4=*&a:int [line 44, column 17]\n  *&return:int=(1 / (n$4 - 1)) [line 44, column 5]\n " shape="box"]
 	
 
 	 "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_13" -> "conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_2" ;
@@ -68,20 +68,20 @@ digraph cfg {
 	
 
 	 "function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_4" -> "function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_2" ;
-"function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_5" [label="5: Prune (true branch, if) \n   n$0=*&a:int [line 37, column 11]\n  PRUNE(n$0, true); [line 37, column 11]\n " shape="invhouse"]
+"function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_5" [label="5: Prune (true branch, if) \n   n$1=*&a:int [line 37, column 11]\n  PRUNE(n$1, true); [line 37, column 11]\n " shape="invhouse"]
 	
 
 	 "function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_5" -> "function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_8" ;
-"function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_6" [label="6: Prune (false branch, if) \n   n$0=*&a:int [line 37, column 11]\n  PRUNE(!n$0, false); [line 37, column 11]\n " shape="invhouse"]
+"function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_6" [label="6: Prune (false branch, if) \n   n$1=*&a:int [line 37, column 11]\n  PRUNE(!n$1, false); [line 37, column 11]\n " shape="invhouse"]
 	
 
 	 "function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_6" -> "function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_3" ;
-"function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_7" [label="7:  DeclStmt \n   n$1=_fun_get1() [line 37, column 15]\n  *&a:int=n$1 [line 37, column 7]\n " shape="box"]
+"function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_7" [label="7:  DeclStmt \n   n$2=_fun_get1() [line 37, column 15]\n  *&a:int=n$2 [line 37, column 7]\n " shape="box"]
 	
 
 	 "function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_7" -> "function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_5" ;
 	 "function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_7" -> "function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_6" ;
-"function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_8" [label="8:  Return Stmt \n   n$2=*&a:int [line 38, column 17]\n  *&return:int=(1 / (n$2 - 1)) [line 38, column 5]\n " shape="box"]
+"function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_8" [label="8:  Return Stmt \n   n$3=*&a:int [line 38, column 17]\n  *&return:int=(1 / (n$3 - 1)) [line 38, column 5]\n " shape="box"]
 	
 
 	 "function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_8" -> "function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_2" ;
@@ -111,11 +111,11 @@ digraph cfg {
 	
 
 	 "reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_4" -> "reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_3" ;
-"reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_5" [label="5: Prune (true branch, if) \n   n$1=*&a:int& [line 50, column 12]\n  n$2=*n$1:int [line 50, column 12]\n  PRUNE(n$2, true); [line 50, column 12]\n " shape="invhouse"]
+"reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_5" [label="5: Prune (true branch, if) \n   n$2=*&a:int& [line 50, column 12]\n  n$3=*n$2:int [line 50, column 12]\n  PRUNE(n$3, true); [line 50, column 12]\n " shape="invhouse"]
 	
 
 	 "reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_5" -> "reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_8" ;
-"reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_6" [label="6: Prune (false branch, if) \n   n$1=*&a:int& [line 50, column 12]\n  n$2=*n$1:int [line 50, column 12]\n  PRUNE(!n$2, false); [line 50, column 12]\n " shape="invhouse"]
+"reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_6" [label="6: Prune (false branch, if) \n   n$2=*&a:int& [line 50, column 12]\n  n$3=*n$2:int [line 50, column 12]\n  PRUNE(!n$3, false); [line 50, column 12]\n " shape="invhouse"]
 	
 
 	 "reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_6" -> "reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_4" ;
@@ -124,7 +124,7 @@ digraph cfg {
 
 	 "reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_7" -> "reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_5" ;
 	 "reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_7" -> "reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_6" ;
-"reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_8" [label="8:  BinaryOperatorStmt: Assign \n   n$3=*&a:int& [line 51, column 5]\n  *n$3:int=0 [line 51, column 5]\n " shape="box"]
+"reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_8" [label="8:  BinaryOperatorStmt: Assign \n   n$5=*&a:int& [line 51, column 5]\n  *n$5:int=0 [line 51, column 5]\n " shape="box"]
 	
 
 	 "reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_8" -> "reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_4" ;
@@ -147,11 +147,11 @@ digraph cfg {
 	
 
 	 "simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_4" -> "simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_2" ;
-"simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_5" [label="5: Prune (true branch, if) \n   n$0=*&a:int [line 25, column 11]\n  PRUNE(n$0, true); [line 25, column 11]\n " shape="invhouse"]
+"simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_5" [label="5: Prune (true branch, if) \n   n$1=*&a:int [line 25, column 11]\n  PRUNE(n$1, true); [line 25, column 11]\n " shape="invhouse"]
 	
 
 	 "simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_5" -> "simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_8" ;
-"simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_6" [label="6: Prune (false branch, if) \n   n$0=*&a:int [line 25, column 11]\n  PRUNE(!n$0, false); [line 25, column 11]\n " shape="invhouse"]
+"simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_6" [label="6: Prune (false branch, if) \n   n$1=*&a:int [line 25, column 11]\n  PRUNE(!n$1, false); [line 25, column 11]\n " shape="invhouse"]
 	
 
 	 "simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_6" -> "simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_12" ;
@@ -168,11 +168,11 @@ digraph cfg {
 	
 
 	 "simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_9" -> "simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_3" ;
-"simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_10" [label="10: Prune (true branch, if) \n   n$1=*&b:int [line 27, column 18]\n  PRUNE(n$1, true); [line 27, column 18]\n " shape="invhouse"]
+"simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_10" [label="10: Prune (true branch, if) \n   n$3=*&b:int [line 27, column 18]\n  PRUNE(n$3, true); [line 27, column 18]\n " shape="invhouse"]
 	
 
 	 "simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_10" -> "simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_13" ;
-"simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_11" [label="11: Prune (false branch, if) \n   n$1=*&b:int [line 27, column 18]\n  PRUNE(!n$1, false); [line 27, column 18]\n " shape="invhouse"]
+"simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_11" [label="11: Prune (false branch, if) \n   n$3=*&b:int [line 27, column 18]\n  PRUNE(!n$3, false); [line 27, column 18]\n " shape="invhouse"]
 	
 
 	 "simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_11" -> "simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_14" ;
@@ -185,7 +185,7 @@ digraph cfg {
 	
 
 	 "simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_13" -> "simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_2" ;
-"simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_14" [label="14:  Return Stmt \n   n$2=*&a:int [line 30, column 17]\n  n$3=*&b:int [line 30, column 21]\n  *&return:int=(1 / (n$2 + n$3)) [line 30, column 5]\n " shape="box"]
+"simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_14" [label="14:  Return Stmt \n   n$5=*&a:int [line 30, column 17]\n  n$6=*&b:int [line 30, column 21]\n  *&return:int=(1 / (n$5 + n$6)) [line 30, column 5]\n " shape="box"]
 	
 
 	 "simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_14" -> "simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_2" ;
@@ -204,11 +204,11 @@ digraph cfg {
 	
 
 	 "simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_4" -> "simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_2" ;
-"simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_5" [label="5: Prune (true branch, if) \n   n$0=*&a:int [line 17, column 11]\n  PRUNE(n$0, true); [line 17, column 11]\n " shape="invhouse"]
+"simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_5" [label="5: Prune (true branch, if) \n   n$1=*&a:int [line 17, column 11]\n  PRUNE(n$1, true); [line 17, column 11]\n " shape="invhouse"]
 	
 
 	 "simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_5" -> "simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_8" ;
-"simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_6" [label="6: Prune (false branch, if) \n   n$0=*&a:int [line 17, column 11]\n  PRUNE(!n$0, false); [line 17, column 11]\n " shape="invhouse"]
+"simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_6" [label="6: Prune (false branch, if) \n   n$1=*&a:int [line 17, column 11]\n  PRUNE(!n$1, false); [line 17, column 11]\n " shape="invhouse"]
 	
 
 	 "simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_6" -> "simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_9" ;
@@ -217,11 +217,11 @@ digraph cfg {
 
 	 "simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_7" -> "simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_5" ;
 	 "simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_7" -> "simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_6" ;
-"simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_8" [label="8:  Return Stmt \n   n$1=*&a:int [line 18, column 12]\n  *&return:int=n$1 [line 18, column 5]\n " shape="box"]
+"simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_8" [label="8:  Return Stmt \n   n$2=*&a:int [line 18, column 12]\n  *&return:int=n$2 [line 18, column 5]\n " shape="box"]
 	
 
 	 "simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_8" -> "simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_2" ;
-"simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_9" [label="9:  Return Stmt \n   n$2=*&a:int [line 20, column 16]\n  *&return:int=(1 / n$2) [line 20, column 5]\n " shape="box"]
+"simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_9" [label="9:  Return Stmt \n   n$4=*&a:int [line 20, column 16]\n  *&return:int=(1 / n$4) [line 20, column 5]\n " shape="box"]
 	
 
 	 "simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_9" -> "simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_2" ;
@@ -240,11 +240,11 @@ digraph cfg {
 	
 
 	 "simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_4" -> "simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_2" ;
-"simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_5" [label="5: Prune (true branch, if) \n   n$0=*&a:int [line 11, column 11]\n  PRUNE(n$0, true); [line 11, column 11]\n " shape="invhouse"]
+"simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_5" [label="5: Prune (true branch, if) \n   n$1=*&a:int [line 11, column 11]\n  PRUNE(n$1, true); [line 11, column 11]\n " shape="invhouse"]
 	
 
 	 "simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_5" -> "simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_8" ;
-"simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_6" [label="6: Prune (false branch, if) \n   n$0=*&a:int [line 11, column 11]\n  PRUNE(!n$0, false); [line 11, column 11]\n " shape="invhouse"]
+"simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_6" [label="6: Prune (false branch, if) \n   n$1=*&a:int [line 11, column 11]\n  PRUNE(!n$1, false); [line 11, column 11]\n " shape="invhouse"]
 	
 
 	 "simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_6" -> "simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_3" ;
@@ -253,7 +253,7 @@ digraph cfg {
 
 	 "simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_7" -> "simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_5" ;
 	 "simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_7" -> "simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_6" ;
-"simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_8" [label="8:  Return Stmt \n   n$1=*&a:int [line 12, column 16]\n  *&return:int=(1 / n$1) [line 12, column 5]\n " shape="box"]
+"simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_8" [label="8:  Return Stmt \n   n$2=*&a:int [line 12, column 16]\n  *&return:int=(1 / n$2) [line 12, column 5]\n " shape="box"]
 	
 
 	 "simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_8" -> "simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_2" ;
@@ -272,11 +272,11 @@ digraph cfg {
 	
 
 	 "simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_4" -> "simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_2" ;
-"simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_5" [label="5: Prune (true branch, if) \n   n$0=*&p:int* [line 57, column 12]\n  PRUNE(n$0, true); [line 57, column 12]\n " shape="invhouse"]
+"simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_5" [label="5: Prune (true branch, if) \n   n$1=*&p:int* [line 57, column 12]\n  PRUNE(n$1, true); [line 57, column 12]\n " shape="invhouse"]
 	
 
 	 "simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_5" -> "simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_8" ;
-"simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_6" [label="6: Prune (false branch, if) \n   n$0=*&p:int* [line 57, column 12]\n  PRUNE(!n$0, false); [line 57, column 12]\n " shape="invhouse"]
+"simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_6" [label="6: Prune (false branch, if) \n   n$1=*&p:int* [line 57, column 12]\n  PRUNE(!n$1, false); [line 57, column 12]\n " shape="invhouse"]
 	
 
 	 "simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_6" -> "simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_9" ;
@@ -289,7 +289,7 @@ digraph cfg {
 	
 
 	 "simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_8" -> "simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_2" ;
-"simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_9" [label="9:  Return Stmt \n   n$1=*&p:int* [line 60, column 13]\n  n$2=*n$1:int [line 60, column 12]\n  *&return:int=n$2 [line 60, column 5]\n " shape="box"]
+"simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_9" [label="9:  Return Stmt \n   n$3=*&p:int* [line 60, column 13]\n  n$4=*n$3:int [line 60, column 12]\n  *&return:int=n$4 [line 60, column 5]\n " shape="box"]
 	
 
 	 "simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_9" -> "simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_2" ;

infer/tests/codetoanalyze/cpp/shared/nestedoperators/var_decl_inside_switch.cpp.dot

@@ -7,12 +7,12 @@ digraph cfg {
 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_2" [label="2: Exit get \n  " color=yellow style=filled]
 	
 
-"get#10177141129833125794.403aae26476e3a02c544075e122228e0_3" [label="3:  Switch_stmt \n   n$0=*&x:int [line 11, column 15]\n " shape="box"]
+"get#10177141129833125794.403aae26476e3a02c544075e122228e0_3" [label="3:  Switch_stmt \n   n$1=*&x:int [line 11, column 15]\n " shape="box"]
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_3" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_13" ;
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_3" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_14" ;
-"get#10177141129833125794.403aae26476e3a02c544075e122228e0_4" [label="4:  DeclStmt \n   n$1=*&a:int [line 11, column 19]\n  *&x:int=n$1 [line 11, column 11]\n " shape="box"]
+"get#10177141129833125794.403aae26476e3a02c544075e122228e0_4" [label="4:  DeclStmt \n   n$2=*&a:int [line 11, column 19]\n  *&x:int=n$2 [line 11, column 11]\n " shape="box"]
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_4" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_3" ;
@@ -20,7 +20,7 @@ digraph cfg {
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_5" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_6" ;
-"get#10177141129833125794.403aae26476e3a02c544075e122228e0_6" [label="6:  Return Stmt \n   n$2=*&x:int [line 18, column 14]\n  *&return:int=n$2 [line 18, column 7]\n " shape="box"]
+"get#10177141129833125794.403aae26476e3a02c544075e122228e0_6" [label="6:  Return Stmt \n   n$3=*&x:int [line 18, column 14]\n  *&return:int=n$3 [line 18, column 7]\n " shape="box"]
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_6" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_2" ;
@@ -28,11 +28,11 @@ digraph cfg {
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_7" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_2" ;
-"get#10177141129833125794.403aae26476e3a02c544075e122228e0_8" [label="8: Prune (true branch, switch) \n   PRUNE((n$0 == 2), true); [line 15, column 5]\n " shape="invhouse"]
+"get#10177141129833125794.403aae26476e3a02c544075e122228e0_8" [label="8: Prune (true branch, switch) \n   PRUNE((n$1 == 2), true); [line 15, column 5]\n " shape="invhouse"]
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_8" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_7" ;
-"get#10177141129833125794.403aae26476e3a02c544075e122228e0_9" [label="9: Prune (false branch, switch) \n   PRUNE(!(n$0 == 2), false); [line 15, column 5]\n " shape="invhouse"]
+"get#10177141129833125794.403aae26476e3a02c544075e122228e0_9" [label="9: Prune (false branch, switch) \n   PRUNE(!(n$1 == 2), false); [line 15, column 5]\n " shape="invhouse"]
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_9" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_5" ;
@@ -40,20 +40,20 @@ digraph cfg {
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_10" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_2" ;
-"get#10177141129833125794.403aae26476e3a02c544075e122228e0_11" [label="11: Prune (true branch, switch) \n   PRUNE((n$0 == 1), true); [line 13, column 5]\n " shape="invhouse"]
+"get#10177141129833125794.403aae26476e3a02c544075e122228e0_11" [label="11: Prune (true branch, switch) \n   PRUNE((n$1 == 1), true); [line 13, column 5]\n " shape="invhouse"]
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_11" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_10" ;
-"get#10177141129833125794.403aae26476e3a02c544075e122228e0_12" [label="12: Prune (false branch, switch) \n   PRUNE(!(n$0 == 1), false); [line 13, column 5]\n " shape="invhouse"]
+"get#10177141129833125794.403aae26476e3a02c544075e122228e0_12" [label="12: Prune (false branch, switch) \n   PRUNE(!(n$1 == 1), false); [line 13, column 5]\n " shape="invhouse"]
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_12" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_8" ;
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_12" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_9" ;
-"get#10177141129833125794.403aae26476e3a02c544075e122228e0_13" [label="13: Prune (true branch, switch) \n   PRUNE((n$0 == 0), true); [line 12, column 5]\n " shape="invhouse"]
+"get#10177141129833125794.403aae26476e3a02c544075e122228e0_13" [label="13: Prune (true branch, switch) \n   PRUNE((n$1 == 0), true); [line 12, column 5]\n " shape="invhouse"]
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_13" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_10" ;
-"get#10177141129833125794.403aae26476e3a02c544075e122228e0_14" [label="14: Prune (false branch, switch) \n   PRUNE(!(n$0 == 0), false); [line 12, column 5]\n " shape="invhouse"]
+"get#10177141129833125794.403aae26476e3a02c544075e122228e0_14" [label="14: Prune (false branch, switch) \n   PRUNE(!(n$1 == 0), false); [line 12, column 5]\n " shape="invhouse"]
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_14" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_11" ;

infer/tests/codetoanalyze/cpp/shared/nestedoperators/var_decl_inside_while.cpp.dot

@@ -1,6 +1,6 @@
 /* @generated */
 digraph cfg {
-"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_1" [label="1: Start conditional_assignment\nFormals: \nLocals:  a:int 0$?%__sil_tmpSIL_temp_conditional___n$1:int result:int x:int \n   DECLARE_LOCALS(&return,&a,&0$?%__sil_tmpSIL_temp_conditional___n$1,&result,&x); [line 20, column 1]\n " color=yellow style=filled]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_1" [label="1: Start conditional_assignment\nFormals: \nLocals:  a:int 0$?%__sil_tmpSIL_temp_conditional___n$2:int result:int x:int \n   DECLARE_LOCALS(&return,&a,&0$?%__sil_tmpSIL_temp_conditional___n$2,&result,&x); [line 20, column 1]\n " color=yellow style=filled]
 	
 
 	 "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_1" -> "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_17" ;
@@ -15,11 +15,11 @@ digraph cfg {
 	
 
 	 "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_4" -> "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_8" ;
-"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_5" [label="5: Prune (true branch, while) \n   n$0=*&a:int [line 23, column 14]\n  PRUNE(n$0, true); [line 23, column 14]\n " shape="invhouse"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_5" [label="5: Prune (true branch, while) \n   n$1=*&a:int [line 23, column 14]\n  PRUNE(n$1, true); [line 23, column 14]\n " shape="invhouse"]
 	
 
 	 "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_5" -> "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_15" ;
-"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_6" [label="6: Prune (false branch, while) \n   n$0=*&a:int [line 23, column 14]\n  PRUNE(!n$0, false); [line 23, column 14]\n " shape="invhouse"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_6" [label="6: Prune (false branch, while) \n   n$1=*&a:int [line 23, column 14]\n  PRUNE(!n$1, false); [line 23, column 14]\n " shape="invhouse"]
 	
 
 	 "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_6" -> "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_3" ;
@@ -27,37 +27,37 @@ digraph cfg {
 	
 
 	 "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_7" -> "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_13" ;
-"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_8" [label="8:  BinaryOperatorStmt: GT \n   n$2=*&x:int [line 23, column 18]\n " shape="box"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_8" [label="8:  BinaryOperatorStmt: GT \n   n$3=*&x:int [line 23, column 18]\n " shape="box"]
 	
 
 	 "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_8" -> "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_9" ;
 	 "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_8" -> "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_10" ;
-"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_9" [label="9: Prune (true branch, boolean exp) \n   PRUNE((n$2 > 0), true); [line 23, column 18]\n " shape="invhouse"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_9" [label="9: Prune (true branch, boolean exp) \n   PRUNE((n$3 > 0), true); [line 23, column 18]\n " shape="invhouse"]
 	
 
 	 "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_9" -> "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_11" ;
-"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_10" [label="10: Prune (false branch, boolean exp) \n   PRUNE(!(n$2 > 0), false); [line 23, column 18]\n " shape="invhouse"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_10" [label="10: Prune (false branch, boolean exp) \n   PRUNE(!(n$3 > 0), false); [line 23, column 18]\n " shape="invhouse"]
 	
 
 	 "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_10" -> "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_12" ;
-"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_11" [label="11:  ConditinalStmt Branch \n   n$3=*&x:int [line 23, column 26]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$3 [line 23, column 18]\n " shape="box"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_11" [label="11:  ConditionalStmt Branch \n   n$4=*&x:int [line 23, column 26]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$4 [line 23, column 18]\n " shape="box"]
 	
 
 	 "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_11" -> "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_7" ;
-"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=0 [line 23, column 18]\n " shape="box"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_12" [label="12:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=0 [line 23, column 18]\n " shape="box"]
 	
 
 	 "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_12" -> "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_7" ;
-"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_13" [label="13:  DeclStmt \n   n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 23, column 18]\n  *&a:int=n$4 [line 23, column 10]\n " shape="box"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_13" [label="13:  DeclStmt \n   n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 23, column 18]\n  *&a:int=n$5 [line 23, column 10]\n " shape="box"]
 	
 
 	 "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_13" -> "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_5" ;
 	 "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_13" -> "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_6" ;
-"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_14" [label="14:  BinaryOperatorStmt: SubAssign \n   n$5=*&x:int [line 25, column 5]\n  *&x:int=(n$5 - 1) [line 25, column 5]\n " shape="box"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_14" [label="14:  BinaryOperatorStmt: SubAssign \n   n$7=*&x:int [line 25, column 5]\n  *&x:int=(n$7 - 1) [line 25, column 5]\n " shape="box"]
 	
 
 	 "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_14" -> "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_4" ;
-"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_15" [label="15:  BinaryOperatorStmt: AddAssign \n   n$6=*&a:int [line 24, column 15]\n  n$7=*&result:int [line 24, column 5]\n  *&result:int=(n$7 + n$6) [line 24, column 5]\n " shape="box"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_15" [label="15:  BinaryOperatorStmt: AddAssign \n   n$8=*&a:int [line 24, column 15]\n  n$9=*&result:int [line 24, column 5]\n  *&result:int=(n$9 + n$8) [line 24, column 5]\n " shape="box"]
 	
 
 	 "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_15" -> "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_14" ;
@@ -84,24 +84,24 @@ digraph cfg {
 	
 
 	 "simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_4" -> "simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_7" ;
-"simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_5" [label="5: Prune (true branch, while) \n   n$0=*&a:int [line 13, column 14]\n  PRUNE(n$0, true); [line 13, column 14]\n " shape="invhouse"]
+"simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_5" [label="5: Prune (true branch, while) \n   n$1=*&a:int [line 13, column 14]\n  PRUNE(n$1, true); [line 13, column 14]\n " shape="invhouse"]
 	
 
 	 "simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_5" -> "simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_9" ;
-"simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_6" [label="6: Prune (false branch, while) \n   n$0=*&a:int [line 13, column 14]\n  PRUNE(!n$0, false); [line 13, column 14]\n " shape="invhouse"]
+"simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_6" [label="6: Prune (false branch, while) \n   n$1=*&a:int [line 13, column 14]\n  PRUNE(!n$1, false); [line 13, column 14]\n " shape="invhouse"]
 	
 
 	 "simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_6" -> "simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_3" ;
-"simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_7" [label="7:  DeclStmt \n   n$1=*&x:int [line 13, column 18]\n  *&a:int=n$1 [line 13, column 10]\n " shape="box"]
+"simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_7" [label="7:  DeclStmt \n   n$2=*&x:int [line 13, column 18]\n  *&a:int=n$2 [line 13, column 10]\n " shape="box"]
 	
 
 	 "simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_7" -> "simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_5" ;
 	 "simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_7" -> "simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_6" ;
-"simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_8" [label="8:  BinaryOperatorStmt: SubAssign \n   n$2=*&x:int [line 15, column 5]\n  *&x:int=(n$2 - 1) [line 15, column 5]\n " shape="box"]
+"simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_8" [label="8:  BinaryOperatorStmt: SubAssign \n   n$4=*&x:int [line 15, column 5]\n  *&x:int=(n$4 - 1) [line 15, column 5]\n " shape="box"]
 	
 
 	 "simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_8" -> "simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_4" ;
-"simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_9" [label="9:  BinaryOperatorStmt: AddAssign \n   n$3=*&a:int [line 14, column 15]\n  n$4=*&result:int [line 14, column 5]\n  *&result:int=(n$4 + n$3) [line 14, column 5]\n " shape="box"]
+"simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_9" [label="9:  BinaryOperatorStmt: AddAssign \n   n$5=*&a:int [line 14, column 15]\n  n$6=*&result:int [line 14, column 5]\n  *&result:int=(n$6 + n$5) [line 14, column 5]\n " shape="box"]
 	
 
 	 "simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_9" -> "simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_8" ;

infer/tests/codetoanalyze/cpp/shared/npe/method_call.cpp.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "call_with_forward_declaration#16178135517860387666.7dab8d0b16e63b8b27f5ae7c5c45a070_2" [label="2: Exit call_with_forward_declaration \n  " color=yellow style=filled]
 	
 
-"call_with_forward_declaration#16178135517860387666.7dab8d0b16e63b8b27f5ae7c5c45a070_3" [label="3:  Call _fun_XForward_call \n   n$0=*&x:XForward* [line 35, column 51]\n  _=*n$0:XForward [line 35, column 51]\n  n$2=_fun_XForward_call(n$0:XForward*) [line 35, column 51]\n " shape="box"]
+"call_with_forward_declaration#16178135517860387666.7dab8d0b16e63b8b27f5ae7c5c45a070_3" [label="3:  Call _fun_XForward_call \n   n$1=*&x:XForward* [line 35, column 51]\n  _=*n$1:XForward [line 35, column 51]\n  n$3=_fun_XForward_call(n$1:XForward*) [line 35, column 51]\n " shape="box"]
 	
 
 	 "call_with_forward_declaration#16178135517860387666.7dab8d0b16e63b8b27f5ae7c5c45a070_3" -> "call_with_forward_declaration#16178135517860387666.7dab8d0b16e63b8b27f5ae7c5c45a070_2" ;
@@ -44,7 +44,7 @@ digraph cfg {
 "npe_call_after_call#8140813350794705532.fd3a6d06275def8a130284a430f22a3d_2" [label="2: Exit npe_call_after_call \n  " color=yellow style=filled]
 	
 
-"npe_call_after_call#8140813350794705532.fd3a6d06275def8a130284a430f22a3d_3" [label="3:  Call _fun_X_call \n   n$0=_fun_getX() [line 22, column 30]\n  _=*n$0:X [line 22, column 30]\n  n$2=_fun_X_call(n$0:X*) [line 22, column 30]\n " shape="box"]
+"npe_call_after_call#8140813350794705532.fd3a6d06275def8a130284a430f22a3d_3" [label="3:  Call _fun_X_call \n   n$1=_fun_getX() [line 22, column 30]\n  _=*n$1:X [line 22, column 30]\n  n$3=_fun_X_call(n$1:X*) [line 22, column 30]\n " shape="box"]
 	
 
 	 "npe_call_after_call#8140813350794705532.fd3a6d06275def8a130284a430f22a3d_3" -> "npe_call_after_call#8140813350794705532.fd3a6d06275def8a130284a430f22a3d_2" ;
@@ -55,7 +55,7 @@ digraph cfg {
 "npe_call_with_forward_declaration#12046983290123510130.5e902eb9a8f96f74e83d527b422bd861_2" [label="2: Exit npe_call_with_forward_declaration \n  " color=yellow style=filled]
 	
 
-"npe_call_with_forward_declaration#12046983290123510130.5e902eb9a8f96f74e83d527b422bd861_3" [label="3:  Call _fun_call_with_forward_declaration \n   n$0=_fun_call_with_forward_declaration(null:XForward*) [line 38, column 3]\n " shape="box"]
+"npe_call_with_forward_declaration#12046983290123510130.5e902eb9a8f96f74e83d527b422bd861_3" [label="3:  Call _fun_call_with_forward_declaration \n   n$1=_fun_call_with_forward_declaration(null:XForward*) [line 38, column 3]\n " shape="box"]
 	
 
 	 "npe_call_with_forward_declaration#12046983290123510130.5e902eb9a8f96f74e83d527b422bd861_3" -> "npe_call_with_forward_declaration#12046983290123510130.5e902eb9a8f96f74e83d527b422bd861_2" ;

infer/tests/codetoanalyze/cpp/shared/reference/increment.cpp.dot

@@ -7,11 +7,11 @@ digraph cfg {
 "using_ref#11585308534136333375.096010b8466cdacb12ca24c30d2a7334_2" [label="2: Exit using_ref \n  " color=yellow style=filled]
 	
 
-"using_ref#11585308534136333375.096010b8466cdacb12ca24c30d2a7334_3" [label="3:  DeclStmt \n   n$0=*&vr:int& [line 20, column 14]\n  n$1=*n$0:int [line 20, column 12]\n  *n$0:int=(n$1 - 1) [line 20, column 12]\n  *&q:int&=n$0 [line 20, column 3]\n " shape="box"]
+"using_ref#11585308534136333375.096010b8466cdacb12ca24c30d2a7334_3" [label="3:  DeclStmt \n   n$1=*&vr:int& [line 20, column 14]\n  n$2=*n$1:int [line 20, column 12]\n  *n$1:int=(n$2 - 1) [line 20, column 12]\n  *&q:int&=n$1 [line 20, column 3]\n " shape="box"]
 	
 
 	 "using_ref#11585308534136333375.096010b8466cdacb12ca24c30d2a7334_3" -> "using_ref#11585308534136333375.096010b8466cdacb12ca24c30d2a7334_2" ;
-"using_ref#11585308534136333375.096010b8466cdacb12ca24c30d2a7334_4" [label="4:  DeclStmt \n   n$2=*&vr:int& [line 19, column 14]\n  n$3=*n$2:int [line 19, column 12]\n  *n$2:int=(n$3 + 1) [line 19, column 12]\n  *&r:int&=n$2 [line 19, column 3]\n " shape="box"]
+"using_ref#11585308534136333375.096010b8466cdacb12ca24c30d2a7334_4" [label="4:  DeclStmt \n   n$3=*&vr:int& [line 19, column 14]\n  n$4=*n$3:int [line 19, column 12]\n  *n$3:int=(n$4 + 1) [line 19, column 12]\n  *&r:int&=n$3 [line 19, column 3]\n " shape="box"]
 	
 
 	 "using_ref#11585308534136333375.096010b8466cdacb12ca24c30d2a7334_4" -> "using_ref#11585308534136333375.096010b8466cdacb12ca24c30d2a7334_3" ;
@@ -30,11 +30,11 @@ digraph cfg {
 "using_value#13692921440907975250.fad67099f85ea68eb3281c85bd0ca170_2" [label="2: Exit using_value \n  " color=yellow style=filled]
 	
 
-"using_value#13692921440907975250.fad67099f85ea68eb3281c85bd0ca170_3" [label="3:  DeclStmt \n   n$0=*&v:int [line 13, column 12]\n  *&v:int=(n$0 - 1) [line 13, column 12]\n  *&q:int&=&v [line 13, column 3]\n " shape="box"]
+"using_value#13692921440907975250.fad67099f85ea68eb3281c85bd0ca170_3" [label="3:  DeclStmt \n   n$1=*&v:int [line 13, column 12]\n  *&v:int=(n$1 - 1) [line 13, column 12]\n  *&q:int&=&v [line 13, column 3]\n " shape="box"]
 	
 
 	 "using_value#13692921440907975250.fad67099f85ea68eb3281c85bd0ca170_3" -> "using_value#13692921440907975250.fad67099f85ea68eb3281c85bd0ca170_2" ;
-"using_value#13692921440907975250.fad67099f85ea68eb3281c85bd0ca170_4" [label="4:  DeclStmt \n   n$1=*&v:int [line 12, column 12]\n  *&v:int=(n$1 + 1) [line 12, column 12]\n  *&r:int&=&v [line 12, column 3]\n " shape="box"]
+"using_value#13692921440907975250.fad67099f85ea68eb3281c85bd0ca170_4" [label="4:  DeclStmt \n   n$2=*&v:int [line 12, column 12]\n  *&v:int=(n$2 + 1) [line 12, column 12]\n  *&r:int&=&v [line 12, column 3]\n " shape="box"]
 	
 
 	 "using_value#13692921440907975250.fad67099f85ea68eb3281c85bd0ca170_4" -> "using_value#13692921440907975250.fad67099f85ea68eb3281c85bd0ca170_3" ;

infer/tests/codetoanalyze/cpp/shared/reference/init.cpp.dot

@@ -7,15 +7,15 @@ digraph cfg {
 "init_from_ptr#9521990274512470149.d27094f3cfd0d42c143fba9593870578_2" [label="2: Exit init_from_ptr \n  " color=yellow style=filled]
 	
 
-"init_from_ptr#9521990274512470149.d27094f3cfd0d42c143fba9593870578_3" [label="3:  DeclStmt \n   n$0=*&par:int* [line 25, column 12]\n  *&p:int*=n$0 [line 25, column 3]\n " shape="box"]
+"init_from_ptr#9521990274512470149.d27094f3cfd0d42c143fba9593870578_3" [label="3:  DeclStmt \n   n$1=*&par:int* [line 25, column 12]\n  *&p:int*=n$1 [line 25, column 3]\n " shape="box"]
 	
 
 	 "init_from_ptr#9521990274512470149.d27094f3cfd0d42c143fba9593870578_3" -> "init_from_ptr#9521990274512470149.d27094f3cfd0d42c143fba9593870578_2" ;
-"init_from_ptr#9521990274512470149.d27094f3cfd0d42c143fba9593870578_4" [label="4:  DeclStmt \n   n$1=*&par:int* [line 24, column 13]\n  *&d:int&=n$1 [line 24, column 3]\n " shape="box"]
+"init_from_ptr#9521990274512470149.d27094f3cfd0d42c143fba9593870578_4" [label="4:  DeclStmt \n   n$2=*&par:int* [line 24, column 13]\n  *&d:int&=n$2 [line 24, column 3]\n " shape="box"]
 	
 
 	 "init_from_ptr#9521990274512470149.d27094f3cfd0d42c143fba9593870578_4" -> "init_from_ptr#9521990274512470149.d27094f3cfd0d42c143fba9593870578_3" ;
-"init_from_ptr#9521990274512470149.d27094f3cfd0d42c143fba9593870578_5" [label="5:  DeclStmt \n   n$2=*&par:int* [line 23, column 12]\n  n$3=*n$2:int [line 23, column 11]\n  *&v:int=n$3 [line 23, column 3]\n " shape="box"]
+"init_from_ptr#9521990274512470149.d27094f3cfd0d42c143fba9593870578_5" [label="5:  DeclStmt \n   n$3=*&par:int* [line 23, column 12]\n  n$4=*n$3:int [line 23, column 11]\n  *&v:int=n$4 [line 23, column 3]\n " shape="box"]
 	
 
 	 "init_from_ptr#9521990274512470149.d27094f3cfd0d42c143fba9593870578_5" -> "init_from_ptr#9521990274512470149.d27094f3cfd0d42c143fba9593870578_4" ;
@@ -26,15 +26,15 @@ digraph cfg {
 "init_from_ref#17239877270654219020.166550b98b7cafba1c908639121bced8_2" [label="2: Exit init_from_ref \n  " color=yellow style=filled]
 	
 
-"init_from_ref#17239877270654219020.166550b98b7cafba1c908639121bced8_3" [label="3:  DeclStmt \n   n$0=*&par:int& [line 13, column 13]\n  *&p:int*=n$0 [line 13, column 3]\n " shape="box"]
+"init_from_ref#17239877270654219020.166550b98b7cafba1c908639121bced8_3" [label="3:  DeclStmt \n   n$1=*&par:int& [line 13, column 13]\n  *&p:int*=n$1 [line 13, column 3]\n " shape="box"]
 	
 
 	 "init_from_ref#17239877270654219020.166550b98b7cafba1c908639121bced8_3" -> "init_from_ref#17239877270654219020.166550b98b7cafba1c908639121bced8_2" ;
-"init_from_ref#17239877270654219020.166550b98b7cafba1c908639121bced8_4" [label="4:  DeclStmt \n   n$1=*&par:int& [line 12, column 12]\n  *&d:int&=n$1 [line 12, column 3]\n " shape="box"]
+"init_from_ref#17239877270654219020.166550b98b7cafba1c908639121bced8_4" [label="4:  DeclStmt \n   n$2=*&par:int& [line 12, column 12]\n  *&d:int&=n$2 [line 12, column 3]\n " shape="box"]
 	
 
 	 "init_from_ref#17239877270654219020.166550b98b7cafba1c908639121bced8_4" -> "init_from_ref#17239877270654219020.166550b98b7cafba1c908639121bced8_3" ;
-"init_from_ref#17239877270654219020.166550b98b7cafba1c908639121bced8_5" [label="5:  DeclStmt \n   n$2=*&par:int& [line 11, column 11]\n  n$3=*n$2:int [line 11, column 11]\n  *&v:int=n$3 [line 11, column 3]\n " shape="box"]
+"init_from_ref#17239877270654219020.166550b98b7cafba1c908639121bced8_5" [label="5:  DeclStmt \n   n$3=*&par:int& [line 11, column 11]\n  n$4=*n$3:int [line 11, column 11]\n  *&v:int=n$4 [line 11, column 3]\n " shape="box"]
 	
 
 	 "init_from_ref#17239877270654219020.166550b98b7cafba1c908639121bced8_5" -> "init_from_ref#17239877270654219020.166550b98b7cafba1c908639121bced8_4" ;
@@ -53,7 +53,7 @@ digraph cfg {
 	
 
 	 "init_from_val#14538961741925123970.e5e29991fa3b6aa0a341c0c9f54754a7_4" -> "init_from_val#14538961741925123970.e5e29991fa3b6aa0a341c0c9f54754a7_3" ;
-"init_from_val#14538961741925123970.e5e29991fa3b6aa0a341c0c9f54754a7_5" [label="5:  DeclStmt \n   n$0=*&par:int [line 17, column 11]\n  *&v:int=n$0 [line 17, column 3]\n " shape="box"]
+"init_from_val#14538961741925123970.e5e29991fa3b6aa0a341c0c9f54754a7_5" [label="5:  DeclStmt \n   n$1=*&par:int [line 17, column 11]\n  *&v:int=n$1 [line 17, column 3]\n " shape="box"]
 	
 
 	 "init_from_val#14538961741925123970.e5e29991fa3b6aa0a341c0c9f54754a7_5" -> "init_from_val#14538961741925123970.e5e29991fa3b6aa0a341c0c9f54754a7_4" ;

infer/tests/codetoanalyze/cpp/shared/reference/member_access.cpp.dot

@@ -7,11 +7,11 @@ digraph cfg {
 "access_ptr#15321479508398739907.c982e7d4bf02ada6326387e65b321af4_2" [label="2: Exit access_ptr \n  " color=yellow style=filled]
 	
 
-"access_ptr#15321479508398739907.c982e7d4bf02ada6326387e65b321af4_3" [label="3:  DeclStmt \n   n$0=*&x:X* [line 22, column 11]\n  _=*n$0:X [line 22, column 11]\n  n$2=_fun_X_call(n$0:X*) [line 22, column 11]\n  *&c:int=n$2 [line 22, column 3]\n " shape="box"]
+"access_ptr#15321479508398739907.c982e7d4bf02ada6326387e65b321af4_3" [label="3:  DeclStmt \n   n$1=*&x:X* [line 22, column 11]\n  _=*n$1:X [line 22, column 11]\n  n$3=_fun_X_call(n$1:X*) [line 22, column 11]\n  *&c:int=n$3 [line 22, column 3]\n " shape="box"]
 	
 
 	 "access_ptr#15321479508398739907.c982e7d4bf02ada6326387e65b321af4_3" -> "access_ptr#15321479508398739907.c982e7d4bf02ada6326387e65b321af4_2" ;
-"access_ptr#15321479508398739907.c982e7d4bf02ada6326387e65b321af4_4" [label="4:  DeclStmt \n   n$3=*&x:X* [line 21, column 11]\n  n$4=*n$3.f:int [line 21, column 11]\n  *&f:int=n$4 [line 21, column 3]\n " shape="box"]
+"access_ptr#15321479508398739907.c982e7d4bf02ada6326387e65b321af4_4" [label="4:  DeclStmt \n   n$4=*&x:X* [line 21, column 11]\n  n$5=*n$4.f:int [line 21, column 11]\n  *&f:int=n$5 [line 21, column 3]\n " shape="box"]
 	
 
 	 "access_ptr#15321479508398739907.c982e7d4bf02ada6326387e65b321af4_4" -> "access_ptr#15321479508398739907.c982e7d4bf02ada6326387e65b321af4_3" ;
@@ -22,11 +22,11 @@ digraph cfg {
 "access_ref#4794488565171451856.2c0cb1f039897d6498c9fea4cbfec99e_2" [label="2: Exit access_ref \n  " color=yellow style=filled]
 	
 
-"access_ref#4794488565171451856.2c0cb1f039897d6498c9fea4cbfec99e_3" [label="3:  DeclStmt \n   n$0=*&x:X& [line 17, column 11]\n  _=*n$0:X [line 17, column 11]\n  n$2=_fun_X_call(n$0:X&) [line 17, column 11]\n  *&c:int=n$2 [line 17, column 3]\n " shape="box"]
+"access_ref#4794488565171451856.2c0cb1f039897d6498c9fea4cbfec99e_3" [label="3:  DeclStmt \n   n$1=*&x:X& [line 17, column 11]\n  _=*n$1:X [line 17, column 11]\n  n$3=_fun_X_call(n$1:X&) [line 17, column 11]\n  *&c:int=n$3 [line 17, column 3]\n " shape="box"]
 	
 
 	 "access_ref#4794488565171451856.2c0cb1f039897d6498c9fea4cbfec99e_3" -> "access_ref#4794488565171451856.2c0cb1f039897d6498c9fea4cbfec99e_2" ;
-"access_ref#4794488565171451856.2c0cb1f039897d6498c9fea4cbfec99e_4" [label="4:  DeclStmt \n   n$3=*&x:X& [line 16, column 11]\n  n$4=*n$3.f:int [line 16, column 11]\n  *&f:int=n$4 [line 16, column 3]\n " shape="box"]
+"access_ref#4794488565171451856.2c0cb1f039897d6498c9fea4cbfec99e_4" [label="4:  DeclStmt \n   n$4=*&x:X& [line 16, column 11]\n  n$5=*n$4.f:int [line 16, column 11]\n  *&f:int=n$5 [line 16, column 3]\n " shape="box"]
 	
 
 	 "access_ref#4794488565171451856.2c0cb1f039897d6498c9fea4cbfec99e_4" -> "access_ref#4794488565171451856.2c0cb1f039897d6498c9fea4cbfec99e_3" ;

infer/tests/codetoanalyze/cpp/shared/reference/member_access_from_return.cpp.dot

@@ -40,11 +40,11 @@ digraph cfg {
 "test_ptr#11416786403465510397.fe356f46dccde5545eadf0c661f4974d_2" [label="2: Exit test_ptr \n  " color=yellow style=filled]
 	
 
-"test_ptr#11416786403465510397.fe356f46dccde5545eadf0c661f4974d_3" [label="3:  DeclStmt \n   n$0=_fun_get_ptr() [line 26, column 11]\n  _=*n$0:X [line 26, column 11]\n  n$2=_fun_X_call(n$0:X*) [line 26, column 11]\n  *&c:int=n$2 [line 26, column 3]\n " shape="box"]
+"test_ptr#11416786403465510397.fe356f46dccde5545eadf0c661f4974d_3" [label="3:  DeclStmt \n   n$1=_fun_get_ptr() [line 26, column 11]\n  _=*n$1:X [line 26, column 11]\n  n$3=_fun_X_call(n$1:X*) [line 26, column 11]\n  *&c:int=n$3 [line 26, column 3]\n " shape="box"]
 	
 
 	 "test_ptr#11416786403465510397.fe356f46dccde5545eadf0c661f4974d_3" -> "test_ptr#11416786403465510397.fe356f46dccde5545eadf0c661f4974d_2" ;
-"test_ptr#11416786403465510397.fe356f46dccde5545eadf0c661f4974d_4" [label="4:  DeclStmt \n   n$3=_fun_get_ptr() [line 25, column 11]\n  n$4=*n$3.f:int [line 25, column 11]\n  *&f:int=n$4 [line 25, column 3]\n " shape="box"]
+"test_ptr#11416786403465510397.fe356f46dccde5545eadf0c661f4974d_4" [label="4:  DeclStmt \n   n$4=_fun_get_ptr() [line 25, column 11]\n  n$5=*n$4.f:int [line 25, column 11]\n  *&f:int=n$5 [line 25, column 3]\n " shape="box"]
 	
 
 	 "test_ptr#11416786403465510397.fe356f46dccde5545eadf0c661f4974d_4" -> "test_ptr#11416786403465510397.fe356f46dccde5545eadf0c661f4974d_3" ;
@@ -55,11 +55,11 @@ digraph cfg {
 "test_ref#7021555814503032268.9c735d5eedd26e3009ec35c4af427db4_2" [label="2: Exit test_ref \n  " color=yellow style=filled]
 	
 
-"test_ref#7021555814503032268.9c735d5eedd26e3009ec35c4af427db4_3" [label="3:  DeclStmt \n   n$0=_fun_get_ref() [line 21, column 11]\n  _=*n$0:X [line 21, column 11]\n  n$2=_fun_X_call(n$0:X&) [line 21, column 11]\n  *&c:int=n$2 [line 21, column 3]\n " shape="box"]
+"test_ref#7021555814503032268.9c735d5eedd26e3009ec35c4af427db4_3" [label="3:  DeclStmt \n   n$1=_fun_get_ref() [line 21, column 11]\n  _=*n$1:X [line 21, column 11]\n  n$3=_fun_X_call(n$1:X&) [line 21, column 11]\n  *&c:int=n$3 [line 21, column 3]\n " shape="box"]
 	
 
 	 "test_ref#7021555814503032268.9c735d5eedd26e3009ec35c4af427db4_3" -> "test_ref#7021555814503032268.9c735d5eedd26e3009ec35c4af427db4_2" ;
-"test_ref#7021555814503032268.9c735d5eedd26e3009ec35c4af427db4_4" [label="4:  DeclStmt \n   n$3=_fun_get_ref() [line 20, column 11]\n  n$4=*n$3.f:int [line 20, column 11]\n  *&f:int=n$4 [line 20, column 3]\n " shape="box"]
+"test_ref#7021555814503032268.9c735d5eedd26e3009ec35c4af427db4_4" [label="4:  DeclStmt \n   n$4=_fun_get_ref() [line 20, column 11]\n  n$5=*n$4.f:int [line 20, column 11]\n  *&f:int=n$5 [line 20, column 3]\n " shape="box"]
 	
 
 	 "test_ref#7021555814503032268.9c735d5eedd26e3009ec35c4af427db4_4" -> "test_ref#7021555814503032268.9c735d5eedd26e3009ec35c4af427db4_3" ;

infer/tests/codetoanalyze/cpp/shared/reference/nested_assignment.cpp.dot

@@ -7,15 +7,15 @@ digraph cfg {
 "crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_2" [label="2: Exit crazy_nested \n  " color=yellow style=filled]
 	
 
-"crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_3" [label="3:  DeclStmt \n   n$0=*&ref_from_val:int& [line 29, column 23]\n  *&b:int=5 [line 29, column 38]\n  n$1=*&b:int [line 29, column 38]\n  *n$0:int=n$1 [line 29, column 23]\n  *&ref_from_ref:int&=n$0 [line 29, column 3]\n " shape="box"]
+"crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_3" [label="3:  DeclStmt \n   n$1=*&ref_from_val:int& [line 29, column 23]\n  *&b:int=5 [line 29, column 38]\n  n$2=*&b:int [line 29, column 38]\n  *n$1:int=n$2 [line 29, column 23]\n  *&ref_from_ref:int&=n$1 [line 29, column 3]\n " shape="box"]
 	
 
 	 "crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_3" -> "crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_2" ;
-"crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_4" [label="4:  DeclStmt \n   *&b:int=4 [line 28, column 27]\n  n$2=*&b:int [line 28, column 27]\n  *&a:int=n$2 [line 28, column 23]\n  *&ref_from_val:int&=&a [line 28, column 3]\n " shape="box"]
+"crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_4" [label="4:  DeclStmt \n   *&b:int=4 [line 28, column 27]\n  n$3=*&b:int [line 28, column 27]\n  *&a:int=n$3 [line 28, column 23]\n  *&ref_from_val:int&=&a [line 28, column 3]\n " shape="box"]
 	
 
 	 "crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_4" -> "crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_3" ;
-"crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_5" [label="5:  DeclStmt \n   n$3=*&a:int [line 24, column 11]\n  *&b:int=n$3 [line 24, column 3]\n " shape="box"]
+"crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_5" [label="5:  DeclStmt \n   n$4=*&a:int [line 24, column 11]\n  *&b:int=n$4 [line 24, column 3]\n " shape="box"]
 	
 
 	 "crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_5" -> "crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_4" ;
@@ -30,7 +30,7 @@ digraph cfg {
 "nested#4768179933025409429.17c34afcb279e8ad08f7f8afaad41585_2" [label="2: Exit nested \n  " color=yellow style=filled]
 	
 
-"nested#4768179933025409429.17c34afcb279e8ad08f7f8afaad41585_3" [label="3:  DeclStmt \n   n$0=*&ref_from_val:int& [line 19, column 23]\n  *n$0:int=6 [line 19, column 23]\n  *&ref_from_ref:int&=n$0 [line 19, column 3]\n " shape="box"]
+"nested#4768179933025409429.17c34afcb279e8ad08f7f8afaad41585_3" [label="3:  DeclStmt \n   n$1=*&ref_from_val:int& [line 19, column 23]\n  *n$1:int=6 [line 19, column 23]\n  *&ref_from_ref:int&=n$1 [line 19, column 3]\n " shape="box"]
 	
 
 	 "nested#4768179933025409429.17c34afcb279e8ad08f7f8afaad41585_3" -> "nested#4768179933025409429.17c34afcb279e8ad08f7f8afaad41585_2" ;
@@ -49,7 +49,7 @@ digraph cfg {
 "normal#16009437256715545217.c7cd9ebbb6d7cc9f4987cf90ce12a044_2" [label="2: Exit normal \n  " color=yellow style=filled]
 	
 
-"normal#16009437256715545217.c7cd9ebbb6d7cc9f4987cf90ce12a044_3" [label="3:  DeclStmt \n   n$0=*&ref_from_val:int& [line 13, column 23]\n  *&ref_from_ref:int&=n$0 [line 13, column 3]\n " shape="box"]
+"normal#16009437256715545217.c7cd9ebbb6d7cc9f4987cf90ce12a044_3" [label="3:  DeclStmt \n   n$1=*&ref_from_val:int& [line 13, column 23]\n  *&ref_from_ref:int&=n$1 [line 13, column 3]\n " shape="box"]
 	
 
 	 "normal#16009437256715545217.c7cd9ebbb6d7cc9f4987cf90ce12a044_3" -> "normal#16009437256715545217.c7cd9ebbb6d7cc9f4987cf90ce12a044_2" ;

infer/tests/codetoanalyze/cpp/shared/reference/ptr_mem.cpp.dot

@@ -7,15 +7,15 @@ digraph cfg {
 "noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_2" [label="2: Exit noskip \n  " color=yellow style=filled]
 	
 
-"noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_3" [label="3:  Call _fun_List<item>_add_byref \n   n$0=*&l:List<item>& [line 37, column 3]\n  _=*n$0:List<item> [line 37, column 3]\n  n$2=_fun_List<item>_add_byref(n$0:List<item>&,&i:item&) [line 37, column 3]\n " shape="box"]
+"noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_3" [label="3:  Call _fun_List<item>_add_byref \n   n$1=*&l:List<item>& [line 37, column 3]\n  _=*n$1:List<item> [line 37, column 3]\n  n$3=_fun_List<item>_add_byref(n$1:List<item>&,&i:item&) [line 37, column 3]\n " shape="box"]
 	
 
 	 "noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_3" -> "noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_2" ;
-"noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_4" [label="4:  Call _fun_List<item>_add \n   n$3=*&l:List<item>& [line 36, column 3]\n  _=*n$3:List<item> [line 36, column 3]\n  n$5=_fun_List<item>_add(n$3:List<item>&,&i:item*) [line 36, column 3]\n " shape="box"]
+"noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_4" [label="4:  Call _fun_List<item>_add \n   n$4=*&l:List<item>& [line 36, column 3]\n  _=*n$4:List<item> [line 36, column 3]\n  n$6=_fun_List<item>_add(n$4:List<item>&,&i:item*) [line 36, column 3]\n " shape="box"]
 	
 
 	 "noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_4" -> "noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_3" ;
-"noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_5" [label="5:  DeclStmt \n   n$6=_fun_item_item(&i:item*) [line 35, column 8]\n " shape="box"]
+"noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_5" [label="5:  DeclStmt \n   n$7=_fun_item_item(&i:item*) [line 35, column 8]\n " shape="box"]
 	
 
 	 "noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_5" -> "noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_4" ;
@@ -26,11 +26,11 @@ digraph cfg {
 "List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_2" [label="2: Exit List<item>_List \n  " color=yellow style=filled]
 	
 
-"List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_3" [label="3:  Constructor Init \n   n$0=*&this:List<item>* [line 16, column 42]\n  n$1=*&next_ptr:void [line 16, column 51]\n  *n$0.next_ptr:void=n$1 [line 16, column 42]\n " shape="box"]
+"List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_3" [label="3:  Constructor Init \n   n$2=*&this:List<item>* [line 16, column 42]\n  n$3=*&next_ptr:void [line 16, column 51]\n  *n$2.next_ptr:void=n$3 [line 16, column 42]\n " shape="box"]
 	
 
 	 "List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_3" -> "List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_2" ;
-"List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_4" [label="4:  Constructor Init \n   n$2=*&this:List<item>* [line 16, column 27]\n  *n$2.head:item*=null [line 16, column 27]\n " shape="box"]
+"List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_4" [label="4:  Constructor Init \n   n$4=*&this:List<item>* [line 16, column 27]\n  *n$4.head:item*=null [line 16, column 27]\n " shape="box"]
 	
 
 	 "List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_4" -> "List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_3" ;

infer/tests/codetoanalyze/cpp/shared/reference/reference_field.cpp.dot

@@ -15,7 +15,7 @@ digraph cfg {
 	
 
 	 "ptr_F_div0#reference_field#14005768761742554773.fa7bac24d70ab0b747e7fb5360157c5f_4" -> "ptr_F_div0#reference_field#14005768761742554773.fa7bac24d70ab0b747e7fb5360157c5f_3" ;
-"ptr_F_div0#reference_field#14005768761742554773.fa7bac24d70ab0b747e7fb5360157c5f_5" [label="5:  DeclStmt \n   n$4=_fun_reference_field::Ptr_Ptr(&r:reference_field::Ptr*,&x:reference_field::X&) [line 84, column 7]\n " shape="box"]
+"ptr_F_div0#reference_field#14005768761742554773.fa7bac24d70ab0b747e7fb5360157c5f_5" [label="5:  DeclStmt \n   n$5=_fun_reference_field::Ptr_Ptr(&r:reference_field::Ptr*,&x:reference_field::X&) [line 84, column 7]\n " shape="box"]
 	
 
 	 "ptr_F_div0#reference_field#14005768761742554773.fa7bac24d70ab0b747e7fb5360157c5f_5" -> "ptr_F_div0#reference_field#14005768761742554773.fa7bac24d70ab0b747e7fb5360157c5f_4" ;
@@ -23,7 +23,7 @@ digraph cfg {
 	
 
 	 "ptr_F_div0#reference_field#14005768761742554773.fa7bac24d70ab0b747e7fb5360157c5f_6" -> "ptr_F_div0#reference_field#14005768761742554773.fa7bac24d70ab0b747e7fb5360157c5f_5" ;
-"ptr_F_div0#reference_field#14005768761742554773.fa7bac24d70ab0b747e7fb5360157c5f_7" [label="7:  DeclStmt \n   n$5=_fun_reference_field::X_X(&x:reference_field::X*) [line 82, column 5]\n " shape="box"]
+"ptr_F_div0#reference_field#14005768761742554773.fa7bac24d70ab0b747e7fb5360157c5f_7" [label="7:  DeclStmt \n   n$6=_fun_reference_field::X_X(&x:reference_field::X*) [line 82, column 5]\n " shape="box"]
 	
 
 	 "ptr_F_div0#reference_field#14005768761742554773.fa7bac24d70ab0b747e7fb5360157c5f_7" -> "ptr_F_div0#reference_field#14005768761742554773.fa7bac24d70ab0b747e7fb5360157c5f_6" ;
@@ -42,7 +42,7 @@ digraph cfg {
 	
 
 	 "ptr_I_div0#reference_field#18255668366877010738.5b1f39b2d5e2810cbdbf96621d88c2d0_4" -> "ptr_I_div0#reference_field#18255668366877010738.5b1f39b2d5e2810cbdbf96621d88c2d0_3" ;
-"ptr_I_div0#reference_field#18255668366877010738.5b1f39b2d5e2810cbdbf96621d88c2d0_5" [label="5:  DeclStmt \n   n$4=_fun_reference_field::Ptr_Ptr(&r:reference_field::Ptr*,&x:reference_field::X&) [line 92, column 7]\n " shape="box"]
+"ptr_I_div0#reference_field#18255668366877010738.5b1f39b2d5e2810cbdbf96621d88c2d0_5" [label="5:  DeclStmt \n   n$5=_fun_reference_field::Ptr_Ptr(&r:reference_field::Ptr*,&x:reference_field::X&) [line 92, column 7]\n " shape="box"]
 	
 
 	 "ptr_I_div0#reference_field#18255668366877010738.5b1f39b2d5e2810cbdbf96621d88c2d0_5" -> "ptr_I_div0#reference_field#18255668366877010738.5b1f39b2d5e2810cbdbf96621d88c2d0_4" ;
@@ -50,7 +50,7 @@ digraph cfg {
 	
 
 	 "ptr_I_div0#reference_field#18255668366877010738.5b1f39b2d5e2810cbdbf96621d88c2d0_6" -> "ptr_I_div0#reference_field#18255668366877010738.5b1f39b2d5e2810cbdbf96621d88c2d0_5" ;
-"ptr_I_div0#reference_field#18255668366877010738.5b1f39b2d5e2810cbdbf96621d88c2d0_7" [label="7:  DeclStmt \n   n$5=_fun_reference_field::X_X(&x:reference_field::X*) [line 90, column 5]\n " shape="box"]
+"ptr_I_div0#reference_field#18255668366877010738.5b1f39b2d5e2810cbdbf96621d88c2d0_7" [label="7:  DeclStmt \n   n$6=_fun_reference_field::X_X(&x:reference_field::X*) [line 90, column 5]\n " shape="box"]
 	
 
 	 "ptr_I_div0#reference_field#18255668366877010738.5b1f39b2d5e2810cbdbf96621d88c2d0_7" -> "ptr_I_div0#reference_field#18255668366877010738.5b1f39b2d5e2810cbdbf96621d88c2d0_6" ;
@@ -69,7 +69,7 @@ digraph cfg {
 	
 
 	 "ptr_getF_div0#reference_field#3337646019334387234.41e241b3e1d6a6f7c629a1c6ca69cf07_4" -> "ptr_getF_div0#reference_field#3337646019334387234.41e241b3e1d6a6f7c629a1c6ca69cf07_3" ;
-"ptr_getF_div0#reference_field#3337646019334387234.41e241b3e1d6a6f7c629a1c6ca69cf07_5" [label="5:  DeclStmt \n   n$4=_fun_reference_field::Ptr_Ptr(&r:reference_field::Ptr*,&x:reference_field::X&) [line 100, column 7]\n " shape="box"]
+"ptr_getF_div0#reference_field#3337646019334387234.41e241b3e1d6a6f7c629a1c6ca69cf07_5" [label="5:  DeclStmt \n   n$5=_fun_reference_field::Ptr_Ptr(&r:reference_field::Ptr*,&x:reference_field::X&) [line 100, column 7]\n " shape="box"]
 	
 
 	 "ptr_getF_div0#reference_field#3337646019334387234.41e241b3e1d6a6f7c629a1c6ca69cf07_5" -> "ptr_getF_div0#reference_field#3337646019334387234.41e241b3e1d6a6f7c629a1c6ca69cf07_4" ;
@@ -77,7 +77,7 @@ digraph cfg {
 	
 
 	 "ptr_getF_div0#reference_field#3337646019334387234.41e241b3e1d6a6f7c629a1c6ca69cf07_6" -> "ptr_getF_div0#reference_field#3337646019334387234.41e241b3e1d6a6f7c629a1c6ca69cf07_5" ;
-"ptr_getF_div0#reference_field#3337646019334387234.41e241b3e1d6a6f7c629a1c6ca69cf07_7" [label="7:  DeclStmt \n   n$5=_fun_reference_field::X_X(&x:reference_field::X*) [line 98, column 5]\n " shape="box"]
+"ptr_getF_div0#reference_field#3337646019334387234.41e241b3e1d6a6f7c629a1c6ca69cf07_7" [label="7:  DeclStmt \n   n$6=_fun_reference_field::X_X(&x:reference_field::X*) [line 98, column 5]\n " shape="box"]
 	
 
 	 "ptr_getF_div0#reference_field#3337646019334387234.41e241b3e1d6a6f7c629a1c6ca69cf07_7" -> "ptr_getF_div0#reference_field#3337646019334387234.41e241b3e1d6a6f7c629a1c6ca69cf07_6" ;
@@ -96,7 +96,7 @@ digraph cfg {
 	
 
 	 "ptr_getI_div0#reference_field#2818660867908728453.99667cea541002986498839338031f13_4" -> "ptr_getI_div0#reference_field#2818660867908728453.99667cea541002986498839338031f13_3" ;
-"ptr_getI_div0#reference_field#2818660867908728453.99667cea541002986498839338031f13_5" [label="5:  DeclStmt \n   n$4=_fun_reference_field::Ptr_Ptr(&r:reference_field::Ptr*,&x:reference_field::X&) [line 108, column 7]\n " shape="box"]
+"ptr_getI_div0#reference_field#2818660867908728453.99667cea541002986498839338031f13_5" [label="5:  DeclStmt \n   n$5=_fun_reference_field::Ptr_Ptr(&r:reference_field::Ptr*,&x:reference_field::X&) [line 108, column 7]\n " shape="box"]
 	
 
 	 "ptr_getI_div0#reference_field#2818660867908728453.99667cea541002986498839338031f13_5" -> "ptr_getI_div0#reference_field#2818660867908728453.99667cea541002986498839338031f13_4" ;
@@ -104,7 +104,7 @@ digraph cfg {
 	
 
 	 "ptr_getI_div0#reference_field#2818660867908728453.99667cea541002986498839338031f13_6" -> "ptr_getI_div0#reference_field#2818660867908728453.99667cea541002986498839338031f13_5" ;
-"ptr_getI_div0#reference_field#2818660867908728453.99667cea541002986498839338031f13_7" [label="7:  DeclStmt \n   n$5=_fun_reference_field::X_X(&x:reference_field::X*) [line 106, column 5]\n " shape="box"]
+"ptr_getI_div0#reference_field#2818660867908728453.99667cea541002986498839338031f13_7" [label="7:  DeclStmt \n   n$6=_fun_reference_field::X_X(&x:reference_field::X*) [line 106, column 5]\n " shape="box"]
 	
 
 	 "ptr_getI_div0#reference_field#2818660867908728453.99667cea541002986498839338031f13_7" -> "ptr_getI_div0#reference_field#2818660867908728453.99667cea541002986498839338031f13_6" ;
@@ -123,7 +123,7 @@ digraph cfg {
 	
 
 	 "ref_F_div0#reference_field#11041134718140208132.6e58f8c7050613499e915a7d12b0f081_4" -> "ref_F_div0#reference_field#11041134718140208132.6e58f8c7050613499e915a7d12b0f081_3" ;
-"ref_F_div0#reference_field#11041134718140208132.6e58f8c7050613499e915a7d12b0f081_5" [label="5:  DeclStmt \n   n$4=_fun_reference_field::Ref_Ref(&r:reference_field::Ref*,&x:reference_field::X&) [line 51, column 7]\n " shape="box"]
+"ref_F_div0#reference_field#11041134718140208132.6e58f8c7050613499e915a7d12b0f081_5" [label="5:  DeclStmt \n   n$5=_fun_reference_field::Ref_Ref(&r:reference_field::Ref*,&x:reference_field::X&) [line 51, column 7]\n " shape="box"]
 	
 
 	 "ref_F_div0#reference_field#11041134718140208132.6e58f8c7050613499e915a7d12b0f081_5" -> "ref_F_div0#reference_field#11041134718140208132.6e58f8c7050613499e915a7d12b0f081_4" ;
@@ -131,7 +131,7 @@ digraph cfg {
 	
 
 	 "ref_F_div0#reference_field#11041134718140208132.6e58f8c7050613499e915a7d12b0f081_6" -> "ref_F_div0#reference_field#11041134718140208132.6e58f8c7050613499e915a7d12b0f081_5" ;
-"ref_F_div0#reference_field#11041134718140208132.6e58f8c7050613499e915a7d12b0f081_7" [label="7:  DeclStmt \n   n$5=_fun_reference_field::X_X(&x:reference_field::X*) [line 49, column 5]\n " shape="box"]
+"ref_F_div0#reference_field#11041134718140208132.6e58f8c7050613499e915a7d12b0f081_7" [label="7:  DeclStmt \n   n$6=_fun_reference_field::X_X(&x:reference_field::X*) [line 49, column 5]\n " shape="box"]
 	
 
 	 "ref_F_div0#reference_field#11041134718140208132.6e58f8c7050613499e915a7d12b0f081_7" -> "ref_F_div0#reference_field#11041134718140208132.6e58f8c7050613499e915a7d12b0f081_6" ;
@@ -150,7 +150,7 @@ digraph cfg {
 	
 
 	 "ref_I_div0#reference_field#12578013844532400739.b911fdef1ca9c73b658bff3d5d964b9b_4" -> "ref_I_div0#reference_field#12578013844532400739.b911fdef1ca9c73b658bff3d5d964b9b_3" ;
-"ref_I_div0#reference_field#12578013844532400739.b911fdef1ca9c73b658bff3d5d964b9b_5" [label="5:  DeclStmt \n   n$4=_fun_reference_field::Ref_Ref(&r:reference_field::Ref*,&x:reference_field::X&) [line 59, column 7]\n " shape="box"]
+"ref_I_div0#reference_field#12578013844532400739.b911fdef1ca9c73b658bff3d5d964b9b_5" [label="5:  DeclStmt \n   n$5=_fun_reference_field::Ref_Ref(&r:reference_field::Ref*,&x:reference_field::X&) [line 59, column 7]\n " shape="box"]
 	
 
 	 "ref_I_div0#reference_field#12578013844532400739.b911fdef1ca9c73b658bff3d5d964b9b_5" -> "ref_I_div0#reference_field#12578013844532400739.b911fdef1ca9c73b658bff3d5d964b9b_4" ;
@@ -158,7 +158,7 @@ digraph cfg {
 	
 
 	 "ref_I_div0#reference_field#12578013844532400739.b911fdef1ca9c73b658bff3d5d964b9b_6" -> "ref_I_div0#reference_field#12578013844532400739.b911fdef1ca9c73b658bff3d5d964b9b_5" ;
-"ref_I_div0#reference_field#12578013844532400739.b911fdef1ca9c73b658bff3d5d964b9b_7" [label="7:  DeclStmt \n   n$5=_fun_reference_field::X_X(&x:reference_field::X*) [line 57, column 5]\n " shape="box"]
+"ref_I_div0#reference_field#12578013844532400739.b911fdef1ca9c73b658bff3d5d964b9b_7" [label="7:  DeclStmt \n   n$6=_fun_reference_field::X_X(&x:reference_field::X*) [line 57, column 5]\n " shape="box"]
 	
 
 	 "ref_I_div0#reference_field#12578013844532400739.b911fdef1ca9c73b658bff3d5d964b9b_7" -> "ref_I_div0#reference_field#12578013844532400739.b911fdef1ca9c73b658bff3d5d964b9b_6" ;
@@ -177,7 +177,7 @@ digraph cfg {
 	
 
 	 "ref_getF_div0#reference_field#2481930918988851369.2dc7181f26bf9bad7c2f06846f4d7ec4_4" -> "ref_getF_div0#reference_field#2481930918988851369.2dc7181f26bf9bad7c2f06846f4d7ec4_3" ;
-"ref_getF_div0#reference_field#2481930918988851369.2dc7181f26bf9bad7c2f06846f4d7ec4_5" [label="5:  DeclStmt \n   n$4=_fun_reference_field::Ref_Ref(&r:reference_field::Ref*,&x:reference_field::X&) [line 67, column 7]\n " shape="box"]
+"ref_getF_div0#reference_field#2481930918988851369.2dc7181f26bf9bad7c2f06846f4d7ec4_5" [label="5:  DeclStmt \n   n$5=_fun_reference_field::Ref_Ref(&r:reference_field::Ref*,&x:reference_field::X&) [line 67, column 7]\n " shape="box"]
 	
 
 	 "ref_getF_div0#reference_field#2481930918988851369.2dc7181f26bf9bad7c2f06846f4d7ec4_5" -> "ref_getF_div0#reference_field#2481930918988851369.2dc7181f26bf9bad7c2f06846f4d7ec4_4" ;
@@ -185,7 +185,7 @@ digraph cfg {
 	
 
 	 "ref_getF_div0#reference_field#2481930918988851369.2dc7181f26bf9bad7c2f06846f4d7ec4_6" -> "ref_getF_div0#reference_field#2481930918988851369.2dc7181f26bf9bad7c2f06846f4d7ec4_5" ;
-"ref_getF_div0#reference_field#2481930918988851369.2dc7181f26bf9bad7c2f06846f4d7ec4_7" [label="7:  DeclStmt \n   n$5=_fun_reference_field::X_X(&x:reference_field::X*) [line 65, column 5]\n " shape="box"]
+"ref_getF_div0#reference_field#2481930918988851369.2dc7181f26bf9bad7c2f06846f4d7ec4_7" [label="7:  DeclStmt \n   n$6=_fun_reference_field::X_X(&x:reference_field::X*) [line 65, column 5]\n " shape="box"]
 	
 
 	 "ref_getF_div0#reference_field#2481930918988851369.2dc7181f26bf9bad7c2f06846f4d7ec4_7" -> "ref_getF_div0#reference_field#2481930918988851369.2dc7181f26bf9bad7c2f06846f4d7ec4_6" ;
@@ -204,7 +204,7 @@ digraph cfg {
 	
 
 	 "ref_getI_div0#reference_field#17267881158640772750.8919328183561d84930ec2a40da70667_4" -> "ref_getI_div0#reference_field#17267881158640772750.8919328183561d84930ec2a40da70667_3" ;
-"ref_getI_div0#reference_field#17267881158640772750.8919328183561d84930ec2a40da70667_5" [label="5:  DeclStmt \n   n$4=_fun_reference_field::Ref_Ref(&r:reference_field::Ref*,&x:reference_field::X&) [line 75, column 7]\n " shape="box"]
+"ref_getI_div0#reference_field#17267881158640772750.8919328183561d84930ec2a40da70667_5" [label="5:  DeclStmt \n   n$5=_fun_reference_field::Ref_Ref(&r:reference_field::Ref*,&x:reference_field::X&) [line 75, column 7]\n " shape="box"]
 	
 
 	 "ref_getI_div0#reference_field#17267881158640772750.8919328183561d84930ec2a40da70667_5" -> "ref_getI_div0#reference_field#17267881158640772750.8919328183561d84930ec2a40da70667_4" ;
@@ -212,7 +212,7 @@ digraph cfg {
 	
 
 	 "ref_getI_div0#reference_field#17267881158640772750.8919328183561d84930ec2a40da70667_6" -> "ref_getI_div0#reference_field#17267881158640772750.8919328183561d84930ec2a40da70667_5" ;
-"ref_getI_div0#reference_field#17267881158640772750.8919328183561d84930ec2a40da70667_7" [label="7:  DeclStmt \n   n$5=_fun_reference_field::X_X(&x:reference_field::X*) [line 73, column 5]\n " shape="box"]
+"ref_getI_div0#reference_field#17267881158640772750.8919328183561d84930ec2a40da70667_7" [label="7:  DeclStmt \n   n$6=_fun_reference_field::X_X(&x:reference_field::X*) [line 73, column 5]\n " shape="box"]
 	
 
 	 "ref_getI_div0#reference_field#17267881158640772750.8919328183561d84930ec2a40da70667_7" -> "ref_getI_div0#reference_field#17267881158640772750.8919328183561d84930ec2a40da70667_6" ;
@@ -231,7 +231,7 @@ digraph cfg {
 	
 
 	 "val_F_div0#reference_field#8428286850923379914.8fdee85eabf77b0016437fa0006d373c_4" -> "val_F_div0#reference_field#8428286850923379914.8fdee85eabf77b0016437fa0006d373c_3" ;
-"val_F_div0#reference_field#8428286850923379914.8fdee85eabf77b0016437fa0006d373c_5" [label="5:  DeclStmt \n   n$3=_fun_reference_field::Val_Val(&r:reference_field::Val*,&x:reference_field::X&) [line 117, column 7]\n " shape="box"]
+"val_F_div0#reference_field#8428286850923379914.8fdee85eabf77b0016437fa0006d373c_5" [label="5:  DeclStmt \n   n$4=_fun_reference_field::Val_Val(&r:reference_field::Val*,&x:reference_field::X&) [line 117, column 7]\n " shape="box"]
 	
 
 	 "val_F_div0#reference_field#8428286850923379914.8fdee85eabf77b0016437fa0006d373c_5" -> "val_F_div0#reference_field#8428286850923379914.8fdee85eabf77b0016437fa0006d373c_4" ;
@@ -239,7 +239,7 @@ digraph cfg {
 	
 
 	 "val_F_div0#reference_field#8428286850923379914.8fdee85eabf77b0016437fa0006d373c_6" -> "val_F_div0#reference_field#8428286850923379914.8fdee85eabf77b0016437fa0006d373c_5" ;
-"val_F_div0#reference_field#8428286850923379914.8fdee85eabf77b0016437fa0006d373c_7" [label="7:  DeclStmt \n   n$4=_fun_reference_field::X_X(&x:reference_field::X*) [line 115, column 5]\n " shape="box"]
+"val_F_div0#reference_field#8428286850923379914.8fdee85eabf77b0016437fa0006d373c_7" [label="7:  DeclStmt \n   n$5=_fun_reference_field::X_X(&x:reference_field::X*) [line 115, column 5]\n " shape="box"]
 	
 
 	 "val_F_div0#reference_field#8428286850923379914.8fdee85eabf77b0016437fa0006d373c_7" -> "val_F_div0#reference_field#8428286850923379914.8fdee85eabf77b0016437fa0006d373c_6" ;
@@ -258,7 +258,7 @@ digraph cfg {
 	
 
 	 "val_I_div0#reference_field#17788064844610257149.11b45a3e82e229e7a7714480217c1af3_4" -> "val_I_div0#reference_field#17788064844610257149.11b45a3e82e229e7a7714480217c1af3_3" ;
-"val_I_div0#reference_field#17788064844610257149.11b45a3e82e229e7a7714480217c1af3_5" [label="5:  DeclStmt \n   n$3=_fun_reference_field::Val_Val(&r:reference_field::Val*,&x:reference_field::X&) [line 125, column 7]\n " shape="box"]
+"val_I_div0#reference_field#17788064844610257149.11b45a3e82e229e7a7714480217c1af3_5" [label="5:  DeclStmt \n   n$4=_fun_reference_field::Val_Val(&r:reference_field::Val*,&x:reference_field::X&) [line 125, column 7]\n " shape="box"]
 	
 
 	 "val_I_div0#reference_field#17788064844610257149.11b45a3e82e229e7a7714480217c1af3_5" -> "val_I_div0#reference_field#17788064844610257149.11b45a3e82e229e7a7714480217c1af3_4" ;
@@ -266,7 +266,7 @@ digraph cfg {
 	
 
 	 "val_I_div0#reference_field#17788064844610257149.11b45a3e82e229e7a7714480217c1af3_6" -> "val_I_div0#reference_field#17788064844610257149.11b45a3e82e229e7a7714480217c1af3_5" ;
-"val_I_div0#reference_field#17788064844610257149.11b45a3e82e229e7a7714480217c1af3_7" [label="7:  DeclStmt \n   n$4=_fun_reference_field::X_X(&x:reference_field::X*) [line 123, column 5]\n " shape="box"]
+"val_I_div0#reference_field#17788064844610257149.11b45a3e82e229e7a7714480217c1af3_7" [label="7:  DeclStmt \n   n$5=_fun_reference_field::X_X(&x:reference_field::X*) [line 123, column 5]\n " shape="box"]
 	
 
 	 "val_I_div0#reference_field#17788064844610257149.11b45a3e82e229e7a7714480217c1af3_7" -> "val_I_div0#reference_field#17788064844610257149.11b45a3e82e229e7a7714480217c1af3_6" ;
@@ -285,7 +285,7 @@ digraph cfg {
 	
 
 	 "val_getF_div0#reference_field#16910887455441500799.24fc3c9591435f1b92c06c5c7da4bd2e_4" -> "val_getF_div0#reference_field#16910887455441500799.24fc3c9591435f1b92c06c5c7da4bd2e_3" ;
-"val_getF_div0#reference_field#16910887455441500799.24fc3c9591435f1b92c06c5c7da4bd2e_5" [label="5:  DeclStmt \n   n$4=_fun_reference_field::Val_Val(&r:reference_field::Val*,&x:reference_field::X&) [line 133, column 7]\n " shape="box"]
+"val_getF_div0#reference_field#16910887455441500799.24fc3c9591435f1b92c06c5c7da4bd2e_5" [label="5:  DeclStmt \n   n$5=_fun_reference_field::Val_Val(&r:reference_field::Val*,&x:reference_field::X&) [line 133, column 7]\n " shape="box"]
 	
 
 	 "val_getF_div0#reference_field#16910887455441500799.24fc3c9591435f1b92c06c5c7da4bd2e_5" -> "val_getF_div0#reference_field#16910887455441500799.24fc3c9591435f1b92c06c5c7da4bd2e_4" ;
@@ -293,7 +293,7 @@ digraph cfg {
 	
 
 	 "val_getF_div0#reference_field#16910887455441500799.24fc3c9591435f1b92c06c5c7da4bd2e_6" -> "val_getF_div0#reference_field#16910887455441500799.24fc3c9591435f1b92c06c5c7da4bd2e_5" ;
-"val_getF_div0#reference_field#16910887455441500799.24fc3c9591435f1b92c06c5c7da4bd2e_7" [label="7:  DeclStmt \n   n$5=_fun_reference_field::X_X(&x:reference_field::X*) [line 131, column 5]\n " shape="box"]
+"val_getF_div0#reference_field#16910887455441500799.24fc3c9591435f1b92c06c5c7da4bd2e_7" [label="7:  DeclStmt \n   n$6=_fun_reference_field::X_X(&x:reference_field::X*) [line 131, column 5]\n " shape="box"]
 	
 
 	 "val_getF_div0#reference_field#16910887455441500799.24fc3c9591435f1b92c06c5c7da4bd2e_7" -> "val_getF_div0#reference_field#16910887455441500799.24fc3c9591435f1b92c06c5c7da4bd2e_6" ;
@@ -312,7 +312,7 @@ digraph cfg {
 	
 
 	 "val_getI_div0#reference_field#1916539470996695608.683d462cf87abbc81874a14e4872564a_4" -> "val_getI_div0#reference_field#1916539470996695608.683d462cf87abbc81874a14e4872564a_3" ;
-"val_getI_div0#reference_field#1916539470996695608.683d462cf87abbc81874a14e4872564a_5" [label="5:  DeclStmt \n   n$4=_fun_reference_field::Val_Val(&r:reference_field::Val*,&x:reference_field::X&) [line 141, column 7]\n " shape="box"]
+"val_getI_div0#reference_field#1916539470996695608.683d462cf87abbc81874a14e4872564a_5" [label="5:  DeclStmt \n   n$5=_fun_reference_field::Val_Val(&r:reference_field::Val*,&x:reference_field::X&) [line 141, column 7]\n " shape="box"]
 	
 
 	 "val_getI_div0#reference_field#1916539470996695608.683d462cf87abbc81874a14e4872564a_5" -> "val_getI_div0#reference_field#1916539470996695608.683d462cf87abbc81874a14e4872564a_4" ;
@@ -320,7 +320,7 @@ digraph cfg {
 	
 
 	 "val_getI_div0#reference_field#1916539470996695608.683d462cf87abbc81874a14e4872564a_6" -> "val_getI_div0#reference_field#1916539470996695608.683d462cf87abbc81874a14e4872564a_5" ;
-"val_getI_div0#reference_field#1916539470996695608.683d462cf87abbc81874a14e4872564a_7" [label="7:  DeclStmt \n   n$5=_fun_reference_field::X_X(&x:reference_field::X*) [line 139, column 5]\n " shape="box"]
+"val_getI_div0#reference_field#1916539470996695608.683d462cf87abbc81874a14e4872564a_7" [label="7:  DeclStmt \n   n$6=_fun_reference_field::X_X(&x:reference_field::X*) [line 139, column 5]\n " shape="box"]
 	
 
 	 "val_getI_div0#reference_field#1916539470996695608.683d462cf87abbc81874a14e4872564a_7" -> "val_getI_div0#reference_field#1916539470996695608.683d462cf87abbc81874a14e4872564a_6" ;
@@ -331,11 +331,11 @@ digraph cfg {
 "Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_2" [label="2: Exit reference_field::Ptr_Ptr \n  " color=yellow style=filled]
 	
 
-"Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_3" [label="3:  Constructor Init \n   n$0=*&this:reference_field::Ptr* [line 34, column 24]\n  n$1=*&this:reference_field::Ptr* [line 34, column 27]\n  n$2=*n$1.x:reference_field::X* [line 34, column 27]\n  *n$0.i:int*=n$2.f [line 34, column 24]\n " shape="box"]
+"Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_3" [label="3:  Constructor Init \n   n$2=*&this:reference_field::Ptr* [line 34, column 24]\n  n$3=*&this:reference_field::Ptr* [line 34, column 27]\n  n$4=*n$3.x:reference_field::X* [line 34, column 27]\n  *n$2.i:int*=n$4.f [line 34, column 24]\n " shape="box"]
 	
 
 	 "Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_3" -> "Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_2" ;
-"Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_4" [label="4:  Constructor Init \n   n$3=*&this:reference_field::Ptr* [line 34, column 16]\n  n$4=*&r_:reference_field::X& [line 34, column 19]\n  *n$3.x:reference_field::X*=n$4 [line 34, column 16]\n " shape="box"]
+"Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_4" [label="4:  Constructor Init \n   n$5=*&this:reference_field::Ptr* [line 34, column 16]\n  n$6=*&r_:reference_field::X& [line 34, column 19]\n  *n$5.x:reference_field::X*=n$6 [line 34, column 16]\n " shape="box"]
 	
 
 	 "Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_4" -> "Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_3" ;
@@ -346,11 +346,11 @@ digraph cfg {
 "Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_2" [label="2: Exit reference_field::Ref_Ref \n  " color=yellow style=filled]
 	
 
-"Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_3" [label="3:  Constructor Init \n   n$0=*&this:reference_field::Ref* [line 26, column 23]\n  n$1=*&this:reference_field::Ref* [line 26, column 25]\n  n$2=*n$1.x:reference_field::X& [line 26, column 25]\n  *n$0.i:int&=n$2.f [line 26, column 23]\n " shape="box"]
+"Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_3" [label="3:  Constructor Init \n   n$2=*&this:reference_field::Ref* [line 26, column 23]\n  n$3=*&this:reference_field::Ref* [line 26, column 25]\n  n$4=*n$3.x:reference_field::X& [line 26, column 25]\n  *n$2.i:int&=n$4.f [line 26, column 23]\n " shape="box"]
 	
 
 	 "Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_3" -> "Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_2" ;
-"Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_4" [label="4:  Constructor Init \n   n$3=*&this:reference_field::Ref* [line 26, column 16]\n  n$4=*&r_:reference_field::X& [line 26, column 18]\n  *n$3.x:reference_field::X&=n$4 [line 26, column 16]\n " shape="box"]
+"Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_4" [label="4:  Constructor Init \n   n$5=*&this:reference_field::Ref* [line 26, column 16]\n  n$6=*&r_:reference_field::X& [line 26, column 18]\n  *n$5.x:reference_field::X&=n$6 [line 26, column 16]\n " shape="box"]
 	
 
 	 "Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_4" -> "Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_3" ;
@@ -361,11 +361,11 @@ digraph cfg {
 "Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_2" [label="2: Exit reference_field::Val_Val \n  " color=yellow style=filled]
 	
 
-"Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_3" [label="3:  Constructor Init \n   n$0=*&this:reference_field::Val* [line 42, column 23]\n  n$1=*&this:reference_field::Val* [line 42, column 25]\n  n$2=*n$1.x.f:int [line 42, column 25]\n  *n$0.i:int=n$2 [line 42, column 23]\n " shape="box"]
+"Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_3" [label="3:  Constructor Init \n   n$2=*&this:reference_field::Val* [line 42, column 23]\n  n$3=*&this:reference_field::Val* [line 42, column 25]\n  n$4=*n$3.x.f:int [line 42, column 25]\n  *n$2.i:int=n$4 [line 42, column 23]\n " shape="box"]
 	
 
 	 "Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_3" -> "Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_2" ;
-"Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_4" [label="4:  Constructor Init \n   n$3=*&this:reference_field::Val* [line 42, column 16]\n  n$4=*&r_:reference_field::X& [line 42, column 18]\n  n$5=_fun_reference_field::X_X(n$3.x:reference_field::X*,n$4:reference_field::X&) [line 42, column 16]\n " shape="box"]
+"Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_4" [label="4:  Constructor Init \n   n$5=*&this:reference_field::Val* [line 42, column 16]\n  n$6=*&r_:reference_field::X& [line 42, column 18]\n  n$7=_fun_reference_field::X_X(n$5.x:reference_field::X*,n$6:reference_field::X&) [line 42, column 16]\n " shape="box"]
 	
 
 	 "Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_4" -> "Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_3" ;
@@ -376,7 +376,7 @@ digraph cfg {
 "X#X#reference_field#{16892162000533972663|constexpr}.d3ad2332bde2031935fecc6685296b44_2" [label="2: Exit reference_field::X_X \n  " color=yellow style=filled]
 	
 
-"X#X#reference_field#{16892162000533972663|constexpr}.d3ad2332bde2031935fecc6685296b44_3" [label="3:  Constructor Init \n   n$0=*&this:reference_field::X* [line 12, column 8]\n  n$1=*&__param_0:reference_field::X const & [line 12, column 8]\n  n$2=*n$1.f:int [line 12, column 8]\n  *n$0.f:int=n$2 [line 12, column 8]\n " shape="box"]
+"X#X#reference_field#{16892162000533972663|constexpr}.d3ad2332bde2031935fecc6685296b44_3" [label="3:  Constructor Init \n   n$2=*&this:reference_field::X* [line 12, column 8]\n  n$3=*&__param_0:reference_field::X const & [line 12, column 8]\n  n$4=*n$3.f:int [line 12, column 8]\n  *n$2.f:int=n$4 [line 12, column 8]\n " shape="box"]
 	
 
 	 "X#X#reference_field#{16892162000533972663|constexpr}.d3ad2332bde2031935fecc6685296b44_3" -> "X#X#reference_field#{16892162000533972663|constexpr}.d3ad2332bde2031935fecc6685296b44_2" ;

infer/tests/codetoanalyze/cpp/shared/reference/reference_struct_e2e.cpp.dot

@@ -27,19 +27,19 @@ digraph cfg {
 	
 
 	 "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_4" -> "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_2" ;
-"field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_5" [label="5: Prune (true branch, if) \n   n$0=*&x:X* [line 48, column 7]\n  PRUNE(n$0, true); [line 48, column 7]\n " shape="invhouse"]
+"field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_5" [label="5: Prune (true branch, if) \n   n$1=*&x:X* [line 48, column 7]\n  PRUNE(n$1, true); [line 48, column 7]\n " shape="invhouse"]
 	
 
 	 "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_5" -> "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_8" ;
-"field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_6" [label="6: Prune (false branch, if) \n   n$0=*&x:X* [line 48, column 7]\n  PRUNE(!n$0, false); [line 48, column 7]\n " shape="invhouse"]
+"field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_6" [label="6: Prune (false branch, if) \n   n$1=*&x:X* [line 48, column 7]\n  PRUNE(!n$1, false); [line 48, column 7]\n " shape="invhouse"]
 	
 
 	 "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_6" -> "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_3" ;
-"field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_7" [label="7:  Return Stmt \n   n$1=*&x:X* [line 50, column 12]\n  _=*n$1:X [line 50, column 12]\n  n$3=_fun_X_div(n$1:X*) [line 50, column 12]\n  *&return:int=n$3 [line 50, column 5]\n " shape="box"]
+"field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_7" [label="7:  Return Stmt \n   n$2=*&x:X* [line 50, column 12]\n  _=*n$2:X [line 50, column 12]\n  n$4=_fun_X_div(n$2:X*) [line 50, column 12]\n  *&return:int=n$4 [line 50, column 5]\n " shape="box"]
 	
 
 	 "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_7" -> "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_2" ;
-"field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_8" [label="8:  Call _fun_set_field_ptr \n   n$4=*&x:X* [line 49, column 19]\n  n$5=_fun_set_field_ptr(n$4:X*,0:int) [line 49, column 5]\n " shape="box"]
+"field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_8" [label="8:  Call _fun_set_field_ptr \n   n$6=*&x:X* [line 49, column 19]\n  n$7=_fun_set_field_ptr(n$6:X*,0:int) [line 49, column 5]\n " shape="box"]
 	
 
 	 "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_8" -> "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_7" ;
@@ -54,7 +54,7 @@ digraph cfg {
 	
 
 	 "field_div0_ref#11723804822630548942.b7eb5245bed0a75cdc2d181e5af92008_3" -> "field_div0_ref#11723804822630548942.b7eb5245bed0a75cdc2d181e5af92008_2" ;
-"field_div0_ref#11723804822630548942.b7eb5245bed0a75cdc2d181e5af92008_4" [label="4:  Call _fun_set_field_ref \n   n$3=*&x:X& [line 96, column 17]\n  n$4=_fun_set_field_ref(n$3:X&,0:int) [line 96, column 3]\n " shape="box"]
+"field_div0_ref#11723804822630548942.b7eb5245bed0a75cdc2d181e5af92008_4" [label="4:  Call _fun_set_field_ref \n   n$4=*&x:X& [line 96, column 17]\n  n$5=_fun_set_field_ref(n$4:X&,0:int) [line 96, column 3]\n " shape="box"]
 	
 
 	 "field_div0_ref#11723804822630548942.b7eb5245bed0a75cdc2d181e5af92008_4" -> "field_div0_ref#11723804822630548942.b7eb5245bed0a75cdc2d181e5af92008_3" ;
@@ -74,19 +74,19 @@ digraph cfg {
 	
 
 	 "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_4" -> "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_2" ;
-"field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_5" [label="5: Prune (true branch, if) \n   n$0=*&x:X* [line 55, column 7]\n  PRUNE(n$0, true); [line 55, column 7]\n " shape="invhouse"]
+"field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_5" [label="5: Prune (true branch, if) \n   n$1=*&x:X* [line 55, column 7]\n  PRUNE(n$1, true); [line 55, column 7]\n " shape="invhouse"]
 	
 
 	 "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_5" -> "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_8" ;
-"field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_6" [label="6: Prune (false branch, if) \n   n$0=*&x:X* [line 55, column 7]\n  PRUNE(!n$0, false); [line 55, column 7]\n " shape="invhouse"]
+"field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_6" [label="6: Prune (false branch, if) \n   n$1=*&x:X* [line 55, column 7]\n  PRUNE(!n$1, false); [line 55, column 7]\n " shape="invhouse"]
 	
 
 	 "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_6" -> "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_3" ;
-"field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_7" [label="7:  Return Stmt \n   n$1=*&x:X* [line 57, column 12]\n  _=*n$1:X [line 57, column 12]\n  n$3=_fun_X_div(n$1:X*) [line 57, column 12]\n  *&return:int=n$3 [line 57, column 5]\n " shape="box"]
+"field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_7" [label="7:  Return Stmt \n   n$2=*&x:X* [line 57, column 12]\n  _=*n$2:X [line 57, column 12]\n  n$4=_fun_X_div(n$2:X*) [line 57, column 12]\n  *&return:int=n$4 [line 57, column 5]\n " shape="box"]
 	
 
 	 "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_7" -> "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_2" ;
-"field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_8" [label="8:  Call _fun_set_field_ptr \n   n$4=*&x:X* [line 56, column 19]\n  n$5=_fun_set_field_ptr(n$4:X*,1:int) [line 56, column 5]\n " shape="box"]
+"field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_8" [label="8:  Call _fun_set_field_ptr \n   n$6=*&x:X* [line 56, column 19]\n  n$7=_fun_set_field_ptr(n$6:X*,1:int) [line 56, column 5]\n " shape="box"]
 	
 
 	 "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_8" -> "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_7" ;
@@ -101,7 +101,7 @@ digraph cfg {
 	
 
 	 "field_div1_ref#1499715418357335887.5b6e5f87301df1903e4a04faae98d6d5_3" -> "field_div1_ref#1499715418357335887.5b6e5f87301df1903e4a04faae98d6d5_2" ;
-"field_div1_ref#1499715418357335887.5b6e5f87301df1903e4a04faae98d6d5_4" [label="4:  Call _fun_set_field_ref \n   n$3=*&x:X& [line 101, column 17]\n  n$4=_fun_set_field_ref(n$3:X&,1:int) [line 101, column 3]\n " shape="box"]
+"field_div1_ref#1499715418357335887.5b6e5f87301df1903e4a04faae98d6d5_4" [label="4:  Call _fun_set_field_ref \n   n$4=*&x:X& [line 101, column 17]\n  n$5=_fun_set_field_ref(n$4:X&,1:int) [line 101, column 3]\n " shape="box"]
 	
 
 	 "field_div1_ref#1499715418357335887.5b6e5f87301df1903e4a04faae98d6d5_4" -> "field_div1_ref#1499715418357335887.5b6e5f87301df1903e4a04faae98d6d5_3" ;
@@ -123,15 +123,15 @@ digraph cfg {
 "get_global_ptr_div0_field#8708891951617234281.85a5d13d32b9177abaa3c8c98323c45e_2" [label="2: Exit get_global_ptr_div0_field \n  " color=yellow style=filled]
 	
 
-"get_global_ptr_div0_field#8708891951617234281.85a5d13d32b9177abaa3c8c98323c45e_3" [label="3:  Call _fun_X_div \n   n$0=_fun_get_global_ptr() [line 76, column 3]\n  _=*n$0:X [line 76, column 3]\n  n$2=_fun_X_div(n$0:X*) [line 76, column 3]\n " shape="box"]
+"get_global_ptr_div0_field#8708891951617234281.85a5d13d32b9177abaa3c8c98323c45e_3" [label="3:  Call _fun_X_div \n   n$1=_fun_get_global_ptr() [line 76, column 3]\n  _=*n$1:X [line 76, column 3]\n  n$3=_fun_X_div(n$1:X*) [line 76, column 3]\n " shape="box"]
 	
 
 	 "get_global_ptr_div0_field#8708891951617234281.85a5d13d32b9177abaa3c8c98323c45e_3" -> "get_global_ptr_div0_field#8708891951617234281.85a5d13d32b9177abaa3c8c98323c45e_2" ;
-"get_global_ptr_div0_field#8708891951617234281.85a5d13d32b9177abaa3c8c98323c45e_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=_fun_get_global_ptr() [line 75, column 3]\n  *n$3.f:int=0 [line 75, column 3]\n " shape="box"]
+"get_global_ptr_div0_field#8708891951617234281.85a5d13d32b9177abaa3c8c98323c45e_4" [label="4:  BinaryOperatorStmt: Assign \n   n$4=_fun_get_global_ptr() [line 75, column 3]\n  *n$4.f:int=0 [line 75, column 3]\n " shape="box"]
 	
 
 	 "get_global_ptr_div0_field#8708891951617234281.85a5d13d32b9177abaa3c8c98323c45e_4" -> "get_global_ptr_div0_field#8708891951617234281.85a5d13d32b9177abaa3c8c98323c45e_3" ;
-"get_global_ptr_div0_field#8708891951617234281.85a5d13d32b9177abaa3c8c98323c45e_5" [label="5:  Call _fun_X_nonzero \n   n$4=_fun_get_global_ptr() [line 74, column 3]\n  _=*n$4:X [line 74, column 3]\n  n$6=_fun_X_nonzero(n$4:X*) [line 74, column 3]\n " shape="box"]
+"get_global_ptr_div0_field#8708891951617234281.85a5d13d32b9177abaa3c8c98323c45e_5" [label="5:  Call _fun_X_nonzero \n   n$5=_fun_get_global_ptr() [line 74, column 3]\n  _=*n$5:X [line 74, column 3]\n  n$7=_fun_X_nonzero(n$5:X*) [line 74, column 3]\n " shape="box"]
 	
 
 	 "get_global_ptr_div0_field#8708891951617234281.85a5d13d32b9177abaa3c8c98323c45e_5" -> "get_global_ptr_div0_field#8708891951617234281.85a5d13d32b9177abaa3c8c98323c45e_4" ;
@@ -142,15 +142,15 @@ digraph cfg {
 "get_global_ptr_div0_method#6868600075123047675.d796dd8227b55f7d5d2ba2c1a06183dd_2" [label="2: Exit get_global_ptr_div0_method \n  " color=yellow style=filled]
 	
 
-"get_global_ptr_div0_method#6868600075123047675.d796dd8227b55f7d5d2ba2c1a06183dd_3" [label="3:  Call _fun_X_div \n   n$0=_fun_get_global_ptr() [line 64, column 3]\n  _=*n$0:X [line 64, column 3]\n  n$2=_fun_X_div(n$0:X*) [line 64, column 3]\n " shape="box"]
+"get_global_ptr_div0_method#6868600075123047675.d796dd8227b55f7d5d2ba2c1a06183dd_3" [label="3:  Call _fun_X_div \n   n$1=_fun_get_global_ptr() [line 64, column 3]\n  _=*n$1:X [line 64, column 3]\n  n$3=_fun_X_div(n$1:X*) [line 64, column 3]\n " shape="box"]
 	
 
 	 "get_global_ptr_div0_method#6868600075123047675.d796dd8227b55f7d5d2ba2c1a06183dd_3" -> "get_global_ptr_div0_method#6868600075123047675.d796dd8227b55f7d5d2ba2c1a06183dd_2" ;
-"get_global_ptr_div0_method#6868600075123047675.d796dd8227b55f7d5d2ba2c1a06183dd_4" [label="4:  Call _fun_X_zero \n   n$3=_fun_get_global_ptr() [line 63, column 3]\n  _=*n$3:X [line 63, column 3]\n  n$5=_fun_X_zero(n$3:X*) [line 63, column 3]\n " shape="box"]
+"get_global_ptr_div0_method#6868600075123047675.d796dd8227b55f7d5d2ba2c1a06183dd_4" [label="4:  Call _fun_X_zero \n   n$4=_fun_get_global_ptr() [line 63, column 3]\n  _=*n$4:X [line 63, column 3]\n  n$6=_fun_X_zero(n$4:X*) [line 63, column 3]\n " shape="box"]
 	
 
 	 "get_global_ptr_div0_method#6868600075123047675.d796dd8227b55f7d5d2ba2c1a06183dd_4" -> "get_global_ptr_div0_method#6868600075123047675.d796dd8227b55f7d5d2ba2c1a06183dd_3" ;
-"get_global_ptr_div0_method#6868600075123047675.d796dd8227b55f7d5d2ba2c1a06183dd_5" [label="5:  BinaryOperatorStmt: Assign \n   n$6=_fun_get_global_ptr() [line 62, column 3]\n  *n$6.f:int=1 [line 62, column 3]\n " shape="box"]
+"get_global_ptr_div0_method#6868600075123047675.d796dd8227b55f7d5d2ba2c1a06183dd_5" [label="5:  BinaryOperatorStmt: Assign \n   n$7=_fun_get_global_ptr() [line 62, column 3]\n  *n$7.f:int=1 [line 62, column 3]\n " shape="box"]
 	
 
 	 "get_global_ptr_div0_method#6868600075123047675.d796dd8227b55f7d5d2ba2c1a06183dd_5" -> "get_global_ptr_div0_method#6868600075123047675.d796dd8227b55f7d5d2ba2c1a06183dd_4" ;
@@ -161,15 +161,15 @@ digraph cfg {
 "get_global_ptr_div1_field#6744083307199058304.94ebaff789d09fecbd24e3f8bfd75e70_2" [label="2: Exit get_global_ptr_div1_field \n  " color=yellow style=filled]
 	
 
-"get_global_ptr_div1_field#6744083307199058304.94ebaff789d09fecbd24e3f8bfd75e70_3" [label="3:  Call _fun_X_div \n   n$0=_fun_get_global_ptr() [line 82, column 3]\n  _=*n$0:X [line 82, column 3]\n  n$2=_fun_X_div(n$0:X*) [line 82, column 3]\n " shape="box"]
+"get_global_ptr_div1_field#6744083307199058304.94ebaff789d09fecbd24e3f8bfd75e70_3" [label="3:  Call _fun_X_div \n   n$1=_fun_get_global_ptr() [line 82, column 3]\n  _=*n$1:X [line 82, column 3]\n  n$3=_fun_X_div(n$1:X*) [line 82, column 3]\n " shape="box"]
 	
 
 	 "get_global_ptr_div1_field#6744083307199058304.94ebaff789d09fecbd24e3f8bfd75e70_3" -> "get_global_ptr_div1_field#6744083307199058304.94ebaff789d09fecbd24e3f8bfd75e70_2" ;
-"get_global_ptr_div1_field#6744083307199058304.94ebaff789d09fecbd24e3f8bfd75e70_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=_fun_get_global_ptr() [line 81, column 3]\n  *n$3.f:int=1 [line 81, column 3]\n " shape="box"]
+"get_global_ptr_div1_field#6744083307199058304.94ebaff789d09fecbd24e3f8bfd75e70_4" [label="4:  BinaryOperatorStmt: Assign \n   n$4=_fun_get_global_ptr() [line 81, column 3]\n  *n$4.f:int=1 [line 81, column 3]\n " shape="box"]
 	
 
 	 "get_global_ptr_div1_field#6744083307199058304.94ebaff789d09fecbd24e3f8bfd75e70_4" -> "get_global_ptr_div1_field#6744083307199058304.94ebaff789d09fecbd24e3f8bfd75e70_3" ;
-"get_global_ptr_div1_field#6744083307199058304.94ebaff789d09fecbd24e3f8bfd75e70_5" [label="5:  Call _fun_X_zero \n   n$4=_fun_get_global_ptr() [line 80, column 3]\n  _=*n$4:X [line 80, column 3]\n  n$6=_fun_X_zero(n$4:X*) [line 80, column 3]\n " shape="box"]
+"get_global_ptr_div1_field#6744083307199058304.94ebaff789d09fecbd24e3f8bfd75e70_5" [label="5:  Call _fun_X_zero \n   n$5=_fun_get_global_ptr() [line 80, column 3]\n  _=*n$5:X [line 80, column 3]\n  n$7=_fun_X_zero(n$5:X*) [line 80, column 3]\n " shape="box"]
 	
 
 	 "get_global_ptr_div1_field#6744083307199058304.94ebaff789d09fecbd24e3f8bfd75e70_5" -> "get_global_ptr_div1_field#6744083307199058304.94ebaff789d09fecbd24e3f8bfd75e70_4" ;
@@ -180,15 +180,15 @@ digraph cfg {
 "get_global_ptr_div1_method#13320237176965265316.b7b17bcc9c036a753453d67e3683d764_2" [label="2: Exit get_global_ptr_div1_method \n  " color=yellow style=filled]
 	
 
-"get_global_ptr_div1_method#13320237176965265316.b7b17bcc9c036a753453d67e3683d764_3" [label="3:  Call _fun_X_div \n   n$0=_fun_get_global_ptr() [line 70, column 3]\n  _=*n$0:X [line 70, column 3]\n  n$2=_fun_X_div(n$0:X*) [line 70, column 3]\n " shape="box"]
+"get_global_ptr_div1_method#13320237176965265316.b7b17bcc9c036a753453d67e3683d764_3" [label="3:  Call _fun_X_div \n   n$1=_fun_get_global_ptr() [line 70, column 3]\n  _=*n$1:X [line 70, column 3]\n  n$3=_fun_X_div(n$1:X*) [line 70, column 3]\n " shape="box"]
 	
 
 	 "get_global_ptr_div1_method#13320237176965265316.b7b17bcc9c036a753453d67e3683d764_3" -> "get_global_ptr_div1_method#13320237176965265316.b7b17bcc9c036a753453d67e3683d764_2" ;
-"get_global_ptr_div1_method#13320237176965265316.b7b17bcc9c036a753453d67e3683d764_4" [label="4:  Call _fun_X_nonzero \n   n$3=_fun_get_global_ptr() [line 69, column 3]\n  _=*n$3:X [line 69, column 3]\n  n$5=_fun_X_nonzero(n$3:X*) [line 69, column 3]\n " shape="box"]
+"get_global_ptr_div1_method#13320237176965265316.b7b17bcc9c036a753453d67e3683d764_4" [label="4:  Call _fun_X_nonzero \n   n$4=_fun_get_global_ptr() [line 69, column 3]\n  _=*n$4:X [line 69, column 3]\n  n$6=_fun_X_nonzero(n$4:X*) [line 69, column 3]\n " shape="box"]
 	
 
 	 "get_global_ptr_div1_method#13320237176965265316.b7b17bcc9c036a753453d67e3683d764_4" -> "get_global_ptr_div1_method#13320237176965265316.b7b17bcc9c036a753453d67e3683d764_3" ;
-"get_global_ptr_div1_method#13320237176965265316.b7b17bcc9c036a753453d67e3683d764_5" [label="5:  BinaryOperatorStmt: Assign \n   n$6=_fun_get_global_ptr() [line 68, column 3]\n  *n$6.f:int=0 [line 68, column 3]\n " shape="box"]
+"get_global_ptr_div1_method#13320237176965265316.b7b17bcc9c036a753453d67e3683d764_5" [label="5:  BinaryOperatorStmt: Assign \n   n$7=_fun_get_global_ptr() [line 68, column 3]\n  *n$7.f:int=0 [line 68, column 3]\n " shape="box"]
 	
 
 	 "get_global_ptr_div1_method#13320237176965265316.b7b17bcc9c036a753453d67e3683d764_5" -> "get_global_ptr_div1_method#13320237176965265316.b7b17bcc9c036a753453d67e3683d764_4" ;
@@ -210,15 +210,15 @@ digraph cfg {
 "get_global_ref_div0_field#9894336115642083138.99dfafa929e6446e06064af81022e228_2" [label="2: Exit get_global_ref_div0_field \n  " color=yellow style=filled]
 	
 
-"get_global_ref_div0_field#9894336115642083138.99dfafa929e6446e06064af81022e228_3" [label="3:  Call _fun_X_div \n   n$0=_fun_get_global_ref() [line 120, column 3]\n  _=*n$0:X [line 120, column 3]\n  n$2=_fun_X_div(n$0:X&) [line 120, column 3]\n " shape="box"]
+"get_global_ref_div0_field#9894336115642083138.99dfafa929e6446e06064af81022e228_3" [label="3:  Call _fun_X_div \n   n$1=_fun_get_global_ref() [line 120, column 3]\n  _=*n$1:X [line 120, column 3]\n  n$3=_fun_X_div(n$1:X&) [line 120, column 3]\n " shape="box"]
 	
 
 	 "get_global_ref_div0_field#9894336115642083138.99dfafa929e6446e06064af81022e228_3" -> "get_global_ref_div0_field#9894336115642083138.99dfafa929e6446e06064af81022e228_2" ;
-"get_global_ref_div0_field#9894336115642083138.99dfafa929e6446e06064af81022e228_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=_fun_get_global_ref() [line 119, column 3]\n  *n$3.f:int=0 [line 119, column 3]\n " shape="box"]
+"get_global_ref_div0_field#9894336115642083138.99dfafa929e6446e06064af81022e228_4" [label="4:  BinaryOperatorStmt: Assign \n   n$4=_fun_get_global_ref() [line 119, column 3]\n  *n$4.f:int=0 [line 119, column 3]\n " shape="box"]
 	
 
 	 "get_global_ref_div0_field#9894336115642083138.99dfafa929e6446e06064af81022e228_4" -> "get_global_ref_div0_field#9894336115642083138.99dfafa929e6446e06064af81022e228_3" ;
-"get_global_ref_div0_field#9894336115642083138.99dfafa929e6446e06064af81022e228_5" [label="5:  Call _fun_X_nonzero \n   n$4=_fun_get_global_ref() [line 118, column 3]\n  _=*n$4:X [line 118, column 3]\n  n$6=_fun_X_nonzero(n$4:X&) [line 118, column 3]\n " shape="box"]
+"get_global_ref_div0_field#9894336115642083138.99dfafa929e6446e06064af81022e228_5" [label="5:  Call _fun_X_nonzero \n   n$5=_fun_get_global_ref() [line 118, column 3]\n  _=*n$5:X [line 118, column 3]\n  n$7=_fun_X_nonzero(n$5:X&) [line 118, column 3]\n " shape="box"]
 	
 
 	 "get_global_ref_div0_field#9894336115642083138.99dfafa929e6446e06064af81022e228_5" -> "get_global_ref_div0_field#9894336115642083138.99dfafa929e6446e06064af81022e228_4" ;
@@ -229,15 +229,15 @@ digraph cfg {
 "get_global_ref_div0_method#4500024601676141702.703eacc20d3ff2ec6f40a78b62656e3a_2" [label="2: Exit get_global_ref_div0_method \n  " color=yellow style=filled]
 	
 
-"get_global_ref_div0_method#4500024601676141702.703eacc20d3ff2ec6f40a78b62656e3a_3" [label="3:  Call _fun_X_div \n   n$0=_fun_get_global_ref() [line 108, column 3]\n  _=*n$0:X [line 108, column 3]\n  n$2=_fun_X_div(n$0:X&) [line 108, column 3]\n " shape="box"]
+"get_global_ref_div0_method#4500024601676141702.703eacc20d3ff2ec6f40a78b62656e3a_3" [label="3:  Call _fun_X_div \n   n$1=_fun_get_global_ref() [line 108, column 3]\n  _=*n$1:X [line 108, column 3]\n  n$3=_fun_X_div(n$1:X&) [line 108, column 3]\n " shape="box"]
 	
 
 	 "get_global_ref_div0_method#4500024601676141702.703eacc20d3ff2ec6f40a78b62656e3a_3" -> "get_global_ref_div0_method#4500024601676141702.703eacc20d3ff2ec6f40a78b62656e3a_2" ;
-"get_global_ref_div0_method#4500024601676141702.703eacc20d3ff2ec6f40a78b62656e3a_4" [label="4:  Call _fun_X_zero \n   n$3=_fun_get_global_ref() [line 107, column 3]\n  _=*n$3:X [line 107, column 3]\n  n$5=_fun_X_zero(n$3:X&) [line 107, column 3]\n " shape="box"]
+"get_global_ref_div0_method#4500024601676141702.703eacc20d3ff2ec6f40a78b62656e3a_4" [label="4:  Call _fun_X_zero \n   n$4=_fun_get_global_ref() [line 107, column 3]\n  _=*n$4:X [line 107, column 3]\n  n$6=_fun_X_zero(n$4:X&) [line 107, column 3]\n " shape="box"]
 	
 
 	 "get_global_ref_div0_method#4500024601676141702.703eacc20d3ff2ec6f40a78b62656e3a_4" -> "get_global_ref_div0_method#4500024601676141702.703eacc20d3ff2ec6f40a78b62656e3a_3" ;
-"get_global_ref_div0_method#4500024601676141702.703eacc20d3ff2ec6f40a78b62656e3a_5" [label="5:  BinaryOperatorStmt: Assign \n   n$6=_fun_get_global_ref() [line 106, column 3]\n  *n$6.f:int=1 [line 106, column 3]\n " shape="box"]
+"get_global_ref_div0_method#4500024601676141702.703eacc20d3ff2ec6f40a78b62656e3a_5" [label="5:  BinaryOperatorStmt: Assign \n   n$7=_fun_get_global_ref() [line 106, column 3]\n  *n$7.f:int=1 [line 106, column 3]\n " shape="box"]
 	
 
 	 "get_global_ref_div0_method#4500024601676141702.703eacc20d3ff2ec6f40a78b62656e3a_5" -> "get_global_ref_div0_method#4500024601676141702.703eacc20d3ff2ec6f40a78b62656e3a_4" ;
@@ -248,15 +248,15 @@ digraph cfg {
 "get_global_ref_div1_field#9400638526174087075.f2be9db8a45f6acda1c8ab83ffea2ce8_2" [label="2: Exit get_global_ref_div1_field \n  " color=yellow style=filled]
 	
 
-"get_global_ref_div1_field#9400638526174087075.f2be9db8a45f6acda1c8ab83ffea2ce8_3" [label="3:  Call _fun_X_div \n   n$0=_fun_get_global_ref() [line 126, column 3]\n  _=*n$0:X [line 126, column 3]\n  n$2=_fun_X_div(n$0:X&) [line 126, column 3]\n " shape="box"]
+"get_global_ref_div1_field#9400638526174087075.f2be9db8a45f6acda1c8ab83ffea2ce8_3" [label="3:  Call _fun_X_div \n   n$1=_fun_get_global_ref() [line 126, column 3]\n  _=*n$1:X [line 126, column 3]\n  n$3=_fun_X_div(n$1:X&) [line 126, column 3]\n " shape="box"]
 	
 
 	 "get_global_ref_div1_field#9400638526174087075.f2be9db8a45f6acda1c8ab83ffea2ce8_3" -> "get_global_ref_div1_field#9400638526174087075.f2be9db8a45f6acda1c8ab83ffea2ce8_2" ;
-"get_global_ref_div1_field#9400638526174087075.f2be9db8a45f6acda1c8ab83ffea2ce8_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=_fun_get_global_ref() [line 125, column 3]\n  *n$3.f:int=1 [line 125, column 3]\n " shape="box"]
+"get_global_ref_div1_field#9400638526174087075.f2be9db8a45f6acda1c8ab83ffea2ce8_4" [label="4:  BinaryOperatorStmt: Assign \n   n$4=_fun_get_global_ref() [line 125, column 3]\n  *n$4.f:int=1 [line 125, column 3]\n " shape="box"]
 	
 
 	 "get_global_ref_div1_field#9400638526174087075.f2be9db8a45f6acda1c8ab83ffea2ce8_4" -> "get_global_ref_div1_field#9400638526174087075.f2be9db8a45f6acda1c8ab83ffea2ce8_3" ;
-"get_global_ref_div1_field#9400638526174087075.f2be9db8a45f6acda1c8ab83ffea2ce8_5" [label="5:  Call _fun_X_zero \n   n$4=_fun_get_global_ref() [line 124, column 3]\n  _=*n$4:X [line 124, column 3]\n  n$6=_fun_X_zero(n$4:X&) [line 124, column 3]\n " shape="box"]
+"get_global_ref_div1_field#9400638526174087075.f2be9db8a45f6acda1c8ab83ffea2ce8_5" [label="5:  Call _fun_X_zero \n   n$5=_fun_get_global_ref() [line 124, column 3]\n  _=*n$5:X [line 124, column 3]\n  n$7=_fun_X_zero(n$5:X&) [line 124, column 3]\n " shape="box"]
 	
 
 	 "get_global_ref_div1_field#9400638526174087075.f2be9db8a45f6acda1c8ab83ffea2ce8_5" -> "get_global_ref_div1_field#9400638526174087075.f2be9db8a45f6acda1c8ab83ffea2ce8_4" ;
@@ -267,15 +267,15 @@ digraph cfg {
 "get_global_ref_div1_method#9218905628510589917.1d66d8c44e8582bb6fcdcb7df79e3215_2" [label="2: Exit get_global_ref_div1_method \n  " color=yellow style=filled]
 	
 
-"get_global_ref_div1_method#9218905628510589917.1d66d8c44e8582bb6fcdcb7df79e3215_3" [label="3:  Call _fun_X_div \n   n$0=_fun_get_global_ref() [line 114, column 3]\n  _=*n$0:X [line 114, column 3]\n  n$2=_fun_X_div(n$0:X&) [line 114, column 3]\n " shape="box"]
+"get_global_ref_div1_method#9218905628510589917.1d66d8c44e8582bb6fcdcb7df79e3215_3" [label="3:  Call _fun_X_div \n   n$1=_fun_get_global_ref() [line 114, column 3]\n  _=*n$1:X [line 114, column 3]\n  n$3=_fun_X_div(n$1:X&) [line 114, column 3]\n " shape="box"]
 	
 
 	 "get_global_ref_div1_method#9218905628510589917.1d66d8c44e8582bb6fcdcb7df79e3215_3" -> "get_global_ref_div1_method#9218905628510589917.1d66d8c44e8582bb6fcdcb7df79e3215_2" ;
-"get_global_ref_div1_method#9218905628510589917.1d66d8c44e8582bb6fcdcb7df79e3215_4" [label="4:  Call _fun_X_nonzero \n   n$3=_fun_get_global_ref() [line 113, column 3]\n  _=*n$3:X [line 113, column 3]\n  n$5=_fun_X_nonzero(n$3:X&) [line 113, column 3]\n " shape="box"]
+"get_global_ref_div1_method#9218905628510589917.1d66d8c44e8582bb6fcdcb7df79e3215_4" [label="4:  Call _fun_X_nonzero \n   n$4=_fun_get_global_ref() [line 113, column 3]\n  _=*n$4:X [line 113, column 3]\n  n$6=_fun_X_nonzero(n$4:X&) [line 113, column 3]\n " shape="box"]
 	
 
 	 "get_global_ref_div1_method#9218905628510589917.1d66d8c44e8582bb6fcdcb7df79e3215_4" -> "get_global_ref_div1_method#9218905628510589917.1d66d8c44e8582bb6fcdcb7df79e3215_3" ;
-"get_global_ref_div1_method#9218905628510589917.1d66d8c44e8582bb6fcdcb7df79e3215_5" [label="5:  BinaryOperatorStmt: Assign \n   n$6=_fun_get_global_ref() [line 112, column 3]\n  *n$6.f:int=0 [line 112, column 3]\n " shape="box"]
+"get_global_ref_div1_method#9218905628510589917.1d66d8c44e8582bb6fcdcb7df79e3215_5" [label="5:  BinaryOperatorStmt: Assign \n   n$7=_fun_get_global_ref() [line 112, column 3]\n  *n$7.f:int=0 [line 112, column 3]\n " shape="box"]
 	
 
 	 "get_global_ref_div1_method#9218905628510589917.1d66d8c44e8582bb6fcdcb7df79e3215_5" -> "get_global_ref_div1_method#9218905628510589917.1d66d8c44e8582bb6fcdcb7df79e3215_4" ;
@@ -295,19 +295,19 @@ digraph cfg {
 	
 
 	 "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_4" -> "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_2" ;
-"method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_5" [label="5: Prune (true branch, if) \n   n$0=*&x:X* [line 34, column 7]\n  PRUNE(n$0, true); [line 34, column 7]\n " shape="invhouse"]
+"method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_5" [label="5: Prune (true branch, if) \n   n$1=*&x:X* [line 34, column 7]\n  PRUNE(n$1, true); [line 34, column 7]\n " shape="invhouse"]
 	
 
 	 "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_5" -> "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_8" ;
-"method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_6" [label="6: Prune (false branch, if) \n   n$0=*&x:X* [line 34, column 7]\n  PRUNE(!n$0, false); [line 34, column 7]\n " shape="invhouse"]
+"method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_6" [label="6: Prune (false branch, if) \n   n$1=*&x:X* [line 34, column 7]\n  PRUNE(!n$1, false); [line 34, column 7]\n " shape="invhouse"]
 	
 
 	 "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_6" -> "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_3" ;
-"method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_7" [label="7:  Return Stmt \n   n$1=*&x:X* [line 36, column 12]\n  _=*n$1:X [line 36, column 12]\n  n$3=_fun_X_div(n$1:X*) [line 36, column 12]\n  *&return:int=n$3 [line 36, column 5]\n " shape="box"]
+"method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_7" [label="7:  Return Stmt \n   n$2=*&x:X* [line 36, column 12]\n  _=*n$2:X [line 36, column 12]\n  n$4=_fun_X_div(n$2:X*) [line 36, column 12]\n  *&return:int=n$4 [line 36, column 5]\n " shape="box"]
 	
 
 	 "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_7" -> "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_2" ;
-"method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_8" [label="8:  Call _fun_zero_ptr \n   n$4=*&x:X* [line 35, column 14]\n  n$5=_fun_zero_ptr(n$4:X*) [line 35, column 5]\n " shape="box"]
+"method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_8" [label="8:  Call _fun_zero_ptr \n   n$6=*&x:X* [line 35, column 14]\n  n$7=_fun_zero_ptr(n$6:X*) [line 35, column 5]\n " shape="box"]
 	
 
 	 "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_8" -> "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_7" ;
@@ -322,7 +322,7 @@ digraph cfg {
 	
 
 	 "method_div0_ref#12048348997540346822.5280d482da62ad0e098e3e6ad4e7915e_3" -> "method_div0_ref#12048348997540346822.5280d482da62ad0e098e3e6ad4e7915e_2" ;
-"method_div0_ref#12048348997540346822.5280d482da62ad0e098e3e6ad4e7915e_4" [label="4:  Call _fun_zero_ref \n   n$3=*&x:X& [line 86, column 12]\n  n$4=_fun_zero_ref(n$3:X&) [line 86, column 3]\n " shape="box"]
+"method_div0_ref#12048348997540346822.5280d482da62ad0e098e3e6ad4e7915e_4" [label="4:  Call _fun_zero_ref \n   n$4=*&x:X& [line 86, column 12]\n  n$5=_fun_zero_ref(n$4:X&) [line 86, column 3]\n " shape="box"]
 	
 
 	 "method_div0_ref#12048348997540346822.5280d482da62ad0e098e3e6ad4e7915e_4" -> "method_div0_ref#12048348997540346822.5280d482da62ad0e098e3e6ad4e7915e_3" ;
@@ -342,19 +342,19 @@ digraph cfg {
 	
 
 	 "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_4" -> "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_2" ;
-"method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_5" [label="5: Prune (true branch, if) \n   n$0=*&x:X* [line 41, column 7]\n  PRUNE(n$0, true); [line 41, column 7]\n " shape="invhouse"]
+"method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_5" [label="5: Prune (true branch, if) \n   n$1=*&x:X* [line 41, column 7]\n  PRUNE(n$1, true); [line 41, column 7]\n " shape="invhouse"]
 	
 
 	 "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_5" -> "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_8" ;
-"method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_6" [label="6: Prune (false branch, if) \n   n$0=*&x:X* [line 41, column 7]\n  PRUNE(!n$0, false); [line 41, column 7]\n " shape="invhouse"]
+"method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_6" [label="6: Prune (false branch, if) \n   n$1=*&x:X* [line 41, column 7]\n  PRUNE(!n$1, false); [line 41, column 7]\n " shape="invhouse"]
 	
 
 	 "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_6" -> "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_3" ;
-"method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_7" [label="7:  Return Stmt \n   n$1=*&x:X* [line 43, column 12]\n  _=*n$1:X [line 43, column 12]\n  n$3=_fun_X_div(n$1:X*) [line 43, column 12]\n  *&return:int=n$3 [line 43, column 5]\n " shape="box"]
+"method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_7" [label="7:  Return Stmt \n   n$2=*&x:X* [line 43, column 12]\n  _=*n$2:X [line 43, column 12]\n  n$4=_fun_X_div(n$2:X*) [line 43, column 12]\n  *&return:int=n$4 [line 43, column 5]\n " shape="box"]
 	
 
 	 "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_7" -> "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_2" ;
-"method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_8" [label="8:  Call _fun_nonzero_ptr \n   n$4=*&x:X* [line 42, column 17]\n  n$5=_fun_nonzero_ptr(n$4:X*) [line 42, column 5]\n " shape="box"]
+"method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_8" [label="8:  Call _fun_nonzero_ptr \n   n$6=*&x:X* [line 42, column 17]\n  n$7=_fun_nonzero_ptr(n$6:X*) [line 42, column 5]\n " shape="box"]
 	
 
 	 "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_8" -> "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_7" ;
@@ -369,7 +369,7 @@ digraph cfg {
 	
 
 	 "method_div1_ref#18445848838166655559.1ecfa9c02aff37ba12fb556cb038f32c_3" -> "method_div1_ref#18445848838166655559.1ecfa9c02aff37ba12fb556cb038f32c_2" ;
-"method_div1_ref#18445848838166655559.1ecfa9c02aff37ba12fb556cb038f32c_4" [label="4:  Call _fun_nonzero_ref \n   n$3=*&x:X& [line 91, column 15]\n  n$4=_fun_nonzero_ref(n$3:X&) [line 91, column 3]\n " shape="box"]
+"method_div1_ref#18445848838166655559.1ecfa9c02aff37ba12fb556cb038f32c_4" [label="4:  Call _fun_nonzero_ref \n   n$4=*&x:X& [line 91, column 15]\n  n$5=_fun_nonzero_ref(n$4:X&) [line 91, column 3]\n " shape="box"]
 	
 
 	 "method_div1_ref#18445848838166655559.1ecfa9c02aff37ba12fb556cb038f32c_4" -> "method_div1_ref#18445848838166655559.1ecfa9c02aff37ba12fb556cb038f32c_3" ;
@@ -380,7 +380,7 @@ digraph cfg {
 "nonzero_ptr#1716920554390102131.73cd383c8a42e9a8d0f617a226ea9df9_2" [label="2: Exit nonzero_ptr \n  " color=yellow style=filled]
 	
 
-"nonzero_ptr#1716920554390102131.73cd383c8a42e9a8d0f617a226ea9df9_3" [label="3:  Call _fun_X_nonzero \n   n$0=*&x:X* [line 19, column 26]\n  _=*n$0:X [line 19, column 26]\n  n$2=_fun_X_nonzero(n$0:X*) [line 19, column 26]\n " shape="box"]
+"nonzero_ptr#1716920554390102131.73cd383c8a42e9a8d0f617a226ea9df9_3" [label="3:  Call _fun_X_nonzero \n   n$1=*&x:X* [line 19, column 26]\n  _=*n$1:X [line 19, column 26]\n  n$3=_fun_X_nonzero(n$1:X*) [line 19, column 26]\n " shape="box"]
 	
 
 	 "nonzero_ptr#1716920554390102131.73cd383c8a42e9a8d0f617a226ea9df9_3" -> "nonzero_ptr#1716920554390102131.73cd383c8a42e9a8d0f617a226ea9df9_2" ;
@@ -391,7 +391,7 @@ digraph cfg {
 "nonzero_ref#2062801655575406720.e5794366c34a5ecd10e2fd062a659f30_2" [label="2: Exit nonzero_ref \n  " color=yellow style=filled]
 	
 
-"nonzero_ref#2062801655575406720.e5794366c34a5ecd10e2fd062a659f30_3" [label="3:  Call _fun_X_nonzero \n   n$0=*&x:X& [line 25, column 26]\n  _=*n$0:X [line 25, column 26]\n  n$2=_fun_X_nonzero(n$0:X&) [line 25, column 26]\n " shape="box"]
+"nonzero_ref#2062801655575406720.e5794366c34a5ecd10e2fd062a659f30_3" [label="3:  Call _fun_X_nonzero \n   n$1=*&x:X& [line 25, column 26]\n  _=*n$1:X [line 25, column 26]\n  n$3=_fun_X_nonzero(n$1:X&) [line 25, column 26]\n " shape="box"]
 	
 
 	 "nonzero_ref#2062801655575406720.e5794366c34a5ecd10e2fd062a659f30_3" -> "nonzero_ref#2062801655575406720.e5794366c34a5ecd10e2fd062a659f30_2" ;
@@ -402,7 +402,7 @@ digraph cfg {
 "set_field_ptr#10262801862810946974.0df004d43278f4c67506fb9e7451494c_2" [label="2: Exit set_field_ptr \n  " color=yellow style=filled]
 	
 
-"set_field_ptr#10262801862810946974.0df004d43278f4c67506fb9e7451494c_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&x:X* [line 21, column 37]\n  n$1=*&val:int [line 21, column 44]\n  *n$0.f:int=n$1 [line 21, column 37]\n " shape="box"]
+"set_field_ptr#10262801862810946974.0df004d43278f4c67506fb9e7451494c_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&x:X* [line 21, column 37]\n  n$2=*&val:int [line 21, column 44]\n  *n$1.f:int=n$2 [line 21, column 37]\n " shape="box"]
 	
 
 	 "set_field_ptr#10262801862810946974.0df004d43278f4c67506fb9e7451494c_3" -> "set_field_ptr#10262801862810946974.0df004d43278f4c67506fb9e7451494c_2" ;
@@ -413,7 +413,7 @@ digraph cfg {
 "set_field_ref#15177497547761982491.aa4620ee8933c900acc4164344e57432_2" [label="2: Exit set_field_ref \n  " color=yellow style=filled]
 	
 
-"set_field_ref#15177497547761982491.aa4620ee8933c900acc4164344e57432_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&x:X& [line 27, column 37]\n  n$1=*&val:int [line 27, column 43]\n  *n$0.f:int=n$1 [line 27, column 37]\n " shape="box"]
+"set_field_ref#15177497547761982491.aa4620ee8933c900acc4164344e57432_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&x:X& [line 27, column 37]\n  n$2=*&val:int [line 27, column 43]\n  *n$1.f:int=n$2 [line 27, column 37]\n " shape="box"]
 	
 
 	 "set_field_ref#15177497547761982491.aa4620ee8933c900acc4164344e57432_3" -> "set_field_ref#15177497547761982491.aa4620ee8933c900acc4164344e57432_2" ;
@@ -424,7 +424,7 @@ digraph cfg {
 "zero_ptr#12528709853087384868.d5a909d971ab439311f13a14aded5aa9_2" [label="2: Exit zero_ptr \n  " color=yellow style=filled]
 	
 
-"zero_ptr#12528709853087384868.d5a909d971ab439311f13a14aded5aa9_3" [label="3:  Call _fun_X_zero \n   n$0=*&x:X* [line 17, column 23]\n  _=*n$0:X [line 17, column 23]\n  n$2=_fun_X_zero(n$0:X*) [line 17, column 23]\n " shape="box"]
+"zero_ptr#12528709853087384868.d5a909d971ab439311f13a14aded5aa9_3" [label="3:  Call _fun_X_zero \n   n$1=*&x:X* [line 17, column 23]\n  _=*n$1:X [line 17, column 23]\n  n$3=_fun_X_zero(n$1:X*) [line 17, column 23]\n " shape="box"]
 	
 
 	 "zero_ptr#12528709853087384868.d5a909d971ab439311f13a14aded5aa9_3" -> "zero_ptr#12528709853087384868.d5a909d971ab439311f13a14aded5aa9_2" ;
@@ -435,7 +435,7 @@ digraph cfg {
 "zero_ref#14077465191616488315.9f868765c76672369ef06a4d03ded4f3_2" [label="2: Exit zero_ref \n  " color=yellow style=filled]
 	
 
-"zero_ref#14077465191616488315.9f868765c76672369ef06a4d03ded4f3_3" [label="3:  Call _fun_X_zero \n   n$0=*&x:X& [line 23, column 23]\n  _=*n$0:X [line 23, column 23]\n  n$2=_fun_X_zero(n$0:X&) [line 23, column 23]\n " shape="box"]
+"zero_ref#14077465191616488315.9f868765c76672369ef06a4d03ded4f3_3" [label="3:  Call _fun_X_zero \n   n$1=*&x:X& [line 23, column 23]\n  _=*n$1:X [line 23, column 23]\n  n$3=_fun_X_zero(n$1:X&) [line 23, column 23]\n " shape="box"]
 	
 
 	 "zero_ref#14077465191616488315.9f868765c76672369ef06a4d03ded4f3_3" -> "zero_ref#14077465191616488315.9f868765c76672369ef06a4d03ded4f3_2" ;
@@ -464,7 +464,7 @@ digraph cfg {
 "nonzero#X#(11619218627491700674).1d7c44c6589f4c816f501055b35038bc_2" [label="2: Exit X_nonzero \n  " color=yellow style=filled]
 	
 
-"nonzero#X#(11619218627491700674).1d7c44c6589f4c816f501055b35038bc_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:X* [line 12, column 20]\n  *n$0.f:int=1 [line 12, column 20]\n " shape="box"]
+"nonzero#X#(11619218627491700674).1d7c44c6589f4c816f501055b35038bc_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:X* [line 12, column 20]\n  *n$1.f:int=1 [line 12, column 20]\n " shape="box"]
 	
 
 	 "nonzero#X#(11619218627491700674).1d7c44c6589f4c816f501055b35038bc_3" -> "nonzero#X#(11619218627491700674).1d7c44c6589f4c816f501055b35038bc_2" ;
@@ -475,7 +475,7 @@ digraph cfg {
 "zero#X#(16299302305861440992).e13842f7b98f126e5d2188644c16a995_2" [label="2: Exit X_zero \n  " color=yellow style=filled]
 	
 
-"zero#X#(16299302305861440992).e13842f7b98f126e5d2188644c16a995_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:X* [line 13, column 17]\n  *n$0.f:int=0 [line 13, column 17]\n " shape="box"]
+"zero#X#(16299302305861440992).e13842f7b98f126e5d2188644c16a995_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:X* [line 13, column 17]\n  *n$1.f:int=0 [line 13, column 17]\n " shape="box"]
 	
 
 	 "zero#X#(16299302305861440992).e13842f7b98f126e5d2188644c16a995_3" -> "zero#X#(16299302305861440992).e13842f7b98f126e5d2188644c16a995_2" ;

infer/tests/codetoanalyze/cpp/shared/reference/reference_type_e2e.cpp.dot

@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "ptr_div0#14193575060740497524.6928690623c7c21a5a52547c8cdd4310_3" -> "ptr_div0#14193575060740497524.6928690623c7c21a5a52547c8cdd4310_2" ;
-"ptr_div0#14193575060740497524.6928690623c7c21a5a52547c8cdd4310_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&p:int* [line 16, column 4]\n  *n$1:int=0 [line 16, column 3]\n " shape="box"]
+"ptr_div0#14193575060740497524.6928690623c7c21a5a52547c8cdd4310_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&p:int* [line 16, column 4]\n  *n$2:int=0 [line 16, column 3]\n " shape="box"]
 	
 
 	 "ptr_div0#14193575060740497524.6928690623c7c21a5a52547c8cdd4310_4" -> "ptr_div0#14193575060740497524.6928690623c7c21a5a52547c8cdd4310_3" ;
@@ -34,7 +34,7 @@ digraph cfg {
 	
 
 	 "ptr_div0_function#15472019236267517423.0a3eb7529edaa487d598988d34f0b091_3" -> "ptr_div0_function#15472019236267517423.0a3eb7529edaa487d598988d34f0b091_2" ;
-"ptr_div0_function#15472019236267517423.0a3eb7529edaa487d598988d34f0b091_4" [label="4:  Call _fun_zero_ptr \n   n$1=_fun_zero_ptr(&a:int*) [line 22, column 3]\n " shape="box"]
+"ptr_div0_function#15472019236267517423.0a3eb7529edaa487d598988d34f0b091_4" [label="4:  Call _fun_zero_ptr \n   n$2=_fun_zero_ptr(&a:int*) [line 22, column 3]\n " shape="box"]
 	
 
 	 "ptr_div0_function#15472019236267517423.0a3eb7529edaa487d598988d34f0b091_4" -> "ptr_div0_function#15472019236267517423.0a3eb7529edaa487d598988d34f0b091_3" ;
@@ -53,7 +53,7 @@ digraph cfg {
 	
 
 	 "ptr_div0_function_temp_var#5150281836928396778.6b88ca0a7e844195f8de319fd04a3139_3" -> "ptr_div0_function_temp_var#5150281836928396778.6b88ca0a7e844195f8de319fd04a3139_2" ;
-"ptr_div0_function_temp_var#5150281836928396778.6b88ca0a7e844195f8de319fd04a3139_4" [label="4:  Call _fun_zero_ptr \n   n$1=*&r:int* [line 29, column 12]\n  n$2=_fun_zero_ptr(n$1:int*) [line 29, column 3]\n " shape="box"]
+"ptr_div0_function_temp_var#5150281836928396778.6b88ca0a7e844195f8de319fd04a3139_4" [label="4:  Call _fun_zero_ptr \n   n$2=*&r:int* [line 29, column 12]\n  n$3=_fun_zero_ptr(n$2:int*) [line 29, column 3]\n " shape="box"]
 	
 
 	 "ptr_div0_function_temp_var#5150281836928396778.6b88ca0a7e844195f8de319fd04a3139_4" -> "ptr_div0_function_temp_var#5150281836928396778.6b88ca0a7e844195f8de319fd04a3139_3" ;
@@ -76,7 +76,7 @@ digraph cfg {
 	
 
 	 "ref_div0#1043072996947162803.d8e5fefe42038c8549979f6316354144_3" -> "ref_div0#1043072996947162803.d8e5fefe42038c8549979f6316354144_2" ;
-"ref_div0#1043072996947162803.d8e5fefe42038c8549979f6316354144_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&r:int& [line 36, column 3]\n  *n$1:int=0 [line 36, column 3]\n " shape="box"]
+"ref_div0#1043072996947162803.d8e5fefe42038c8549979f6316354144_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&r:int& [line 36, column 3]\n  *n$2:int=0 [line 36, column 3]\n " shape="box"]
 	
 
 	 "ref_div0#1043072996947162803.d8e5fefe42038c8549979f6316354144_4" -> "ref_div0#1043072996947162803.d8e5fefe42038c8549979f6316354144_3" ;
@@ -99,7 +99,7 @@ digraph cfg {
 	
 
 	 "ref_div0_function#15446684317306379342.095fd29aa2a7d2024ec0380b2c42aad4_3" -> "ref_div0_function#15446684317306379342.095fd29aa2a7d2024ec0380b2c42aad4_2" ;
-"ref_div0_function#15446684317306379342.095fd29aa2a7d2024ec0380b2c42aad4_4" [label="4:  Call _fun_zero_ref \n   n$1=_fun_zero_ref(&a:int&) [line 42, column 3]\n " shape="box"]
+"ref_div0_function#15446684317306379342.095fd29aa2a7d2024ec0380b2c42aad4_4" [label="4:  Call _fun_zero_ref \n   n$2=_fun_zero_ref(&a:int&) [line 42, column 3]\n " shape="box"]
 	
 
 	 "ref_div0_function#15446684317306379342.095fd29aa2a7d2024ec0380b2c42aad4_4" -> "ref_div0_function#15446684317306379342.095fd29aa2a7d2024ec0380b2c42aad4_3" ;
@@ -118,7 +118,7 @@ digraph cfg {
 	
 
 	 "ref_div0_function_temp_var#14207866842047996477.a899517f09b367d539ea5f04365fd46e_3" -> "ref_div0_function_temp_var#14207866842047996477.a899517f09b367d539ea5f04365fd46e_2" ;
-"ref_div0_function_temp_var#14207866842047996477.a899517f09b367d539ea5f04365fd46e_4" [label="4:  Call _fun_zero_ref \n   n$1=*&r:int& [line 49, column 12]\n  n$2=_fun_zero_ref(n$1:int&) [line 49, column 3]\n " shape="box"]
+"ref_div0_function_temp_var#14207866842047996477.a899517f09b367d539ea5f04365fd46e_4" [label="4:  Call _fun_zero_ref \n   n$2=*&r:int& [line 49, column 12]\n  n$3=_fun_zero_ref(n$2:int&) [line 49, column 3]\n " shape="box"]
 	
 
 	 "ref_div0_function_temp_var#14207866842047996477.a899517f09b367d539ea5f04365fd46e_4" -> "ref_div0_function_temp_var#14207866842047996477.a899517f09b367d539ea5f04365fd46e_3" ;
@@ -141,11 +141,11 @@ digraph cfg {
 	
 
 	 "ref_div0_nested_assignment#17126972420420854569.bd6abb3056f6689fbac92af920ec6879_3" -> "ref_div0_nested_assignment#17126972420420854569.bd6abb3056f6689fbac92af920ec6879_2" ;
-"ref_div0_nested_assignment#17126972420420854569.bd6abb3056f6689fbac92af920ec6879_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&r2:int& [line 58, column 3]\n  *n$1:int=0 [line 58, column 3]\n " shape="box"]
+"ref_div0_nested_assignment#17126972420420854569.bd6abb3056f6689fbac92af920ec6879_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&r2:int& [line 58, column 3]\n  *n$2:int=0 [line 58, column 3]\n " shape="box"]
 	
 
 	 "ref_div0_nested_assignment#17126972420420854569.bd6abb3056f6689fbac92af920ec6879_4" -> "ref_div0_nested_assignment#17126972420420854569.bd6abb3056f6689fbac92af920ec6879_3" ;
-"ref_div0_nested_assignment#17126972420420854569.bd6abb3056f6689fbac92af920ec6879_5" [label="5:  DeclStmt \n   n$2=*&r1:int& [line 57, column 13]\n  *&b:int=1 [line 57, column 18]\n  n$3=*&b:int [line 57, column 18]\n  *n$2:int=n$3 [line 57, column 13]\n  *&r2:int&=n$2 [line 57, column 3]\n " shape="box"]
+"ref_div0_nested_assignment#17126972420420854569.bd6abb3056f6689fbac92af920ec6879_5" [label="5:  DeclStmt \n   n$3=*&r1:int& [line 57, column 13]\n  *&b:int=1 [line 57, column 18]\n  n$4=*&b:int [line 57, column 18]\n  *n$3:int=n$4 [line 57, column 13]\n  *&r2:int&=n$3 [line 57, column 3]\n " shape="box"]
 	
 
 	 "ref_div0_nested_assignment#17126972420420854569.bd6abb3056f6689fbac92af920ec6879_5" -> "ref_div0_nested_assignment#17126972420420854569.bd6abb3056f6689fbac92af920ec6879_4" ;
@@ -172,11 +172,11 @@ digraph cfg {
 	
 
 	 "ref_div1_nested_assignment#5121576951592231820.a9f8511d9ff791c44569fd8a8eb9d3cf_3" -> "ref_div1_nested_assignment#5121576951592231820.a9f8511d9ff791c44569fd8a8eb9d3cf_2" ;
-"ref_div1_nested_assignment#5121576951592231820.a9f8511d9ff791c44569fd8a8eb9d3cf_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&r2:int& [line 67, column 3]\n  *n$1:int=0 [line 67, column 3]\n " shape="box"]
+"ref_div1_nested_assignment#5121576951592231820.a9f8511d9ff791c44569fd8a8eb9d3cf_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&r2:int& [line 67, column 3]\n  *n$2:int=0 [line 67, column 3]\n " shape="box"]
 	
 
 	 "ref_div1_nested_assignment#5121576951592231820.a9f8511d9ff791c44569fd8a8eb9d3cf_4" -> "ref_div1_nested_assignment#5121576951592231820.a9f8511d9ff791c44569fd8a8eb9d3cf_3" ;
-"ref_div1_nested_assignment#5121576951592231820.a9f8511d9ff791c44569fd8a8eb9d3cf_5" [label="5:  DeclStmt \n   n$2=*&r1:int& [line 66, column 13]\n  *&b:int=1 [line 66, column 18]\n  n$3=*&b:int [line 66, column 18]\n  *n$2:int=n$3 [line 66, column 13]\n  *&r2:int&=n$2 [line 66, column 3]\n " shape="box"]
+"ref_div1_nested_assignment#5121576951592231820.a9f8511d9ff791c44569fd8a8eb9d3cf_5" [label="5:  DeclStmt \n   n$3=*&r1:int& [line 66, column 13]\n  *&b:int=1 [line 66, column 18]\n  n$4=*&b:int [line 66, column 18]\n  *n$3:int=n$4 [line 66, column 13]\n  *&r2:int&=n$3 [line 66, column 3]\n " shape="box"]
 	
 
 	 "ref_div1_nested_assignment#5121576951592231820.a9f8511d9ff791c44569fd8a8eb9d3cf_5" -> "ref_div1_nested_assignment#5121576951592231820.a9f8511d9ff791c44569fd8a8eb9d3cf_4" ;
@@ -199,7 +199,7 @@ digraph cfg {
 "zero_ptr#10962438709356261388.c1a1091e7e1d49bd9bd5d8cac96703e9_2" [label="2: Exit zero_ptr \n  " color=yellow style=filled]
 	
 
-"zero_ptr#10962438709356261388.c1a1091e7e1d49bd9bd5d8cac96703e9_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&p:int* [line 10, column 26]\n  *n$0:int=0 [line 10, column 25]\n " shape="box"]
+"zero_ptr#10962438709356261388.c1a1091e7e1d49bd9bd5d8cac96703e9_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&p:int* [line 10, column 26]\n  *n$1:int=0 [line 10, column 25]\n " shape="box"]
 	
 
 	 "zero_ptr#10962438709356261388.c1a1091e7e1d49bd9bd5d8cac96703e9_3" -> "zero_ptr#10962438709356261388.c1a1091e7e1d49bd9bd5d8cac96703e9_2" ;
@@ -210,7 +210,7 @@ digraph cfg {
 "zero_ref#8777441955929384761.2247f2b8d396eabba21c20ef967ac6ec_2" [label="2: Exit zero_ref \n  " color=yellow style=filled]
 	
 
-"zero_ref#8777441955929384761.2247f2b8d396eabba21c20ef967ac6ec_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&p:int& [line 11, column 25]\n  *n$0:int=0 [line 11, column 25]\n " shape="box"]
+"zero_ref#8777441955929384761.2247f2b8d396eabba21c20ef967ac6ec_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&p:int& [line 11, column 25]\n  *n$1:int=0 [line 11, column 25]\n " shape="box"]
 	
 
 	 "zero_ref#8777441955929384761.2247f2b8d396eabba21c20ef967ac6ec_3" -> "zero_ref#8777441955929384761.2247f2b8d396eabba21c20ef967ac6ec_2" ;

infer/tests/codetoanalyze/cpp/shared/reference/temporary_lvalue.cpp.dot

@@ -11,18 +11,18 @@ digraph cfg {
 	
 
 	 "div#1879538779647861770.84b17ea73594d098fb69bd947fc358c0_3" -> "div#1879538779647861770.84b17ea73594d098fb69bd947fc358c0_2" ;
-"div0_function_param_cast#10492767400319523474.071b9a9b757a9140938b53a95e971def_1" [label="1: Start div0_function_param_cast\nFormals: \nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$0:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 17, column 1]\n " color=yellow style=filled]
+"div0_function_param_cast#10492767400319523474.071b9a9b757a9140938b53a95e971def_1" [label="1: Start div0_function_param_cast\nFormals: \nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$0:int const  \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 17, column 1]\n " color=yellow style=filled]
 	
 
 	 "div0_function_param_cast#10492767400319523474.071b9a9b757a9140938b53a95e971def_1" -> "div0_function_param_cast#10492767400319523474.071b9a9b757a9140938b53a95e971def_3" ;
 "div0_function_param_cast#10492767400319523474.071b9a9b757a9140938b53a95e971def_2" [label="2: Exit div0_function_param_cast \n  " color=yellow style=filled]
 	
 
-"div0_function_param_cast#10492767400319523474.071b9a9b757a9140938b53a95e971def_3" [label="3:  Return Stmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$0:int=0 [line 17, column 45]\n  n$1=_fun_div(&0$?%__sil_tmpSIL_materialize_temp__n$0:int&) [line 17, column 41]\n  *&return:int=n$1 [line 17, column 34]\n " shape="box"]
+"div0_function_param_cast#10492767400319523474.071b9a9b757a9140938b53a95e971def_3" [label="3:  Return Stmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$0:int=0 [line 17, column 45]\n  n$1=_fun_div(&0$?%__sil_tmpSIL_materialize_temp__n$0:int const &) [line 17, column 41]\n  *&return:int=n$1 [line 17, column 34]\n " shape="box"]
 	
 
 	 "div0_function_param_cast#10492767400319523474.071b9a9b757a9140938b53a95e971def_3" -> "div0_function_param_cast#10492767400319523474.071b9a9b757a9140938b53a95e971def_2" ;
-"div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_1" [label="1: Start div0_init_expr\nFormals: \nLocals:  a:int const & 0$?%__sil_tmpSIL_materialize_temp__n$2:int \n   DECLARE_LOCALS(&return,&a,&0$?%__sil_tmpSIL_materialize_temp__n$2); [line 12, column 1]\n " color=yellow style=filled]
+"div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_1" [label="1: Start div0_init_expr\nFormals: \nLocals:  a:int const & 0$?%__sil_tmpSIL_materialize_temp__n$3:int const  \n   DECLARE_LOCALS(&return,&a,&0$?%__sil_tmpSIL_materialize_temp__n$3); [line 12, column 1]\n " color=yellow style=filled]
 	
 
 	 "div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_1" -> "div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_4" ;
@@ -33,7 +33,7 @@ digraph cfg {
 	
 
 	 "div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_3" -> "div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_2" ;
-"div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$2:int=0 [line 13, column 18]\n  *&a:int&=&0$?%__sil_tmpSIL_materialize_temp__n$2 [line 13, column 3]\n " shape="box"]
+"div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$3:int=0 [line 13, column 18]\n  *&a:int const &=&0$?%__sil_tmpSIL_materialize_temp__n$3 [line 13, column 3]\n " shape="box"]
 	
 
 	 "div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_4" -> "div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_3" ;

infer/tests/codetoanalyze/cpp/shared/reference/unbox.cpp.dot

@@ -40,15 +40,15 @@ digraph cfg {
 "unbox_ptr#3550280956167916174.75d50cc2e2dfffd1cc23613b01fc878b_2" [label="2: Exit unbox_ptr \n  " color=yellow style=filled]
 	
 
-"unbox_ptr#3550280956167916174.75d50cc2e2dfffd1cc23613b01fc878b_3" [label="3:  Call _fun_fun_r \n   n$0=*&p:int* [line 33, column 10]\n  n$1=_fun_fun_r(n$0:int&) [line 33, column 3]\n " shape="box"]
+"unbox_ptr#3550280956167916174.75d50cc2e2dfffd1cc23613b01fc878b_3" [label="3:  Call _fun_fun_r \n   n$1=*&p:int* [line 33, column 10]\n  n$2=_fun_fun_r(n$1:int&) [line 33, column 3]\n " shape="box"]
 	
 
 	 "unbox_ptr#3550280956167916174.75d50cc2e2dfffd1cc23613b01fc878b_3" -> "unbox_ptr#3550280956167916174.75d50cc2e2dfffd1cc23613b01fc878b_2" ;
-"unbox_ptr#3550280956167916174.75d50cc2e2dfffd1cc23613b01fc878b_4" [label="4:  Call _fun_fun_v \n   n$2=*&p:int* [line 32, column 10]\n  n$3=*n$2:int [line 32, column 9]\n  n$4=_fun_fun_v(n$3:int) [line 32, column 3]\n " shape="box"]
+"unbox_ptr#3550280956167916174.75d50cc2e2dfffd1cc23613b01fc878b_4" [label="4:  Call _fun_fun_v \n   n$3=*&p:int* [line 32, column 10]\n  n$4=*n$3:int [line 32, column 9]\n  n$5=_fun_fun_v(n$4:int) [line 32, column 3]\n " shape="box"]
 	
 
 	 "unbox_ptr#3550280956167916174.75d50cc2e2dfffd1cc23613b01fc878b_4" -> "unbox_ptr#3550280956167916174.75d50cc2e2dfffd1cc23613b01fc878b_3" ;
-"unbox_ptr#3550280956167916174.75d50cc2e2dfffd1cc23613b01fc878b_5" [label="5:  Call _fun_fun_p \n   n$5=*&p:int* [line 31, column 9]\n  n$6=_fun_fun_p(n$5:int*) [line 31, column 3]\n " shape="box"]
+"unbox_ptr#3550280956167916174.75d50cc2e2dfffd1cc23613b01fc878b_5" [label="5:  Call _fun_fun_p \n   n$6=*&p:int* [line 31, column 9]\n  n$7=_fun_fun_p(n$6:int*) [line 31, column 3]\n " shape="box"]
 	
 
 	 "unbox_ptr#3550280956167916174.75d50cc2e2dfffd1cc23613b01fc878b_5" -> "unbox_ptr#3550280956167916174.75d50cc2e2dfffd1cc23613b01fc878b_4" ;
@@ -67,15 +67,15 @@ digraph cfg {
 "unbox_ref#9977470601320200599.91094dce9e5b43dc4c89abcbc69b2c70_2" [label="2: Exit unbox_ref \n  " color=yellow style=filled]
 	
 
-"unbox_ref#9977470601320200599.91094dce9e5b43dc4c89abcbc69b2c70_3" [label="3:  Call _fun_fun_r \n   n$0=*&r:int& [line 23, column 9]\n  n$1=_fun_fun_r(n$0:int&) [line 23, column 3]\n " shape="box"]
+"unbox_ref#9977470601320200599.91094dce9e5b43dc4c89abcbc69b2c70_3" [label="3:  Call _fun_fun_r \n   n$1=*&r:int& [line 23, column 9]\n  n$2=_fun_fun_r(n$1:int&) [line 23, column 3]\n " shape="box"]
 	
 
 	 "unbox_ref#9977470601320200599.91094dce9e5b43dc4c89abcbc69b2c70_3" -> "unbox_ref#9977470601320200599.91094dce9e5b43dc4c89abcbc69b2c70_2" ;
-"unbox_ref#9977470601320200599.91094dce9e5b43dc4c89abcbc69b2c70_4" [label="4:  Call _fun_fun_v \n   n$2=*&r:int& [line 22, column 9]\n  n$3=*n$2:int [line 22, column 9]\n  n$4=_fun_fun_v(n$3:int) [line 22, column 3]\n " shape="box"]
+"unbox_ref#9977470601320200599.91094dce9e5b43dc4c89abcbc69b2c70_4" [label="4:  Call _fun_fun_v \n   n$3=*&r:int& [line 22, column 9]\n  n$4=*n$3:int [line 22, column 9]\n  n$5=_fun_fun_v(n$4:int) [line 22, column 3]\n " shape="box"]
 	
 
 	 "unbox_ref#9977470601320200599.91094dce9e5b43dc4c89abcbc69b2c70_4" -> "unbox_ref#9977470601320200599.91094dce9e5b43dc4c89abcbc69b2c70_3" ;
-"unbox_ref#9977470601320200599.91094dce9e5b43dc4c89abcbc69b2c70_5" [label="5:  Call _fun_fun_p \n   n$5=*&r:int& [line 21, column 10]\n  n$6=_fun_fun_p(n$5:int*) [line 21, column 3]\n " shape="box"]
+"unbox_ref#9977470601320200599.91094dce9e5b43dc4c89abcbc69b2c70_5" [label="5:  Call _fun_fun_p \n   n$6=*&r:int& [line 21, column 10]\n  n$7=_fun_fun_p(n$6:int*) [line 21, column 3]\n " shape="box"]
 	
 
 	 "unbox_ref#9977470601320200599.91094dce9e5b43dc4c89abcbc69b2c70_5" -> "unbox_ref#9977470601320200599.91094dce9e5b43dc4c89abcbc69b2c70_4" ;