From db800f138b6f6531ffd203ece4ad993bac42bd0e Mon Sep 17 00:00:00 2001
From: Jules Villard <jul@fb.com>
Date: Mon, 17 Jun 2019 03:55:04 -0700
Subject: [PATCH] [clang] rewrite scope computations

Summary:
This started as an attempt to understand how to modify the frontend to
inject destructors for C++ temporaries (see next diffs).

This diff rewrites the existing logic for computing the list of
variables that should be destroyed at the end of each statement, either
because it's the end of their syntactic scope or because control flow
branches outside of their syntactic scope.

The frontend translates a function from the last instructions to the
first, but scope computation needs to be done in the other direction, so
it's done in a separate pass *before* the main translation happens. That
first pass creates a map from statements in the AST to the list of
variables that should be destroyed at the end of these statements. This
is still the case now.

Before, that map would be computed in a bit of a weird way: scopes are
naturally a stack but instead of that the structure maintained was a
flat list + a counter to know where the current scope ended in that
list.

In this diff, redo the computation maintaining a stack of scopes
instead, which is a bit cleaner. Also treat more instructions as
introducing a new scope, eg if, for, ...

Reviewed By: mbouaziz

Differential Revision: D15674208

fbshipit-source-id: c92429e82
---
 infer/src/IR/Procdesc.ml                      |   3 +
 infer/src/IR/Procdesc.mli                     |   1 +
 infer/src/clang/cFrontend_decl.ml             |   8 +-
 infer/src/clang/cScope.ml                     | 213 +++++++++++++
 infer/src/clang/cScope.mli                    |  14 +
 infer/src/clang/cTrans.ml                     | 142 +++++----
 infer/src/clang/cTrans_utils.ml               |  61 ----
 infer/src/clang/cTrans_utils.mli              |   7 -
 .../clang_translation/src/main.cpp.dot        | 120 ++++----
 .../src/main_default_root.cpp.dot             | 120 ++++----
 .../src/main_default_symlink.cpp.dot          | 120 ++++----
 .../src/main_symlink.cpp.dot                  | 120 ++++----
 .../attributes/clang_fallthrough.cpp.dot      |  20 +-
 .../cpp/frontend/builtin/new.cpp.dot          |   8 +-
 .../frontend/destructors/break_scope.cpp.dot  | 290 +++++++++---------
 .../destructors/call_destructor.cpp.dot       |   2 +-
 .../destructors/call_on_delete.cpp.dot        |   4 +-
 .../destructors/continue_scope.cpp.dot        | 234 +++++++-------
 .../destructors/destructor_bases.cpp.dot      |  34 +-
 .../pseudo_destructor_expr.cpp.dot            |   8 +-
 .../cpp/frontend/destructors/scope.cpp.dot    |   8 +-
 .../frontend/destructors/simple_decl.cpp.dot  |   4 +-
 .../frontend/globals/global_const1.cpp.dot    |   2 +-
 .../codetoanalyze/cpp/frontend/if.cpp.dot     |  50 +--
 .../include_header/include_templ.cpp.dot      |  12 +-
 .../inheriting_constructor.cpp.dot            |   4 +-
 .../frontend/initialization/init_list.cpp.dot |  24 +-
 .../literals/scalar_value_init.cpp.dot        |  10 +-
 .../cpp/frontend/loops/do_while.cpp.dot       |  16 +-
 .../cpp/frontend/loops/foreach1.cpp.dot       |  68 ++--
 .../assign_in_condition.cpp.dot               |   6 +-
 .../assign_with_increment.cpp.dot             |   8 +-
 .../frontend/nestedoperators/union.cpp.dot    |   6 +-
 .../tests/codetoanalyze/cpp/pulse/basics.cpp  |  42 +++
 .../cpp/shared/attributes/annotate.cpp.dot    |  40 +--
 .../conditional/lvalue_conditional.cpp.dot    |  50 +--
 .../constructors/constructor_array.cpp.dot    |  28 +-
 .../constructor_default_arg.cpp.dot           |   8 +-
 .../constructors/constructor_init.cpp.dot     |  14 +-
 .../constructors/constructor_new.cpp.dot      |  92 +++---
 .../constructor_struct_init_list.cpp.dot      |   6 +-
 .../constructor_with_body.cpp.dot             |  22 +-
 .../constructors/copy_array_field.cpp.dot     |  12 +-
 .../copy_move_constructor.cpp.dot             |   8 +-
 .../constructors/default_field_init.cpp.dot   |  20 +-
 .../shared/constructors/std_init_list.cpp.dot |  16 +-
 .../shared/constructors/temp_object.cpp.dot   |   6 +-
 .../cpp/shared/exceptions/Exceptions.cpp.dot  |  58 ++--
 .../cpp/shared/lambda/lambda1.cpp.dot         |  22 +-
 .../cpp/shared/methods/byvals.cpp.dot         |   4 +-
 .../methods/conversion_operator.cpp.dot       |  24 +-
 .../shared/methods/default_parameters.cpp.dot |   6 +-
 .../shared/methods/dereference_this.cpp.dot   |   6 +-
 .../cpp/shared/methods/inline_method.cpp.dot  |   4 +-
 .../cpp/shared/methods/overloading.cpp.dot    |   4 +-
 .../cpp/shared/methods/return_struct.cpp.dot  |   2 +-
 .../cpp/shared/methods/static.cpp.dot         |   4 +-
 .../shared/methods/virtual_methods.cpp.dot    |  14 +-
 .../cpp/shared/namespace/namespace.cpp.dot    |  16 +-
 .../var_decl_inside_for.cpp.dot               |  18 +-
 .../var_decl_inside_if.cpp.dot                |  58 ++--
 .../var_decl_inside_switch.cpp.dot            |  18 +-
 .../var_decl_inside_while.cpp.dot             |  32 +-
 .../cpp/shared/npe/method_call.cpp.dot        |   6 +-
 .../cpp/shared/reference/increment.cpp.dot    |   8 +-
 .../cpp/shared/reference/init.cpp.dot         |  14 +-
 .../shared/reference/member_access.cpp.dot    |   8 +-
 .../member_access_from_return.cpp.dot         |   8 +-
 .../reference/nested_assignment.cpp.dot       |  10 +-
 .../cpp/shared/reference/ptr_mem.cpp.dot      |  10 +-
 .../shared/reference/reference_field.cpp.dot  |  14 +-
 .../reference/reference_struct_e2e.cpp.dot    | 104 +++----
 .../reference/reference_type_e2e.cpp.dot      |  24 +-
 .../shared/reference/temporary_lvalue.cpp.dot |   6 +-
 .../cpp/shared/reference/unbox.cpp.dot        |  12 +-
 .../templates/class_specialization.cpp.dot    |  20 +-
 .../cpp/shared/templates/function.cpp.dot     |  12 +-
 .../cpp/shared/templates/method.cpp.dot       |  32 +-
 .../cpp/shared/templates/simple.cpp.dot       |   4 +-
 .../cpp/shared/templates/sizeof_pack.cpp.dot  |   4 +-
 .../cpp/shared/types/casts.cpp.dot            |   2 +-
 .../cpp/shared/types/const.cpp.dot            |  14 +-
 .../cpp/shared/types/functions.cpp.dot        |  12 +-
 .../cpp/shared/types/inheritance.cpp.dot      |  20 +-
 .../shared/types/inheritance_casts.cpp.dot    |   6 +-
 .../shared/types/inheritance_field.cpp.dot    |  28 +-
 .../shared/types/operator_overload.cpp.dot    |   6 +-
 .../cpp/shared/types/return_struct.cpp.dot    |  10 +-
 .../cpp/shared/types/struct.cpp.dot           |   8 +-
 .../types/struct_forward_declare.cpp.dot      |  16 +-
 .../shared/types/struct_pass_by_value.cpp.dot |  10 +-
 .../frontend/global_const/global_const.mm.dot |   6 +-
 92 files changed, 1512 insertions(+), 1323 deletions(-)
 create mode 100644 infer/src/clang/cScope.ml
 create mode 100644 infer/src/clang/cScope.mli

diff --git a/infer/src/IR/Procdesc.ml b/infer/src/IR/Procdesc.ml
index 6191095d4..9844c7aac 100644
--- a/infer/src/IR/Procdesc.ml
+++ b/infer/src/IR/Procdesc.ml
@@ -89,6 +89,7 @@ module Node = struct
     | ObjCCPPThrow
     | OutOfBound
     | ReturnStmt
+    | Scope of string
     | Skip of string
     | SwitchStmt
     | ThisNotNull
@@ -326,6 +327,8 @@ module Node = struct
         F.pp_print_string fmt "Out of bound"
     | ReturnStmt ->
         F.pp_print_string fmt "Return Stmt"
+    | Scope descr ->
+        F.fprintf fmt "Scope(%s)" descr
     | Skip reason ->
         F.pp_print_string fmt reason
     | SwitchStmt ->
diff --git a/infer/src/IR/Procdesc.mli b/infer/src/IR/Procdesc.mli
index dfabf43e8..9956beecc 100644
--- a/infer/src/IR/Procdesc.mli
+++ b/infer/src/IR/Procdesc.mli
@@ -70,6 +70,7 @@ module Node : sig
     | ObjCCPPThrow
     | OutOfBound
     | ReturnStmt
+    | Scope of string
     | Skip of string
     | SwitchStmt
     | ThisNotNull
diff --git a/infer/src/clang/cFrontend_decl.ml b/infer/src/clang/cFrontend_decl.ml
index 0b5883973..d26ec0c38 100644
--- a/infer/src/clang/cFrontend_decl.ml
+++ b/infer/src/clang/cFrontend_decl.ml
@@ -61,16 +61,16 @@ module CFrontend_decl_funct (T : CModule_type.CTranslation) : CModule_type.CFron
     let f () =
       match Typ.Procname.Hash.find cfg procname with
       | procdesc when Procdesc.is_defined procdesc && not (model_exists procname) -> (
-          let vars_to_destroy = CTrans_utils.Scope.compute_vars_to_destroy body in
+          L.(debug Capture Verbose)
+            "@\n@\n>>---------- Start translating body of function: '%s' ---------<<@\n@."
+            (Typ.Procname.to_string procname) ;
+          let vars_to_destroy = CScope.Variables.compute_vars_to_destroy_map body in
           let context =
             CContext.create_context trans_unit_ctx tenv cfg procdesc class_decl_opt
               has_return_param outer_context_opt vars_to_destroy
           in
           let start_node = Procdesc.get_start_node procdesc in
           let exit_node = Procdesc.get_exit_node procdesc in
-          L.(debug Capture Verbose)
-            "@\n@\n>>---------- Start translating body of function: '%s' ---------<<@\n@."
-            (Typ.Procname.to_string procname) ;
           let meth_body_nodes =
             T.instructions_trans context body extra_instrs exit_node ~is_destructor_wrapper
           in
diff --git a/infer/src/clang/cScope.ml b/infer/src/clang/cScope.ml
new file mode 100644
index 000000000..621b76760
--- /dev/null
+++ b/infer/src/clang/cScope.ml
@@ -0,0 +1,213 @@
+(*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *)
+
+open! IStd
+module L = Logging
+
+type scope_kind =
+  | Breakable  (** loop or switch statement within which it's ok to [break;] *)
+  | Compound  (** inside a CompoundStmt *)
+  | InitialScope  (** should be only one of these at the bottom of the stack *)
+[@@deriving compare]
+
+let equal_scope_kind = [%compare.equal: scope_kind]
+
+let string_of_kind = function
+  | Compound ->
+      "Compound"
+  | Breakable ->
+      "Breakable"
+  | InitialScope ->
+      "InitialScope"
+
+
+(** the [current] scope is distinguished to make it easy to add elements to it *)
+type 'a scope = {current: 'a list; current_kind: scope_kind; outers: ('a list * scope_kind) list}
+
+(** executes [f] in new scope where [kind] has been pushed on top *)
+let in_ kind scope ~f =
+  L.debug Capture Verbose "<@[<v2>%s|" (string_of_kind kind) ;
+  let scope =
+    {current= []; current_kind= kind; outers= (scope.current, scope.current_kind) :: scope.outers}
+  in
+  let scope, x = f scope in
+  let (current, current_kind), outers =
+    match scope.outers with [] -> assert false | top :: rest -> (top, rest)
+  in
+  L.debug Capture Verbose "@]%s>@\n" (string_of_kind scope.current_kind) ;
+  (scope.current, {current; current_kind; outers}, x)
+
+
+let rev_append xs scope = {scope with current= List.rev_append xs scope.current}
+
+let collect_until kind scope =
+  let rec aux kind rev_vars_to_destroy = function
+    | [] ->
+        assert false
+    | (in_scope, kind') :: outers ->
+        let rev_vars_to_destroy = List.rev_append in_scope rev_vars_to_destroy in
+        if equal_scope_kind kind' kind then List.rev rev_vars_to_destroy
+        else aux kind rev_vars_to_destroy outers
+  in
+  aux kind [] ((scope.current, scope.current_kind) :: scope.outers)
+
+
+let breaks_control_flow = function
+  | Clang_ast_t.(ReturnStmt _ | BreakStmt _ | ContinueStmt _) ->
+      true
+  | _ ->
+      false
+
+
+module Variables = struct
+  let pp_var_decl f = function
+    | Clang_ast_t.VarDecl (_, {ni_name}, _, _) ->
+        Format.pp_print_string f ni_name
+    | _ ->
+        assert false
+
+
+  type scope =
+    { outer_scope: Clang_ast_t.stmt list  (** statements that are under the new scope *)
+    ; breakable_scope: Clang_ast_t.stmt list
+          (** the body of a loop or switch statement that defines the scope that [BreakStmt] and
+              [ContinueStmt] will exit *)
+    ; swallow_destructors: bool
+          (** That scope does not generate destructor calls (eg because it ends in an instruction
+              that will already do so like [ReturnStmt]). We still want to generate a scope to catch
+              variables declared in that scope and avoid them being destroyed elsewhere. *)
+    }
+
+  (** get which statements define a variable scope and possible a breakable scope *)
+  let get_scopes stmt =
+    let is_compound_stmt_ending_in_control_flow_break stmt =
+      match (stmt : Clang_ast_t.stmt) with
+      | CompoundStmt (_, stmt_list) ->
+          List.last stmt_list |> Option.exists ~f:breaks_control_flow
+      | _ ->
+          false
+    in
+    match (stmt : Clang_ast_t.stmt) with
+    | CompoundStmt (_, stmt_list) | IfStmt (_, stmt_list, _) ->
+        Some
+          { outer_scope= stmt_list
+          ; breakable_scope= []
+          ; swallow_destructors= is_compound_stmt_ending_in_control_flow_break stmt }
+    | CXXForRangeStmt
+        ( _
+        , [ _init
+          (* TODO: ignored here because ignored in [CTrans] *)
+          ; iterator_decl
+          ; begin_stmt
+          ; end_stmt
+          ; exit_cond
+          ; increment
+          ; assign_current_index
+          ; loop_body ] ) ->
+        Some
+          { outer_scope= [iterator_decl; begin_stmt; end_stmt; exit_cond; increment]
+          ; breakable_scope= [assign_current_index; loop_body]
+          ; swallow_destructors= false }
+    | ObjCForCollectionStmt (_, [item; items; body]) ->
+        Some {outer_scope= [item; items]; breakable_scope= [body]; swallow_destructors= false}
+    | ForStmt (_stmt_info, [init; decl_stmt; condition; increment; body]) ->
+        Some
+          { outer_scope= [init; decl_stmt; condition; increment]
+          ; breakable_scope= [body]
+          ; swallow_destructors= false }
+    | DoStmt (_, [body; condition]) | WhileStmt (_, [condition; body]) ->
+        Some {outer_scope= [condition]; breakable_scope= [body]; swallow_destructors= false}
+    | WhileStmt (_, [decls; condition; body]) ->
+        Some {outer_scope= [decls; condition]; breakable_scope= [body]; swallow_destructors= false}
+    | SwitchStmt (stmt_info, _stmt_list, switch_stmt_info) ->
+        let condition =
+          CAst_utils.get_stmt_exn switch_stmt_info.Clang_ast_t.ssi_cond
+            stmt_info.Clang_ast_t.si_source_range
+        in
+        let body =
+          CAst_utils.get_stmt_exn switch_stmt_info.Clang_ast_t.ssi_body
+            stmt_info.Clang_ast_t.si_source_range
+        in
+        let cond_var = switch_stmt_info.Clang_ast_t.ssi_cond_var in
+        Some
+          { outer_scope= condition :: Option.to_list cond_var
+          ; breakable_scope= [body]
+          ; swallow_destructors= false }
+    | _ ->
+        None
+
+
+  let rec visit_stmt stmt ((scope, map) as scope_map) =
+    L.debug Capture Verbose "%a{%a}@;"
+      (Pp.to_string ~f:Clang_ast_proj.get_stmt_kind_string)
+      stmt (Pp.seq ~sep:"," pp_var_decl) scope.current ;
+    match (stmt : Clang_ast_t.stmt) with
+    | ReturnStmt (stmt_info, _)
+    | BreakStmt (stmt_info, _)
+    | ContinueStmt (stmt_info, _) (* TODO: GotoStmt *) ->
+        let break_until =
+          match stmt with Clang_ast_t.ReturnStmt _ -> InitialScope | _ -> Breakable
+        in
+        let vars_to_destroy = collect_until break_until scope in
+        L.debug Capture Verbose "~[%d:%a]" stmt_info.Clang_ast_t.si_pointer
+          (Pp.seq ~sep:"," pp_var_decl) vars_to_destroy ;
+        let map =
+          ClangPointers.Map.set map ~key:stmt_info.Clang_ast_t.si_pointer ~data:vars_to_destroy
+        in
+        (scope, map)
+    | DeclStmt (_, _, decl_list) ->
+        let new_vars =
+          List.filter decl_list ~f:(function Clang_ast_t.VarDecl _ -> true | _ -> false)
+        in
+        (* the reverse order is the one we want to destroy the variables in at the end of the scope
+           *)
+        L.debug Capture Verbose "+%a" (Pp.seq ~sep:"," pp_var_decl) new_vars ;
+        (rev_append new_vars scope, map)
+    | _ -> (
+        let stmt_info, stmt_list = Clang_ast_proj.get_stmt_tuple stmt in
+        match get_scopes stmt with
+        | None ->
+            visit_stmt_list stmt_list scope_map
+        | Some {outer_scope; breakable_scope; swallow_destructors} ->
+            with_scope ~inject_destructors:(not swallow_destructors) Compound
+              stmt_info.Clang_ast_t.si_pointer scope ~f:(fun scope ->
+                let scope_map = visit_stmt_list outer_scope (scope, map) in
+                match breakable_scope with
+                | [] ->
+                    scope_map
+                | _ :: _ as body ->
+                    let body_ptr =
+                      List.last_exn body |> Clang_ast_proj.get_stmt_tuple
+                      |> function {Clang_ast_t.si_pointer}, _ -> si_pointer
+                    in
+                    let scope, map = scope_map in
+                    with_scope Breakable ~inject_destructors:false body_ptr scope ~f:(fun scope ->
+                        visit_stmt_list body (scope, map) ) ) )
+
+
+  and with_scope ?(inject_destructors = true) kind pointer scope ~f =
+    let vars_to_destroy, scope, map = in_ kind scope ~f:(fun scope -> f scope) in
+    let map =
+      if inject_destructors then (
+        L.debug Capture Verbose "~[%d:%a]" pointer (Pp.seq ~sep:"," pp_var_decl) vars_to_destroy ;
+        ClangPointers.Map.set map ~key:pointer ~data:vars_to_destroy )
+      else (
+        L.debug Capture Verbose "~[%d:skip]" pointer ;
+        map )
+    in
+    (scope, map)
+
+
+  and visit_stmt_list stmt_list scope_map =
+    List.fold stmt_list ~f:(fun scope_map stmt -> visit_stmt stmt scope_map) ~init:scope_map
+
+
+  let empty_scope = {current= []; current_kind= InitialScope; outers= []}
+
+  let compute_vars_to_destroy_map body =
+    visit_stmt body (empty_scope, ClangPointers.Map.empty) |> snd
+end
diff --git a/infer/src/clang/cScope.mli b/infer/src/clang/cScope.mli
new file mode 100644
index 000000000..ed875df70
--- /dev/null
+++ b/infer/src/clang/cScope.mli
@@ -0,0 +1,14 @@
+(*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *)
+
+open! IStd
+
+val breaks_control_flow : Clang_ast_t.stmt -> bool
+
+module Variables : sig
+  val compute_vars_to_destroy_map : Clang_ast_t.stmt -> Clang_ast_t.decl list ClangPointers.Map.t
+end
diff --git a/infer/src/clang/cTrans.ml b/infer/src/clang/cTrans.ml
index 5342b0a03..dc3e8338b 100644
--- a/infer/src/clang/cTrans.ml
+++ b/infer/src/clang/cTrans.ml
@@ -1446,63 +1446,39 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s
         try
           let map = context.CContext.vars_to_destroy in
           let vars_to_destroy = CContext.StmtMap.find_exn map stmt_info.Clang_ast_t.si_pointer in
-          List.filter_map
-            ~f:(function
-              | Clang_ast_t.VarDecl (_, _, qual_type, _) as decl ->
-                  let pvar = CVar_decl.sil_var_of_decl context decl procname in
-                  if Pvar.is_static_local pvar then (* don't call destructors on static vars *)
-                    None
-                  else
-                    let exp = Exp.Lvar pvar in
-                    let typ = CType_decl.qual_type_to_sil_type context.CContext.tenv qual_type in
-                    let this_res_trans_destruct = mk_trans_result (exp, typ) empty_control in
-                    cxx_destructor_call_trans trans_state_pri stmt_info_loc this_res_trans_destruct
-                      qual_type.Clang_ast_t.qt_type_ptr ~is_injected_destructor:true
-                      ~is_inner_destructor:false
-              | _ ->
-                  assert false )
-            vars_to_destroy
+          L.debug Capture Verbose "Destroying pointer %d@\n" stmt_info.Clang_ast_t.si_pointer ;
+          List.filter_map vars_to_destroy ~f:(function
+            | Clang_ast_t.VarDecl (_, _, qual_type, _) as decl ->
+                let pvar = CVar_decl.sil_var_of_decl context decl procname in
+                if Pvar.is_static_local pvar then (* don't call destructors on static vars *)
+                  None
+                else
+                  let exp = Exp.Lvar pvar in
+                  let typ = CType_decl.qual_type_to_sil_type context.CContext.tenv qual_type in
+                  let this_res_trans_destruct = mk_trans_result (exp, typ) empty_control in
+                  cxx_destructor_call_trans trans_state_pri stmt_info_loc this_res_trans_destruct
+                    qual_type.Clang_ast_t.qt_type_ptr ~is_injected_destructor:true
+                    ~is_inner_destructor:false
+            | _ ->
+                assert false )
         with Caml.Not_found ->
           L.(debug Capture Verbose) "@\n Variables that go out of scope are not found...@\n@." ;
           []
       in
-      let sil_loc =
-        CLocation.location_of_stmt_info context.translation_unit_context.source_file stmt_info
-      in
-      Some
-        (PriorityNode.compute_results_to_parent trans_state_pri sil_loc
-           ~node_name:(Destruction destr_kind) stmt_info' ~return:(mk_fresh_void_exp_typ ())
-           all_res_trans)
+      if List.is_empty all_res_trans then None
+      else
+        let sil_loc =
+          CLocation.location_of_stmt_info context.translation_unit_context.source_file stmt_info
+        in
+        Some
+          (PriorityNode.compute_results_to_parent trans_state_pri sil_loc
+             ~node_name:(Destruction destr_kind) stmt_info' ~return:(mk_fresh_void_exp_typ ())
+             all_res_trans)
 
 
-  and compoundStmt_trans trans_state stmt_info stmt_list =
-    (* Computing destructor call nodes to inject at the end of the compound statement,
-       except if the statement ends with Return statemenent *)
-    let destr_trans_result =
-      match List.last stmt_list with
-      | Some (Clang_ast_t.ReturnStmt _) ->
-          None
-      | _ ->
-          inject_destructors Procdesc.Node.DestrScope trans_state stmt_info
-    in
-    (* Injecting destructor call nodes at the end of the compound statement *)
-    let succ_nodes =
-      match destr_trans_result with
-      | Some {control= {root_nodes= []}} | None ->
-          trans_state.succ_nodes
-      | Some {control= {root_nodes}} ->
-          root_nodes
-    in
-    let trans_state' = {trans_state with succ_nodes} in
-    let compound_control, returns = instructions trans_state' stmt_list in
-    let compound_control' =
-      match destr_trans_result with
-      | Some {control= {leaf_nodes= []}} | None ->
-          compound_control
-      | Some {control= {leaf_nodes}} ->
-          {compound_control with leaf_nodes}
-    in
-    mk_trans_result (last_or_mk_fresh_void_exp_typ returns) compound_control'
+  and compoundStmt_trans trans_state stmt_list =
+    let compound_control, returns = instructions trans_state stmt_list in
+    mk_trans_result (last_or_mk_fresh_void_exp_typ returns) compound_control
 
 
   and conditionalOperator_trans trans_state stmt_info stmt_list expr_info =
@@ -1794,7 +1770,7 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s
     let else_body =
       match if_stmt_info.isi_else with
       | None ->
-          Clang_ast_t.NullStmt (stmt_info, [])
+          Clang_ast_t.NullStmt ({stmt_info with si_pointer= CAst_utils.get_fresh_pointer ()}, [])
       | Some (else_body_ptr, _) ->
           CAst_utils.get_stmt_exn else_body_ptr source_range
     in
@@ -1947,10 +1923,8 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s
   and tryStmt_trans trans_state stmts =
     let open Clang_ast_t in
     let translate_catch catch_root_nodes_acc = function
-      | CXXCatchStmt (catch_stmt_info, catch_body_stmts, _) ->
-          let catch_trans_result =
-            compoundStmt_trans trans_state catch_stmt_info catch_body_stmts
-          in
+      | CXXCatchStmt (_, catch_body_stmts, _) ->
+          let catch_trans_result = compoundStmt_trans trans_state catch_body_stmts in
           (* no risk of duplicates because two catch blocks should never have the same root nodes
              (they have to be in different syntactic locations, after all!) *)
           catch_trans_result.control.root_nodes @ catch_root_nodes_acc
@@ -2128,6 +2102,10 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s
       ; increment
       ; assign_current_index
       ; loop_body ] ->
+        (* do not use [stmt_info]'s pointer again because we use a pointer map to assign lists of
+           variables to destruct to each statement and so re-using pointers can be problematic and
+           lead to multiple destructions of the same variables *)
+        let stmt_info = {stmt_info with si_pointer= CAst_utils.get_fresh_pointer ()} in
         let loop_body' = CompoundStmt (stmt_info, [assign_current_index; loop_body]) in
         let null_stmt = NullStmt (stmt_info, []) in
         let beginend_stmt = CompoundStmt (stmt_info, [begin_stmt; end_stmt]) in
@@ -3277,7 +3255,7 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s
         (Pp.to_string ~f:Clang_ast_proj.get_stmt_kind_string)
         instr pp_pointer instr ;
       let trans_result =
-        try instruction_translate trans_state instr
+        try instruction_scope trans_state instr
         with e ->
           IExn.reraise_after e ~f:(fun () ->
               let should_log_error = not !logged_error in
@@ -3322,6 +3300,36 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s
       trans_result
 
 
+  (** inject destructors at the end of the translation of the statement if the context map says
+     there are variables to destruct *)
+  and instruction_scope trans_state stmt =
+    let stmt_info, _ = Clang_ast_proj.get_stmt_tuple stmt in
+    let destr_trans_result =
+      (* Statements that break control flow will inject appropriate destructor calls themselves and
+         trying to insert them again here would be wasteful and produce nodes that are "unconnected"
+         (without a predecessor in the CFG) since the inner statement translation will, well.. break
+         control flow. *)
+      if CScope.breaks_control_flow stmt then (
+        L.debug Capture Verbose "break of control flow detected, skipping destructor injection@\n" ;
+        None )
+      else inject_destructors Procdesc.Node.DestrScope trans_state stmt_info
+    in
+    (* adjust successors of the translation of [stmt] to point at the injected destructors *)
+    let trans_state =
+      match destr_trans_result with
+      | Some {control= {root_nodes= []}} | None ->
+          trans_state
+      | Some {control= {root_nodes}} ->
+          {trans_state with succ_nodes= root_nodes}
+    in
+    let stmt_result = instruction_translate trans_state stmt in
+    match destr_trans_result with
+    | None | Some {control= {leaf_nodes= []}} ->
+        stmt_result
+    | Some {control= {leaf_nodes}} ->
+        {stmt_result with control= {stmt_result.control with leaf_nodes}}
+
+
   and instruction_translate trans_state (instr : Clang_ast_t.stmt) =
     match instr with
     | GotoStmt (stmt_info, _, {Clang_ast_t.gsi_label= label_name; _}) ->
@@ -3355,9 +3363,9 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s
           cxx_construct_inherited_expr_info ~is_inherited_ctor:true
     | ObjCMessageExpr (stmt_info, stmt_list, expr_info, obj_c_message_expr_info) ->
         objCMessageExpr_trans trans_state stmt_info obj_c_message_expr_info stmt_list expr_info
-    | CompoundStmt (stmt_info, stmt_list) ->
+    | CompoundStmt (_, stmt_list) ->
         (* No node for this statement. We just collect its statement list*)
-        compoundStmt_trans trans_state stmt_info stmt_list
+        compoundStmt_trans trans_state stmt_list
     | ConditionalOperator (stmt_info, stmt_list, expr_info) ->
         (* Ternary operator "cond ? exp1 : exp2" *)
         conditionalOperator_trans trans_state stmt_info stmt_list expr_info
@@ -3478,10 +3486,10 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s
         mk_trans_result (last_or_mk_fresh_void_exp_typ returns) control
     | BlockExpr (stmt_info, _, expr_info, decl) ->
         blockExpr_trans trans_state stmt_info expr_info decl
-    | ObjCAutoreleasePoolStmt (stmt_info, stmts) ->
-        compoundStmt_trans trans_state stmt_info stmts
-    | ObjCAtTryStmt (stmt_info, stmts) ->
-        compoundStmt_trans trans_state stmt_info stmts
+    | ObjCAutoreleasePoolStmt (_, stmts) ->
+        compoundStmt_trans trans_state stmts
+    | ObjCAtTryStmt (_, stmts) ->
+        compoundStmt_trans trans_state stmts
     | CXXTryStmt (_, try_stmts) ->
         tryStmt_trans trans_state try_stmts
     | CXXCatchStmt _ ->
@@ -3489,10 +3497,10 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s
         assert false
     | ObjCAtThrowStmt (stmt_info, stmts) | CXXThrowExpr (stmt_info, stmts, _) ->
         objc_cxx_throw_trans trans_state stmt_info stmts
-    | ObjCAtFinallyStmt (stmt_info, stmts) ->
-        compoundStmt_trans trans_state stmt_info stmts
-    | ObjCAtCatchStmt (stmt_info, _, _) ->
-        compoundStmt_trans trans_state stmt_info []
+    | ObjCAtFinallyStmt (_, stmts) ->
+        compoundStmt_trans trans_state stmts
+    | ObjCAtCatchStmt _ ->
+        compoundStmt_trans trans_state []
     | PredefinedExpr (_, _, expr_info, _) ->
         stringLiteral_trans trans_state expr_info ""
     | BinaryConditionalOperator (stmt_info, stmts, expr_info) ->
diff --git a/infer/src/clang/cTrans_utils.ml b/infer/src/clang/cTrans_utils.ml
index d3e778c79..f2035547b 100644
--- a/infer/src/clang/cTrans_utils.ml
+++ b/infer/src/clang/cTrans_utils.ml
@@ -271,67 +271,6 @@ module Loops = struct
     match loop_kind with For {condition} | While {condition} | DoWhile {condition} -> condition
 end
 
-module Scope = struct
-  module StmtMap = ClangPointers.Map
-
-  let add_scope_vars_to_destroy var_map stmt_info vars =
-    let ptr = stmt_info.Clang_ast_t.si_pointer in
-    StmtMap.set var_map ~key:ptr ~data:vars
-
-
-  let rec compute_vars vars_in_scope break_count var_map stmt =
-    (* vars_in_scope corresponds to the list of all variables existing in the current scope *)
-    (* break_count saves the number of variables in the current scope when entering the most recent loop *)
-    (* there is an assumption that break can only be used in iteration statements *)
-    let open Clang_ast_t in
-    let get_var_info_from_decl = function VarDecl _ as decl -> Some decl | _ -> None in
-    let get_new_vars = function
-      | DeclStmt (_, _, decl_list) ->
-          List.filter_map ~f:get_var_info_from_decl decl_list
-      | _ ->
-          []
-    in
-    let rec handle_instructions_block var_map vars_in_scope break_count instrs =
-      match instrs with
-      | [] ->
-          (vars_in_scope, var_map)
-      | stmt :: rest ->
-          let new_var_map = compute_vars vars_in_scope break_count var_map stmt in
-          let new_vars_in_stmt = get_new_vars stmt in
-          handle_instructions_block new_var_map (new_vars_in_stmt @ vars_in_scope) break_count rest
-    in
-    (* TODO handle following stmts: *)
-    (* GotoStmt _ |  | LabelStmt_ *)
-    match stmt with
-    | CompoundStmt (stmt_info, stmt_list) ->
-        let vars, new_var_map =
-          handle_instructions_block var_map vars_in_scope break_count stmt_list
-        in
-        (* vars contains the variables defined in the current compound statement + vars_in_scope *)
-        let vars_to_destroy = List.take vars (List.length vars - List.length vars_in_scope) in
-        add_scope_vars_to_destroy new_var_map stmt_info vars_to_destroy
-    | ReturnStmt (stmt_info, _) ->
-        add_scope_vars_to_destroy var_map stmt_info vars_in_scope
-    | BreakStmt (stmt_info, _) | ContinueStmt (stmt_info, _) ->
-        let vars_to_destroy = List.take vars_in_scope (List.length vars_in_scope - break_count) in
-        add_scope_vars_to_destroy var_map stmt_info vars_to_destroy
-    (* TODO handle variable declarations inside for / foreach / while / switch *)
-    | WhileStmt (_, stmt_list)
-    | DoStmt (_, stmt_list)
-    | SwitchStmt (_, stmt_list, _)
-    | ForStmt (_, stmt_list)
-    | CXXForRangeStmt (_, stmt_list) ->
-        let break_count = List.length vars_in_scope in
-        List.fold_left ~f:(compute_vars vars_in_scope break_count) stmt_list ~init:var_map
-    | _ ->
-        let stmt_list = snd (Clang_ast_proj.get_stmt_tuple stmt) in
-        List.fold_left ~f:(compute_vars vars_in_scope break_count) stmt_list ~init:var_map
-
-
-  let compute_vars_to_destroy body =
-    List.fold_left ~f:(compute_vars [] 0) ~init:StmtMap.empty [body]
-end
-
 (** This function handles ObjC new/alloc and C++ new calls *)
 let create_alloc_instrs integer_type_widths ~alloc_builtin ?size_exp ?placement_args_exps sil_loc
     function_type =
diff --git a/infer/src/clang/cTrans_utils.mli b/infer/src/clang/cTrans_utils.mli
index 0db5a1127..b25a158e6 100644
--- a/infer/src/clang/cTrans_utils.mli
+++ b/infer/src/clang/cTrans_utils.mli
@@ -222,13 +222,6 @@ module Loops : sig
   val get_body : loop_kind -> Clang_ast_t.stmt
 end
 
-(** Module that provides utilities for scopes *)
-module Scope : sig
-  module StmtMap = ClangPointers.Map
-
-  val compute_vars_to_destroy : Clang_ast_t.stmt -> Clang_ast_t.decl list StmtMap.t
-end
-
 (** This module handles the translation of the variable self which is challenging because self is
     used both as a variable in instance method calls and also as a type in class method calls. *)
 module Self : sig
diff --git a/infer/tests/build_systems/codetoanalyze/clang_translation/src/main.cpp.dot b/infer/tests/build_systems/codetoanalyze/clang_translation/src/main.cpp.dot
index 30caecdf2..11ba8b5ce 100644
--- a/infer/tests/build_systems/codetoanalyze/clang_translation/src/main.cpp.dot
+++ b/infer/tests/build_systems/codetoanalyze/clang_translation/src/main.cpp.dot
@@ -7,7 +7,7 @@ digraph cfg {
 "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$1=*&f:std::atomic_flag* [line 965, column 51]\n  _=*n$1:std::atomic_flag [line 965, column 51]\n  n$3=_fun_std::atomic_flag::clear(n$1:std::atomic_flag*,5:int) [line 965, column 51]\n  NULLIFY(&f); [line 965, column 51]\n  EXIT_SCOPE(_,n$1,n$3,f); [line 965, column 51]\n  APPLY_ABSTRACTION; [line 965, column 51]\n " shape="box"]
+"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$0=*&f:std::atomic_flag* [line 965, column 51]\n  _=*n$0:std::atomic_flag [line 965, column 51]\n  n$2=_fun_std::atomic_flag::clear(n$0:std::atomic_flag*,5:int) [line 965, column 51]\n  NULLIFY(&f); [line 965, column 51]\n  EXIT_SCOPE(_,n$0,n$2,f); [line 965, column 51]\n  APPLY_ABSTRACTION; [line 965, column 51]\n " shape="box"]
 	
 
 	 "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" -> "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$1=*&f:std::atomic_flag* [line 964, column 60]\n  _=*n$1:std::atomic_flag [line 964, column 60]\n  n$3=_fun_std::atomic_flag::clear(n$1:std::atomic_flag*,5:int) [line 964, column 60]\n  NULLIFY(&f); [line 964, column 60]\n  EXIT_SCOPE(_,n$1,n$3,f); [line 964, column 60]\n  APPLY_ABSTRACTION; [line 964, column 60]\n " shape="box"]
+"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$0=*&f:std::atomic_flag* [line 964, column 60]\n  _=*n$0:std::atomic_flag [line 964, column 60]\n  n$2=_fun_std::atomic_flag::clear(n$0:std::atomic_flag*,5:int) [line 964, column 60]\n  NULLIFY(&f); [line 964, column 60]\n  EXIT_SCOPE(_,n$0,n$2,f); [line 964, column 60]\n  APPLY_ABSTRACTION; [line 964, column 60]\n " shape="box"]
 	
 
 	 "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" -> "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_2" ;
@@ -29,7 +29,7 @@ digraph cfg {
 "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$1=*&f:std::atomic_flag* [line 971, column 3]\n  _=*n$1:std::atomic_flag [line 971, column 3]\n  n$3=*&mo:int [line 971, column 12]\n  n$4=_fun_std::atomic_flag::clear(n$1:std::atomic_flag*,n$3:int) [line 971, column 3]\n  NULLIFY(&f); [line 971, column 3]\n  NULLIFY(&mo); [line 971, column 3]\n  EXIT_SCOPE(_,n$1,n$3,n$4,f,mo); [line 971, column 3]\n  APPLY_ABSTRACTION; [line 971, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$0=*&f:std::atomic_flag* [line 971, column 3]\n  _=*n$0:std::atomic_flag [line 971, column 3]\n  n$2=*&mo:int [line 971, column 12]\n  n$3=_fun_std::atomic_flag::clear(n$0:std::atomic_flag*,n$2:int) [line 971, column 3]\n  NULLIFY(&f); [line 971, column 3]\n  NULLIFY(&mo); [line 971, column 3]\n  EXIT_SCOPE(_,n$0,n$2,n$3,f,mo); [line 971, column 3]\n  APPLY_ABSTRACTION; [line 971, column 3]\n " shape="box"]
 	
 
 	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_2" ;
@@ -40,7 +40,7 @@ digraph cfg {
 "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$1=*&f:std::atomic_flag* [line 968, column 3]\n  _=*n$1:std::atomic_flag [line 968, column 3]\n  n$3=*&mo:int [line 968, column 12]\n  n$4=_fun_std::atomic_flag::clear(n$1:std::atomic_flag*,n$3:int) [line 968, column 3]\n  NULLIFY(&f); [line 968, column 3]\n  NULLIFY(&mo); [line 968, column 3]\n  EXIT_SCOPE(_,n$1,n$3,n$4,f,mo); [line 968, column 3]\n  APPLY_ABSTRACTION; [line 968, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$0=*&f:std::atomic_flag* [line 968, column 3]\n  _=*n$0:std::atomic_flag [line 968, column 3]\n  n$2=*&mo:int [line 968, column 12]\n  n$3=_fun_std::atomic_flag::clear(n$0:std::atomic_flag*,n$2:int) [line 968, column 3]\n  NULLIFY(&f); [line 968, column 3]\n  NULLIFY(&mo); [line 968, column 3]\n  EXIT_SCOPE(_,n$0,n$2,n$3,f,mo); [line 968, column 3]\n  APPLY_ABSTRACTION; [line 968, column 3]\n " shape="box"]
 	
 
 	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_2" ;
@@ -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   VARIABLE_DECLARED(x:int); [line 15, column 3]\n  n$3=_fun_internal::used_in_main_header(0:int) [line 15, column 11]\n  *&x:int=n$3 [line 15, column 3]\n  NULLIFY(&x); [line 15, column 3]\n  EXIT_SCOPE(n$3,x); [line 15, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 15, column 3]\n  n$2=_fun_internal::used_in_main_header(0:int) [line 15, column 11]\n  *&x:int=n$2 [line 15, column 3]\n  NULLIFY(&x); [line 15, column 3]\n  EXIT_SCOPE(n$2,x); [line 15, 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$2=*&this:std::__infer_atomic_base<long>* [line 165, column 46]\n  n$3=*&desired:long [line 165, column 61]\n  *n$2._wrapped_value:long=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<long>* [line 165, column 46]\n  n$2=*&desired:long [line 165, column 61]\n  *n$1._wrapped_value:long=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned long>* [line 165, column 46]\n  n$3=*&desired:unsigned long [line 165, column 61]\n  *n$2._wrapped_value:unsigned long=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<unsigned long>* [line 165, column 46]\n  n$2=*&desired:unsigned long [line 165, column 61]\n  *n$1._wrapped_value:unsigned long=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$3=*&desired:char [line 165, column 61]\n  *n$2._wrapped_value:char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$2=*&desired:char [line 165, column 61]\n  *n$1._wrapped_value:char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<short>* [line 165, column 46]\n  n$3=*&desired:short [line 165, column 61]\n  *n$2._wrapped_value:short=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<short>* [line 165, column 46]\n  n$2=*&desired:short [line 165, column 61]\n  *n$1._wrapped_value:short=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned short>* [line 165, column 46]\n  n$3=*&desired:unsigned short [line 165, column 61]\n  *n$2._wrapped_value:unsigned short=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<unsigned short>* [line 165, column 46]\n  n$2=*&desired:unsigned short [line 165, column 61]\n  *n$1._wrapped_value:unsigned short=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$3=*&desired:char [line 165, column 61]\n  *n$2._wrapped_value:char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$2=*&desired:char [line 165, column 61]\n  *n$1._wrapped_value:char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<long long>* [line 165, column 46]\n  n$3=*&desired:long long [line 165, column 61]\n  *n$2._wrapped_value:long long=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<long long>* [line 165, column 46]\n  n$2=*&desired:long long [line 165, column 61]\n  *n$1._wrapped_value:long long=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<signed char>* [line 165, column 46]\n  n$3=*&desired:signed char [line 165, column 61]\n  *n$2._wrapped_value:signed char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<signed char>* [line 165, column 46]\n  n$2=*&desired:signed char [line 165, column 61]\n  *n$1._wrapped_value:signed char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$3=*&desired:char [line 165, column 61]\n  *n$2._wrapped_value:char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$2=*&desired:char [line 165, column 61]\n  *n$1._wrapped_value:char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned long long>* [line 165, column 46]\n  n$3=*&desired:unsigned long long [line 165, column 61]\n  *n$2._wrapped_value:unsigned long long=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$1=*&this:std::__infer_atomic_base<unsigned long long>* [line 165, column 46]\n  n$2=*&desired:unsigned long long [line 165, column 61]\n  *n$1._wrapped_value:unsigned long long=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned char>* [line 165, column 46]\n  n$3=*&desired:unsigned char [line 165, column 61]\n  *n$2._wrapped_value:unsigned char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<unsigned char>* [line 165, column 46]\n  n$2=*&desired:unsigned char [line 165, column 61]\n  *n$1._wrapped_value:unsigned char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<int>* [line 165, column 46]\n  n$3=*&desired:int [line 165, column 61]\n  *n$2._wrapped_value:int=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<int>* [line 165, column 46]\n  n$2=*&desired:int [line 165, column 61]\n  *n$1._wrapped_value:int=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned int>* [line 165, column 46]\n  n$3=*&desired:unsigned int [line 165, column 61]\n  *n$2._wrapped_value:unsigned int=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<unsigned int>* [line 165, column 46]\n  n$2=*&desired:unsigned int [line 165, column 61]\n  *n$1._wrapped_value:unsigned int=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$3=*&desired:char [line 165, column 61]\n  *n$2._wrapped_value:char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$2=*&desired:char [line 165, column 61]\n  *n$1._wrapped_value:char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$3=*&d:char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$2=*&d:char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<char>*,n$2:char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned short>* [line 185, column 53]\n  n$3=*&d:unsigned short [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<unsigned short>* [line 185, column 53]\n  n$2=*&d:unsigned short [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned short>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned short>*,n$2:unsigned short) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned long long>* [line 185, column 53]\n  n$3=*&d:unsigned long long [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$1=*&this:std::__infer_atomic_integral<unsigned long long>* [line 185, column 53]\n  n$2=*&d:unsigned long long [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned long long>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned long long>*,n$2:unsigned long long) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<short>* [line 185, column 53]\n  n$3=*&d:short [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<short>* [line 185, column 53]\n  n$2=*&d:short [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<short>::__infer_atomic_base(n$1:std::__infer_atomic_integral<short>*,n$2:short) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$3=*&d:char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$2=*&d:char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<char>*,n$2:char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<signed char>* [line 185, column 53]\n  n$3=*&d:signed char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<signed char>* [line 185, column 53]\n  n$2=*&d:signed char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<signed char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<signed char>*,n$2:signed char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$3=*&d:char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$2=*&d:char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<char>*,n$2:char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<long long>* [line 185, column 53]\n  n$3=*&d:long long [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<long long>* [line 185, column 53]\n  n$2=*&d:long long [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<long long>::__infer_atomic_base(n$1:std::__infer_atomic_integral<long long>*,n$2:long long) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<long>* [line 185, column 53]\n  n$3=*&d:long [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<long>* [line 185, column 53]\n  n$2=*&d:long [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<long>::__infer_atomic_base(n$1:std::__infer_atomic_integral<long>*,n$2:long) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned long>* [line 185, column 53]\n  n$3=*&d:unsigned long [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<unsigned long>* [line 185, column 53]\n  n$2=*&d:unsigned long [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned long>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned long>*,n$2:unsigned long) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned int>* [line 185, column 53]\n  n$3=*&d:unsigned int [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<unsigned int>* [line 185, column 53]\n  n$2=*&d:unsigned int [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned int>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned int>*,n$2:unsigned int) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned char>* [line 185, column 53]\n  n$3=*&d:unsigned char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<unsigned char>* [line 185, column 53]\n  n$2=*&d:unsigned char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned char>*,n$2:unsigned char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$3=*&d:char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$2=*&d:char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<char>*,n$2:char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<int>* [line 185, column 53]\n  n$3=*&d:int [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<int>* [line 185, column 53]\n  n$2=*&d:int [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<int>::__infer_atomic_base(n$1:std::__infer_atomic_integral<int>*,n$2:int) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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" ;
@@ -485,7 +485,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$2=*&this:std::atomic<unsigned short>* [line 406, column 50]\n  n$3=*&d:unsigned short [line 406, 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 406, column 50]\n  NULLIFY(&d); [line 406, column 50]\n  NULLIFY(&this); [line 406, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 406, column 50]\n  APPLY_ABSTRACTION; [line 406, column 50]\n " shape="box"]
+"atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned short>* [line 406, column 50]\n  n$2=*&d:unsigned short [line 406, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned short>::__infer_atomic_integral(n$1:std::atomic<unsigned short>*,n$2:unsigned short) [line 406, column 50]\n  NULLIFY(&d); [line 406, column 50]\n  NULLIFY(&this); [line 406, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 406, column 50]\n  APPLY_ABSTRACTION; [line 406, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" -> "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_2" ;
@@ -496,7 +496,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$2=*&this:std::atomic<char>* [line 470, column 50]\n  n$3=*&d:char [line 470, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 470, column 50]\n  NULLIFY(&d); [line 470, column 50]\n  NULLIFY(&this); [line 470, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 470, column 50]\n  APPLY_ABSTRACTION; [line 470, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<char>* [line 470, column 50]\n  n$2=*&d:char [line 470, column 57]\n  n$3=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$1:std::atomic<char>*,n$2:char) [line 470, column 50]\n  NULLIFY(&d); [line 470, column 50]\n  NULLIFY(&this); [line 470, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 470, column 50]\n  APPLY_ABSTRACTION; [line 470, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" -> "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_2" ;
@@ -507,7 +507,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$2=*&this:std::atomic<unsigned long>* [line 442, column 50]\n  n$3=*&d:unsigned long [line 442, 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 442, column 50]\n  NULLIFY(&d); [line 442, column 50]\n  NULLIFY(&this); [line 442, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 442, column 50]\n  APPLY_ABSTRACTION; [line 442, column 50]\n " shape="box"]
+"atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned long>* [line 442, column 50]\n  n$2=*&d:unsigned long [line 442, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned long>::__infer_atomic_integral(n$1:std::atomic<unsigned long>*,n$2:unsigned long) [line 442, column 50]\n  NULLIFY(&d); [line 442, column 50]\n  NULLIFY(&this); [line 442, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 442, column 50]\n  APPLY_ABSTRACTION; [line 442, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" -> "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_2" ;
@@ -518,7 +518,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$2=*&this:std::atomic<short>* [line 397, column 50]\n  n$3=*&d:short [line 397, column 57]\n  n$4=_fun_std::__infer_atomic_integral<short>::__infer_atomic_integral(n$2:std::atomic<short>*,n$3:short) [line 397, column 50]\n  NULLIFY(&d); [line 397, column 50]\n  NULLIFY(&this); [line 397, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 397, column 50]\n  APPLY_ABSTRACTION; [line 397, column 50]\n " shape="box"]
+"atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<short>* [line 397, column 50]\n  n$2=*&d:short [line 397, column 57]\n  n$3=_fun_std::__infer_atomic_integral<short>::__infer_atomic_integral(n$1:std::atomic<short>*,n$2:short) [line 397, column 50]\n  NULLIFY(&d); [line 397, column 50]\n  NULLIFY(&this); [line 397, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 397, column 50]\n  APPLY_ABSTRACTION; [line 397, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" -> "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_2" ;
@@ -529,7 +529,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$2=*&this:std::atomic<long>* [line 433, column 50]\n  n$3=*&d:long [line 433, column 57]\n  n$4=_fun_std::__infer_atomic_integral<long>::__infer_atomic_integral(n$2:std::atomic<long>*,n$3:long) [line 433, column 50]\n  NULLIFY(&d); [line 433, column 50]\n  NULLIFY(&this); [line 433, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 433, column 50]\n  APPLY_ABSTRACTION; [line 433, column 50]\n " shape="box"]
+"atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<long>* [line 433, column 50]\n  n$2=*&d:long [line 433, column 57]\n  n$3=_fun_std::__infer_atomic_integral<long>::__infer_atomic_integral(n$1:std::atomic<long>*,n$2:long) [line 433, column 50]\n  NULLIFY(&d); [line 433, column 50]\n  NULLIFY(&this); [line 433, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 433, column 50]\n  APPLY_ABSTRACTION; [line 433, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" -> "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_2" ;
@@ -540,7 +540,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$2=*&this:std::atomic<int>* [line 415, column 50]\n  n$3=*&d:int [line 415, column 57]\n  n$4=_fun_std::__infer_atomic_integral<int>::__infer_atomic_integral(n$2:std::atomic<int>*,n$3:int) [line 415, column 50]\n  NULLIFY(&d); [line 415, column 50]\n  NULLIFY(&this); [line 415, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 415, column 50]\n  APPLY_ABSTRACTION; [line 415, column 50]\n " shape="box"]
+"atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<int>* [line 415, column 50]\n  n$2=*&d:int [line 415, column 57]\n  n$3=_fun_std::__infer_atomic_integral<int>::__infer_atomic_integral(n$1:std::atomic<int>*,n$2:int) [line 415, column 50]\n  NULLIFY(&d); [line 415, column 50]\n  NULLIFY(&this); [line 415, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 415, column 50]\n  APPLY_ABSTRACTION; [line 415, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" -> "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_2" ;
@@ -551,7 +551,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$2=*&this:std::atomic<unsigned char>* [line 388, column 50]\n  n$3=*&d:unsigned char [line 388, 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 388, column 50]\n  NULLIFY(&d); [line 388, column 50]\n  NULLIFY(&this); [line 388, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 388, column 50]\n  APPLY_ABSTRACTION; [line 388, column 50]\n " shape="box"]
+"atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned char>* [line 388, column 50]\n  n$2=*&d:unsigned char [line 388, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned char>::__infer_atomic_integral(n$1:std::atomic<unsigned char>*,n$2:unsigned char) [line 388, column 50]\n  NULLIFY(&d); [line 388, column 50]\n  NULLIFY(&this); [line 388, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 388, column 50]\n  APPLY_ABSTRACTION; [line 388, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" -> "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_2" ;
@@ -562,7 +562,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$2=*&this:std::atomic<char>* [line 479, column 50]\n  n$3=*&d:char [line 479, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 479, column 50]\n  NULLIFY(&d); [line 479, column 50]\n  NULLIFY(&this); [line 479, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 479, column 50]\n  APPLY_ABSTRACTION; [line 479, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<char>* [line 479, column 50]\n  n$2=*&d:char [line 479, column 57]\n  n$3=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$1:std::atomic<char>*,n$2:char) [line 479, column 50]\n  NULLIFY(&d); [line 479, column 50]\n  NULLIFY(&this); [line 479, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 479, column 50]\n  APPLY_ABSTRACTION; [line 479, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" -> "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_2" ;
@@ -573,7 +573,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$2=*&this:std::atomic<signed char>* [line 379, column 50]\n  n$3=*&d:signed char [line 379, 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 379, column 50]\n  NULLIFY(&d); [line 379, column 50]\n  NULLIFY(&this); [line 379, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 379, column 50]\n  APPLY_ABSTRACTION; [line 379, column 50]\n " shape="box"]
+"atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<signed char>* [line 379, column 50]\n  n$2=*&d:signed char [line 379, column 57]\n  n$3=_fun_std::__infer_atomic_integral<signed char>::__infer_atomic_integral(n$1:std::atomic<signed char>*,n$2:signed char) [line 379, column 50]\n  NULLIFY(&d); [line 379, column 50]\n  NULLIFY(&this); [line 379, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 379, column 50]\n  APPLY_ABSTRACTION; [line 379, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" -> "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_2" ;
@@ -584,7 +584,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$2=*&this:std::atomic<char>* [line 370, column 50]\n  n$3=*&d:char [line 370, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 370, column 50]\n  NULLIFY(&d); [line 370, column 50]\n  NULLIFY(&this); [line 370, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 370, column 50]\n  APPLY_ABSTRACTION; [line 370, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<char>* [line 370, column 50]\n  n$2=*&d:char [line 370, column 57]\n  n$3=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$1:std::atomic<char>*,n$2:char) [line 370, column 50]\n  NULLIFY(&d); [line 370, column 50]\n  NULLIFY(&this); [line 370, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 370, column 50]\n  APPLY_ABSTRACTION; [line 370, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" -> "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_2" ;
@@ -595,7 +595,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$2=*&this:std::atomic<char>* [line 488, column 50]\n  n$3=*&d:char [line 488, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 488, column 50]\n  NULLIFY(&d); [line 488, column 50]\n  NULLIFY(&this); [line 488, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 488, column 50]\n  APPLY_ABSTRACTION; [line 488, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<char>* [line 488, column 50]\n  n$2=*&d:char [line 488, column 57]\n  n$3=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$1:std::atomic<char>*,n$2:char) [line 488, column 50]\n  NULLIFY(&d); [line 488, column 50]\n  NULLIFY(&this); [line 488, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 488, column 50]\n  APPLY_ABSTRACTION; [line 488, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" -> "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_2" ;
@@ -606,7 +606,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$2=*&this:std::atomic<unsigned int>* [line 424, column 50]\n  n$3=*&d:unsigned int [line 424, 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 424, column 50]\n  NULLIFY(&d); [line 424, column 50]\n  NULLIFY(&this); [line 424, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 424, column 50]\n  APPLY_ABSTRACTION; [line 424, column 50]\n " shape="box"]
+"atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned int>* [line 424, column 50]\n  n$2=*&d:unsigned int [line 424, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned int>::__infer_atomic_integral(n$1:std::atomic<unsigned int>*,n$2:unsigned int) [line 424, column 50]\n  NULLIFY(&d); [line 424, column 50]\n  NULLIFY(&this); [line 424, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 424, column 50]\n  APPLY_ABSTRACTION; [line 424, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" -> "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_2" ;
@@ -617,7 +617,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$2=*&this:std::atomic<unsigned long long>* [line 461, column 50]\n  n$3=*&d:unsigned long long [line 461, 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 461, column 50]\n  NULLIFY(&d); [line 461, column 50]\n  NULLIFY(&this); [line 461, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 461, column 50]\n  APPLY_ABSTRACTION; [line 461, column 50]\n " shape="box"]
+"atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned long long>* [line 461, column 50]\n  n$2=*&d:unsigned long long [line 461, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned long long>::__infer_atomic_integral(n$1:std::atomic<unsigned long long>*,n$2:unsigned long long) [line 461, column 50]\n  NULLIFY(&d); [line 461, column 50]\n  NULLIFY(&this); [line 461, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 461, column 50]\n  APPLY_ABSTRACTION; [line 461, 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" ;
@@ -628,7 +628,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$2=*&this:std::atomic<long long>* [line 451, column 50]\n  n$3=*&d:long long [line 451, 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 451, column 50]\n  NULLIFY(&d); [line 451, column 50]\n  NULLIFY(&this); [line 451, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 451, column 50]\n  APPLY_ABSTRACTION; [line 451, column 50]\n " shape="box"]
+"atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<long long>* [line 451, column 50]\n  n$2=*&d:long long [line 451, column 57]\n  n$3=_fun_std::__infer_atomic_integral<long long>::__infer_atomic_integral(n$1:std::atomic<long long>*,n$2:long long) [line 451, column 50]\n  NULLIFY(&d); [line 451, column 50]\n  NULLIFY(&this); [line 451, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 451, column 50]\n  APPLY_ABSTRACTION; [line 451, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" -> "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_2" ;
@@ -639,7 +639,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$1=*&this:std::atomic_flag* [line 944, column 5]\n  *n$1.a:_Bool=0 [line 944, column 5]\n  NULLIFY(&this); [line 944, column 5]\n  EXIT_SCOPE(n$1,this); [line 944, column 5]\n  APPLY_ABSTRACTION; [line 944, column 5]\n " shape="box"]
+"clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:std::atomic_flag* [line 944, column 5]\n  *n$0.a:_Bool=0 [line 944, column 5]\n  NULLIFY(&this); [line 944, column 5]\n  EXIT_SCOPE(n$0,this); [line 944, column 5]\n  APPLY_ABSTRACTION; [line 944, column 5]\n " shape="box"]
 	
 
 	 "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" -> "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_2" ;
@@ -650,7 +650,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$1=*&this:std::atomic_flag* [line 946, column 65]\n  *n$1.a:_Bool=0 [line 946, column 65]\n  NULLIFY(&this); [line 946, column 65]\n  EXIT_SCOPE(n$1,this); [line 946, column 65]\n  APPLY_ABSTRACTION; [line 946, column 65]\n " shape="box"]
+"clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:std::atomic_flag* [line 946, column 65]\n  *n$0.a:_Bool=0 [line 946, column 65]\n  NULLIFY(&this); [line 946, column 65]\n  EXIT_SCOPE(n$0,this); [line 946, column 65]\n  APPLY_ABSTRACTION; [line 946, column 65]\n " shape="box"]
 	
 
 	 "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" -> "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_2" ;
@@ -665,11 +665,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$2=*&this:std::atomic_flag* [line 934, column 5]\n  *n$2.a:_Bool=1 [line 934, column 5]\n  NULLIFY(&this); [line 934, column 5]\n  EXIT_SCOPE(n$2,this); [line 934, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 934, column 5]\n  *n$1.a:_Bool=1 [line 934, column 5]\n  NULLIFY(&this); [line 934, column 5]\n  EXIT_SCOPE(n$1,this); [line 934, 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   VARIABLE_DECLARED(ret:_Bool); [line 933, column 5]\n  n$3=*&this:std::atomic_flag* [line 933, column 16]\n  n$4=*n$3.a:_Bool [line 933, column 16]\n  *&ret:_Bool=n$4 [line 933, column 5]\n  EXIT_SCOPE(n$3,n$4); [line 933, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(ret:_Bool); [line 933, column 5]\n  n$2=*&this:std::atomic_flag* [line 933, column 16]\n  n$3=*n$2.a:_Bool [line 933, column 16]\n  *&ret:_Bool=n$3 [line 933, column 5]\n  EXIT_SCOPE(n$2,n$3); [line 933, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" ;
@@ -684,11 +684,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$2=*&this:std::atomic_flag* [line 939, column 5]\n  *n$2.a:_Bool=1 [line 939, column 5]\n  NULLIFY(&this); [line 939, column 5]\n  EXIT_SCOPE(n$2,this); [line 939, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 939, column 5]\n  *n$1.a:_Bool=1 [line 939, column 5]\n  NULLIFY(&this); [line 939, column 5]\n  EXIT_SCOPE(n$1,this); [line 939, 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   VARIABLE_DECLARED(ret:_Bool); [line 938, column 5]\n  n$3=*&this:std::atomic_flag* [line 938, column 16]\n  n$4=*n$3.a:_Bool [line 938, column 16]\n  *&ret:_Bool=n$4 [line 938, column 5]\n  EXIT_SCOPE(n$3,n$4); [line 938, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(ret:_Bool); [line 938, column 5]\n  n$2=*&this:std::atomic_flag* [line 938, column 16]\n  n$3=*n$2.a:_Bool [line 938, column 16]\n  *&ret:_Bool=n$3 [line 938, column 5]\n  EXIT_SCOPE(n$2,n$3); [line 938, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" ;
@@ -699,7 +699,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$2=*&this:std::atomic_flag* [line 927, column 44]\n  n$3=*&i:_Bool [line 927, column 46]\n  *n$2.a:_Bool=n$3 [line 927, column 44]\n  NULLIFY(&this); [line 927, column 44]\n  NULLIFY(&i); [line 927, column 44]\n  EXIT_SCOPE(n$2,n$3,this,i); [line 927, column 44]\n  APPLY_ABSTRACTION; [line 927, column 44]\n " shape="box"]
+"atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic_flag* [line 927, column 44]\n  n$2=*&i:_Bool [line 927, column 46]\n  *n$1.a:_Bool=n$2 [line 927, column 44]\n  NULLIFY(&this); [line 927, column 44]\n  NULLIFY(&i); [line 927, column 44]\n  EXIT_SCOPE(n$1,n$2,this,i); [line 927, column 44]\n  APPLY_ABSTRACTION; [line 927, column 44]\n " shape="box"]
 	
 
 	 "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" -> "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_2" ;
@@ -710,7 +710,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$1=*&self:void const ** [line 65, column 6]\n  n$2=*&value:void* [line 65, column 37]\n  *n$1:void const *=n$2 [line 65, column 5]\n  NULLIFY(&value); [line 65, column 5]\n  NULLIFY(&self); [line 65, column 5]\n  EXIT_SCOPE(n$1,n$2,value,self); [line 65, column 5]\n  APPLY_ABSTRACTION; [line 65, column 5]\n " shape="box"]
+"model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void const ** [line 65, column 6]\n  n$1=*&value:void* [line 65, column 37]\n  *n$0:void const *=n$1 [line 65, column 5]\n  NULLIFY(&value); [line 65, column 5]\n  NULLIFY(&self); [line 65, column 5]\n  EXIT_SCOPE(n$0,n$1,value,self); [line 65, column 5]\n  APPLY_ABSTRACTION; [line 65, column 5]\n " shape="box"]
 	
 
 	 "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" -> "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_2" ;
@@ -721,7 +721,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$1=*&self:void const ** [line 53, column 6]\n  n$2=*&value:int [line 53, column 13]\n  *n$1:void const *=n$2 [line 53, column 5]\n  NULLIFY(&value); [line 53, column 5]\n  NULLIFY(&self); [line 53, column 5]\n  EXIT_SCOPE(n$1,n$2,value,self); [line 53, column 5]\n  APPLY_ABSTRACTION; [line 53, column 5]\n " shape="box"]
+"model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void const ** [line 53, column 6]\n  n$1=*&value:int [line 53, column 13]\n  *n$0:void const *=n$1 [line 53, column 5]\n  NULLIFY(&value); [line 53, column 5]\n  NULLIFY(&self); [line 53, column 5]\n  EXIT_SCOPE(n$0,n$1,value,self); [line 53, column 5]\n  APPLY_ABSTRACTION; [line 53, column 5]\n " shape="box"]
 	
 
 	 "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" -> "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_2" ;
@@ -732,7 +732,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$2=*&this:int** [line 236, column 15]\n  n$3=*&p:int* [line 236, column 42]\n  n$4=_fun_std::shared_ptr<int>::model_set(n$2:void const **,n$3:void*) [line 236, column 5]\n  NULLIFY(&p); [line 236, column 5]\n  NULLIFY(&this); [line 236, column 5]\n  EXIT_SCOPE(n$2,n$3,n$4,p,this); [line 236, column 5]\n  APPLY_ABSTRACTION; [line 236, 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$1=*&this:int** [line 236, column 15]\n  n$2=*&p:int* [line 236, column 42]\n  n$3=_fun_std::shared_ptr<int>::model_set(n$1:void const **,n$2:void*) [line 236, column 5]\n  NULLIFY(&p); [line 236, column 5]\n  NULLIFY(&this); [line 236, column 5]\n  EXIT_SCOPE(n$1,n$2,n$3,p,this); [line 236, column 5]\n  APPLY_ABSTRACTION; [line 236, 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" ;
@@ -743,11 +743,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$2=*&this:int** [line 97, column 15]\n  n$3=_fun_std::shared_ptr<int>::model_set(n$2:void const **,null:int) [line 97, column 5]\n  NULLIFY(&this); [line 97, column 5]\n  EXIT_SCOPE(n$2,n$3,this); [line 97, column 5]\n  APPLY_ABSTRACTION; [line 97, 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$1=*&this:int** [line 97, column 15]\n  n$2=_fun_std::shared_ptr<int>::model_set(n$1:void const **,null:int) [line 97, column 5]\n  NULLIFY(&this); [line 97, column 5]\n  EXIT_SCOPE(n$1,n$2,this); [line 97, column 5]\n  APPLY_ABSTRACTION; [line 97, 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$4=*&this:int** [line 97, column 42]\n  n$5=_fun_std::std__shared_ptr<int>::std__shared_ptr(n$4:int**) [line 96, column 13]\n  EXIT_SCOPE(n$4,n$5); [line 96, column 13]\n " shape="box"]
+"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_4" [label="4:  Constructor Init \n   n$3=*&this:int** [line 97, column 42]\n  n$4=_fun_std::std__shared_ptr<int>::std__shared_ptr(n$3:int**) [line 96, column 13]\n  EXIT_SCOPE(n$3,n$4); [line 96, 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" ;
@@ -762,7 +762,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$5=*&this:int** [line 178, column 19]\n  _=*n$5:int* [line 178, column 19]\n  n$7=_fun_std::shared_ptr<int>::reset<int,_void>(n$5:int**,null:int*) [line 178, column 19]\n  EXIT_SCOPE(_,n$5,n$7); [line 178, 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$4=*&this:int** [line 178, column 19]\n  _=*n$4:int* [line 178, column 19]\n  n$6=_fun_std::shared_ptr<int>::reset<int,_void>(n$4:int**,null:int*) [line 178, column 19]\n  EXIT_SCOPE(_,n$4,n$6); [line 178, 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" ;
diff --git a/infer/tests/build_systems/codetoanalyze/clang_translation/src/main_default_root.cpp.dot b/infer/tests/build_systems/codetoanalyze/clang_translation/src/main_default_root.cpp.dot
index 30caecdf2..11ba8b5ce 100644
--- a/infer/tests/build_systems/codetoanalyze/clang_translation/src/main_default_root.cpp.dot
+++ b/infer/tests/build_systems/codetoanalyze/clang_translation/src/main_default_root.cpp.dot
@@ -7,7 +7,7 @@ digraph cfg {
 "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$1=*&f:std::atomic_flag* [line 965, column 51]\n  _=*n$1:std::atomic_flag [line 965, column 51]\n  n$3=_fun_std::atomic_flag::clear(n$1:std::atomic_flag*,5:int) [line 965, column 51]\n  NULLIFY(&f); [line 965, column 51]\n  EXIT_SCOPE(_,n$1,n$3,f); [line 965, column 51]\n  APPLY_ABSTRACTION; [line 965, column 51]\n " shape="box"]
+"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$0=*&f:std::atomic_flag* [line 965, column 51]\n  _=*n$0:std::atomic_flag [line 965, column 51]\n  n$2=_fun_std::atomic_flag::clear(n$0:std::atomic_flag*,5:int) [line 965, column 51]\n  NULLIFY(&f); [line 965, column 51]\n  EXIT_SCOPE(_,n$0,n$2,f); [line 965, column 51]\n  APPLY_ABSTRACTION; [line 965, column 51]\n " shape="box"]
 	
 
 	 "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" -> "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$1=*&f:std::atomic_flag* [line 964, column 60]\n  _=*n$1:std::atomic_flag [line 964, column 60]\n  n$3=_fun_std::atomic_flag::clear(n$1:std::atomic_flag*,5:int) [line 964, column 60]\n  NULLIFY(&f); [line 964, column 60]\n  EXIT_SCOPE(_,n$1,n$3,f); [line 964, column 60]\n  APPLY_ABSTRACTION; [line 964, column 60]\n " shape="box"]
+"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$0=*&f:std::atomic_flag* [line 964, column 60]\n  _=*n$0:std::atomic_flag [line 964, column 60]\n  n$2=_fun_std::atomic_flag::clear(n$0:std::atomic_flag*,5:int) [line 964, column 60]\n  NULLIFY(&f); [line 964, column 60]\n  EXIT_SCOPE(_,n$0,n$2,f); [line 964, column 60]\n  APPLY_ABSTRACTION; [line 964, column 60]\n " shape="box"]
 	
 
 	 "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" -> "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_2" ;
@@ -29,7 +29,7 @@ digraph cfg {
 "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$1=*&f:std::atomic_flag* [line 971, column 3]\n  _=*n$1:std::atomic_flag [line 971, column 3]\n  n$3=*&mo:int [line 971, column 12]\n  n$4=_fun_std::atomic_flag::clear(n$1:std::atomic_flag*,n$3:int) [line 971, column 3]\n  NULLIFY(&f); [line 971, column 3]\n  NULLIFY(&mo); [line 971, column 3]\n  EXIT_SCOPE(_,n$1,n$3,n$4,f,mo); [line 971, column 3]\n  APPLY_ABSTRACTION; [line 971, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$0=*&f:std::atomic_flag* [line 971, column 3]\n  _=*n$0:std::atomic_flag [line 971, column 3]\n  n$2=*&mo:int [line 971, column 12]\n  n$3=_fun_std::atomic_flag::clear(n$0:std::atomic_flag*,n$2:int) [line 971, column 3]\n  NULLIFY(&f); [line 971, column 3]\n  NULLIFY(&mo); [line 971, column 3]\n  EXIT_SCOPE(_,n$0,n$2,n$3,f,mo); [line 971, column 3]\n  APPLY_ABSTRACTION; [line 971, column 3]\n " shape="box"]
 	
 
 	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_2" ;
@@ -40,7 +40,7 @@ digraph cfg {
 "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$1=*&f:std::atomic_flag* [line 968, column 3]\n  _=*n$1:std::atomic_flag [line 968, column 3]\n  n$3=*&mo:int [line 968, column 12]\n  n$4=_fun_std::atomic_flag::clear(n$1:std::atomic_flag*,n$3:int) [line 968, column 3]\n  NULLIFY(&f); [line 968, column 3]\n  NULLIFY(&mo); [line 968, column 3]\n  EXIT_SCOPE(_,n$1,n$3,n$4,f,mo); [line 968, column 3]\n  APPLY_ABSTRACTION; [line 968, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$0=*&f:std::atomic_flag* [line 968, column 3]\n  _=*n$0:std::atomic_flag [line 968, column 3]\n  n$2=*&mo:int [line 968, column 12]\n  n$3=_fun_std::atomic_flag::clear(n$0:std::atomic_flag*,n$2:int) [line 968, column 3]\n  NULLIFY(&f); [line 968, column 3]\n  NULLIFY(&mo); [line 968, column 3]\n  EXIT_SCOPE(_,n$0,n$2,n$3,f,mo); [line 968, column 3]\n  APPLY_ABSTRACTION; [line 968, column 3]\n " shape="box"]
 	
 
 	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_2" ;
@@ -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   VARIABLE_DECLARED(x:int); [line 15, column 3]\n  n$3=_fun_internal::used_in_main_header(0:int) [line 15, column 11]\n  *&x:int=n$3 [line 15, column 3]\n  NULLIFY(&x); [line 15, column 3]\n  EXIT_SCOPE(n$3,x); [line 15, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 15, column 3]\n  n$2=_fun_internal::used_in_main_header(0:int) [line 15, column 11]\n  *&x:int=n$2 [line 15, column 3]\n  NULLIFY(&x); [line 15, column 3]\n  EXIT_SCOPE(n$2,x); [line 15, 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$2=*&this:std::__infer_atomic_base<long>* [line 165, column 46]\n  n$3=*&desired:long [line 165, column 61]\n  *n$2._wrapped_value:long=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<long>* [line 165, column 46]\n  n$2=*&desired:long [line 165, column 61]\n  *n$1._wrapped_value:long=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned long>* [line 165, column 46]\n  n$3=*&desired:unsigned long [line 165, column 61]\n  *n$2._wrapped_value:unsigned long=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<unsigned long>* [line 165, column 46]\n  n$2=*&desired:unsigned long [line 165, column 61]\n  *n$1._wrapped_value:unsigned long=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$3=*&desired:char [line 165, column 61]\n  *n$2._wrapped_value:char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$2=*&desired:char [line 165, column 61]\n  *n$1._wrapped_value:char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<short>* [line 165, column 46]\n  n$3=*&desired:short [line 165, column 61]\n  *n$2._wrapped_value:short=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<short>* [line 165, column 46]\n  n$2=*&desired:short [line 165, column 61]\n  *n$1._wrapped_value:short=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned short>* [line 165, column 46]\n  n$3=*&desired:unsigned short [line 165, column 61]\n  *n$2._wrapped_value:unsigned short=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<unsigned short>* [line 165, column 46]\n  n$2=*&desired:unsigned short [line 165, column 61]\n  *n$1._wrapped_value:unsigned short=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$3=*&desired:char [line 165, column 61]\n  *n$2._wrapped_value:char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$2=*&desired:char [line 165, column 61]\n  *n$1._wrapped_value:char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<long long>* [line 165, column 46]\n  n$3=*&desired:long long [line 165, column 61]\n  *n$2._wrapped_value:long long=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<long long>* [line 165, column 46]\n  n$2=*&desired:long long [line 165, column 61]\n  *n$1._wrapped_value:long long=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<signed char>* [line 165, column 46]\n  n$3=*&desired:signed char [line 165, column 61]\n  *n$2._wrapped_value:signed char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<signed char>* [line 165, column 46]\n  n$2=*&desired:signed char [line 165, column 61]\n  *n$1._wrapped_value:signed char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$3=*&desired:char [line 165, column 61]\n  *n$2._wrapped_value:char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$2=*&desired:char [line 165, column 61]\n  *n$1._wrapped_value:char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned long long>* [line 165, column 46]\n  n$3=*&desired:unsigned long long [line 165, column 61]\n  *n$2._wrapped_value:unsigned long long=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$1=*&this:std::__infer_atomic_base<unsigned long long>* [line 165, column 46]\n  n$2=*&desired:unsigned long long [line 165, column 61]\n  *n$1._wrapped_value:unsigned long long=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned char>* [line 165, column 46]\n  n$3=*&desired:unsigned char [line 165, column 61]\n  *n$2._wrapped_value:unsigned char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<unsigned char>* [line 165, column 46]\n  n$2=*&desired:unsigned char [line 165, column 61]\n  *n$1._wrapped_value:unsigned char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<int>* [line 165, column 46]\n  n$3=*&desired:int [line 165, column 61]\n  *n$2._wrapped_value:int=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<int>* [line 165, column 46]\n  n$2=*&desired:int [line 165, column 61]\n  *n$1._wrapped_value:int=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned int>* [line 165, column 46]\n  n$3=*&desired:unsigned int [line 165, column 61]\n  *n$2._wrapped_value:unsigned int=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<unsigned int>* [line 165, column 46]\n  n$2=*&desired:unsigned int [line 165, column 61]\n  *n$1._wrapped_value:unsigned int=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$3=*&desired:char [line 165, column 61]\n  *n$2._wrapped_value:char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$2=*&desired:char [line 165, column 61]\n  *n$1._wrapped_value:char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$3=*&d:char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$2=*&d:char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<char>*,n$2:char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned short>* [line 185, column 53]\n  n$3=*&d:unsigned short [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<unsigned short>* [line 185, column 53]\n  n$2=*&d:unsigned short [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned short>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned short>*,n$2:unsigned short) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned long long>* [line 185, column 53]\n  n$3=*&d:unsigned long long [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$1=*&this:std::__infer_atomic_integral<unsigned long long>* [line 185, column 53]\n  n$2=*&d:unsigned long long [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned long long>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned long long>*,n$2:unsigned long long) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<short>* [line 185, column 53]\n  n$3=*&d:short [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<short>* [line 185, column 53]\n  n$2=*&d:short [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<short>::__infer_atomic_base(n$1:std::__infer_atomic_integral<short>*,n$2:short) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$3=*&d:char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$2=*&d:char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<char>*,n$2:char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<signed char>* [line 185, column 53]\n  n$3=*&d:signed char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<signed char>* [line 185, column 53]\n  n$2=*&d:signed char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<signed char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<signed char>*,n$2:signed char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$3=*&d:char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$2=*&d:char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<char>*,n$2:char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<long long>* [line 185, column 53]\n  n$3=*&d:long long [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<long long>* [line 185, column 53]\n  n$2=*&d:long long [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<long long>::__infer_atomic_base(n$1:std::__infer_atomic_integral<long long>*,n$2:long long) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<long>* [line 185, column 53]\n  n$3=*&d:long [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<long>* [line 185, column 53]\n  n$2=*&d:long [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<long>::__infer_atomic_base(n$1:std::__infer_atomic_integral<long>*,n$2:long) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned long>* [line 185, column 53]\n  n$3=*&d:unsigned long [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<unsigned long>* [line 185, column 53]\n  n$2=*&d:unsigned long [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned long>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned long>*,n$2:unsigned long) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned int>* [line 185, column 53]\n  n$3=*&d:unsigned int [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<unsigned int>* [line 185, column 53]\n  n$2=*&d:unsigned int [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned int>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned int>*,n$2:unsigned int) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned char>* [line 185, column 53]\n  n$3=*&d:unsigned char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<unsigned char>* [line 185, column 53]\n  n$2=*&d:unsigned char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned char>*,n$2:unsigned char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$3=*&d:char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$2=*&d:char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<char>*,n$2:char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<int>* [line 185, column 53]\n  n$3=*&d:int [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<int>* [line 185, column 53]\n  n$2=*&d:int [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<int>::__infer_atomic_base(n$1:std::__infer_atomic_integral<int>*,n$2:int) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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" ;
@@ -485,7 +485,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$2=*&this:std::atomic<unsigned short>* [line 406, column 50]\n  n$3=*&d:unsigned short [line 406, 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 406, column 50]\n  NULLIFY(&d); [line 406, column 50]\n  NULLIFY(&this); [line 406, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 406, column 50]\n  APPLY_ABSTRACTION; [line 406, column 50]\n " shape="box"]
+"atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned short>* [line 406, column 50]\n  n$2=*&d:unsigned short [line 406, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned short>::__infer_atomic_integral(n$1:std::atomic<unsigned short>*,n$2:unsigned short) [line 406, column 50]\n  NULLIFY(&d); [line 406, column 50]\n  NULLIFY(&this); [line 406, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 406, column 50]\n  APPLY_ABSTRACTION; [line 406, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" -> "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_2" ;
@@ -496,7 +496,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$2=*&this:std::atomic<char>* [line 470, column 50]\n  n$3=*&d:char [line 470, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 470, column 50]\n  NULLIFY(&d); [line 470, column 50]\n  NULLIFY(&this); [line 470, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 470, column 50]\n  APPLY_ABSTRACTION; [line 470, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<char>* [line 470, column 50]\n  n$2=*&d:char [line 470, column 57]\n  n$3=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$1:std::atomic<char>*,n$2:char) [line 470, column 50]\n  NULLIFY(&d); [line 470, column 50]\n  NULLIFY(&this); [line 470, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 470, column 50]\n  APPLY_ABSTRACTION; [line 470, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" -> "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_2" ;
@@ -507,7 +507,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$2=*&this:std::atomic<unsigned long>* [line 442, column 50]\n  n$3=*&d:unsigned long [line 442, 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 442, column 50]\n  NULLIFY(&d); [line 442, column 50]\n  NULLIFY(&this); [line 442, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 442, column 50]\n  APPLY_ABSTRACTION; [line 442, column 50]\n " shape="box"]
+"atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned long>* [line 442, column 50]\n  n$2=*&d:unsigned long [line 442, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned long>::__infer_atomic_integral(n$1:std::atomic<unsigned long>*,n$2:unsigned long) [line 442, column 50]\n  NULLIFY(&d); [line 442, column 50]\n  NULLIFY(&this); [line 442, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 442, column 50]\n  APPLY_ABSTRACTION; [line 442, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" -> "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_2" ;
@@ -518,7 +518,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$2=*&this:std::atomic<short>* [line 397, column 50]\n  n$3=*&d:short [line 397, column 57]\n  n$4=_fun_std::__infer_atomic_integral<short>::__infer_atomic_integral(n$2:std::atomic<short>*,n$3:short) [line 397, column 50]\n  NULLIFY(&d); [line 397, column 50]\n  NULLIFY(&this); [line 397, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 397, column 50]\n  APPLY_ABSTRACTION; [line 397, column 50]\n " shape="box"]
+"atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<short>* [line 397, column 50]\n  n$2=*&d:short [line 397, column 57]\n  n$3=_fun_std::__infer_atomic_integral<short>::__infer_atomic_integral(n$1:std::atomic<short>*,n$2:short) [line 397, column 50]\n  NULLIFY(&d); [line 397, column 50]\n  NULLIFY(&this); [line 397, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 397, column 50]\n  APPLY_ABSTRACTION; [line 397, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" -> "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_2" ;
@@ -529,7 +529,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$2=*&this:std::atomic<long>* [line 433, column 50]\n  n$3=*&d:long [line 433, column 57]\n  n$4=_fun_std::__infer_atomic_integral<long>::__infer_atomic_integral(n$2:std::atomic<long>*,n$3:long) [line 433, column 50]\n  NULLIFY(&d); [line 433, column 50]\n  NULLIFY(&this); [line 433, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 433, column 50]\n  APPLY_ABSTRACTION; [line 433, column 50]\n " shape="box"]
+"atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<long>* [line 433, column 50]\n  n$2=*&d:long [line 433, column 57]\n  n$3=_fun_std::__infer_atomic_integral<long>::__infer_atomic_integral(n$1:std::atomic<long>*,n$2:long) [line 433, column 50]\n  NULLIFY(&d); [line 433, column 50]\n  NULLIFY(&this); [line 433, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 433, column 50]\n  APPLY_ABSTRACTION; [line 433, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" -> "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_2" ;
@@ -540,7 +540,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$2=*&this:std::atomic<int>* [line 415, column 50]\n  n$3=*&d:int [line 415, column 57]\n  n$4=_fun_std::__infer_atomic_integral<int>::__infer_atomic_integral(n$2:std::atomic<int>*,n$3:int) [line 415, column 50]\n  NULLIFY(&d); [line 415, column 50]\n  NULLIFY(&this); [line 415, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 415, column 50]\n  APPLY_ABSTRACTION; [line 415, column 50]\n " shape="box"]
+"atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<int>* [line 415, column 50]\n  n$2=*&d:int [line 415, column 57]\n  n$3=_fun_std::__infer_atomic_integral<int>::__infer_atomic_integral(n$1:std::atomic<int>*,n$2:int) [line 415, column 50]\n  NULLIFY(&d); [line 415, column 50]\n  NULLIFY(&this); [line 415, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 415, column 50]\n  APPLY_ABSTRACTION; [line 415, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" -> "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_2" ;
@@ -551,7 +551,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$2=*&this:std::atomic<unsigned char>* [line 388, column 50]\n  n$3=*&d:unsigned char [line 388, 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 388, column 50]\n  NULLIFY(&d); [line 388, column 50]\n  NULLIFY(&this); [line 388, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 388, column 50]\n  APPLY_ABSTRACTION; [line 388, column 50]\n " shape="box"]
+"atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned char>* [line 388, column 50]\n  n$2=*&d:unsigned char [line 388, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned char>::__infer_atomic_integral(n$1:std::atomic<unsigned char>*,n$2:unsigned char) [line 388, column 50]\n  NULLIFY(&d); [line 388, column 50]\n  NULLIFY(&this); [line 388, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 388, column 50]\n  APPLY_ABSTRACTION; [line 388, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" -> "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_2" ;
@@ -562,7 +562,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$2=*&this:std::atomic<char>* [line 479, column 50]\n  n$3=*&d:char [line 479, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 479, column 50]\n  NULLIFY(&d); [line 479, column 50]\n  NULLIFY(&this); [line 479, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 479, column 50]\n  APPLY_ABSTRACTION; [line 479, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<char>* [line 479, column 50]\n  n$2=*&d:char [line 479, column 57]\n  n$3=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$1:std::atomic<char>*,n$2:char) [line 479, column 50]\n  NULLIFY(&d); [line 479, column 50]\n  NULLIFY(&this); [line 479, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 479, column 50]\n  APPLY_ABSTRACTION; [line 479, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" -> "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_2" ;
@@ -573,7 +573,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$2=*&this:std::atomic<signed char>* [line 379, column 50]\n  n$3=*&d:signed char [line 379, 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 379, column 50]\n  NULLIFY(&d); [line 379, column 50]\n  NULLIFY(&this); [line 379, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 379, column 50]\n  APPLY_ABSTRACTION; [line 379, column 50]\n " shape="box"]
+"atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<signed char>* [line 379, column 50]\n  n$2=*&d:signed char [line 379, column 57]\n  n$3=_fun_std::__infer_atomic_integral<signed char>::__infer_atomic_integral(n$1:std::atomic<signed char>*,n$2:signed char) [line 379, column 50]\n  NULLIFY(&d); [line 379, column 50]\n  NULLIFY(&this); [line 379, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 379, column 50]\n  APPLY_ABSTRACTION; [line 379, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" -> "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_2" ;
@@ -584,7 +584,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$2=*&this:std::atomic<char>* [line 370, column 50]\n  n$3=*&d:char [line 370, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 370, column 50]\n  NULLIFY(&d); [line 370, column 50]\n  NULLIFY(&this); [line 370, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 370, column 50]\n  APPLY_ABSTRACTION; [line 370, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<char>* [line 370, column 50]\n  n$2=*&d:char [line 370, column 57]\n  n$3=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$1:std::atomic<char>*,n$2:char) [line 370, column 50]\n  NULLIFY(&d); [line 370, column 50]\n  NULLIFY(&this); [line 370, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 370, column 50]\n  APPLY_ABSTRACTION; [line 370, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" -> "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_2" ;
@@ -595,7 +595,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$2=*&this:std::atomic<char>* [line 488, column 50]\n  n$3=*&d:char [line 488, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 488, column 50]\n  NULLIFY(&d); [line 488, column 50]\n  NULLIFY(&this); [line 488, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 488, column 50]\n  APPLY_ABSTRACTION; [line 488, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<char>* [line 488, column 50]\n  n$2=*&d:char [line 488, column 57]\n  n$3=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$1:std::atomic<char>*,n$2:char) [line 488, column 50]\n  NULLIFY(&d); [line 488, column 50]\n  NULLIFY(&this); [line 488, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 488, column 50]\n  APPLY_ABSTRACTION; [line 488, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" -> "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_2" ;
@@ -606,7 +606,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$2=*&this:std::atomic<unsigned int>* [line 424, column 50]\n  n$3=*&d:unsigned int [line 424, 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 424, column 50]\n  NULLIFY(&d); [line 424, column 50]\n  NULLIFY(&this); [line 424, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 424, column 50]\n  APPLY_ABSTRACTION; [line 424, column 50]\n " shape="box"]
+"atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned int>* [line 424, column 50]\n  n$2=*&d:unsigned int [line 424, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned int>::__infer_atomic_integral(n$1:std::atomic<unsigned int>*,n$2:unsigned int) [line 424, column 50]\n  NULLIFY(&d); [line 424, column 50]\n  NULLIFY(&this); [line 424, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 424, column 50]\n  APPLY_ABSTRACTION; [line 424, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" -> "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_2" ;
@@ -617,7 +617,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$2=*&this:std::atomic<unsigned long long>* [line 461, column 50]\n  n$3=*&d:unsigned long long [line 461, 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 461, column 50]\n  NULLIFY(&d); [line 461, column 50]\n  NULLIFY(&this); [line 461, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 461, column 50]\n  APPLY_ABSTRACTION; [line 461, column 50]\n " shape="box"]
+"atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned long long>* [line 461, column 50]\n  n$2=*&d:unsigned long long [line 461, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned long long>::__infer_atomic_integral(n$1:std::atomic<unsigned long long>*,n$2:unsigned long long) [line 461, column 50]\n  NULLIFY(&d); [line 461, column 50]\n  NULLIFY(&this); [line 461, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 461, column 50]\n  APPLY_ABSTRACTION; [line 461, 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" ;
@@ -628,7 +628,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$2=*&this:std::atomic<long long>* [line 451, column 50]\n  n$3=*&d:long long [line 451, 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 451, column 50]\n  NULLIFY(&d); [line 451, column 50]\n  NULLIFY(&this); [line 451, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 451, column 50]\n  APPLY_ABSTRACTION; [line 451, column 50]\n " shape="box"]
+"atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<long long>* [line 451, column 50]\n  n$2=*&d:long long [line 451, column 57]\n  n$3=_fun_std::__infer_atomic_integral<long long>::__infer_atomic_integral(n$1:std::atomic<long long>*,n$2:long long) [line 451, column 50]\n  NULLIFY(&d); [line 451, column 50]\n  NULLIFY(&this); [line 451, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 451, column 50]\n  APPLY_ABSTRACTION; [line 451, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" -> "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_2" ;
@@ -639,7 +639,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$1=*&this:std::atomic_flag* [line 944, column 5]\n  *n$1.a:_Bool=0 [line 944, column 5]\n  NULLIFY(&this); [line 944, column 5]\n  EXIT_SCOPE(n$1,this); [line 944, column 5]\n  APPLY_ABSTRACTION; [line 944, column 5]\n " shape="box"]
+"clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:std::atomic_flag* [line 944, column 5]\n  *n$0.a:_Bool=0 [line 944, column 5]\n  NULLIFY(&this); [line 944, column 5]\n  EXIT_SCOPE(n$0,this); [line 944, column 5]\n  APPLY_ABSTRACTION; [line 944, column 5]\n " shape="box"]
 	
 
 	 "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" -> "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_2" ;
@@ -650,7 +650,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$1=*&this:std::atomic_flag* [line 946, column 65]\n  *n$1.a:_Bool=0 [line 946, column 65]\n  NULLIFY(&this); [line 946, column 65]\n  EXIT_SCOPE(n$1,this); [line 946, column 65]\n  APPLY_ABSTRACTION; [line 946, column 65]\n " shape="box"]
+"clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:std::atomic_flag* [line 946, column 65]\n  *n$0.a:_Bool=0 [line 946, column 65]\n  NULLIFY(&this); [line 946, column 65]\n  EXIT_SCOPE(n$0,this); [line 946, column 65]\n  APPLY_ABSTRACTION; [line 946, column 65]\n " shape="box"]
 	
 
 	 "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" -> "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_2" ;
@@ -665,11 +665,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$2=*&this:std::atomic_flag* [line 934, column 5]\n  *n$2.a:_Bool=1 [line 934, column 5]\n  NULLIFY(&this); [line 934, column 5]\n  EXIT_SCOPE(n$2,this); [line 934, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 934, column 5]\n  *n$1.a:_Bool=1 [line 934, column 5]\n  NULLIFY(&this); [line 934, column 5]\n  EXIT_SCOPE(n$1,this); [line 934, 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   VARIABLE_DECLARED(ret:_Bool); [line 933, column 5]\n  n$3=*&this:std::atomic_flag* [line 933, column 16]\n  n$4=*n$3.a:_Bool [line 933, column 16]\n  *&ret:_Bool=n$4 [line 933, column 5]\n  EXIT_SCOPE(n$3,n$4); [line 933, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(ret:_Bool); [line 933, column 5]\n  n$2=*&this:std::atomic_flag* [line 933, column 16]\n  n$3=*n$2.a:_Bool [line 933, column 16]\n  *&ret:_Bool=n$3 [line 933, column 5]\n  EXIT_SCOPE(n$2,n$3); [line 933, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" ;
@@ -684,11 +684,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$2=*&this:std::atomic_flag* [line 939, column 5]\n  *n$2.a:_Bool=1 [line 939, column 5]\n  NULLIFY(&this); [line 939, column 5]\n  EXIT_SCOPE(n$2,this); [line 939, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 939, column 5]\n  *n$1.a:_Bool=1 [line 939, column 5]\n  NULLIFY(&this); [line 939, column 5]\n  EXIT_SCOPE(n$1,this); [line 939, 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   VARIABLE_DECLARED(ret:_Bool); [line 938, column 5]\n  n$3=*&this:std::atomic_flag* [line 938, column 16]\n  n$4=*n$3.a:_Bool [line 938, column 16]\n  *&ret:_Bool=n$4 [line 938, column 5]\n  EXIT_SCOPE(n$3,n$4); [line 938, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(ret:_Bool); [line 938, column 5]\n  n$2=*&this:std::atomic_flag* [line 938, column 16]\n  n$3=*n$2.a:_Bool [line 938, column 16]\n  *&ret:_Bool=n$3 [line 938, column 5]\n  EXIT_SCOPE(n$2,n$3); [line 938, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" ;
@@ -699,7 +699,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$2=*&this:std::atomic_flag* [line 927, column 44]\n  n$3=*&i:_Bool [line 927, column 46]\n  *n$2.a:_Bool=n$3 [line 927, column 44]\n  NULLIFY(&this); [line 927, column 44]\n  NULLIFY(&i); [line 927, column 44]\n  EXIT_SCOPE(n$2,n$3,this,i); [line 927, column 44]\n  APPLY_ABSTRACTION; [line 927, column 44]\n " shape="box"]
+"atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic_flag* [line 927, column 44]\n  n$2=*&i:_Bool [line 927, column 46]\n  *n$1.a:_Bool=n$2 [line 927, column 44]\n  NULLIFY(&this); [line 927, column 44]\n  NULLIFY(&i); [line 927, column 44]\n  EXIT_SCOPE(n$1,n$2,this,i); [line 927, column 44]\n  APPLY_ABSTRACTION; [line 927, column 44]\n " shape="box"]
 	
 
 	 "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" -> "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_2" ;
@@ -710,7 +710,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$1=*&self:void const ** [line 65, column 6]\n  n$2=*&value:void* [line 65, column 37]\n  *n$1:void const *=n$2 [line 65, column 5]\n  NULLIFY(&value); [line 65, column 5]\n  NULLIFY(&self); [line 65, column 5]\n  EXIT_SCOPE(n$1,n$2,value,self); [line 65, column 5]\n  APPLY_ABSTRACTION; [line 65, column 5]\n " shape="box"]
+"model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void const ** [line 65, column 6]\n  n$1=*&value:void* [line 65, column 37]\n  *n$0:void const *=n$1 [line 65, column 5]\n  NULLIFY(&value); [line 65, column 5]\n  NULLIFY(&self); [line 65, column 5]\n  EXIT_SCOPE(n$0,n$1,value,self); [line 65, column 5]\n  APPLY_ABSTRACTION; [line 65, column 5]\n " shape="box"]
 	
 
 	 "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" -> "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_2" ;
@@ -721,7 +721,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$1=*&self:void const ** [line 53, column 6]\n  n$2=*&value:int [line 53, column 13]\n  *n$1:void const *=n$2 [line 53, column 5]\n  NULLIFY(&value); [line 53, column 5]\n  NULLIFY(&self); [line 53, column 5]\n  EXIT_SCOPE(n$1,n$2,value,self); [line 53, column 5]\n  APPLY_ABSTRACTION; [line 53, column 5]\n " shape="box"]
+"model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void const ** [line 53, column 6]\n  n$1=*&value:int [line 53, column 13]\n  *n$0:void const *=n$1 [line 53, column 5]\n  NULLIFY(&value); [line 53, column 5]\n  NULLIFY(&self); [line 53, column 5]\n  EXIT_SCOPE(n$0,n$1,value,self); [line 53, column 5]\n  APPLY_ABSTRACTION; [line 53, column 5]\n " shape="box"]
 	
 
 	 "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" -> "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_2" ;
@@ -732,7 +732,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$2=*&this:int** [line 236, column 15]\n  n$3=*&p:int* [line 236, column 42]\n  n$4=_fun_std::shared_ptr<int>::model_set(n$2:void const **,n$3:void*) [line 236, column 5]\n  NULLIFY(&p); [line 236, column 5]\n  NULLIFY(&this); [line 236, column 5]\n  EXIT_SCOPE(n$2,n$3,n$4,p,this); [line 236, column 5]\n  APPLY_ABSTRACTION; [line 236, 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$1=*&this:int** [line 236, column 15]\n  n$2=*&p:int* [line 236, column 42]\n  n$3=_fun_std::shared_ptr<int>::model_set(n$1:void const **,n$2:void*) [line 236, column 5]\n  NULLIFY(&p); [line 236, column 5]\n  NULLIFY(&this); [line 236, column 5]\n  EXIT_SCOPE(n$1,n$2,n$3,p,this); [line 236, column 5]\n  APPLY_ABSTRACTION; [line 236, 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" ;
@@ -743,11 +743,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$2=*&this:int** [line 97, column 15]\n  n$3=_fun_std::shared_ptr<int>::model_set(n$2:void const **,null:int) [line 97, column 5]\n  NULLIFY(&this); [line 97, column 5]\n  EXIT_SCOPE(n$2,n$3,this); [line 97, column 5]\n  APPLY_ABSTRACTION; [line 97, 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$1=*&this:int** [line 97, column 15]\n  n$2=_fun_std::shared_ptr<int>::model_set(n$1:void const **,null:int) [line 97, column 5]\n  NULLIFY(&this); [line 97, column 5]\n  EXIT_SCOPE(n$1,n$2,this); [line 97, column 5]\n  APPLY_ABSTRACTION; [line 97, 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$4=*&this:int** [line 97, column 42]\n  n$5=_fun_std::std__shared_ptr<int>::std__shared_ptr(n$4:int**) [line 96, column 13]\n  EXIT_SCOPE(n$4,n$5); [line 96, column 13]\n " shape="box"]
+"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_4" [label="4:  Constructor Init \n   n$3=*&this:int** [line 97, column 42]\n  n$4=_fun_std::std__shared_ptr<int>::std__shared_ptr(n$3:int**) [line 96, column 13]\n  EXIT_SCOPE(n$3,n$4); [line 96, 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" ;
@@ -762,7 +762,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$5=*&this:int** [line 178, column 19]\n  _=*n$5:int* [line 178, column 19]\n  n$7=_fun_std::shared_ptr<int>::reset<int,_void>(n$5:int**,null:int*) [line 178, column 19]\n  EXIT_SCOPE(_,n$5,n$7); [line 178, 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$4=*&this:int** [line 178, column 19]\n  _=*n$4:int* [line 178, column 19]\n  n$6=_fun_std::shared_ptr<int>::reset<int,_void>(n$4:int**,null:int*) [line 178, column 19]\n  EXIT_SCOPE(_,n$4,n$6); [line 178, 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" ;
diff --git a/infer/tests/build_systems/codetoanalyze/clang_translation/src/main_default_symlink.cpp.dot b/infer/tests/build_systems/codetoanalyze/clang_translation/src/main_default_symlink.cpp.dot
index 30caecdf2..11ba8b5ce 100644
--- a/infer/tests/build_systems/codetoanalyze/clang_translation/src/main_default_symlink.cpp.dot
+++ b/infer/tests/build_systems/codetoanalyze/clang_translation/src/main_default_symlink.cpp.dot
@@ -7,7 +7,7 @@ digraph cfg {
 "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$1=*&f:std::atomic_flag* [line 965, column 51]\n  _=*n$1:std::atomic_flag [line 965, column 51]\n  n$3=_fun_std::atomic_flag::clear(n$1:std::atomic_flag*,5:int) [line 965, column 51]\n  NULLIFY(&f); [line 965, column 51]\n  EXIT_SCOPE(_,n$1,n$3,f); [line 965, column 51]\n  APPLY_ABSTRACTION; [line 965, column 51]\n " shape="box"]
+"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$0=*&f:std::atomic_flag* [line 965, column 51]\n  _=*n$0:std::atomic_flag [line 965, column 51]\n  n$2=_fun_std::atomic_flag::clear(n$0:std::atomic_flag*,5:int) [line 965, column 51]\n  NULLIFY(&f); [line 965, column 51]\n  EXIT_SCOPE(_,n$0,n$2,f); [line 965, column 51]\n  APPLY_ABSTRACTION; [line 965, column 51]\n " shape="box"]
 	
 
 	 "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" -> "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$1=*&f:std::atomic_flag* [line 964, column 60]\n  _=*n$1:std::atomic_flag [line 964, column 60]\n  n$3=_fun_std::atomic_flag::clear(n$1:std::atomic_flag*,5:int) [line 964, column 60]\n  NULLIFY(&f); [line 964, column 60]\n  EXIT_SCOPE(_,n$1,n$3,f); [line 964, column 60]\n  APPLY_ABSTRACTION; [line 964, column 60]\n " shape="box"]
+"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$0=*&f:std::atomic_flag* [line 964, column 60]\n  _=*n$0:std::atomic_flag [line 964, column 60]\n  n$2=_fun_std::atomic_flag::clear(n$0:std::atomic_flag*,5:int) [line 964, column 60]\n  NULLIFY(&f); [line 964, column 60]\n  EXIT_SCOPE(_,n$0,n$2,f); [line 964, column 60]\n  APPLY_ABSTRACTION; [line 964, column 60]\n " shape="box"]
 	
 
 	 "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" -> "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_2" ;
@@ -29,7 +29,7 @@ digraph cfg {
 "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$1=*&f:std::atomic_flag* [line 971, column 3]\n  _=*n$1:std::atomic_flag [line 971, column 3]\n  n$3=*&mo:int [line 971, column 12]\n  n$4=_fun_std::atomic_flag::clear(n$1:std::atomic_flag*,n$3:int) [line 971, column 3]\n  NULLIFY(&f); [line 971, column 3]\n  NULLIFY(&mo); [line 971, column 3]\n  EXIT_SCOPE(_,n$1,n$3,n$4,f,mo); [line 971, column 3]\n  APPLY_ABSTRACTION; [line 971, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$0=*&f:std::atomic_flag* [line 971, column 3]\n  _=*n$0:std::atomic_flag [line 971, column 3]\n  n$2=*&mo:int [line 971, column 12]\n  n$3=_fun_std::atomic_flag::clear(n$0:std::atomic_flag*,n$2:int) [line 971, column 3]\n  NULLIFY(&f); [line 971, column 3]\n  NULLIFY(&mo); [line 971, column 3]\n  EXIT_SCOPE(_,n$0,n$2,n$3,f,mo); [line 971, column 3]\n  APPLY_ABSTRACTION; [line 971, column 3]\n " shape="box"]
 	
 
 	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_2" ;
@@ -40,7 +40,7 @@ digraph cfg {
 "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$1=*&f:std::atomic_flag* [line 968, column 3]\n  _=*n$1:std::atomic_flag [line 968, column 3]\n  n$3=*&mo:int [line 968, column 12]\n  n$4=_fun_std::atomic_flag::clear(n$1:std::atomic_flag*,n$3:int) [line 968, column 3]\n  NULLIFY(&f); [line 968, column 3]\n  NULLIFY(&mo); [line 968, column 3]\n  EXIT_SCOPE(_,n$1,n$3,n$4,f,mo); [line 968, column 3]\n  APPLY_ABSTRACTION; [line 968, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$0=*&f:std::atomic_flag* [line 968, column 3]\n  _=*n$0:std::atomic_flag [line 968, column 3]\n  n$2=*&mo:int [line 968, column 12]\n  n$3=_fun_std::atomic_flag::clear(n$0:std::atomic_flag*,n$2:int) [line 968, column 3]\n  NULLIFY(&f); [line 968, column 3]\n  NULLIFY(&mo); [line 968, column 3]\n  EXIT_SCOPE(_,n$0,n$2,n$3,f,mo); [line 968, column 3]\n  APPLY_ABSTRACTION; [line 968, column 3]\n " shape="box"]
 	
 
 	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_2" ;
@@ -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   VARIABLE_DECLARED(x:int); [line 15, column 3]\n  n$3=_fun_internal::used_in_main_header(0:int) [line 15, column 11]\n  *&x:int=n$3 [line 15, column 3]\n  NULLIFY(&x); [line 15, column 3]\n  EXIT_SCOPE(n$3,x); [line 15, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 15, column 3]\n  n$2=_fun_internal::used_in_main_header(0:int) [line 15, column 11]\n  *&x:int=n$2 [line 15, column 3]\n  NULLIFY(&x); [line 15, column 3]\n  EXIT_SCOPE(n$2,x); [line 15, 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$2=*&this:std::__infer_atomic_base<long>* [line 165, column 46]\n  n$3=*&desired:long [line 165, column 61]\n  *n$2._wrapped_value:long=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<long>* [line 165, column 46]\n  n$2=*&desired:long [line 165, column 61]\n  *n$1._wrapped_value:long=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned long>* [line 165, column 46]\n  n$3=*&desired:unsigned long [line 165, column 61]\n  *n$2._wrapped_value:unsigned long=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<unsigned long>* [line 165, column 46]\n  n$2=*&desired:unsigned long [line 165, column 61]\n  *n$1._wrapped_value:unsigned long=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$3=*&desired:char [line 165, column 61]\n  *n$2._wrapped_value:char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$2=*&desired:char [line 165, column 61]\n  *n$1._wrapped_value:char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<short>* [line 165, column 46]\n  n$3=*&desired:short [line 165, column 61]\n  *n$2._wrapped_value:short=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<short>* [line 165, column 46]\n  n$2=*&desired:short [line 165, column 61]\n  *n$1._wrapped_value:short=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned short>* [line 165, column 46]\n  n$3=*&desired:unsigned short [line 165, column 61]\n  *n$2._wrapped_value:unsigned short=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<unsigned short>* [line 165, column 46]\n  n$2=*&desired:unsigned short [line 165, column 61]\n  *n$1._wrapped_value:unsigned short=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$3=*&desired:char [line 165, column 61]\n  *n$2._wrapped_value:char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$2=*&desired:char [line 165, column 61]\n  *n$1._wrapped_value:char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<long long>* [line 165, column 46]\n  n$3=*&desired:long long [line 165, column 61]\n  *n$2._wrapped_value:long long=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<long long>* [line 165, column 46]\n  n$2=*&desired:long long [line 165, column 61]\n  *n$1._wrapped_value:long long=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<signed char>* [line 165, column 46]\n  n$3=*&desired:signed char [line 165, column 61]\n  *n$2._wrapped_value:signed char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<signed char>* [line 165, column 46]\n  n$2=*&desired:signed char [line 165, column 61]\n  *n$1._wrapped_value:signed char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$3=*&desired:char [line 165, column 61]\n  *n$2._wrapped_value:char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$2=*&desired:char [line 165, column 61]\n  *n$1._wrapped_value:char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned long long>* [line 165, column 46]\n  n$3=*&desired:unsigned long long [line 165, column 61]\n  *n$2._wrapped_value:unsigned long long=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$1=*&this:std::__infer_atomic_base<unsigned long long>* [line 165, column 46]\n  n$2=*&desired:unsigned long long [line 165, column 61]\n  *n$1._wrapped_value:unsigned long long=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned char>* [line 165, column 46]\n  n$3=*&desired:unsigned char [line 165, column 61]\n  *n$2._wrapped_value:unsigned char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<unsigned char>* [line 165, column 46]\n  n$2=*&desired:unsigned char [line 165, column 61]\n  *n$1._wrapped_value:unsigned char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<int>* [line 165, column 46]\n  n$3=*&desired:int [line 165, column 61]\n  *n$2._wrapped_value:int=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<int>* [line 165, column 46]\n  n$2=*&desired:int [line 165, column 61]\n  *n$1._wrapped_value:int=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned int>* [line 165, column 46]\n  n$3=*&desired:unsigned int [line 165, column 61]\n  *n$2._wrapped_value:unsigned int=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<unsigned int>* [line 165, column 46]\n  n$2=*&desired:unsigned int [line 165, column 61]\n  *n$1._wrapped_value:unsigned int=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$3=*&desired:char [line 165, column 61]\n  *n$2._wrapped_value:char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$2=*&desired:char [line 165, column 61]\n  *n$1._wrapped_value:char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$3=*&d:char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$2=*&d:char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<char>*,n$2:char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned short>* [line 185, column 53]\n  n$3=*&d:unsigned short [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<unsigned short>* [line 185, column 53]\n  n$2=*&d:unsigned short [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned short>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned short>*,n$2:unsigned short) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned long long>* [line 185, column 53]\n  n$3=*&d:unsigned long long [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$1=*&this:std::__infer_atomic_integral<unsigned long long>* [line 185, column 53]\n  n$2=*&d:unsigned long long [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned long long>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned long long>*,n$2:unsigned long long) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<short>* [line 185, column 53]\n  n$3=*&d:short [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<short>* [line 185, column 53]\n  n$2=*&d:short [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<short>::__infer_atomic_base(n$1:std::__infer_atomic_integral<short>*,n$2:short) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$3=*&d:char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$2=*&d:char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<char>*,n$2:char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<signed char>* [line 185, column 53]\n  n$3=*&d:signed char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<signed char>* [line 185, column 53]\n  n$2=*&d:signed char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<signed char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<signed char>*,n$2:signed char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$3=*&d:char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$2=*&d:char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<char>*,n$2:char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<long long>* [line 185, column 53]\n  n$3=*&d:long long [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<long long>* [line 185, column 53]\n  n$2=*&d:long long [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<long long>::__infer_atomic_base(n$1:std::__infer_atomic_integral<long long>*,n$2:long long) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<long>* [line 185, column 53]\n  n$3=*&d:long [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<long>* [line 185, column 53]\n  n$2=*&d:long [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<long>::__infer_atomic_base(n$1:std::__infer_atomic_integral<long>*,n$2:long) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned long>* [line 185, column 53]\n  n$3=*&d:unsigned long [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<unsigned long>* [line 185, column 53]\n  n$2=*&d:unsigned long [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned long>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned long>*,n$2:unsigned long) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned int>* [line 185, column 53]\n  n$3=*&d:unsigned int [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<unsigned int>* [line 185, column 53]\n  n$2=*&d:unsigned int [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned int>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned int>*,n$2:unsigned int) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned char>* [line 185, column 53]\n  n$3=*&d:unsigned char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<unsigned char>* [line 185, column 53]\n  n$2=*&d:unsigned char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned char>*,n$2:unsigned char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$3=*&d:char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$2=*&d:char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<char>*,n$2:char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<int>* [line 185, column 53]\n  n$3=*&d:int [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<int>* [line 185, column 53]\n  n$2=*&d:int [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<int>::__infer_atomic_base(n$1:std::__infer_atomic_integral<int>*,n$2:int) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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" ;
@@ -485,7 +485,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$2=*&this:std::atomic<unsigned short>* [line 406, column 50]\n  n$3=*&d:unsigned short [line 406, 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 406, column 50]\n  NULLIFY(&d); [line 406, column 50]\n  NULLIFY(&this); [line 406, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 406, column 50]\n  APPLY_ABSTRACTION; [line 406, column 50]\n " shape="box"]
+"atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned short>* [line 406, column 50]\n  n$2=*&d:unsigned short [line 406, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned short>::__infer_atomic_integral(n$1:std::atomic<unsigned short>*,n$2:unsigned short) [line 406, column 50]\n  NULLIFY(&d); [line 406, column 50]\n  NULLIFY(&this); [line 406, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 406, column 50]\n  APPLY_ABSTRACTION; [line 406, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" -> "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_2" ;
@@ -496,7 +496,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$2=*&this:std::atomic<char>* [line 470, column 50]\n  n$3=*&d:char [line 470, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 470, column 50]\n  NULLIFY(&d); [line 470, column 50]\n  NULLIFY(&this); [line 470, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 470, column 50]\n  APPLY_ABSTRACTION; [line 470, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<char>* [line 470, column 50]\n  n$2=*&d:char [line 470, column 57]\n  n$3=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$1:std::atomic<char>*,n$2:char) [line 470, column 50]\n  NULLIFY(&d); [line 470, column 50]\n  NULLIFY(&this); [line 470, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 470, column 50]\n  APPLY_ABSTRACTION; [line 470, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" -> "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_2" ;
@@ -507,7 +507,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$2=*&this:std::atomic<unsigned long>* [line 442, column 50]\n  n$3=*&d:unsigned long [line 442, 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 442, column 50]\n  NULLIFY(&d); [line 442, column 50]\n  NULLIFY(&this); [line 442, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 442, column 50]\n  APPLY_ABSTRACTION; [line 442, column 50]\n " shape="box"]
+"atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned long>* [line 442, column 50]\n  n$2=*&d:unsigned long [line 442, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned long>::__infer_atomic_integral(n$1:std::atomic<unsigned long>*,n$2:unsigned long) [line 442, column 50]\n  NULLIFY(&d); [line 442, column 50]\n  NULLIFY(&this); [line 442, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 442, column 50]\n  APPLY_ABSTRACTION; [line 442, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" -> "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_2" ;
@@ -518,7 +518,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$2=*&this:std::atomic<short>* [line 397, column 50]\n  n$3=*&d:short [line 397, column 57]\n  n$4=_fun_std::__infer_atomic_integral<short>::__infer_atomic_integral(n$2:std::atomic<short>*,n$3:short) [line 397, column 50]\n  NULLIFY(&d); [line 397, column 50]\n  NULLIFY(&this); [line 397, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 397, column 50]\n  APPLY_ABSTRACTION; [line 397, column 50]\n " shape="box"]
+"atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<short>* [line 397, column 50]\n  n$2=*&d:short [line 397, column 57]\n  n$3=_fun_std::__infer_atomic_integral<short>::__infer_atomic_integral(n$1:std::atomic<short>*,n$2:short) [line 397, column 50]\n  NULLIFY(&d); [line 397, column 50]\n  NULLIFY(&this); [line 397, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 397, column 50]\n  APPLY_ABSTRACTION; [line 397, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" -> "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_2" ;
@@ -529,7 +529,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$2=*&this:std::atomic<long>* [line 433, column 50]\n  n$3=*&d:long [line 433, column 57]\n  n$4=_fun_std::__infer_atomic_integral<long>::__infer_atomic_integral(n$2:std::atomic<long>*,n$3:long) [line 433, column 50]\n  NULLIFY(&d); [line 433, column 50]\n  NULLIFY(&this); [line 433, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 433, column 50]\n  APPLY_ABSTRACTION; [line 433, column 50]\n " shape="box"]
+"atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<long>* [line 433, column 50]\n  n$2=*&d:long [line 433, column 57]\n  n$3=_fun_std::__infer_atomic_integral<long>::__infer_atomic_integral(n$1:std::atomic<long>*,n$2:long) [line 433, column 50]\n  NULLIFY(&d); [line 433, column 50]\n  NULLIFY(&this); [line 433, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 433, column 50]\n  APPLY_ABSTRACTION; [line 433, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" -> "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_2" ;
@@ -540,7 +540,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$2=*&this:std::atomic<int>* [line 415, column 50]\n  n$3=*&d:int [line 415, column 57]\n  n$4=_fun_std::__infer_atomic_integral<int>::__infer_atomic_integral(n$2:std::atomic<int>*,n$3:int) [line 415, column 50]\n  NULLIFY(&d); [line 415, column 50]\n  NULLIFY(&this); [line 415, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 415, column 50]\n  APPLY_ABSTRACTION; [line 415, column 50]\n " shape="box"]
+"atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<int>* [line 415, column 50]\n  n$2=*&d:int [line 415, column 57]\n  n$3=_fun_std::__infer_atomic_integral<int>::__infer_atomic_integral(n$1:std::atomic<int>*,n$2:int) [line 415, column 50]\n  NULLIFY(&d); [line 415, column 50]\n  NULLIFY(&this); [line 415, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 415, column 50]\n  APPLY_ABSTRACTION; [line 415, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" -> "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_2" ;
@@ -551,7 +551,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$2=*&this:std::atomic<unsigned char>* [line 388, column 50]\n  n$3=*&d:unsigned char [line 388, 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 388, column 50]\n  NULLIFY(&d); [line 388, column 50]\n  NULLIFY(&this); [line 388, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 388, column 50]\n  APPLY_ABSTRACTION; [line 388, column 50]\n " shape="box"]
+"atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned char>* [line 388, column 50]\n  n$2=*&d:unsigned char [line 388, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned char>::__infer_atomic_integral(n$1:std::atomic<unsigned char>*,n$2:unsigned char) [line 388, column 50]\n  NULLIFY(&d); [line 388, column 50]\n  NULLIFY(&this); [line 388, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 388, column 50]\n  APPLY_ABSTRACTION; [line 388, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" -> "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_2" ;
@@ -562,7 +562,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$2=*&this:std::atomic<char>* [line 479, column 50]\n  n$3=*&d:char [line 479, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 479, column 50]\n  NULLIFY(&d); [line 479, column 50]\n  NULLIFY(&this); [line 479, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 479, column 50]\n  APPLY_ABSTRACTION; [line 479, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<char>* [line 479, column 50]\n  n$2=*&d:char [line 479, column 57]\n  n$3=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$1:std::atomic<char>*,n$2:char) [line 479, column 50]\n  NULLIFY(&d); [line 479, column 50]\n  NULLIFY(&this); [line 479, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 479, column 50]\n  APPLY_ABSTRACTION; [line 479, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" -> "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_2" ;
@@ -573,7 +573,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$2=*&this:std::atomic<signed char>* [line 379, column 50]\n  n$3=*&d:signed char [line 379, 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 379, column 50]\n  NULLIFY(&d); [line 379, column 50]\n  NULLIFY(&this); [line 379, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 379, column 50]\n  APPLY_ABSTRACTION; [line 379, column 50]\n " shape="box"]
+"atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<signed char>* [line 379, column 50]\n  n$2=*&d:signed char [line 379, column 57]\n  n$3=_fun_std::__infer_atomic_integral<signed char>::__infer_atomic_integral(n$1:std::atomic<signed char>*,n$2:signed char) [line 379, column 50]\n  NULLIFY(&d); [line 379, column 50]\n  NULLIFY(&this); [line 379, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 379, column 50]\n  APPLY_ABSTRACTION; [line 379, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" -> "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_2" ;
@@ -584,7 +584,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$2=*&this:std::atomic<char>* [line 370, column 50]\n  n$3=*&d:char [line 370, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 370, column 50]\n  NULLIFY(&d); [line 370, column 50]\n  NULLIFY(&this); [line 370, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 370, column 50]\n  APPLY_ABSTRACTION; [line 370, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<char>* [line 370, column 50]\n  n$2=*&d:char [line 370, column 57]\n  n$3=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$1:std::atomic<char>*,n$2:char) [line 370, column 50]\n  NULLIFY(&d); [line 370, column 50]\n  NULLIFY(&this); [line 370, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 370, column 50]\n  APPLY_ABSTRACTION; [line 370, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" -> "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_2" ;
@@ -595,7 +595,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$2=*&this:std::atomic<char>* [line 488, column 50]\n  n$3=*&d:char [line 488, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 488, column 50]\n  NULLIFY(&d); [line 488, column 50]\n  NULLIFY(&this); [line 488, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 488, column 50]\n  APPLY_ABSTRACTION; [line 488, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<char>* [line 488, column 50]\n  n$2=*&d:char [line 488, column 57]\n  n$3=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$1:std::atomic<char>*,n$2:char) [line 488, column 50]\n  NULLIFY(&d); [line 488, column 50]\n  NULLIFY(&this); [line 488, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 488, column 50]\n  APPLY_ABSTRACTION; [line 488, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" -> "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_2" ;
@@ -606,7 +606,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$2=*&this:std::atomic<unsigned int>* [line 424, column 50]\n  n$3=*&d:unsigned int [line 424, 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 424, column 50]\n  NULLIFY(&d); [line 424, column 50]\n  NULLIFY(&this); [line 424, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 424, column 50]\n  APPLY_ABSTRACTION; [line 424, column 50]\n " shape="box"]
+"atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned int>* [line 424, column 50]\n  n$2=*&d:unsigned int [line 424, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned int>::__infer_atomic_integral(n$1:std::atomic<unsigned int>*,n$2:unsigned int) [line 424, column 50]\n  NULLIFY(&d); [line 424, column 50]\n  NULLIFY(&this); [line 424, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 424, column 50]\n  APPLY_ABSTRACTION; [line 424, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" -> "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_2" ;
@@ -617,7 +617,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$2=*&this:std::atomic<unsigned long long>* [line 461, column 50]\n  n$3=*&d:unsigned long long [line 461, 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 461, column 50]\n  NULLIFY(&d); [line 461, column 50]\n  NULLIFY(&this); [line 461, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 461, column 50]\n  APPLY_ABSTRACTION; [line 461, column 50]\n " shape="box"]
+"atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned long long>* [line 461, column 50]\n  n$2=*&d:unsigned long long [line 461, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned long long>::__infer_atomic_integral(n$1:std::atomic<unsigned long long>*,n$2:unsigned long long) [line 461, column 50]\n  NULLIFY(&d); [line 461, column 50]\n  NULLIFY(&this); [line 461, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 461, column 50]\n  APPLY_ABSTRACTION; [line 461, 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" ;
@@ -628,7 +628,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$2=*&this:std::atomic<long long>* [line 451, column 50]\n  n$3=*&d:long long [line 451, 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 451, column 50]\n  NULLIFY(&d); [line 451, column 50]\n  NULLIFY(&this); [line 451, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 451, column 50]\n  APPLY_ABSTRACTION; [line 451, column 50]\n " shape="box"]
+"atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<long long>* [line 451, column 50]\n  n$2=*&d:long long [line 451, column 57]\n  n$3=_fun_std::__infer_atomic_integral<long long>::__infer_atomic_integral(n$1:std::atomic<long long>*,n$2:long long) [line 451, column 50]\n  NULLIFY(&d); [line 451, column 50]\n  NULLIFY(&this); [line 451, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 451, column 50]\n  APPLY_ABSTRACTION; [line 451, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" -> "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_2" ;
@@ -639,7 +639,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$1=*&this:std::atomic_flag* [line 944, column 5]\n  *n$1.a:_Bool=0 [line 944, column 5]\n  NULLIFY(&this); [line 944, column 5]\n  EXIT_SCOPE(n$1,this); [line 944, column 5]\n  APPLY_ABSTRACTION; [line 944, column 5]\n " shape="box"]
+"clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:std::atomic_flag* [line 944, column 5]\n  *n$0.a:_Bool=0 [line 944, column 5]\n  NULLIFY(&this); [line 944, column 5]\n  EXIT_SCOPE(n$0,this); [line 944, column 5]\n  APPLY_ABSTRACTION; [line 944, column 5]\n " shape="box"]
 	
 
 	 "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" -> "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_2" ;
@@ -650,7 +650,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$1=*&this:std::atomic_flag* [line 946, column 65]\n  *n$1.a:_Bool=0 [line 946, column 65]\n  NULLIFY(&this); [line 946, column 65]\n  EXIT_SCOPE(n$1,this); [line 946, column 65]\n  APPLY_ABSTRACTION; [line 946, column 65]\n " shape="box"]
+"clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:std::atomic_flag* [line 946, column 65]\n  *n$0.a:_Bool=0 [line 946, column 65]\n  NULLIFY(&this); [line 946, column 65]\n  EXIT_SCOPE(n$0,this); [line 946, column 65]\n  APPLY_ABSTRACTION; [line 946, column 65]\n " shape="box"]
 	
 
 	 "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" -> "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_2" ;
@@ -665,11 +665,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$2=*&this:std::atomic_flag* [line 934, column 5]\n  *n$2.a:_Bool=1 [line 934, column 5]\n  NULLIFY(&this); [line 934, column 5]\n  EXIT_SCOPE(n$2,this); [line 934, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 934, column 5]\n  *n$1.a:_Bool=1 [line 934, column 5]\n  NULLIFY(&this); [line 934, column 5]\n  EXIT_SCOPE(n$1,this); [line 934, 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   VARIABLE_DECLARED(ret:_Bool); [line 933, column 5]\n  n$3=*&this:std::atomic_flag* [line 933, column 16]\n  n$4=*n$3.a:_Bool [line 933, column 16]\n  *&ret:_Bool=n$4 [line 933, column 5]\n  EXIT_SCOPE(n$3,n$4); [line 933, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(ret:_Bool); [line 933, column 5]\n  n$2=*&this:std::atomic_flag* [line 933, column 16]\n  n$3=*n$2.a:_Bool [line 933, column 16]\n  *&ret:_Bool=n$3 [line 933, column 5]\n  EXIT_SCOPE(n$2,n$3); [line 933, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" ;
@@ -684,11 +684,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$2=*&this:std::atomic_flag* [line 939, column 5]\n  *n$2.a:_Bool=1 [line 939, column 5]\n  NULLIFY(&this); [line 939, column 5]\n  EXIT_SCOPE(n$2,this); [line 939, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 939, column 5]\n  *n$1.a:_Bool=1 [line 939, column 5]\n  NULLIFY(&this); [line 939, column 5]\n  EXIT_SCOPE(n$1,this); [line 939, 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   VARIABLE_DECLARED(ret:_Bool); [line 938, column 5]\n  n$3=*&this:std::atomic_flag* [line 938, column 16]\n  n$4=*n$3.a:_Bool [line 938, column 16]\n  *&ret:_Bool=n$4 [line 938, column 5]\n  EXIT_SCOPE(n$3,n$4); [line 938, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(ret:_Bool); [line 938, column 5]\n  n$2=*&this:std::atomic_flag* [line 938, column 16]\n  n$3=*n$2.a:_Bool [line 938, column 16]\n  *&ret:_Bool=n$3 [line 938, column 5]\n  EXIT_SCOPE(n$2,n$3); [line 938, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" ;
@@ -699,7 +699,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$2=*&this:std::atomic_flag* [line 927, column 44]\n  n$3=*&i:_Bool [line 927, column 46]\n  *n$2.a:_Bool=n$3 [line 927, column 44]\n  NULLIFY(&this); [line 927, column 44]\n  NULLIFY(&i); [line 927, column 44]\n  EXIT_SCOPE(n$2,n$3,this,i); [line 927, column 44]\n  APPLY_ABSTRACTION; [line 927, column 44]\n " shape="box"]
+"atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic_flag* [line 927, column 44]\n  n$2=*&i:_Bool [line 927, column 46]\n  *n$1.a:_Bool=n$2 [line 927, column 44]\n  NULLIFY(&this); [line 927, column 44]\n  NULLIFY(&i); [line 927, column 44]\n  EXIT_SCOPE(n$1,n$2,this,i); [line 927, column 44]\n  APPLY_ABSTRACTION; [line 927, column 44]\n " shape="box"]
 	
 
 	 "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" -> "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_2" ;
@@ -710,7 +710,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$1=*&self:void const ** [line 65, column 6]\n  n$2=*&value:void* [line 65, column 37]\n  *n$1:void const *=n$2 [line 65, column 5]\n  NULLIFY(&value); [line 65, column 5]\n  NULLIFY(&self); [line 65, column 5]\n  EXIT_SCOPE(n$1,n$2,value,self); [line 65, column 5]\n  APPLY_ABSTRACTION; [line 65, column 5]\n " shape="box"]
+"model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void const ** [line 65, column 6]\n  n$1=*&value:void* [line 65, column 37]\n  *n$0:void const *=n$1 [line 65, column 5]\n  NULLIFY(&value); [line 65, column 5]\n  NULLIFY(&self); [line 65, column 5]\n  EXIT_SCOPE(n$0,n$1,value,self); [line 65, column 5]\n  APPLY_ABSTRACTION; [line 65, column 5]\n " shape="box"]
 	
 
 	 "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" -> "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_2" ;
@@ -721,7 +721,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$1=*&self:void const ** [line 53, column 6]\n  n$2=*&value:int [line 53, column 13]\n  *n$1:void const *=n$2 [line 53, column 5]\n  NULLIFY(&value); [line 53, column 5]\n  NULLIFY(&self); [line 53, column 5]\n  EXIT_SCOPE(n$1,n$2,value,self); [line 53, column 5]\n  APPLY_ABSTRACTION; [line 53, column 5]\n " shape="box"]
+"model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void const ** [line 53, column 6]\n  n$1=*&value:int [line 53, column 13]\n  *n$0:void const *=n$1 [line 53, column 5]\n  NULLIFY(&value); [line 53, column 5]\n  NULLIFY(&self); [line 53, column 5]\n  EXIT_SCOPE(n$0,n$1,value,self); [line 53, column 5]\n  APPLY_ABSTRACTION; [line 53, column 5]\n " shape="box"]
 	
 
 	 "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" -> "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_2" ;
@@ -732,7 +732,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$2=*&this:int** [line 236, column 15]\n  n$3=*&p:int* [line 236, column 42]\n  n$4=_fun_std::shared_ptr<int>::model_set(n$2:void const **,n$3:void*) [line 236, column 5]\n  NULLIFY(&p); [line 236, column 5]\n  NULLIFY(&this); [line 236, column 5]\n  EXIT_SCOPE(n$2,n$3,n$4,p,this); [line 236, column 5]\n  APPLY_ABSTRACTION; [line 236, 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$1=*&this:int** [line 236, column 15]\n  n$2=*&p:int* [line 236, column 42]\n  n$3=_fun_std::shared_ptr<int>::model_set(n$1:void const **,n$2:void*) [line 236, column 5]\n  NULLIFY(&p); [line 236, column 5]\n  NULLIFY(&this); [line 236, column 5]\n  EXIT_SCOPE(n$1,n$2,n$3,p,this); [line 236, column 5]\n  APPLY_ABSTRACTION; [line 236, 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" ;
@@ -743,11 +743,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$2=*&this:int** [line 97, column 15]\n  n$3=_fun_std::shared_ptr<int>::model_set(n$2:void const **,null:int) [line 97, column 5]\n  NULLIFY(&this); [line 97, column 5]\n  EXIT_SCOPE(n$2,n$3,this); [line 97, column 5]\n  APPLY_ABSTRACTION; [line 97, 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$1=*&this:int** [line 97, column 15]\n  n$2=_fun_std::shared_ptr<int>::model_set(n$1:void const **,null:int) [line 97, column 5]\n  NULLIFY(&this); [line 97, column 5]\n  EXIT_SCOPE(n$1,n$2,this); [line 97, column 5]\n  APPLY_ABSTRACTION; [line 97, 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$4=*&this:int** [line 97, column 42]\n  n$5=_fun_std::std__shared_ptr<int>::std__shared_ptr(n$4:int**) [line 96, column 13]\n  EXIT_SCOPE(n$4,n$5); [line 96, column 13]\n " shape="box"]
+"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_4" [label="4:  Constructor Init \n   n$3=*&this:int** [line 97, column 42]\n  n$4=_fun_std::std__shared_ptr<int>::std__shared_ptr(n$3:int**) [line 96, column 13]\n  EXIT_SCOPE(n$3,n$4); [line 96, 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" ;
@@ -762,7 +762,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$5=*&this:int** [line 178, column 19]\n  _=*n$5:int* [line 178, column 19]\n  n$7=_fun_std::shared_ptr<int>::reset<int,_void>(n$5:int**,null:int*) [line 178, column 19]\n  EXIT_SCOPE(_,n$5,n$7); [line 178, 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$4=*&this:int** [line 178, column 19]\n  _=*n$4:int* [line 178, column 19]\n  n$6=_fun_std::shared_ptr<int>::reset<int,_void>(n$4:int**,null:int*) [line 178, column 19]\n  EXIT_SCOPE(_,n$4,n$6); [line 178, 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" ;
diff --git a/infer/tests/build_systems/codetoanalyze/clang_translation/src/main_symlink.cpp.dot b/infer/tests/build_systems/codetoanalyze/clang_translation/src/main_symlink.cpp.dot
index 30caecdf2..11ba8b5ce 100644
--- a/infer/tests/build_systems/codetoanalyze/clang_translation/src/main_symlink.cpp.dot
+++ b/infer/tests/build_systems/codetoanalyze/clang_translation/src/main_symlink.cpp.dot
@@ -7,7 +7,7 @@ digraph cfg {
 "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$1=*&f:std::atomic_flag* [line 965, column 51]\n  _=*n$1:std::atomic_flag [line 965, column 51]\n  n$3=_fun_std::atomic_flag::clear(n$1:std::atomic_flag*,5:int) [line 965, column 51]\n  NULLIFY(&f); [line 965, column 51]\n  EXIT_SCOPE(_,n$1,n$3,f); [line 965, column 51]\n  APPLY_ABSTRACTION; [line 965, column 51]\n " shape="box"]
+"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$0=*&f:std::atomic_flag* [line 965, column 51]\n  _=*n$0:std::atomic_flag [line 965, column 51]\n  n$2=_fun_std::atomic_flag::clear(n$0:std::atomic_flag*,5:int) [line 965, column 51]\n  NULLIFY(&f); [line 965, column 51]\n  EXIT_SCOPE(_,n$0,n$2,f); [line 965, column 51]\n  APPLY_ABSTRACTION; [line 965, column 51]\n " shape="box"]
 	
 
 	 "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" -> "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$1=*&f:std::atomic_flag* [line 964, column 60]\n  _=*n$1:std::atomic_flag [line 964, column 60]\n  n$3=_fun_std::atomic_flag::clear(n$1:std::atomic_flag*,5:int) [line 964, column 60]\n  NULLIFY(&f); [line 964, column 60]\n  EXIT_SCOPE(_,n$1,n$3,f); [line 964, column 60]\n  APPLY_ABSTRACTION; [line 964, column 60]\n " shape="box"]
+"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$0=*&f:std::atomic_flag* [line 964, column 60]\n  _=*n$0:std::atomic_flag [line 964, column 60]\n  n$2=_fun_std::atomic_flag::clear(n$0:std::atomic_flag*,5:int) [line 964, column 60]\n  NULLIFY(&f); [line 964, column 60]\n  EXIT_SCOPE(_,n$0,n$2,f); [line 964, column 60]\n  APPLY_ABSTRACTION; [line 964, column 60]\n " shape="box"]
 	
 
 	 "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" -> "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_2" ;
@@ -29,7 +29,7 @@ digraph cfg {
 "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$1=*&f:std::atomic_flag* [line 971, column 3]\n  _=*n$1:std::atomic_flag [line 971, column 3]\n  n$3=*&mo:int [line 971, column 12]\n  n$4=_fun_std::atomic_flag::clear(n$1:std::atomic_flag*,n$3:int) [line 971, column 3]\n  NULLIFY(&f); [line 971, column 3]\n  NULLIFY(&mo); [line 971, column 3]\n  EXIT_SCOPE(_,n$1,n$3,n$4,f,mo); [line 971, column 3]\n  APPLY_ABSTRACTION; [line 971, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$0=*&f:std::atomic_flag* [line 971, column 3]\n  _=*n$0:std::atomic_flag [line 971, column 3]\n  n$2=*&mo:int [line 971, column 12]\n  n$3=_fun_std::atomic_flag::clear(n$0:std::atomic_flag*,n$2:int) [line 971, column 3]\n  NULLIFY(&f); [line 971, column 3]\n  NULLIFY(&mo); [line 971, column 3]\n  EXIT_SCOPE(_,n$0,n$2,n$3,f,mo); [line 971, column 3]\n  APPLY_ABSTRACTION; [line 971, column 3]\n " shape="box"]
 	
 
 	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_2" ;
@@ -40,7 +40,7 @@ digraph cfg {
 "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$1=*&f:std::atomic_flag* [line 968, column 3]\n  _=*n$1:std::atomic_flag [line 968, column 3]\n  n$3=*&mo:int [line 968, column 12]\n  n$4=_fun_std::atomic_flag::clear(n$1:std::atomic_flag*,n$3:int) [line 968, column 3]\n  NULLIFY(&f); [line 968, column 3]\n  NULLIFY(&mo); [line 968, column 3]\n  EXIT_SCOPE(_,n$1,n$3,n$4,f,mo); [line 968, column 3]\n  APPLY_ABSTRACTION; [line 968, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" [label="3:  Call _fun_std::atomic_flag::clear \n   n$0=*&f:std::atomic_flag* [line 968, column 3]\n  _=*n$0:std::atomic_flag [line 968, column 3]\n  n$2=*&mo:int [line 968, column 12]\n  n$3=_fun_std::atomic_flag::clear(n$0:std::atomic_flag*,n$2:int) [line 968, column 3]\n  NULLIFY(&f); [line 968, column 3]\n  NULLIFY(&mo); [line 968, column 3]\n  EXIT_SCOPE(_,n$0,n$2,n$3,f,mo); [line 968, column 3]\n  APPLY_ABSTRACTION; [line 968, column 3]\n " shape="box"]
 	
 
 	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_2" ;
@@ -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   VARIABLE_DECLARED(x:int); [line 15, column 3]\n  n$3=_fun_internal::used_in_main_header(0:int) [line 15, column 11]\n  *&x:int=n$3 [line 15, column 3]\n  NULLIFY(&x); [line 15, column 3]\n  EXIT_SCOPE(n$3,x); [line 15, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 15, column 3]\n  n$2=_fun_internal::used_in_main_header(0:int) [line 15, column 11]\n  *&x:int=n$2 [line 15, column 3]\n  NULLIFY(&x); [line 15, column 3]\n  EXIT_SCOPE(n$2,x); [line 15, 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$2=*&this:std::__infer_atomic_base<long>* [line 165, column 46]\n  n$3=*&desired:long [line 165, column 61]\n  *n$2._wrapped_value:long=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<long>#std#{13775723528237147754|constexpr}.1a6095f0713eed47cffb337d5bd470ba_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<long>* [line 165, column 46]\n  n$2=*&desired:long [line 165, column 61]\n  *n$1._wrapped_value:long=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned long>* [line 165, column 46]\n  n$3=*&desired:unsigned long [line 165, column 61]\n  *n$2._wrapped_value:unsigned long=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{7791849041241637472|constexpr}.44bc6742f53642a5ddb7e71e80b34b68_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<unsigned long>* [line 165, column 46]\n  n$2=*&desired:unsigned long [line 165, column 61]\n  *n$1._wrapped_value:unsigned long=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$3=*&desired:char [line 165, column 61]\n  *n$2._wrapped_value:char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{11319810518798892734|constexpr}.74d2c2ce173fcccf9cf8bc068d35c1fb_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$2=*&desired:char [line 165, column 61]\n  *n$1._wrapped_value:char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<short>* [line 165, column 46]\n  n$3=*&desired:short [line 165, column 61]\n  *n$2._wrapped_value:short=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<short>#std#{18234009817680553112|constexpr}.7a1f00575eae64e359678097638ddc12_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<short>* [line 165, column 46]\n  n$2=*&desired:short [line 165, column 61]\n  *n$1._wrapped_value:short=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned short>* [line 165, column 46]\n  n$3=*&desired:unsigned short [line 165, column 61]\n  *n$2._wrapped_value:unsigned short=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{16073524453317401930|constexpr}.d3f224e2d1fe7b0ad7e4e07024b91c5d_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<unsigned short>* [line 165, column 46]\n  n$2=*&desired:unsigned short [line 165, column 61]\n  *n$1._wrapped_value:unsigned short=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$3=*&desired:char [line 165, column 61]\n  *n$2._wrapped_value:char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{9938535674916741600|constexpr}.b3505ad067544b42cd3d24960993f2d2_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$2=*&desired:char [line 165, column 61]\n  *n$1._wrapped_value:char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<long long>* [line 165, column 46]\n  n$3=*&desired:long long [line 165, column 61]\n  *n$2._wrapped_value:long long=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<long long>#std#{8782788136688727146|constexpr}.3f103dad2faa43c9afacd724927e0000_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<long long>* [line 165, column 46]\n  n$2=*&desired:long long [line 165, column 61]\n  *n$1._wrapped_value:long long=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<signed char>* [line 165, column 46]\n  n$3=*&desired:signed char [line 165, column 61]\n  *n$2._wrapped_value:signed char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{7365870495610955464|constexpr}.7e9c5ad29861b93350b8ee38f6d0df14_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<signed char>* [line 165, column 46]\n  n$2=*&desired:signed char [line 165, column 61]\n  *n$1._wrapped_value:signed char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$3=*&desired:char [line 165, column 61]\n  *n$2._wrapped_value:char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{14341025698771447512|constexpr}.a4ea01d510cd8d527bb600a45ccd1b98_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$2=*&desired:char [line 165, column 61]\n  *n$1._wrapped_value:char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned long long>* [line 165, column 46]\n  n$3=*&desired:unsigned long long [line 165, column 61]\n  *n$2._wrapped_value:unsigned long long=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$1=*&this:std::__infer_atomic_base<unsigned long long>* [line 165, column 46]\n  n$2=*&desired:unsigned long long [line 165, column 61]\n  *n$1._wrapped_value:unsigned long long=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned char>* [line 165, column 46]\n  n$3=*&desired:unsigned char [line 165, column 61]\n  *n$2._wrapped_value:unsigned char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{10995699960611463466|constexpr}.b47fc7b50b63c00d13a29883101bbf91_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<unsigned char>* [line 165, column 46]\n  n$2=*&desired:unsigned char [line 165, column 61]\n  *n$1._wrapped_value:unsigned char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<int>* [line 165, column 46]\n  n$3=*&desired:int [line 165, column 61]\n  *n$2._wrapped_value:int=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<int>#std#{16209782391084856520|constexpr}.c8b589ca28905ccc5291f33d793e0ce1_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<int>* [line 165, column 46]\n  n$2=*&desired:int [line 165, column 61]\n  *n$1._wrapped_value:int=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<unsigned int>* [line 165, column 46]\n  n$3=*&desired:unsigned int [line 165, column 61]\n  *n$2._wrapped_value:unsigned int=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{10976553734406539054|constexpr}.c08c69d90dff28bd294937b5d0343af8_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<unsigned int>* [line 165, column 46]\n  n$2=*&desired:unsigned int [line 165, column 61]\n  *n$1._wrapped_value:unsigned int=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$3=*&desired:char [line 165, column 61]\n  *n$2._wrapped_value:char=n$3 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$2,n$3,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, column 46]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{8630701096989804934|constexpr}.85076a22c8a2e53a3f2fc540f31359c7_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_base<char>* [line 165, column 46]\n  n$2=*&desired:char [line 165, column 61]\n  *n$1._wrapped_value:char=n$2 [line 165, column 46]\n  NULLIFY(&desired); [line 165, column 46]\n  NULLIFY(&this); [line 165, column 46]\n  EXIT_SCOPE(n$1,n$2,desired,this); [line 165, column 46]\n  APPLY_ABSTRACTION; [line 165, 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$2=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$3=*&d:char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{2317220937806306842|constexpr}.d393fae7aac1307d35b11f21691789e9_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$2=*&d:char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<char>*,n$2:char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned short>* [line 185, column 53]\n  n$3=*&d:unsigned short [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{4789001703898296148|constexpr}.e708f3dd8e07f928f0136c58ce71aa77_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<unsigned short>* [line 185, column 53]\n  n$2=*&d:unsigned short [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned short>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned short>*,n$2:unsigned short) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned long long>* [line 185, column 53]\n  n$3=*&d:unsigned long long [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$1=*&this:std::__infer_atomic_integral<unsigned long long>* [line 185, column 53]\n  n$2=*&d:unsigned long long [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned long long>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned long long>*,n$2:unsigned long long) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<short>* [line 185, column 53]\n  n$3=*&d:short [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<short>#std#{12484722408092055522|constexpr}.886571206f544c99c3746129fd658bc9_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<short>* [line 185, column 53]\n  n$2=*&d:short [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<short>::__infer_atomic_base(n$1:std::__infer_atomic_integral<short>*,n$2:short) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$3=*&d:char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{8591773473555052674|constexpr}.726ea5334f7395b295f6ac7cd555d392_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$2=*&d:char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<char>*,n$2:char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<signed char>* [line 185, column 53]\n  n$3=*&d:signed char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{9844392485801633554|constexpr}.6f8ca55944a0f4edf0c3180d150032cf_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<signed char>* [line 185, column 53]\n  n$2=*&d:signed char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<signed char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<signed char>*,n$2:signed char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$3=*&d:char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{16522029776639505920|constexpr}.39982a6970fd6e76224956305a5d7c79_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$2=*&d:char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<char>*,n$2:char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<long long>* [line 185, column 53]\n  n$3=*&d:long long [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<long long>#std#{16659147243517555676|constexpr}.63a0b0e30efb12599ce5b737bbb89996_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<long long>* [line 185, column 53]\n  n$2=*&d:long long [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<long long>::__infer_atomic_base(n$1:std::__infer_atomic_integral<long long>*,n$2:long long) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<long>* [line 185, column 53]\n  n$3=*&d:long [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{2173708841126415188|constexpr}.18d3a9ecf5789e4e4e382f28729807c8_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<long>* [line 185, column 53]\n  n$2=*&d:long [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<long>::__infer_atomic_base(n$1:std::__infer_atomic_integral<long>*,n$2:long) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned long>* [line 185, column 53]\n  n$3=*&d:unsigned long [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{14576619656228466890|constexpr}.f782c04753c7831667ca63ed4883ec25_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<unsigned long>* [line 185, column 53]\n  n$2=*&d:unsigned long [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned long>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned long>*,n$2:unsigned long) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned int>* [line 185, column 53]\n  n$3=*&d:unsigned int [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{4588665662015601400|constexpr}.d5e8f3087b4e601b5439130cb84493b0_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<unsigned int>* [line 185, column 53]\n  n$2=*&d:unsigned int [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned int>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned int>*,n$2:unsigned int) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<unsigned char>* [line 185, column 53]\n  n$3=*&d:unsigned char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{812115561232181884|constexpr}.549c03fc14bf4fd6639150c4ad1efe18_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<unsigned char>* [line 185, column 53]\n  n$2=*&d:unsigned char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<unsigned char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<unsigned char>*,n$2:unsigned char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$3=*&d:char [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{15428870764710756536|constexpr}.d0b34811c384e20ccfd3c64a11df4e0a_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<char>* [line 185, column 53]\n  n$2=*&d:char [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<char>::__infer_atomic_base(n$1:std::__infer_atomic_integral<char>*,n$2:char) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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$2=*&this:std::__infer_atomic_integral<int>* [line 185, column 53]\n  n$3=*&d:int [line 185, 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 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, column 53]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<int>#std#{10860901722123512962|constexpr}.f85ea1dfc790b10c2617a4d4f5cafd29_3" [label="3:  Constructor Init \n   n$1=*&this:std::__infer_atomic_integral<int>* [line 185, column 53]\n  n$2=*&d:int [line 185, column 60]\n  n$3=_fun_std::__infer_atomic_base<int>::__infer_atomic_base(n$1:std::__infer_atomic_integral<int>*,n$2:int) [line 185, column 53]\n  NULLIFY(&d); [line 185, column 53]\n  NULLIFY(&this); [line 185, column 53]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 185, column 53]\n  APPLY_ABSTRACTION; [line 185, 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" ;
@@ -485,7 +485,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$2=*&this:std::atomic<unsigned short>* [line 406, column 50]\n  n$3=*&d:unsigned short [line 406, 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 406, column 50]\n  NULLIFY(&d); [line 406, column 50]\n  NULLIFY(&this); [line 406, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 406, column 50]\n  APPLY_ABSTRACTION; [line 406, column 50]\n " shape="box"]
+"atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned short>* [line 406, column 50]\n  n$2=*&d:unsigned short [line 406, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned short>::__infer_atomic_integral(n$1:std::atomic<unsigned short>*,n$2:unsigned short) [line 406, column 50]\n  NULLIFY(&d); [line 406, column 50]\n  NULLIFY(&this); [line 406, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 406, column 50]\n  APPLY_ABSTRACTION; [line 406, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_3" -> "atomic#atomic<unsigned short>#std#{18219637643674479567|constexpr}.a4a5467727100ba5642b3dca850c391b_2" ;
@@ -496,7 +496,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$2=*&this:std::atomic<char>* [line 470, column 50]\n  n$3=*&d:char [line 470, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 470, column 50]\n  NULLIFY(&d); [line 470, column 50]\n  NULLIFY(&this); [line 470, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 470, column 50]\n  APPLY_ABSTRACTION; [line 470, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<char>* [line 470, column 50]\n  n$2=*&d:char [line 470, column 57]\n  n$3=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$1:std::atomic<char>*,n$2:char) [line 470, column 50]\n  NULLIFY(&d); [line 470, column 50]\n  NULLIFY(&this); [line 470, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 470, column 50]\n  APPLY_ABSTRACTION; [line 470, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_3" -> "atomic#atomic<char>#std#{6824382166204133557|constexpr}.be44521bf079e2cb888037b21858e8e6_2" ;
@@ -507,7 +507,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$2=*&this:std::atomic<unsigned long>* [line 442, column 50]\n  n$3=*&d:unsigned long [line 442, 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 442, column 50]\n  NULLIFY(&d); [line 442, column 50]\n  NULLIFY(&this); [line 442, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 442, column 50]\n  APPLY_ABSTRACTION; [line 442, column 50]\n " shape="box"]
+"atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned long>* [line 442, column 50]\n  n$2=*&d:unsigned long [line 442, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned long>::__infer_atomic_integral(n$1:std::atomic<unsigned long>*,n$2:unsigned long) [line 442, column 50]\n  NULLIFY(&d); [line 442, column 50]\n  NULLIFY(&this); [line 442, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 442, column 50]\n  APPLY_ABSTRACTION; [line 442, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_3" -> "atomic#atomic<unsigned long>#std#{12678320818314302393|constexpr}.5cd3aac69014d4e49ff04061ee1f1526_2" ;
@@ -518,7 +518,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$2=*&this:std::atomic<short>* [line 397, column 50]\n  n$3=*&d:short [line 397, column 57]\n  n$4=_fun_std::__infer_atomic_integral<short>::__infer_atomic_integral(n$2:std::atomic<short>*,n$3:short) [line 397, column 50]\n  NULLIFY(&d); [line 397, column 50]\n  NULLIFY(&this); [line 397, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 397, column 50]\n  APPLY_ABSTRACTION; [line 397, column 50]\n " shape="box"]
+"atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<short>* [line 397, column 50]\n  n$2=*&d:short [line 397, column 57]\n  n$3=_fun_std::__infer_atomic_integral<short>::__infer_atomic_integral(n$1:std::atomic<short>*,n$2:short) [line 397, column 50]\n  NULLIFY(&d); [line 397, column 50]\n  NULLIFY(&this); [line 397, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 397, column 50]\n  APPLY_ABSTRACTION; [line 397, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_3" -> "atomic#atomic<short>#std#{17416607751267500557|constexpr}.44c96da43702ebbe4de34f6c26176ccb_2" ;
@@ -529,7 +529,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$2=*&this:std::atomic<long>* [line 433, column 50]\n  n$3=*&d:long [line 433, column 57]\n  n$4=_fun_std::__infer_atomic_integral<long>::__infer_atomic_integral(n$2:std::atomic<long>*,n$3:long) [line 433, column 50]\n  NULLIFY(&d); [line 433, column 50]\n  NULLIFY(&this); [line 433, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 433, column 50]\n  APPLY_ABSTRACTION; [line 433, column 50]\n " shape="box"]
+"atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<long>* [line 433, column 50]\n  n$2=*&d:long [line 433, column 57]\n  n$3=_fun_std::__infer_atomic_integral<long>::__infer_atomic_integral(n$1:std::atomic<long>*,n$2:long) [line 433, column 50]\n  NULLIFY(&d); [line 433, column 50]\n  NULLIFY(&this); [line 433, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 433, column 50]\n  APPLY_ABSTRACTION; [line 433, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_3" -> "atomic#atomic<long>#std#{11783391945814293231|constexpr}.22775463bf145a69731b3305dffc4bb3_2" ;
@@ -540,7 +540,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$2=*&this:std::atomic<int>* [line 415, column 50]\n  n$3=*&d:int [line 415, column 57]\n  n$4=_fun_std::__infer_atomic_integral<int>::__infer_atomic_integral(n$2:std::atomic<int>*,n$3:int) [line 415, column 50]\n  NULLIFY(&d); [line 415, column 50]\n  NULLIFY(&this); [line 415, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 415, column 50]\n  APPLY_ABSTRACTION; [line 415, column 50]\n " shape="box"]
+"atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<int>* [line 415, column 50]\n  n$2=*&d:int [line 415, column 57]\n  n$3=_fun_std::__infer_atomic_integral<int>::__infer_atomic_integral(n$1:std::atomic<int>*,n$2:int) [line 415, column 50]\n  NULLIFY(&d); [line 415, column 50]\n  NULLIFY(&this); [line 415, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 415, column 50]\n  APPLY_ABSTRACTION; [line 415, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_3" -> "atomic#atomic<int>#std#{10680712765411145881|constexpr}.b59b8272bcd92eac36f759f9bac15ee8_2" ;
@@ -551,7 +551,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$2=*&this:std::atomic<unsigned char>* [line 388, column 50]\n  n$3=*&d:unsigned char [line 388, 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 388, column 50]\n  NULLIFY(&d); [line 388, column 50]\n  NULLIFY(&this); [line 388, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 388, column 50]\n  APPLY_ABSTRACTION; [line 388, column 50]\n " shape="box"]
+"atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned char>* [line 388, column 50]\n  n$2=*&d:unsigned char [line 388, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned char>::__infer_atomic_integral(n$1:std::atomic<unsigned char>*,n$2:unsigned char) [line 388, column 50]\n  NULLIFY(&d); [line 388, column 50]\n  NULLIFY(&this); [line 388, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 388, column 50]\n  APPLY_ABSTRACTION; [line 388, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_3" -> "atomic#atomic<unsigned char>#std#{9349229583258484711|constexpr}.9cbc6c1bc35116267ee41b36d8d25cb8_2" ;
@@ -562,7 +562,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$2=*&this:std::atomic<char>* [line 479, column 50]\n  n$3=*&d:char [line 479, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 479, column 50]\n  NULLIFY(&d); [line 479, column 50]\n  NULLIFY(&this); [line 479, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 479, column 50]\n  APPLY_ABSTRACTION; [line 479, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<char>* [line 479, column 50]\n  n$2=*&d:char [line 479, column 57]\n  n$3=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$1:std::atomic<char>*,n$2:char) [line 479, column 50]\n  NULLIFY(&d); [line 479, column 50]\n  NULLIFY(&this); [line 479, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 479, column 50]\n  APPLY_ABSTRACTION; [line 479, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_3" -> "atomic#atomic<char>#std#{8082860668582714463|constexpr}.dd2e5ecabe54fdef20aa889bb6f6f2e6_2" ;
@@ -573,7 +573,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$2=*&this:std::atomic<signed char>* [line 379, column 50]\n  n$3=*&d:signed char [line 379, 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 379, column 50]\n  NULLIFY(&d); [line 379, column 50]\n  NULLIFY(&this); [line 379, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 379, column 50]\n  APPLY_ABSTRACTION; [line 379, column 50]\n " shape="box"]
+"atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<signed char>* [line 379, column 50]\n  n$2=*&d:signed char [line 379, column 57]\n  n$3=_fun_std::__infer_atomic_integral<signed char>::__infer_atomic_integral(n$1:std::atomic<signed char>*,n$2:signed char) [line 379, column 50]\n  NULLIFY(&d); [line 379, column 50]\n  NULLIFY(&this); [line 379, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 379, column 50]\n  APPLY_ABSTRACTION; [line 379, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_3" -> "atomic#atomic<signed char>#std#{5346108577579494905|constexpr}.c15dd9aaf90a685e2a7f542bd251c605_2" ;
@@ -584,7 +584,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$2=*&this:std::atomic<char>* [line 370, column 50]\n  n$3=*&d:char [line 370, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 370, column 50]\n  NULLIFY(&d); [line 370, column 50]\n  NULLIFY(&this); [line 370, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 370, column 50]\n  APPLY_ABSTRACTION; [line 370, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<char>* [line 370, column 50]\n  n$2=*&d:char [line 370, column 57]\n  n$3=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$1:std::atomic<char>*,n$2:char) [line 370, column 50]\n  NULLIFY(&d); [line 370, column 50]\n  NULLIFY(&this); [line 370, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 370, column 50]\n  APPLY_ABSTRACTION; [line 370, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_3" -> "atomic#atomic<char>#std#{1569576068982126765|constexpr}.65635696899f54c5a6d6629c8a6ecb24_2" ;
@@ -595,7 +595,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$2=*&this:std::atomic<char>* [line 488, column 50]\n  n$3=*&d:char [line 488, column 57]\n  n$4=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$2:std::atomic<char>*,n$3:char) [line 488, column 50]\n  NULLIFY(&d); [line 488, column 50]\n  NULLIFY(&this); [line 488, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 488, column 50]\n  APPLY_ABSTRACTION; [line 488, column 50]\n " shape="box"]
+"atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<char>* [line 488, column 50]\n  n$2=*&d:char [line 488, column 57]\n  n$3=_fun_std::__infer_atomic_integral<char>::__infer_atomic_integral(n$1:std::atomic<char>*,n$2:char) [line 488, column 50]\n  NULLIFY(&d); [line 488, column 50]\n  NULLIFY(&this); [line 488, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 488, column 50]\n  APPLY_ABSTRACTION; [line 488, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_3" -> "atomic#atomic<char>#std#{2209937568484024999|constexpr}.6cdd85274a8b59daa2beabef472c513a_2" ;
@@ -606,7 +606,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$2=*&this:std::atomic<unsigned int>* [line 424, column 50]\n  n$3=*&d:unsigned int [line 424, 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 424, column 50]\n  NULLIFY(&d); [line 424, column 50]\n  NULLIFY(&this); [line 424, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 424, column 50]\n  APPLY_ABSTRACTION; [line 424, column 50]\n " shape="box"]
+"atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned int>* [line 424, column 50]\n  n$2=*&d:unsigned int [line 424, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned int>::__infer_atomic_integral(n$1:std::atomic<unsigned int>*,n$2:unsigned int) [line 424, column 50]\n  NULLIFY(&d); [line 424, column 50]\n  NULLIFY(&this); [line 424, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 424, column 50]\n  APPLY_ABSTRACTION; [line 424, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_3" -> "atomic#atomic<unsigned int>#std#{10601848595505065591|constexpr}.a5e478d8ee519cb53e4dcde645e4dbe4_2" ;
@@ -617,7 +617,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$2=*&this:std::atomic<unsigned long long>* [line 461, column 50]\n  n$3=*&d:unsigned long long [line 461, 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 461, column 50]\n  NULLIFY(&d); [line 461, column 50]\n  NULLIFY(&this); [line 461, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 461, column 50]\n  APPLY_ABSTRACTION; [line 461, column 50]\n " shape="box"]
+"atomic#atomic<unsigned long long>#std#{8272996909294858201|constexpr}.4af18384f1b00a3d9942312d16de12f0_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<unsigned long long>* [line 461, column 50]\n  n$2=*&d:unsigned long long [line 461, column 57]\n  n$3=_fun_std::__infer_atomic_integral<unsigned long long>::__infer_atomic_integral(n$1:std::atomic<unsigned long long>*,n$2:unsigned long long) [line 461, column 50]\n  NULLIFY(&d); [line 461, column 50]\n  NULLIFY(&this); [line 461, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 461, column 50]\n  APPLY_ABSTRACTION; [line 461, 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" ;
@@ -628,7 +628,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$2=*&this:std::atomic<long long>* [line 451, column 50]\n  n$3=*&d:long long [line 451, 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 451, column 50]\n  NULLIFY(&d); [line 451, column 50]\n  NULLIFY(&this); [line 451, column 50]\n  EXIT_SCOPE(n$2,n$3,n$4,d,this); [line 451, column 50]\n  APPLY_ABSTRACTION; [line 451, column 50]\n " shape="box"]
+"atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic<long long>* [line 451, column 50]\n  n$2=*&d:long long [line 451, column 57]\n  n$3=_fun_std::__infer_atomic_integral<long long>::__infer_atomic_integral(n$1:std::atomic<long long>*,n$2:long long) [line 451, column 50]\n  NULLIFY(&d); [line 451, column 50]\n  NULLIFY(&this); [line 451, column 50]\n  EXIT_SCOPE(n$1,n$2,n$3,d,this); [line 451, column 50]\n  APPLY_ABSTRACTION; [line 451, column 50]\n " shape="box"]
 	
 
 	 "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_3" -> "atomic#atomic<long long>#std#{13242178517795487559|constexpr}.b120a6c4bb0f1e110121c7888150bd59_2" ;
@@ -639,7 +639,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$1=*&this:std::atomic_flag* [line 944, column 5]\n  *n$1.a:_Bool=0 [line 944, column 5]\n  NULLIFY(&this); [line 944, column 5]\n  EXIT_SCOPE(n$1,this); [line 944, column 5]\n  APPLY_ABSTRACTION; [line 944, column 5]\n " shape="box"]
+"clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:std::atomic_flag* [line 944, column 5]\n  *n$0.a:_Bool=0 [line 944, column 5]\n  NULLIFY(&this); [line 944, column 5]\n  EXIT_SCOPE(n$0,this); [line 944, column 5]\n  APPLY_ABSTRACTION; [line 944, column 5]\n " shape="box"]
 	
 
 	 "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_3" -> "clear#atomic_flag#std#(3684357514402407574).b0b9e53b3e4cf6978b960d4491c0af6d_2" ;
@@ -650,7 +650,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$1=*&this:std::atomic_flag* [line 946, column 65]\n  *n$1.a:_Bool=0 [line 946, column 65]\n  NULLIFY(&this); [line 946, column 65]\n  EXIT_SCOPE(n$1,this); [line 946, column 65]\n  APPLY_ABSTRACTION; [line 946, column 65]\n " shape="box"]
+"clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:std::atomic_flag* [line 946, column 65]\n  *n$0.a:_Bool=0 [line 946, column 65]\n  NULLIFY(&this); [line 946, column 65]\n  EXIT_SCOPE(n$0,this); [line 946, column 65]\n  APPLY_ABSTRACTION; [line 946, column 65]\n " shape="box"]
 	
 
 	 "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_3" -> "clear#atomic_flag#std#(4757429354090136896).a3ca4a9a64ba2fa439a627057e253cfc_2" ;
@@ -665,11 +665,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$2=*&this:std::atomic_flag* [line 934, column 5]\n  *n$2.a:_Bool=1 [line 934, column 5]\n  NULLIFY(&this); [line 934, column 5]\n  EXIT_SCOPE(n$2,this); [line 934, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 934, column 5]\n  *n$1.a:_Bool=1 [line 934, column 5]\n  NULLIFY(&this); [line 934, column 5]\n  EXIT_SCOPE(n$1,this); [line 934, 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   VARIABLE_DECLARED(ret:_Bool); [line 933, column 5]\n  n$3=*&this:std::atomic_flag* [line 933, column 16]\n  n$4=*n$3.a:_Bool [line 933, column 16]\n  *&ret:_Bool=n$4 [line 933, column 5]\n  EXIT_SCOPE(n$3,n$4); [line 933, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(ret:_Bool); [line 933, column 5]\n  n$2=*&this:std::atomic_flag* [line 933, column 16]\n  n$3=*n$2.a:_Bool [line 933, column 16]\n  *&ret:_Bool=n$3 [line 933, column 5]\n  EXIT_SCOPE(n$2,n$3); [line 933, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" ;
@@ -684,11 +684,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$2=*&this:std::atomic_flag* [line 939, column 5]\n  *n$2.a:_Bool=1 [line 939, column 5]\n  NULLIFY(&this); [line 939, column 5]\n  EXIT_SCOPE(n$2,this); [line 939, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&this:std::atomic_flag* [line 939, column 5]\n  *n$1.a:_Bool=1 [line 939, column 5]\n  NULLIFY(&this); [line 939, column 5]\n  EXIT_SCOPE(n$1,this); [line 939, 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   VARIABLE_DECLARED(ret:_Bool); [line 938, column 5]\n  n$3=*&this:std::atomic_flag* [line 938, column 16]\n  n$4=*n$3.a:_Bool [line 938, column 16]\n  *&ret:_Bool=n$4 [line 938, column 5]\n  EXIT_SCOPE(n$3,n$4); [line 938, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(ret:_Bool); [line 938, column 5]\n  n$2=*&this:std::atomic_flag* [line 938, column 16]\n  n$3=*n$2.a:_Bool [line 938, column 16]\n  *&ret:_Bool=n$3 [line 938, column 5]\n  EXIT_SCOPE(n$2,n$3); [line 938, column 5]\n " shape="box"]
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" ;
@@ -699,7 +699,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$2=*&this:std::atomic_flag* [line 927, column 44]\n  n$3=*&i:_Bool [line 927, column 46]\n  *n$2.a:_Bool=n$3 [line 927, column 44]\n  NULLIFY(&this); [line 927, column 44]\n  NULLIFY(&i); [line 927, column 44]\n  EXIT_SCOPE(n$2,n$3,this,i); [line 927, column 44]\n  APPLY_ABSTRACTION; [line 927, column 44]\n " shape="box"]
+"atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" [label="3:  Constructor Init \n   n$1=*&this:std::atomic_flag* [line 927, column 44]\n  n$2=*&i:_Bool [line 927, column 46]\n  *n$1.a:_Bool=n$2 [line 927, column 44]\n  NULLIFY(&this); [line 927, column 44]\n  NULLIFY(&i); [line 927, column 44]\n  EXIT_SCOPE(n$1,n$2,this,i); [line 927, column 44]\n  APPLY_ABSTRACTION; [line 927, column 44]\n " shape="box"]
 	
 
 	 "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_3" -> "atomic_flag#atomic_flag#std#{10931176997288531904|constexpr}.57d7555f5addc9691c180d812b1aad13_2" ;
@@ -710,7 +710,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$1=*&self:void const ** [line 65, column 6]\n  n$2=*&value:void* [line 65, column 37]\n  *n$1:void const *=n$2 [line 65, column 5]\n  NULLIFY(&value); [line 65, column 5]\n  NULLIFY(&self); [line 65, column 5]\n  EXIT_SCOPE(n$1,n$2,value,self); [line 65, column 5]\n  APPLY_ABSTRACTION; [line 65, column 5]\n " shape="box"]
+"model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void const ** [line 65, column 6]\n  n$1=*&value:void* [line 65, column 37]\n  *n$0:void const *=n$1 [line 65, column 5]\n  NULLIFY(&value); [line 65, column 5]\n  NULLIFY(&self); [line 65, column 5]\n  EXIT_SCOPE(n$0,n$1,value,self); [line 65, column 5]\n  APPLY_ABSTRACTION; [line 65, column 5]\n " shape="box"]
 	
 
 	 "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_3" -> "model_set#shared_ptr<int>#std#(4823396094259928824).b93622435d16d4672bfaf2944380f1be_2" ;
@@ -721,7 +721,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$1=*&self:void const ** [line 53, column 6]\n  n$2=*&value:int [line 53, column 13]\n  *n$1:void const *=n$2 [line 53, column 5]\n  NULLIFY(&value); [line 53, column 5]\n  NULLIFY(&self); [line 53, column 5]\n  EXIT_SCOPE(n$1,n$2,value,self); [line 53, column 5]\n  APPLY_ABSTRACTION; [line 53, column 5]\n " shape="box"]
+"model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void const ** [line 53, column 6]\n  n$1=*&value:int [line 53, column 13]\n  *n$0:void const *=n$1 [line 53, column 5]\n  NULLIFY(&value); [line 53, column 5]\n  NULLIFY(&self); [line 53, column 5]\n  EXIT_SCOPE(n$0,n$1,value,self); [line 53, column 5]\n  APPLY_ABSTRACTION; [line 53, column 5]\n " shape="box"]
 	
 
 	 "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_3" -> "model_set#shared_ptr<int>#std#(4842545188773067100).667f44fdf24815c87b171dd5a05fce4a_2" ;
@@ -732,7 +732,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$2=*&this:int** [line 236, column 15]\n  n$3=*&p:int* [line 236, column 42]\n  n$4=_fun_std::shared_ptr<int>::model_set(n$2:void const **,n$3:void*) [line 236, column 5]\n  NULLIFY(&p); [line 236, column 5]\n  NULLIFY(&this); [line 236, column 5]\n  EXIT_SCOPE(n$2,n$3,n$4,p,this); [line 236, column 5]\n  APPLY_ABSTRACTION; [line 236, 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$1=*&this:int** [line 236, column 15]\n  n$2=*&p:int* [line 236, column 42]\n  n$3=_fun_std::shared_ptr<int>::model_set(n$1:void const **,n$2:void*) [line 236, column 5]\n  NULLIFY(&p); [line 236, column 5]\n  NULLIFY(&this); [line 236, column 5]\n  EXIT_SCOPE(n$1,n$2,n$3,p,this); [line 236, column 5]\n  APPLY_ABSTRACTION; [line 236, 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" ;
@@ -743,11 +743,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$2=*&this:int** [line 97, column 15]\n  n$3=_fun_std::shared_ptr<int>::model_set(n$2:void const **,null:int) [line 97, column 5]\n  NULLIFY(&this); [line 97, column 5]\n  EXIT_SCOPE(n$2,n$3,this); [line 97, column 5]\n  APPLY_ABSTRACTION; [line 97, 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$1=*&this:int** [line 97, column 15]\n  n$2=_fun_std::shared_ptr<int>::model_set(n$1:void const **,null:int) [line 97, column 5]\n  NULLIFY(&this); [line 97, column 5]\n  EXIT_SCOPE(n$1,n$2,this); [line 97, column 5]\n  APPLY_ABSTRACTION; [line 97, 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$4=*&this:int** [line 97, column 42]\n  n$5=_fun_std::std__shared_ptr<int>::std__shared_ptr(n$4:int**) [line 96, column 13]\n  EXIT_SCOPE(n$4,n$5); [line 96, column 13]\n " shape="box"]
+"shared_ptr#shared_ptr<int>#std#{8741815665871862164|constexpr}.f88ab7f65e0cffeda975c68f431824d1_4" [label="4:  Constructor Init \n   n$3=*&this:int** [line 97, column 42]\n  n$4=_fun_std::std__shared_ptr<int>::std__shared_ptr(n$3:int**) [line 96, column 13]\n  EXIT_SCOPE(n$3,n$4); [line 96, 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" ;
@@ -762,7 +762,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$5=*&this:int** [line 178, column 19]\n  _=*n$5:int* [line 178, column 19]\n  n$7=_fun_std::shared_ptr<int>::reset<int,_void>(n$5:int**,null:int*) [line 178, column 19]\n  EXIT_SCOPE(_,n$5,n$7); [line 178, 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$4=*&this:int** [line 178, column 19]\n  _=*n$4:int* [line 178, column 19]\n  n$6=_fun_std::shared_ptr<int>::reset<int,_void>(n$4:int**,null:int*) [line 178, column 19]\n  EXIT_SCOPE(_,n$4,n$6); [line 178, 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" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/attributes/clang_fallthrough.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/attributes/clang_fallthrough.cpp.dot
index c09c3dd5d..c2d93ec45 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/attributes/clang_fallthrough.cpp.dot
+++ b/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:  SwitchStmt \n   n$2=*&n:int [line 12, column 11]\n  NULLIFY(&n); [line 12, column 11]\n  EXIT_SCOPE(n); [line 12, column 11]\n " shape="box"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_4" [label="4:  SwitchStmt \n   n$1=*&n:int [line 12, column 11]\n  NULLIFY(&n); [line 12, column 11]\n  EXIT_SCOPE(n); [line 12, 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$6=_fun_h() [line 19, column 13]\n  *&res:int=n$6 [line 19, column 7]\n  EXIT_SCOPE(n$6); [line 19, column 7]\n  APPLY_ABSTRACTION; [line 19, column 7]\n " shape="box"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_5" [label="5:  BinaryOperatorStmt: Assign \n   n$3=_fun_h() [line 19, column 13]\n  *&res:int=n$3 [line 19, column 7]\n  EXIT_SCOPE(n$3); [line 19, column 7]\n  APPLY_ABSTRACTION; [line 19, 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$2 == 77), true); [line 18, column 5]\n  NULLIFY(&res); [line 18, column 5]\n  EXIT_SCOPE(n$2,res); [line 18, column 5]\n  APPLY_ABSTRACTION; [line 18, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_6" [label="6: Prune (true branch, switch) \n   PRUNE((n$1 == 77), true); [line 18, column 5]\n  NULLIFY(&res); [line 18, column 5]\n  EXIT_SCOPE(n$1,res); [line 18, column 5]\n  APPLY_ABSTRACTION; [line 18, 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$2 == 77), false); [line 18, column 5]\n  EXIT_SCOPE(n$2); [line 18, column 5]\n  APPLY_ABSTRACTION; [line 18, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_7" [label="7: Prune (false branch, switch) \n   PRUNE(!(n$1 == 77), false); [line 18, column 5]\n  EXIT_SCOPE(n$1); [line 18, column 5]\n  APPLY_ABSTRACTION; [line 18, 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$2 == 66), true); [line 16, column 5]\n  NULLIFY(&res); [line 16, column 5]\n  EXIT_SCOPE(n$2,res); [line 16, column 5]\n  APPLY_ABSTRACTION; [line 16, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_8" [label="8: Prune (true branch, switch) \n   PRUNE((n$1 == 66), true); [line 16, column 5]\n  NULLIFY(&res); [line 16, column 5]\n  EXIT_SCOPE(n$1,res); [line 16, column 5]\n  APPLY_ABSTRACTION; [line 16, 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$2 == 66), false); [line 16, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_9" [label="9: Prune (false branch, switch) \n   PRUNE(!(n$1 == 66), false); [line 16, 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$2 == 33), true); [line 14, column 5]\n  NULLIFY(&res); [line 14, column 5]\n  EXIT_SCOPE(n$2,res); [line 14, column 5]\n  APPLY_ABSTRACTION; [line 14, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_10" [label="10: Prune (true branch, switch) \n   PRUNE((n$1 == 33), true); [line 14, column 5]\n  NULLIFY(&res); [line 14, column 5]\n  EXIT_SCOPE(n$1,res); [line 14, column 5]\n  APPLY_ABSTRACTION; [line 14, 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$2 == 33), false); [line 14, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_11" [label="11: Prune (false branch, switch) \n   PRUNE(!(n$1 == 33), false); [line 14, 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$2 == 22), true); [line 13, column 5]\n  NULLIFY(&res); [line 13, column 5]\n  EXIT_SCOPE(n$2,res); [line 13, column 5]\n  APPLY_ABSTRACTION; [line 13, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$1 == 22), true); [line 13, column 5]\n  NULLIFY(&res); [line 13, column 5]\n  EXIT_SCOPE(n$1,res); [line 13, column 5]\n  APPLY_ABSTRACTION; [line 13, 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$2 == 22), false); [line 13, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_13" [label="13: Prune (false branch, switch) \n   PRUNE(!(n$1 == 22), false); [line 13, column 5]\n " shape="invhouse"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_13" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_10" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/builtin/new.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/builtin/new.cpp.dot
index cf2c9434d..d54d9b138 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/builtin/new.cpp.dot
+++ b/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$1=*&i:int* [line 12, column 10]\n  n$2=_fun___delete(n$1:int*) [line 12, column 3]\n  NULLIFY(&i); [line 12, column 3]\n  EXIT_SCOPE(n$1,n$2,i); [line 12, column 3]\n  APPLY_ABSTRACTION; [line 12, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Call delete \n   n$0=*&i:int* [line 12, column 10]\n  n$1=_fun___delete(n$0:int*) [line 12, column 3]\n  NULLIFY(&i); [line 12, column 3]\n  EXIT_SCOPE(n$0,n$1,i); [line 12, column 3]\n  APPLY_ABSTRACTION; [line 12, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  CXXNewExpr \n   n$3=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 11, column 3]\n  EXIT_SCOPE(n$3); [line 11, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  CXXNewExpr \n   n$2=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 11, column 3]\n  EXIT_SCOPE(n$2); [line 11, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(i:int*); [line 10, column 3]\n  n$4=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 10, column 12]\n  *&i:int*=n$4 [line 10, column 3]\n  EXIT_SCOPE(n$4); [line 10, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(i:int*); [line 10, column 3]\n  n$3=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 10, column 12]\n  *&i:int*=n$3 [line 10, column 3]\n  EXIT_SCOPE(n$3); [line 10, 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   VARIABLE_DECLARED(p:A*); [line 24, column 45]\n  n$3=*&ptr:void* [line 24, column 60]\n  n$1=*&ptr2:int* [line 24, column 65]\n  *&ptr2:int*=(n$1 + 1) [line 24, column 65]\n  n$2=*&ptr2:int* [line 24, column 65]\n  n$4=_fun___placement_new(sizeof(t=A):unsigned long,n$3:void*,n$2:void*) [line 24, column 55]\n  n$5=_fun_A::A(n$4:A*) [line 24, column 73]\n  *&p:A*=n$4 [line 24, column 45]\n  NULLIFY(&ptr2); [line 24, column 45]\n  NULLIFY(&ptr); [line 24, column 45]\n  NULLIFY(&p); [line 24, column 45]\n  EXIT_SCOPE(n$1,n$2,n$3,n$4,n$5,ptr2,ptr,p); [line 24, column 45]\n  APPLY_ABSTRACTION; [line 24, column 45]\n " shape="box"]
+"test_placement#7589029240520377616.7f92d4e10c030674dddd1682731c0ba3_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(p:A*); [line 24, column 45]\n  n$2=*&ptr:void* [line 24, column 60]\n  n$0=*&ptr2:int* [line 24, column 65]\n  *&ptr2:int*=(n$0 + 1) [line 24, column 65]\n  n$1=*&ptr2:int* [line 24, column 65]\n  n$3=_fun___placement_new(sizeof(t=A):unsigned long,n$2:void*,n$1:void*) [line 24, column 55]\n  n$4=_fun_A::A(n$3:A*) [line 24, column 73]\n  *&p:A*=n$3 [line 24, column 45]\n  NULLIFY(&ptr2); [line 24, column 45]\n  NULLIFY(&ptr); [line 24, column 45]\n  NULLIFY(&p); [line 24, column 45]\n  EXIT_SCOPE(n$0,n$1,n$2,n$3,n$4,ptr2,ptr,p); [line 24, column 45]\n  APPLY_ABSTRACTION; [line 24, column 45]\n " shape="box"]
 	
 
 	 "test_placement#7589029240520377616.7f92d4e10c030674dddd1682731c0ba3_3" -> "test_placement#7589029240520377616.7f92d4e10c030674dddd1682731c0ba3_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/destructors/break_scope.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/destructors/break_scope.cpp.dot
index d00e15748..311e2784a 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/destructors/break_scope.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/destructors/break_scope.cpp.dot
@@ -3,7 +3,7 @@ digraph cfg {
 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_1" [label="1: Start break_scope::test_do_while\nFormals:  a:_Bool b:_Bool\nLocals:  x3:break_scope::X x4:break_scope::X x2:break_scope::X x1:break_scope::X \n  " color=yellow style=filled]
 	
 
-	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_1" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_17" ;
+	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_1" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_16" ;
 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_2" [label="2: Exit break_scope::test_do_while \n   NULLIFY(&x3); [line 89, column 1]\n  NULLIFY(&x1); [line 89, column 1]\n  NULLIFY(&x4); [line 89, column 1]\n  NULLIFY(&x2); [line 89, column 1]\n " color=yellow style=filled]
 	
 
@@ -14,7 +14,7 @@ digraph cfg {
 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_4" [label="4: + \n  " ]
 	
 
-	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_4" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_16" ;
+	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_4" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_15" ;
 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_5" [label="5: Prune (true branch, do while) \n   n$3=*&a:_Bool [line 88, column 12]\n  PRUNE(n$3, true); [line 88, column 12]\n  EXIT_SCOPE(n$3); [line 88, column 12]\n  APPLY_ABSTRACTION; [line 88, column 12]\n " shape="invhouse"]
 	
 
@@ -35,45 +35,41 @@ digraph cfg {
 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_9" [label="9: Prune (true branch, if) \n   n$7=*&b:_Bool [line 82, column 9]\n  PRUNE(n$7, true); [line 82, column 9]\n  NULLIFY(&b); [line 82, column 9]\n  EXIT_SCOPE(n$7,b); [line 82, 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_9" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_12" ;
 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_10" [label="10: Prune (false branch, if) \n   n$7=*&b:_Bool [line 82, column 9]\n  PRUNE(!n$7, false); [line 82, column 9]\n  EXIT_SCOPE(n$7); [line 82, 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(Scope) \n   _=*&x3:break_scope::X [line 85, column 5]\n  n$9=_fun_break_scope::X::~X(&x3:break_scope::X*) injected [line 85, column 5]\n  APPLY_ABSTRACTION; [line 85, column 5]\n " shape="box"]
+	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_10" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_14" ;
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_11" [label="11:  Destruction(break) \n   _=*&x3:break_scope::X [line 84, column 7]\n  n$9=_fun_break_scope::X::~X(&x3:break_scope::X*) injected [line 84, column 7]\n  _=*&x2:break_scope::X [line 84, column 7]\n  n$11=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 84, column 7]\n  EXIT_SCOPE(_,_,n$9,n$11,x2,x3); [line 84, column 7]\n  APPLY_ABSTRACTION; [line 84, column 7]\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(break) \n   _=*&x3:break_scope::X [line 84, column 7]\n  n$12=_fun_break_scope::X::~X(&x3:break_scope::X*) injected [line 84, column 7]\n  _=*&x2:break_scope::X [line 84, column 7]\n  n$14=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 84, column 7]\n  EXIT_SCOPE(_,_,n$12,n$14,x2,x3); [line 84, column 7]\n  APPLY_ABSTRACTION; [line 84, column 7]\n " shape="box"]
+	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_11" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_3" ;
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x3:break_scope::X); [line 83, column 7]\n  n$13=_fun_break_scope::X::X(&x3:break_scope::X*) [line 83, column 9]\n  EXIT_SCOPE(n$13); [line 83, column 9]\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   VARIABLE_DECLARED(x3:break_scope::X); [line 83, column 7]\n  n$16=_fun_break_scope::X::X(&x3:break_scope::X*) [line 83, column 9]\n  EXIT_SCOPE(n$16); [line 83, column 9]\n " shape="box"]
+	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_12" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_11" ;
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_13" [label="13:  Destruction(Scope) \n   _=*&x4:break_scope::X [line 87, column 5]\n  n$15=_fun_break_scope::X::~X(&x4:break_scope::X*) injected [line 87, column 5]\n  EXIT_SCOPE(_,n$15,x4); [line 87, column 5]\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(Scope) \n   _=*&x4:break_scope::X [line 87, column 5]\n  n$18=_fun_break_scope::X::~X(&x4:break_scope::X*) injected [line 87, column 5]\n  EXIT_SCOPE(_,n$18,x4); [line 87, column 5]\n  APPLY_ABSTRACTION; [line 87, column 5]\n " shape="box"]
+	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_13" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_8" ;
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x4:break_scope::X); [line 86, column 7]\n  n$17=_fun_break_scope::X::X(&x4:break_scope::X*) [line 86, column 9]\n  EXIT_SCOPE(n$17); [line 86, column 9]\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   VARIABLE_DECLARED(x4:break_scope::X); [line 86, column 7]\n  n$20=_fun_break_scope::X::X(&x4:break_scope::X*) [line 86, column 9]\n  EXIT_SCOPE(n$20); [line 86, column 9]\n " shape="box"]
+	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_14" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_13" ;
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_15" [label="15:  DeclStmt \n   VARIABLE_DECLARED(x2:break_scope::X); [line 81, column 5]\n  n$19=_fun_break_scope::X::X(&x2:break_scope::X*) [line 81, column 7]\n  EXIT_SCOPE(n$19); [line 81, column 7]\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   VARIABLE_DECLARED(x2:break_scope::X); [line 81, column 5]\n  n$22=_fun_break_scope::X::X(&x2:break_scope::X*) [line 81, column 7]\n  EXIT_SCOPE(n$22); [line 81, column 7]\n " shape="box"]
+	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_15" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_9" ;
+	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_15" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_10" ;
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_16" [label="16:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 79, column 3]\n  n$21=_fun_break_scope::X::X(&x1:break_scope::X*) [line 79, column 5]\n  EXIT_SCOPE(n$21); [line 79, column 5]\n  APPLY_ABSTRACTION; [line 79, column 5]\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   VARIABLE_DECLARED(x1:break_scope::X); [line 79, column 3]\n  n$24=_fun_break_scope::X::X(&x1:break_scope::X*) [line 79, column 5]\n  EXIT_SCOPE(n$24); [line 79, column 5]\n  APPLY_ABSTRACTION; [line 79, 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$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  " color=yellow style=filled]
+	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_16" -> "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$9:break_scope::iterator 0$?%__sil_tmp__temp_return_n$16:break_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$19:break_scope::iterator const  x1:break_scope::X vector:break_scope::vec \n  " color=yellow style=filled]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_1" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_17" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_2" [label="2: Exit break_scope::test_for \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$16); [line 64, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_return_n$13); [line 64, column 1]\n  NULLIFY(&x2); [line 64, column 1]\n  NULLIFY(&x1); [line 64, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$6); [line 64, column 1]\n  NULLIFY(&it); [line 64, column 1]\n  NULLIFY(&vector); [line 64, column 1]\n " color=yellow style=filled]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_2" [label="2: Exit break_scope::test_for \n   NULLIFY(&x2); [line 64, column 1]\n  NULLIFY(&x1); [line 64, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_return_n$16); [line 64, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$19); [line 64, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$9); [line 64, column 1]\n  NULLIFY(&it); [line 64, column 1]\n  NULLIFY(&vector); [line 64, column 1]\n " color=yellow style=filled]
 	
 
 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_3" [label="3:  Destruction(Scope) \n   _=*&x2:break_scope::X [line 64, column 1]\n  n$1=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 64, column 1]\n  _=*&vector:break_scope::vec [line 64, column 1]\n  n$3=_fun_break_scope::vec::~vec(&vector:break_scope::vec*) injected [line 64, column 1]\n  EXIT_SCOPE(_,_,n$1,n$3,vector,x2); [line 64, column 1]\n  APPLY_ABSTRACTION; [line 64, column 1]\n " shape="box"]
@@ -84,133 +80,133 @@ digraph cfg {
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_4" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_3" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_5" [label="5: + \n  " ]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_5" [label="5:  Destruction(Scope) \n   _=*&it:break_scope::iterator [line 62, column 3]\n  n$7=_fun_break_scope::iterator::~iterator(&it:break_scope::iterator*) injected [line 62, column 3]\n  EXIT_SCOPE(_,n$7,it); [line 62, column 3]\n " shape="box"]
 	
 
-	 "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   VARIABLE_DECLARED(it:break_scope::iterator); [line 57, column 8]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$6:break_scope::iterator); [line 57, column 22]\n  _=*&vector:break_scope::vec [line 57, column 22]\n  n$9=_fun_break_scope::vec::begin(&vector:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$6:break_scope::iterator*) assign_last [line 57, 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 57, column 22]\n  EXIT_SCOPE(_,n$9,n$10,0$?%__sil_tmpSIL_materialize_temp__n$6); [line 57, column 22]\n  APPLY_ABSTRACTION; [line 57, column 22]\n " shape="box"]
+	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_5" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_4" ;
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_6" [label="6: + \n  " ]
 	
 
-	 "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$14=_fun_break_scope::iterator::operator++(&it:break_scope::iterator&,&0$?%__sil_tmp__temp_return_n$13:break_scope::iterator*) assign_last [line 57, column 58]\n  EXIT_SCOPE(n$14,0$?%__sil_tmp__temp_return_n$13); [line 57, column 58]\n  APPLY_ABSTRACTION; [line 57, column 58]\n " shape="box"]
+	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_6" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_9" ;
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(it:break_scope::iterator); [line 57, column 8]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$9:break_scope::iterator); [line 57, column 22]\n  _=*&vector:break_scope::vec [line 57, column 22]\n  n$12=_fun_break_scope::vec::begin(&vector:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$9:break_scope::iterator*) assign_last [line 57, column 22]\n  n$13=_fun_break_scope::iterator::iterator(&it:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$9:break_scope::iterator&) [line 57, column 22]\n  EXIT_SCOPE(_,n$12,n$13,0$?%__sil_tmpSIL_materialize_temp__n$9); [line 57, column 22]\n  APPLY_ABSTRACTION; [line 57, column 22]\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   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$16:break_scope::iterator const ); [line 57, column 44]\n  _=*&vector:break_scope::vec [line 57, column 44]\n  n$19=_fun_break_scope::vec::end(&vector:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$16:break_scope::iterator*) assign_last [line 57, 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 57, column 38]\n  EXIT_SCOPE(_,n$19,0$?%__sil_tmpSIL_materialize_temp__n$16); [line 57, column 38]\n " shape="box"]
+	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_7" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_6" ;
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_8" [label="8:  Call _fun_break_scope::iterator::operator++ \n   n$17=_fun_break_scope::iterator::operator++(&it:break_scope::iterator&,&0$?%__sil_tmp__temp_return_n$16:break_scope::iterator*) assign_last [line 57, column 58]\n  EXIT_SCOPE(n$17,0$?%__sil_tmp__temp_return_n$16); [line 57, column 58]\n  APPLY_ABSTRACTION; [line 57, column 58]\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$20, true); [line 57, column 38]\n  EXIT_SCOPE(n$20); [line 57, column 38]\n " shape="invhouse"]
+	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_8" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_6" ;
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_9" [label="9:  Call _fun_break_scope::iterator::operator!= \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$19:break_scope::iterator const ); [line 57, column 44]\n  _=*&vector:break_scope::vec [line 57, column 44]\n  n$22=_fun_break_scope::vec::end(&vector:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$19:break_scope::iterator*) assign_last [line 57, column 44]\n  n$23=_fun_break_scope::iterator::operator!=(&it:break_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$19:break_scope::iterator const &) [line 57, column 38]\n  EXIT_SCOPE(_,n$22,0$?%__sil_tmpSIL_materialize_temp__n$19); [line 57, column 38]\n " shape="box"]
 	
 
-	 "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$20, false); [line 57, column 38]\n  EXIT_SCOPE(n$20,it); [line 57, column 38]\n  APPLY_ABSTRACTION; [line 57, column 38]\n " shape="invhouse"]
+	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_9" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_10" ;
+	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_9" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_11" ;
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_10" [label="10: Prune (true branch, for loop) \n   PRUNE(n$23, true); [line 57, column 38]\n  EXIT_SCOPE(n$23); [line 57, column 38]\n " shape="invhouse"]
 	
 
-	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_10" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_4" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_11" [label="11: + \n  " ]
+	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_10" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_13" ;
+	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_10" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_14" ;
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_11" [label="11: Prune (false branch, for loop) \n   PRUNE(!n$23, false); [line 57, column 38]\n  EXIT_SCOPE(n$23); [line 57, column 38]\n  APPLY_ABSTRACTION; [line 57, column 38]\n " shape="invhouse"]
 	
 
-	 "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$22=*&b:_Bool [line 58, column 9]\n  PRUNE(n$22, true); [line 58, column 9]\n  NULLIFY(&b); [line 58, column 9]\n  EXIT_SCOPE(n$22,it,b); [line 58, column 9]\n " shape="invhouse"]
+	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_11" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_5" ;
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_12" [label="12: + \n  " ]
 	
 
-	 "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$22=*&b:_Bool [line 58, column 9]\n  PRUNE(!n$22, false); [line 58, column 9]\n  EXIT_SCOPE(n$22); [line 58, column 9]\n  APPLY_ABSTRACTION; [line 58, column 9]\n " shape="invhouse"]
+	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_12" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_8" ;
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_13" [label="13: Prune (true branch, if) \n   n$24=*&b:_Bool [line 58, column 9]\n  PRUNE(n$24, true); [line 58, column 9]\n  NULLIFY(&b); [line 58, column 9]\n  EXIT_SCOPE(n$24,b); [line 58, 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(Scope) \n   _=*&x1:break_scope::X [line 61, column 5]\n  n$24=_fun_break_scope::X::~X(&x1:break_scope::X*) injected [line 61, column 5]\n  APPLY_ABSTRACTION; [line 61, column 5]\n " shape="box"]
+	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_13" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_16" ;
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_14" [label="14: Prune (false branch, if) \n   n$24=*&b:_Bool [line 58, column 9]\n  PRUNE(!n$24, false); [line 58, column 9]\n  EXIT_SCOPE(n$24); [line 58, column 9]\n " shape="invhouse"]
 	
 
-	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_14" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_11" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_15" [label="15:  Destruction(break) \n   _=*&x1:break_scope::X [line 60, column 7]\n  n$27=_fun_break_scope::X::~X(&x1:break_scope::X*) injected [line 60, column 7]\n  EXIT_SCOPE(_,n$27,x1); [line 60, column 7]\n  APPLY_ABSTRACTION; [line 60, column 7]\n " shape="box"]
+	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_14" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_12" ;
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_15" [label="15:  Destruction(break) \n   _=*&x1:break_scope::X [line 60, column 7]\n  n$26=_fun_break_scope::X::~X(&x1:break_scope::X*) injected [line 60, column 7]\n  EXIT_SCOPE(_,n$26,x1); [line 60, column 7]\n  APPLY_ABSTRACTION; [line 60, 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   VARIABLE_DECLARED(x1:break_scope::X); [line 59, column 7]\n  n$29=_fun_break_scope::X::X(&x1:break_scope::X*) [line 59, column 9]\n  EXIT_SCOPE(n$29); [line 59, column 9]\n " shape="box"]
+	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_15" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_5" ;
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_16" [label="16:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 59, column 7]\n  n$28=_fun_break_scope::X::X(&x1:break_scope::X*) [line 59, column 9]\n  EXIT_SCOPE(n$28); [line 59, 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   VARIABLE_DECLARED(vector:break_scope::vec); [line 56, column 3]\n  n$33=_fun_break_scope::vec::vec(&vector:break_scope::vec*) [line 56, column 7]\n  EXIT_SCOPE(n$33); [line 56, column 7]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_17" [label="17:  DeclStmt \n   VARIABLE_DECLARED(vector:break_scope::vec); [line 56, column 3]\n  n$32=_fun_break_scope::vec::vec(&vector:break_scope::vec*) [line 56, column 7]\n  EXIT_SCOPE(n$32); [line 56, 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:  __end1:break_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$7:break_scope::iterator __begin1: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  __range1:break_scope::vec& x1:break_scope::X vector:break_scope::vec \n  " color=yellow style=filled]
+	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_17" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_7" ;
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_1" [label="1: Start break_scope::test_for_range\nFormals:  b:_Bool\nLocals:  __end1:break_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$10:break_scope::iterator __begin1:break_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$16:break_scope::iterator 0$?%__sil_tmp__temp_return_n$24:break_scope::iterator x2:break_scope::X x:break_scope::X 0$?%__sil_tmpSIL_materialize_temp__n$37:break_scope::X const  __range1:break_scope::vec& x1:break_scope::X vector:break_scope::vec \n  " color=yellow style=filled]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_1" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_20" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_2" [label="2: Exit break_scope::test_for_range \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$7); [line 53, column 1]\n  NULLIFY(&vector); [line 53, column 1]\n  NULLIFY(&__begin1); [line 53, column 1]\n  NULLIFY(&__end1); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_return_n$21); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$13); [line 53, column 1]\n  NULLIFY(&x2); [line 53, column 1]\n  NULLIFY(&x1); [line 53, column 1]\n  NULLIFY(&x); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$37); [line 53, column 1]\n " color=yellow style=filled]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_2" [label="2: Exit break_scope::test_for_range \n   NULLIFY(&vector); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$16); [line 53, column 1]\n  NULLIFY(&__begin1); [line 53, column 1]\n  NULLIFY(&__end1); [line 53, column 1]\n  NULLIFY(&x2); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$10); [line 53, column 1]\n  NULLIFY(&x1); [line 53, column 1]\n  NULLIFY(&x); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$37); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_return_n$24); [line 53, column 1]\n " color=yellow style=filled]
 	
 
 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_3" [label="3:  Destruction(Scope) \n   _=*&x1:break_scope::X [line 53, column 1]\n  n$1=_fun_break_scope::X::~X(&x1:break_scope::X*) injected [line 53, column 1]\n  _=*&vector:break_scope::vec [line 53, column 1]\n  n$3=_fun_break_scope::vec::~vec(&vector:break_scope::vec*) injected [line 53, column 1]\n  EXIT_SCOPE(_,_,n$1,n$3,x1,vector); [line 53, column 1]\n  APPLY_ABSTRACTION; [line 53, column 1]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_3" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_2" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_4" [label="4: + \n  " ]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_4" [label="4:  Destruction(Scope) \n   _=*&__end1:break_scope::iterator [line 52, column 3]\n  n$6=_fun_break_scope::iterator::~iterator(&__end1:break_scope::iterator*) injected [line 52, column 3]\n  _=*&__begin1:break_scope::iterator [line 52, column 3]\n  n$8=_fun_break_scope::iterator::~iterator(&__begin1:break_scope::iterator*) injected [line 52, column 3]\n  EXIT_SCOPE(_,_,n$6,n$8,__end1,__begin1); [line 52, column 3]\n " shape="box"]
 	
 
-	 "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   VARIABLE_DECLARED(__end1:break_scope::iterator); [line 47, column 12]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$7:break_scope::iterator); [line 47, column 12]\n  n$8=*&__range1:break_scope::vec& [line 47, column 12]\n  _=*n$8:break_scope::vec [line 47, 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*) assign_last [line 47, column 12]\n  n$12=_fun_break_scope::iterator::iterator(&__end1:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$7:break_scope::iterator&) [line 47, column 12]\n  NULLIFY(&__range1); [line 47, column 12]\n  EXIT_SCOPE(_,n$8,n$11,n$12,__range1,0$?%__sil_tmpSIL_materialize_temp__n$7); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, column 12]\n " shape="box"]
+	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_4" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_3" ;
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_5" [label="5: + \n  " ]
 	
 
-	 "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   VARIABLE_DECLARED(__begin1:break_scope::iterator); [line 47, column 12]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$13:break_scope::iterator); [line 47, column 12]\n  n$14=*&__range1:break_scope::vec& [line 47, column 12]\n  _=*n$14:break_scope::vec [line 47, 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*) assign_last [line 47, column 12]\n  n$18=_fun_break_scope::iterator::iterator(&__begin1:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$13:break_scope::iterator&) [line 47, column 12]\n  EXIT_SCOPE(_,n$14,n$17,n$18,0$?%__sil_tmpSIL_materialize_temp__n$13); [line 47, column 12]\n " shape="box"]
+	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_5" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_9" ;
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(__end1:break_scope::iterator); [line 47, column 12]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$10:break_scope::iterator); [line 47, column 12]\n  n$11=*&__range1:break_scope::vec& [line 47, column 12]\n  _=*n$11:break_scope::vec [line 47, column 12]\n  n$14=_fun_break_scope::vec::end(n$11:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$10:break_scope::iterator*) assign_last [line 47, column 12]\n  n$15=_fun_break_scope::iterator::iterator(&__end1:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$10:break_scope::iterator&) [line 47, column 12]\n  NULLIFY(&__range1); [line 47, column 12]\n  EXIT_SCOPE(_,n$11,n$14,n$15,__range1,0$?%__sil_tmpSIL_materialize_temp__n$10); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, 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$22=_fun_break_scope::iterator::operator++(&__begin1:break_scope::iterator&,&0$?%__sil_tmp__temp_return_n$21:break_scope::iterator*) assign_last [line 47, column 12]\n  EXIT_SCOPE(n$22,0$?%__sil_tmp__temp_return_n$21); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, column 12]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(__begin1:break_scope::iterator); [line 47, column 12]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$16:break_scope::iterator); [line 47, column 12]\n  n$17=*&__range1:break_scope::vec& [line 47, column 12]\n  _=*n$17:break_scope::vec [line 47, column 12]\n  n$20=_fun_break_scope::vec::begin(n$17:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$16:break_scope::iterator*) assign_last [line 47, column 12]\n  n$21=_fun_break_scope::iterator::iterator(&__begin1:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$16:break_scope::iterator&) [line 47, column 12]\n  EXIT_SCOPE(_,n$17,n$20,n$21,0$?%__sil_tmpSIL_materialize_temp__n$16); [line 47, 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$24=_fun_break_scope::iterator::operator!=(&__begin1:break_scope::iterator&,&__end1:break_scope::iterator&) [line 47, column 12]\n " shape="box"]
+	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_7" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_6" ;
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_8" [label="8:  Call _fun_break_scope::iterator::operator++ \n   n$25=_fun_break_scope::iterator::operator++(&__begin1:break_scope::iterator&,&0$?%__sil_tmp__temp_return_n$24:break_scope::iterator*) assign_last [line 47, column 12]\n  EXIT_SCOPE(n$25,0$?%__sil_tmp__temp_return_n$24); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, 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$24, true); [line 47, column 12]\n  EXIT_SCOPE(n$24); [line 47, column 12]\n " shape="invhouse"]
+	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_8" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_5" ;
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_9" [label="9:  Call _fun_break_scope::iterator::operator!= \n   n$27=_fun_break_scope::iterator::operator!=(&__begin1:break_scope::iterator&,&__end1:break_scope::iterator&) [line 47, column 12]\n " shape="box"]
 	
 
-	 "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$24, false); [line 47, column 12]\n  EXIT_SCOPE(n$24,__end1,__begin1); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, column 12]\n " shape="invhouse"]
+	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_9" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_10" ;
+	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_9" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_11" ;
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_10" [label="10: Prune (true branch, for loop) \n   PRUNE(n$27, true); [line 47, column 12]\n  EXIT_SCOPE(n$27); [line 47, column 12]\n " shape="invhouse"]
 	
 
-	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_10" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_3" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_11" [label="11: + \n  " ]
+	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_10" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_17" ;
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_11" [label="11: Prune (false branch, for loop) \n   PRUNE(!n$27, false); [line 47, column 12]\n  EXIT_SCOPE(n$27); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, column 12]\n " shape="invhouse"]
 	
 
-	 "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$27=*&b:_Bool [line 48, column 9]\n  PRUNE(n$27, true); [line 48, column 9]\n  NULLIFY(&b); [line 48, column 9]\n  EXIT_SCOPE(n$27,b,__end1,__begin1); [line 48, column 9]\n " shape="invhouse"]
+	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_11" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_4" ;
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_12" [label="12: + \n  " ]
 	
 
-	 "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$27=*&b:_Bool [line 48, column 9]\n  PRUNE(!n$27, false); [line 48, column 9]\n  EXIT_SCOPE(n$27,x); [line 48, column 9]\n  APPLY_ABSTRACTION; [line 48, column 9]\n " shape="invhouse"]
+	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_12" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_8" ;
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_13" [label="13: Prune (true branch, if) \n   n$28=*&b:_Bool [line 48, column 9]\n  PRUNE(n$28, true); [line 48, column 9]\n  NULLIFY(&b); [line 48, column 9]\n  EXIT_SCOPE(n$28,b); [line 48, 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(Scope) \n   _=*&x2:break_scope::X [line 51, column 5]\n  n$29=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 51, column 5]\n  APPLY_ABSTRACTION; [line 51, column 5]\n " shape="box"]
+	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_13" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_16" ;
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_14" [label="14: Prune (false branch, if) \n   n$28=*&b:_Bool [line 48, column 9]\n  PRUNE(!n$28, false); [line 48, column 9]\n  EXIT_SCOPE(n$28,x); [line 48, column 9]\n " shape="invhouse"]
 	
 
-	 "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(break) \n   _=*&x2:break_scope::X [line 50, column 7]\n  n$32=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 50, column 7]\n  EXIT_SCOPE(_,n$32,x2); [line 50, column 7]\n  APPLY_ABSTRACTION; [line 50, column 7]\n " shape="box"]
+	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_14" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_12" ;
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_15" [label="15:  Destruction(break) \n   _=*&x2:break_scope::X [line 50, column 7]\n  n$30=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 50, column 7]\n  _=*&x:break_scope::X [line 50, column 7]\n  n$32=_fun_break_scope::X::~X(&x:break_scope::X*) injected [line 50, column 7]\n  EXIT_SCOPE(_,_,n$30,n$32,x,x2); [line 50, column 7]\n  APPLY_ABSTRACTION; [line 50, 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   VARIABLE_DECLARED(x2:break_scope::X); [line 49, column 7]\n  n$34=_fun_break_scope::X::X(&x2:break_scope::X*,&x:break_scope::X&) [line 49, column 14]\n  EXIT_SCOPE(n$34,x); [line 49, column 14]\n " shape="box"]
+	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_15" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_4" ;
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_16" [label="16:  DeclStmt \n   VARIABLE_DECLARED(x2:break_scope::X); [line 49, column 7]\n  n$34=_fun_break_scope::X::X(&x2:break_scope::X*,&x:break_scope::X&) [line 49, column 14]\n  EXIT_SCOPE(n$34); [line 49, 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   VARIABLE_DECLARED(x:break_scope::X); [line 47, column 8]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$37:break_scope::X const ); [line 47, column 12]\n  n$40=_fun_break_scope::iterator::operator*(&__begin1:break_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$37:break_scope::X*) assign_last [line 47, 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 47, column 12]\n  EXIT_SCOPE(n$40,n$41,0$?%__sil_tmpSIL_materialize_temp__n$37); [line 47, column 12]\n " shape="box"]
 	
 
-	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_17" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_12" ;
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_17" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_13" ;
+	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_17" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_14" ;
 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_18" [label="18:  DeclStmt \n   VARIABLE_DECLARED(__range1:break_scope::vec&); [line 47, column 14]\n  *&__range1:break_scope::vec&=&vector [line 47, column 14]\n " shape="box"]
 	
 
-	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_18" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_6" ;
+	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_18" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_7" ;
 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_19" [label="19:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 46, column 3]\n  n$43=_fun_break_scope::X::X(&x1:break_scope::X*) [line 46, column 5]\n  EXIT_SCOPE(n$43); [line 46, column 5]\n " shape="box"]
 	
 
@@ -222,7 +218,7 @@ digraph cfg {
 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_1" [label="1: Start break_scope::test_switch\nFormals:  n:int\nLocals:  x5:break_scope::X x4:break_scope::X x3:break_scope::X x2:break_scope::X x1:break_scope::X \n  " color=yellow style=filled]
 	
 
-	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_1" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_19" ;
+	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_1" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_18" ;
 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_2" [label="2: Exit break_scope::test_switch \n   NULLIFY(&x4); [line 128, column 1]\n  NULLIFY(&x5); [line 128, column 1]\n  NULLIFY(&x1); [line 128, column 1]\n  NULLIFY(&x3); [line 128, column 1]\n  NULLIFY(&x2); [line 128, column 1]\n " color=yellow style=filled]
 	
 
@@ -237,70 +233,66 @@ digraph cfg {
 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_5" [label="5:  SwitchStmt \n   n$6=*&n:int [line 115, column 11]\n  NULLIFY(&n); [line 115, column 11]\n  EXIT_SCOPE(n); [line 115, column 11]\n " shape="box"]
 	
 
+	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_5" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_16" ;
 	 "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(Scope) \n   _=*&x4:break_scope::X [line 125, column 5]\n  n$9=_fun_break_scope::X::~X(&x4:break_scope::X*) injected [line 125, column 5]\n  EXIT_SCOPE(_,n$9,x4); [line 125, column 5]\n  APPLY_ABSTRACTION; [line 125, column 5]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_6" [label="6:  Destruction(Scope) \n   _=*&x4:break_scope::X [line 125, column 5]\n  n$8=_fun_break_scope::X::~X(&x4:break_scope::X*) injected [line 125, column 5]\n  EXIT_SCOPE(_,n$8,x4); [line 125, column 5]\n  APPLY_ABSTRACTION; [line 125, 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   VARIABLE_DECLARED(x4:break_scope::X); [line 124, column 7]\n  n$11=_fun_break_scope::X::X(&x4:break_scope::X*) [line 124, column 9]\n  EXIT_SCOPE(n$11); [line 124, column 9]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(x4:break_scope::X); [line 124, column 7]\n  n$10=_fun_break_scope::X::X(&x4:break_scope::X*) [line 124, column 9]\n  EXIT_SCOPE(n$10); [line 124, 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:  Destruction(Scope) \n   _=*&x3:break_scope::X [line 122, column 5]\n  n$13=_fun_break_scope::X::~X(&x3:break_scope::X*) injected [line 122, column 5]\n  APPLY_ABSTRACTION; [line 122, column 5]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_8" [label="8:  Destruction(break) \n   _=*&x3:break_scope::X [line 121, column 7]\n  n$12=_fun_break_scope::X::~X(&x3:break_scope::X*) injected [line 121, column 7]\n  EXIT_SCOPE(_,n$12,x3); [line 121, column 7]\n  APPLY_ABSTRACTION; [line 121, column 7]\n " shape="box"]
 	
 
-	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_8" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_7" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_9" [label="9:  Destruction(break) \n   _=*&x3:break_scope::X [line 121, column 7]\n  n$16=_fun_break_scope::X::~X(&x3:break_scope::X*) injected [line 121, column 7]\n  EXIT_SCOPE(_,n$16,x3); [line 121, column 7]\n  APPLY_ABSTRACTION; [line 121, column 7]\n " shape="box"]
+	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_8" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_4" ;
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(x3:break_scope::X); [line 120, column 7]\n  n$14=_fun_break_scope::X::X(&x3:break_scope::X*) [line 120, column 9]\n  EXIT_SCOPE(n$14); [line 120, column 9]\n " shape="box"]
 	
 
-	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_9" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_4" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(x3:break_scope::X); [line 120, column 7]\n  n$18=_fun_break_scope::X::X(&x3:break_scope::X*) [line 120, column 9]\n  EXIT_SCOPE(n$18); [line 120, column 9]\n " shape="box"]
+	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_9" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_8" ;
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_10" [label="10:  Destruction(Scope) \n   _=*&x2:break_scope::X [line 118, column 5]\n  n$16=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 118, column 5]\n  EXIT_SCOPE(_,n$16,x2); [line 118, column 5]\n  APPLY_ABSTRACTION; [line 118, column 5]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_10" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_9" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_11" [label="11:  Destruction(Scope) \n   _=*&x2:break_scope::X [line 118, column 5]\n  n$20=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 118, column 5]\n  EXIT_SCOPE(_,n$20,x2); [line 118, column 5]\n  APPLY_ABSTRACTION; [line 118, column 5]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(x2:break_scope::X); [line 117, column 7]\n  n$18=_fun_break_scope::X::X(&x2:break_scope::X*) [line 117, column 9]\n  EXIT_SCOPE(n$18); [line 117, column 9]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_11" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_10" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x2:break_scope::X); [line 117, column 7]\n  n$22=_fun_break_scope::X::X(&x2:break_scope::X*) [line 117, column 9]\n  EXIT_SCOPE(n$22); [line 117, 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$6 == 3), true); [line 123, column 5]\n  EXIT_SCOPE(n$6); [line 123, column 5]\n  APPLY_ABSTRACTION; [line 123, column 5]\n " shape="invhouse"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$6 == 3), true); [line 123, column 5]\n  EXIT_SCOPE(n$6); [line 123, column 5]\n " shape="invhouse"]
 	
 
-	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_13" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_7" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_14" [label="14: Prune (false branch, switch) \n   PRUNE(!(n$6 == 3), false); [line 123, column 5]\n  EXIT_SCOPE(n$6); [line 123, column 5]\n  APPLY_ABSTRACTION; [line 123, column 5]\n " shape="invhouse"]
+	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_12" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_7" ;
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_13" [label="13: Prune (false branch, switch) \n   PRUNE(!(n$6 == 3), false); [line 123, column 5]\n  EXIT_SCOPE(n$6); [line 123, column 5]\n  APPLY_ABSTRACTION; [line 123, column 5]\n " shape="invhouse"]
 	
 
-	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_14" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_4" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_15" [label="15: Prune (true branch, switch) \n   PRUNE((n$6 == 2), true); [line 119, column 5]\n  EXIT_SCOPE(n$6); [line 119, column 5]\n  APPLY_ABSTRACTION; [line 119, column 5]\n " shape="invhouse"]
+	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_13" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_4" ;
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_14" [label="14: Prune (true branch, switch) \n   PRUNE((n$6 == 2), true); [line 119, column 5]\n  EXIT_SCOPE(n$6); [line 119, column 5]\n  APPLY_ABSTRACTION; [line 119, column 5]\n " shape="invhouse"]
 	
 
-	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_15" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_10" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_16" [label="16: Prune (false branch, switch) \n   PRUNE(!(n$6 == 2), false); [line 119, column 5]\n " shape="invhouse"]
+	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_14" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_9" ;
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_15" [label="15: Prune (false branch, switch) \n   PRUNE(!(n$6 == 2), false); [line 119, column 5]\n " shape="invhouse"]
 	
 
-	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_16" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_13" ;
-	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_16" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_14" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_17" [label="17: Prune (true branch, switch) \n   PRUNE((n$6 == 1), true); [line 116, column 5]\n  EXIT_SCOPE(n$6); [line 116, column 5]\n " shape="invhouse"]
+	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_15" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_12" ;
+	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_15" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_13" ;
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_16" [label="16: Prune (true branch, switch) \n   PRUNE((n$6 == 1), true); [line 116, column 5]\n  EXIT_SCOPE(n$6); [line 116, column 5]\n " shape="invhouse"]
 	
 
-	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_17" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_12" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_18" [label="18: Prune (false branch, switch) \n   PRUNE(!(n$6 == 1), false); [line 116, column 5]\n " shape="invhouse"]
+	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_16" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_11" ;
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_17" [label="17: Prune (false branch, switch) \n   PRUNE(!(n$6 == 1), false); [line 116, column 5]\n " shape="invhouse"]
 	
 
-	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_18" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_15" ;
-	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_18" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_16" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_19" [label="19:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 114, column 3]\n  n$24=_fun_break_scope::X::X(&x1:break_scope::X*) [line 114, column 5]\n  EXIT_SCOPE(n$24); [line 114, column 5]\n " shape="box"]
+	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_17" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_14" ;
+	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_17" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_15" ;
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_18" [label="18:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 114, column 3]\n  n$20=_fun_break_scope::X::X(&x1:break_scope::X*) [line 114, column 5]\n  EXIT_SCOPE(n$20); [line 114, column 5]\n " shape="box"]
 	
 
-	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_19" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_5" ;
+	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_18" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_5" ;
 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_1" [label="1: Start break_scope::test_while1\nFormals:  a:_Bool b:_Bool\nLocals:  x2:break_scope::X x4:break_scope::X x1:break_scope::X \n  " color=yellow style=filled]
 	
 
-	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_1" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_15" ;
+	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_1" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_14" ;
 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_2" [label="2: Exit break_scope::test_while1 \n   NULLIFY(&x2); [line 76, column 1]\n  NULLIFY(&x1); [line 76, column 1]\n  NULLIFY(&x4); [line 76, column 1]\n " color=yellow style=filled]
 	
 
@@ -326,42 +318,38 @@ 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$5=*&b:_Bool [line 69, column 9]\n  PRUNE(n$5, true); [line 69, column 9]\n  NULLIFY(&b); [line 69, column 9]\n  EXIT_SCOPE(n$5,b); [line 69, column 9]\n " shape="invhouse"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_8" [label="8: Prune (true branch, if) \n   n$4=*&b:_Bool [line 69, column 9]\n  PRUNE(n$4, true); [line 69, column 9]\n  NULLIFY(&b); [line 69, column 9]\n  EXIT_SCOPE(n$4,b); [line 69, 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$5=*&b:_Bool [line 69, column 9]\n  PRUNE(!n$5, false); [line 69, column 9]\n  EXIT_SCOPE(n$5); [line 69, column 9]\n " shape="invhouse"]
+	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_8" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_11" ;
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_9" [label="9: Prune (false branch, if) \n   n$4=*&b:_Bool [line 69, column 9]\n  PRUNE(!n$4, false); [line 69, column 9]\n  EXIT_SCOPE(n$4); [line 69, 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(Scope) \n   _=*&x2:break_scope::X [line 72, column 5]\n  n$7=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 72, column 5]\n  APPLY_ABSTRACTION; [line 72, column 5]\n " shape="box"]
+	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_9" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_13" ;
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_10" [label="10:  Destruction(break) \n   _=*&x2:break_scope::X [line 71, column 7]\n  n$6=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 71, column 7]\n  EXIT_SCOPE(_,n$6,x2); [line 71, column 7]\n  APPLY_ABSTRACTION; [line 71, column 7]\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(break) \n   _=*&x2:break_scope::X [line 71, column 7]\n  n$10=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 71, column 7]\n  EXIT_SCOPE(_,n$10,x2); [line 71, column 7]\n  APPLY_ABSTRACTION; [line 71, column 7]\n " shape="box"]
+	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_10" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_3" ;
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(x2:break_scope::X); [line 70, column 7]\n  n$8=_fun_break_scope::X::X(&x2:break_scope::X*) [line 70, column 9]\n  EXIT_SCOPE(n$8); [line 70, column 9]\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   VARIABLE_DECLARED(x2:break_scope::X); [line 70, column 7]\n  n$12=_fun_break_scope::X::X(&x2:break_scope::X*) [line 70, column 9]\n  EXIT_SCOPE(n$12); [line 70, column 9]\n " shape="box"]
+	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_11" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_10" ;
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_12" [label="12:  Destruction(Scope) \n   _=*&x4:break_scope::X [line 74, column 5]\n  n$10=_fun_break_scope::X::~X(&x4:break_scope::X*) injected [line 74, column 5]\n  EXIT_SCOPE(_,n$10,x4); [line 74, column 5]\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(Scope) \n   _=*&x4:break_scope::X [line 74, column 5]\n  n$14=_fun_break_scope::X::~X(&x4:break_scope::X*) injected [line 74, column 5]\n  EXIT_SCOPE(_,n$14,x4); [line 74, column 5]\n  APPLY_ABSTRACTION; [line 74, column 5]\n " shape="box"]
+	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_12" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_7" ;
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x4:break_scope::X); [line 73, column 7]\n  n$12=_fun_break_scope::X::X(&x4:break_scope::X*) [line 73, column 9]\n  EXIT_SCOPE(n$12); [line 73, column 9]\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   VARIABLE_DECLARED(x4:break_scope::X); [line 73, column 7]\n  n$16=_fun_break_scope::X::X(&x4:break_scope::X*) [line 73, column 9]\n  EXIT_SCOPE(n$16); [line 73, column 9]\n " shape="box"]
+	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_13" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_12" ;
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 67, column 3]\n  n$15=_fun_break_scope::X::X(&x1:break_scope::X*) [line 67, column 5]\n  EXIT_SCOPE(n$15); [line 67, column 5]\n  APPLY_ABSTRACTION; [line 67, column 5]\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   VARIABLE_DECLARED(x1:break_scope::X); [line 67, column 3]\n  n$19=_fun_break_scope::X::X(&x1:break_scope::X*) [line 67, column 5]\n  EXIT_SCOPE(n$19); [line 67, column 5]\n  APPLY_ABSTRACTION; [line 67, column 5]\n " shape="box"]
-	
-
-	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_15" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_4" ;
+	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_14" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_4" ;
 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_1" [label="1: Start break_scope::test_while2\nFormals:  a:_Bool b:_Bool\nLocals:  x3:break_scope::X x2:break_scope::X x1:break_scope::X \n  " color=yellow style=filled]
 	
 
-	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_1" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_15" ;
+	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_1" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_14" ;
 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_2" [label="2: Exit break_scope::test_while2 \n   NULLIFY(&x2); [line 100, column 1]\n  NULLIFY(&x1); [line 100, column 1]\n  NULLIFY(&x3); [line 100, column 1]\n " color=yellow style=filled]
 	
 
@@ -377,7 +365,7 @@ digraph cfg {
 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_5" [label="5: Prune (true branch, while) \n   n$3=*&a:_Bool [line 93, column 10]\n  PRUNE(n$3, true); [line 93, column 10]\n  EXIT_SCOPE(n$3); [line 93, 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_5" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_13" ;
 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_6" [label="6: Prune (false branch, while) \n   n$3=*&a:_Bool [line 93, column 10]\n  PRUNE(!n$3, false); [line 93, column 10]\n  NULLIFY(&a); [line 93, column 10]\n  EXIT_SCOPE(n$3,a); [line 93, column 10]\n " shape="invhouse"]
 	
 
@@ -394,31 +382,27 @@ digraph cfg {
 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_9" [label="9: Prune (true branch, while) \n   n$7=*&b:_Bool [line 95, column 12]\n  PRUNE(n$7, true); [line 95, column 12]\n  EXIT_SCOPE(n$7); [line 95, 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_9" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_12" ;
 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_10" [label="10: Prune (false branch, while) \n   n$7=*&b:_Bool [line 95, column 12]\n  PRUNE(!n$7, false); [line 95, column 12]\n  EXIT_SCOPE(n$7); [line 95, column 12]\n  APPLY_ABSTRACTION; [line 95, 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(Scope) \n   _=*&x3:break_scope::X [line 98, column 5]\n  n$9=_fun_break_scope::X::~X(&x3:break_scope::X*) injected [line 98, column 5]\n  APPLY_ABSTRACTION; [line 98, 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(break) \n   _=*&x3:break_scope::X [line 97, column 7]\n  n$12=_fun_break_scope::X::~X(&x3:break_scope::X*) injected [line 97, column 7]\n  EXIT_SCOPE(_,n$12,x3); [line 97, column 7]\n  APPLY_ABSTRACTION; [line 97, column 7]\n " shape="box"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_11" [label="11:  Destruction(break) \n   _=*&x3:break_scope::X [line 97, column 7]\n  n$9=_fun_break_scope::X::~X(&x3:break_scope::X*) injected [line 97, column 7]\n  EXIT_SCOPE(_,n$9,x3); [line 97, column 7]\n  APPLY_ABSTRACTION; [line 97, 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   VARIABLE_DECLARED(x3:break_scope::X); [line 96, column 7]\n  n$14=_fun_break_scope::X::X(&x3:break_scope::X*) [line 96, column 9]\n  EXIT_SCOPE(n$14); [line 96, column 9]\n " shape="box"]
+	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_11" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_7" ;
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x3:break_scope::X); [line 96, column 7]\n  n$11=_fun_break_scope::X::X(&x3:break_scope::X*) [line 96, column 9]\n  EXIT_SCOPE(n$11); [line 96, 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   VARIABLE_DECLARED(x2:break_scope::X); [line 94, column 5]\n  n$16=_fun_break_scope::X::X(&x2:break_scope::X*) [line 94, column 7]\n  EXIT_SCOPE(n$16); [line 94, column 7]\n  APPLY_ABSTRACTION; [line 94, column 7]\n " shape="box"]
+	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_12" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_11" ;
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x2:break_scope::X); [line 94, column 5]\n  n$13=_fun_break_scope::X::X(&x2:break_scope::X*) [line 94, column 7]\n  EXIT_SCOPE(n$13); [line 94, 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   VARIABLE_DECLARED(x1:break_scope::X); [line 92, column 3]\n  n$18=_fun_break_scope::X::X(&x1:break_scope::X*) [line 92, column 5]\n  EXIT_SCOPE(n$18); [line 92, column 5]\n  APPLY_ABSTRACTION; [line 92, column 5]\n " shape="box"]
+	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_13" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_8" ;
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 92, column 3]\n  n$15=_fun_break_scope::X::X(&x1:break_scope::X*) [line 92, column 5]\n  EXIT_SCOPE(n$15); [line 92, column 5]\n  APPLY_ABSTRACTION; [line 92, column 5]\n " shape="box"]
 	
 
-	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_15" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_4" ;
+	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_14" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_4" ;
 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_1" [label="1: Start break_scope::test_while3\nFormals:  a:_Bool b:_Bool\nLocals:  x3:break_scope::X x2:break_scope::X x1:break_scope::X \n  " color=yellow style=filled]
 	
 
@@ -464,11 +448,11 @@ digraph cfg {
 	
 
 	 "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   VARIABLE_DECLARED(x2:break_scope::X); [line 105, column 5]\n  n$15=_fun_break_scope::X::X(&x2:break_scope::X*) [line 105, column 7]\n  EXIT_SCOPE(n$15); [line 105, column 7]\n " shape="box"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x2:break_scope::X); [line 105, column 5]\n  n$13=_fun_break_scope::X::X(&x2:break_scope::X*) [line 105, column 7]\n  EXIT_SCOPE(n$13); [line 105, 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   VARIABLE_DECLARED(x1:break_scope::X); [line 103, column 3]\n  n$17=_fun_break_scope::X::X(&x1:break_scope::X*) [line 103, column 5]\n  EXIT_SCOPE(n$17); [line 103, column 5]\n  APPLY_ABSTRACTION; [line 103, column 5]\n " shape="box"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 103, column 3]\n  n$15=_fun_break_scope::X::X(&x1:break_scope::X*) [line 103, column 5]\n  EXIT_SCOPE(n$15); [line 103, column 5]\n  APPLY_ABSTRACTION; [line 103, column 5]\n " shape="box"]
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_13" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_5" ;
@@ -551,7 +535,7 @@ digraph cfg {
 	
 
 	 "operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_3" -> "operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_2" ;
-"operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_4" [label="4:  UnaryOperator \n   n$4=*&this:break_scope::iterator* [line 23, column 5]\n  n$5=*n$4.position:int [line 23, column 5]\n  *n$4.position:int=(n$5 + 1) [line 23, column 5]\n  EXIT_SCOPE(n$4,n$5); [line 23, column 5]\n " shape="box"]
+"operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_4" [label="4:  UnaryOperator \n   n$3=*&this:break_scope::iterator* [line 23, column 5]\n  n$4=*n$3.position:int [line 23, column 5]\n  *n$3.position:int=(n$4 + 1) [line 23, column 5]\n  EXIT_SCOPE(n$3,n$4); [line 23, column 5]\n " shape="box"]
 	
 
 	 "operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_4" -> "operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_3" ;
@@ -573,11 +557,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$2=*&this:break_scope::iterator* [line 16, column 8]\n  n$3=*&__param_0:break_scope::iterator const & [line 16, column 8]\n  n$4=*n$3.vector:break_scope::vec const * [line 16, column 8]\n  *n$2.vector:break_scope::vec const *=n$4 [line 16, column 8]\n  NULLIFY(&this); [line 16, column 8]\n  NULLIFY(&__param_0); [line 16, column 8]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 16, column 8]\n  APPLY_ABSTRACTION; [line 16, column 8]\n " shape="box"]
+"iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::iterator* [line 16, column 8]\n  n$2=*&__param_0:break_scope::iterator const & [line 16, column 8]\n  n$3=*n$2.vector:break_scope::vec const * [line 16, column 8]\n  *n$1.vector:break_scope::vec const *=n$3 [line 16, column 8]\n  NULLIFY(&this); [line 16, column 8]\n  NULLIFY(&__param_0); [line 16, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 16, column 8]\n  APPLY_ABSTRACTION; [line 16, 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$5=*&this:break_scope::iterator* [line 16, column 8]\n  n$6=*&__param_0:break_scope::iterator const & [line 16, column 8]\n  n$7=*n$6.position:int [line 16, column 8]\n  *n$5.position:int=n$7 [line 16, column 8]\n  EXIT_SCOPE(n$5,n$6,n$7); [line 16, column 8]\n " shape="box"]
+"iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_4" [label="4:  Constructor Init \n   n$4=*&this:break_scope::iterator* [line 16, column 8]\n  n$5=*&__param_0:break_scope::iterator const & [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n  EXIT_SCOPE(n$4,n$5,n$6); [line 16, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_4" -> "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_3" ;
@@ -588,11 +572,11 @@ digraph cfg {
 "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_2" [label="2: Exit break_scope::iterator::iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_3" [label="3:  Constructor Init \n   n$2=*&this:break_scope::iterator* [line 20, column 52]\n  n$3=*&v:break_scope::vec const * [line 20, column 59]\n  *n$2.vector:break_scope::vec const *=n$3 [line 20, column 52]\n  NULLIFY(&v); [line 20, column 52]\n  NULLIFY(&this); [line 20, column 52]\n  EXIT_SCOPE(n$2,n$3,v,this); [line 20, column 52]\n  APPLY_ABSTRACTION; [line 20, column 52]\n " shape="box"]
+"iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::iterator* [line 20, column 52]\n  n$2=*&v:break_scope::vec const * [line 20, column 59]\n  *n$1.vector:break_scope::vec const *=n$2 [line 20, column 52]\n  NULLIFY(&v); [line 20, column 52]\n  NULLIFY(&this); [line 20, column 52]\n  EXIT_SCOPE(n$1,n$2,v,this); [line 20, column 52]\n  APPLY_ABSTRACTION; [line 20, column 52]\n " shape="box"]
 	
 
 	 "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_3" -> "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_2" ;
-"iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_4" [label="4:  Constructor Init \n   n$4=*&this:break_scope::iterator* [line 20, column 37]\n  n$5=*&pos:int [line 20, column 46]\n  *n$4.position:int=n$5 [line 20, column 37]\n  NULLIFY(&pos); [line 20, column 37]\n  EXIT_SCOPE(n$4,n$5,pos); [line 20, column 37]\n " shape="box"]
+"iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_4" [label="4:  Constructor Init \n   n$3=*&this:break_scope::iterator* [line 20, column 37]\n  n$4=*&pos:int [line 20, column 46]\n  *n$3.position:int=n$4 [line 20, column 37]\n  NULLIFY(&pos); [line 20, column 37]\n  EXIT_SCOPE(n$3,n$4,pos); [line 20, column 37]\n " shape="box"]
 	
 
 	 "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_4" -> "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_3" ;
@@ -603,11 +587,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$2=*&this:break_scope::iterator* [line 16, column 8]\n  n$3=*&__param_0:break_scope::iterator& [line 16, column 8]\n  n$4=*n$3.vector:break_scope::vec const * [line 16, column 8]\n  *n$2.vector:break_scope::vec const *=n$4 [line 16, column 8]\n  NULLIFY(&this); [line 16, column 8]\n  NULLIFY(&__param_0); [line 16, column 8]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 16, column 8]\n  APPLY_ABSTRACTION; [line 16, column 8]\n " shape="box"]
+"iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::iterator* [line 16, column 8]\n  n$2=*&__param_0:break_scope::iterator& [line 16, column 8]\n  n$3=*n$2.vector:break_scope::vec const * [line 16, column 8]\n  *n$1.vector:break_scope::vec const *=n$3 [line 16, column 8]\n  NULLIFY(&this); [line 16, column 8]\n  NULLIFY(&__param_0); [line 16, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 16, column 8]\n  APPLY_ABSTRACTION; [line 16, 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$5=*&this:break_scope::iterator* [line 16, column 8]\n  n$6=*&__param_0:break_scope::iterator& [line 16, column 8]\n  n$7=*n$6.position:int [line 16, column 8]\n  *n$5.position:int=n$7 [line 16, column 8]\n  EXIT_SCOPE(n$5,n$6,n$7); [line 16, column 8]\n " shape="box"]
+"iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_4" [label="4:  Constructor Init \n   n$4=*&this:break_scope::iterator* [line 16, column 8]\n  n$5=*&__param_0:break_scope::iterator& [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n  EXIT_SCOPE(n$4,n$5,n$6); [line 16, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_4" -> "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_3" ;
@@ -651,7 +635,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$2=*&this:break_scope::vec* [line 33, column 3]\n  n$3=_fun_break_scope::X::X(n$2._data:break_scope::X[10*1](*)) [line 33, column 3]\n  NULLIFY(&this); [line 33, column 3]\n  EXIT_SCOPE(n$2,n$3,this); [line 33, column 3]\n  APPLY_ABSTRACTION; [line 33, column 3]\n " shape="box"]
+"vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::vec* [line 33, column 3]\n  n$2=_fun_break_scope::X::X(n$1._data:break_scope::X[10*1](*)) [line 33, column 3]\n  NULLIFY(&this); [line 33, column 3]\n  EXIT_SCOPE(n$1,n$2,this); [line 33, column 3]\n  APPLY_ABSTRACTION; [line 33, column 3]\n " shape="box"]
 	
 
 	 "vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_3" -> "vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/destructors/call_destructor.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/destructors/call_destructor.cpp.dot
index f20be9a01..d561f39ad 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/destructors/call_destructor.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/destructors/call_destructor.cpp.dot
@@ -7,7 +7,7 @@ digraph cfg {
 "f(class Person)#3072121847520995784.d15d531febb371128c8a5206341d5cb9_2" [label="2: Exit f \n  " color=yellow style=filled]
 	
 
-"f(class Person)#3072121847520995784.d15d531febb371128c8a5206341d5cb9_3" [label="3:  Call _fun_Person::~Person \n   n$1=*&p:Person* [line 13, column 21]\n  _=*n$1:Person [line 13, column 21]\n  n$3=_fun_Person::~Person(n$1:Person*) [line 13, column 21]\n  NULLIFY(&p); [line 13, column 21]\n  EXIT_SCOPE(_,n$1,n$3,p); [line 13, column 21]\n  APPLY_ABSTRACTION; [line 13, column 21]\n " shape="box"]
+"f(class Person)#3072121847520995784.d15d531febb371128c8a5206341d5cb9_3" [label="3:  Call _fun_Person::~Person \n   n$0=*&p:Person* [line 13, column 21]\n  _=*n$0:Person [line 13, column 21]\n  n$2=_fun_Person::~Person(n$0:Person*) [line 13, column 21]\n  NULLIFY(&p); [line 13, column 21]\n  EXIT_SCOPE(_,n$0,n$2,p); [line 13, column 21]\n  APPLY_ABSTRACTION; [line 13, column 21]\n " shape="box"]
 	
 
 	 "f(class Person)#3072121847520995784.d15d531febb371128c8a5206341d5cb9_3" -> "f(class Person)#3072121847520995784.d15d531febb371128c8a5206341d5cb9_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/destructors/call_on_delete.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/destructors/call_on_delete.cpp.dot
index 0c16fdf8c..e575bb6a2 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/destructors/call_on_delete.cpp.dot
+++ b/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$1=*&x:int* [line 14, column 33]\n  n$2=_fun___delete(n$1:int*) [line 14, column 26]\n  NULLIFY(&x); [line 14, column 26]\n  EXIT_SCOPE(n$1,n$2,x); [line 14, column 26]\n  APPLY_ABSTRACTION; [line 14, column 26]\n " shape="box"]
+"deleteInt#11507157942721721842.63c462d9916f225a70cc32ed39aaaf5f_3" [label="3:  Call delete \n   n$0=*&x:int* [line 14, column 33]\n  n$1=_fun___delete(n$0:int*) [line 14, column 26]\n  NULLIFY(&x); [line 14, column 26]\n  EXIT_SCOPE(n$0,n$1,x); [line 14, column 26]\n  APPLY_ABSTRACTION; [line 14, column 26]\n " shape="box"]
 	
 
 	 "deleteInt#11507157942721721842.63c462d9916f225a70cc32ed39aaaf5f_3" -> "deleteInt#11507157942721721842.63c462d9916f225a70cc32ed39aaaf5f_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "deleteX(class X)#8359832236310221055.de7d98d32d68fd20c6aec48045fd1c8e_2" [label="2: Exit deleteX \n  " color=yellow style=filled]
 	
 
-"deleteX(class X)#8359832236310221055.de7d98d32d68fd20c6aec48045fd1c8e_3" [label="3:  Call delete \n   n$1=*&x:X* [line 12, column 29]\n  n$2=_fun___delete(n$1:X*) [line 12, column 22]\n  NULLIFY(&x); [line 12, column 22]\n  EXIT_SCOPE(n$1,n$2,x); [line 12, column 22]\n  APPLY_ABSTRACTION; [line 12, column 22]\n " shape="box"]
+"deleteX(class X)#8359832236310221055.de7d98d32d68fd20c6aec48045fd1c8e_3" [label="3:  Call delete \n   n$0=*&x:X* [line 12, column 29]\n  n$1=_fun___delete(n$0:X*) [line 12, column 22]\n  NULLIFY(&x); [line 12, column 22]\n  EXIT_SCOPE(n$0,n$1,x); [line 12, column 22]\n  APPLY_ABSTRACTION; [line 12, column 22]\n " shape="box"]
 	
 
 	 "deleteX(class X)#8359832236310221055.de7d98d32d68fd20c6aec48045fd1c8e_3" -> "deleteX(class X)#8359832236310221055.de7d98d32d68fd20c6aec48045fd1c8e_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/destructors/continue_scope.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/destructors/continue_scope.cpp.dot
index 52df5fd89..67d7c951f 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/destructors/continue_scope.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/destructors/continue_scope.cpp.dot
@@ -3,7 +3,7 @@ digraph cfg {
 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_1" [label="1: Start continue_scope::test_do_while\nFormals:  a:_Bool b:_Bool\nLocals:  x3:continue_scope::X x4:continue_scope::X x2:continue_scope::X x1:continue_scope::X \n  " color=yellow style=filled]
 	
 
-	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_1" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_17" ;
+	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_1" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_16" ;
 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_2" [label="2: Exit continue_scope::test_do_while \n   NULLIFY(&x3); [line 89, column 1]\n  NULLIFY(&x1); [line 89, column 1]\n  NULLIFY(&x4); [line 89, column 1]\n  NULLIFY(&x2); [line 89, column 1]\n " color=yellow style=filled]
 	
 
@@ -14,7 +14,7 @@ digraph cfg {
 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_4" [label="4: + \n  " ]
 	
 
-	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_4" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_16" ;
+	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_4" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_15" ;
 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_5" [label="5: Prune (true branch, do while) \n   n$3=*&a:_Bool [line 88, column 12]\n  PRUNE(n$3, true); [line 88, column 12]\n  EXIT_SCOPE(n$3); [line 88, column 12]\n  APPLY_ABSTRACTION; [line 88, column 12]\n " shape="invhouse"]
 	
 
@@ -35,46 +35,42 @@ digraph cfg {
 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_9" [label="9: Prune (true branch, if) \n   n$7=*&b:_Bool [line 82, column 9]\n  PRUNE(n$7, true); [line 82, column 9]\n  EXIT_SCOPE(n$7); [line 82, 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_9" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_12" ;
 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_10" [label="10: Prune (false branch, if) \n   n$7=*&b:_Bool [line 82, column 9]\n  PRUNE(!n$7, false); [line 82, column 9]\n  EXIT_SCOPE(n$7); [line 82, 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(Scope) \n   _=*&x3:continue_scope::X [line 85, column 5]\n  n$9=_fun_continue_scope::X::~X(&x3:continue_scope::X*) injected [line 85, column 5]\n  APPLY_ABSTRACTION; [line 85, column 5]\n " shape="box"]
+	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_10" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_14" ;
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_11" [label="11:  Destruction(continue) \n   _=*&x3:continue_scope::X [line 84, column 7]\n  n$9=_fun_continue_scope::X::~X(&x3:continue_scope::X*) injected [line 84, column 7]\n  _=*&x2:continue_scope::X [line 84, column 7]\n  n$11=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 84, column 7]\n  EXIT_SCOPE(_,_,n$9,n$11,x2,x3); [line 84, column 7]\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(continue) \n   _=*&x3:continue_scope::X [line 84, column 7]\n  n$12=_fun_continue_scope::X::~X(&x3:continue_scope::X*) injected [line 84, column 7]\n  _=*&x2:continue_scope::X [line 84, column 7]\n  n$14=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 84, column 7]\n  EXIT_SCOPE(_,_,n$12,n$14,x2,x3); [line 84, column 7]\n " shape="box"]
+	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_11" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_5" ;
+	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_11" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_6" ;
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x3:continue_scope::X); [line 83, column 7]\n  n$13=_fun_continue_scope::X::X(&x3:continue_scope::X*) [line 83, column 9]\n  EXIT_SCOPE(n$13); [line 83, column 9]\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   VARIABLE_DECLARED(x3:continue_scope::X); [line 83, column 7]\n  n$16=_fun_continue_scope::X::X(&x3:continue_scope::X*) [line 83, column 9]\n  EXIT_SCOPE(n$16); [line 83, column 9]\n " shape="box"]
+	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_12" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_11" ;
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_13" [label="13:  Destruction(Scope) \n   _=*&x4:continue_scope::X [line 87, column 5]\n  n$15=_fun_continue_scope::X::~X(&x4:continue_scope::X*) injected [line 87, column 5]\n  EXIT_SCOPE(_,n$15,x4); [line 87, column 5]\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(Scope) \n   _=*&x4:continue_scope::X [line 87, column 5]\n  n$18=_fun_continue_scope::X::~X(&x4:continue_scope::X*) injected [line 87, column 5]\n  EXIT_SCOPE(_,n$18,x4); [line 87, column 5]\n  APPLY_ABSTRACTION; [line 87, column 5]\n " shape="box"]
+	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_13" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_8" ;
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x4:continue_scope::X); [line 86, column 7]\n  n$17=_fun_continue_scope::X::X(&x4:continue_scope::X*) [line 86, column 9]\n  EXIT_SCOPE(n$17); [line 86, column 9]\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   VARIABLE_DECLARED(x4:continue_scope::X); [line 86, column 7]\n  n$20=_fun_continue_scope::X::X(&x4:continue_scope::X*) [line 86, column 9]\n  EXIT_SCOPE(n$20); [line 86, column 9]\n " shape="box"]
+	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_14" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_13" ;
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_15" [label="15:  DeclStmt \n   VARIABLE_DECLARED(x2:continue_scope::X); [line 81, column 5]\n  n$19=_fun_continue_scope::X::X(&x2:continue_scope::X*) [line 81, column 7]\n  EXIT_SCOPE(n$19); [line 81, column 7]\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   VARIABLE_DECLARED(x2:continue_scope::X); [line 81, column 5]\n  n$22=_fun_continue_scope::X::X(&x2:continue_scope::X*) [line 81, column 7]\n  EXIT_SCOPE(n$22); [line 81, column 7]\n " shape="box"]
+	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_15" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_9" ;
+	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_15" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_10" ;
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_16" [label="16:  DeclStmt \n   VARIABLE_DECLARED(x1:continue_scope::X); [line 79, column 3]\n  n$21=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 79, column 5]\n  EXIT_SCOPE(n$21); [line 79, column 5]\n  APPLY_ABSTRACTION; [line 79, column 5]\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   VARIABLE_DECLARED(x1:continue_scope::X); [line 79, column 3]\n  n$24=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 79, column 5]\n  EXIT_SCOPE(n$24); [line 79, column 5]\n  APPLY_ABSTRACTION; [line 79, 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$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  " color=yellow style=filled]
+	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_16" -> "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$9:continue_scope::iterator 0$?%__sil_tmp__temp_return_n$16:continue_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$19:continue_scope::iterator const  x1:continue_scope::X vector:continue_scope::vec \n  " color=yellow style=filled]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_1" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_17" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_2" [label="2: Exit continue_scope::test_for \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$16); [line 64, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_return_n$13); [line 64, column 1]\n  NULLIFY(&x2); [line 64, column 1]\n  NULLIFY(&x1); [line 64, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$6); [line 64, column 1]\n  NULLIFY(&it); [line 64, column 1]\n  NULLIFY(&vector); [line 64, column 1]\n " color=yellow style=filled]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_2" [label="2: Exit continue_scope::test_for \n   NULLIFY(&x2); [line 64, column 1]\n  NULLIFY(&x1); [line 64, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_return_n$16); [line 64, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$19); [line 64, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$9); [line 64, column 1]\n  NULLIFY(&it); [line 64, column 1]\n  NULLIFY(&vector); [line 64, column 1]\n " color=yellow style=filled]
 	
 
 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_3" [label="3:  Destruction(Scope) \n   _=*&x2:continue_scope::X [line 64, column 1]\n  n$1=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 64, column 1]\n  _=*&vector:continue_scope::vec [line 64, column 1]\n  n$3=_fun_continue_scope::vec::~vec(&vector:continue_scope::vec*) injected [line 64, column 1]\n  EXIT_SCOPE(_,_,n$1,n$3,vector,x2); [line 64, column 1]\n  APPLY_ABSTRACTION; [line 64, column 1]\n " shape="box"]
@@ -85,133 +81,133 @@ digraph cfg {
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_4" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_3" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_5" [label="5: + \n  " ]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_5" [label="5:  Destruction(Scope) \n   _=*&it:continue_scope::iterator [line 62, column 3]\n  n$7=_fun_continue_scope::iterator::~iterator(&it:continue_scope::iterator*) injected [line 62, column 3]\n  EXIT_SCOPE(_,n$7,it); [line 62, column 3]\n " shape="box"]
 	
 
-	 "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   VARIABLE_DECLARED(it:continue_scope::iterator); [line 57, column 8]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$6:continue_scope::iterator); [line 57, column 22]\n  _=*&vector:continue_scope::vec [line 57, column 22]\n  n$9=_fun_continue_scope::vec::begin(&vector:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$6:continue_scope::iterator*) assign_last [line 57, 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 57, column 22]\n  EXIT_SCOPE(_,n$9,n$10,0$?%__sil_tmpSIL_materialize_temp__n$6); [line 57, column 22]\n  APPLY_ABSTRACTION; [line 57, column 22]\n " shape="box"]
+	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_5" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_4" ;
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_6" [label="6: + \n  " ]
 	
 
-	 "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$14=_fun_continue_scope::iterator::operator++(&it:continue_scope::iterator&,&0$?%__sil_tmp__temp_return_n$13:continue_scope::iterator*) assign_last [line 57, column 58]\n  EXIT_SCOPE(n$14,0$?%__sil_tmp__temp_return_n$13); [line 57, column 58]\n  APPLY_ABSTRACTION; [line 57, column 58]\n " shape="box"]
+	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_6" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_9" ;
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(it:continue_scope::iterator); [line 57, column 8]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$9:continue_scope::iterator); [line 57, column 22]\n  _=*&vector:continue_scope::vec [line 57, column 22]\n  n$12=_fun_continue_scope::vec::begin(&vector:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$9:continue_scope::iterator*) assign_last [line 57, column 22]\n  n$13=_fun_continue_scope::iterator::iterator(&it:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$9:continue_scope::iterator&) [line 57, column 22]\n  EXIT_SCOPE(_,n$12,n$13,0$?%__sil_tmpSIL_materialize_temp__n$9); [line 57, column 22]\n  APPLY_ABSTRACTION; [line 57, column 22]\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   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$16:continue_scope::iterator const ); [line 57, column 44]\n  _=*&vector:continue_scope::vec [line 57, column 44]\n  n$19=_fun_continue_scope::vec::end(&vector:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$16:continue_scope::iterator*) assign_last [line 57, 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 57, column 38]\n  EXIT_SCOPE(_,n$19,0$?%__sil_tmpSIL_materialize_temp__n$16); [line 57, column 38]\n " shape="box"]
+	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_7" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_6" ;
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_8" [label="8:  Call _fun_continue_scope::iterator::operator++ \n   n$17=_fun_continue_scope::iterator::operator++(&it:continue_scope::iterator&,&0$?%__sil_tmp__temp_return_n$16:continue_scope::iterator*) assign_last [line 57, column 58]\n  EXIT_SCOPE(n$17,0$?%__sil_tmp__temp_return_n$16); [line 57, column 58]\n  APPLY_ABSTRACTION; [line 57, column 58]\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$20, true); [line 57, column 38]\n  EXIT_SCOPE(n$20); [line 57, column 38]\n " shape="invhouse"]
+	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_8" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_6" ;
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_9" [label="9:  Call _fun_continue_scope::iterator::operator!= \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$19:continue_scope::iterator const ); [line 57, column 44]\n  _=*&vector:continue_scope::vec [line 57, column 44]\n  n$22=_fun_continue_scope::vec::end(&vector:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$19:continue_scope::iterator*) assign_last [line 57, column 44]\n  n$23=_fun_continue_scope::iterator::operator!=(&it:continue_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$19:continue_scope::iterator const &) [line 57, column 38]\n  EXIT_SCOPE(_,n$22,0$?%__sil_tmpSIL_materialize_temp__n$19); [line 57, column 38]\n " shape="box"]
 	
 
-	 "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$20, false); [line 57, column 38]\n  EXIT_SCOPE(n$20,it); [line 57, column 38]\n " shape="invhouse"]
+	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_9" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_10" ;
+	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_9" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_11" ;
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_10" [label="10: Prune (true branch, for loop) \n   PRUNE(n$23, true); [line 57, column 38]\n  EXIT_SCOPE(n$23); [line 57, column 38]\n " shape="invhouse"]
 	
 
-	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_10" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_4" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_11" [label="11: + \n  " ]
+	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_10" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_13" ;
+	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_10" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_14" ;
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_11" [label="11: Prune (false branch, for loop) \n   PRUNE(!n$23, false); [line 57, column 38]\n  EXIT_SCOPE(n$23); [line 57, column 38]\n " shape="invhouse"]
 	
 
-	 "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$22=*&b:_Bool [line 58, column 9]\n  PRUNE(n$22, true); [line 58, column 9]\n  EXIT_SCOPE(n$22); [line 58, column 9]\n " shape="invhouse"]
+	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_11" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_5" ;
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_12" [label="12: + \n  " ]
 	
 
-	 "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$22=*&b:_Bool [line 58, column 9]\n  PRUNE(!n$22, false); [line 58, column 9]\n  EXIT_SCOPE(n$22); [line 58, column 9]\n  APPLY_ABSTRACTION; [line 58, column 9]\n " shape="invhouse"]
+	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_12" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_8" ;
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_13" [label="13: Prune (true branch, if) \n   n$24=*&b:_Bool [line 58, column 9]\n  PRUNE(n$24, true); [line 58, column 9]\n  EXIT_SCOPE(n$24); [line 58, 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(Scope) \n   _=*&x1:continue_scope::X [line 61, column 5]\n  n$24=_fun_continue_scope::X::~X(&x1:continue_scope::X*) injected [line 61, column 5]\n  APPLY_ABSTRACTION; [line 61, column 5]\n " shape="box"]
+	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_13" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_16" ;
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_14" [label="14: Prune (false branch, if) \n   n$24=*&b:_Bool [line 58, column 9]\n  PRUNE(!n$24, false); [line 58, column 9]\n  EXIT_SCOPE(n$24); [line 58, column 9]\n " shape="invhouse"]
 	
 
-	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_14" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_11" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_15" [label="15:  Destruction(continue) \n   _=*&x1:continue_scope::X [line 60, column 7]\n  n$27=_fun_continue_scope::X::~X(&x1:continue_scope::X*) injected [line 60, column 7]\n  EXIT_SCOPE(_,n$27,x1); [line 60, column 7]\n  APPLY_ABSTRACTION; [line 60, column 7]\n " shape="box"]
+	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_14" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_12" ;
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_15" [label="15:  Destruction(continue) \n   _=*&x1:continue_scope::X [line 60, column 7]\n  n$26=_fun_continue_scope::X::~X(&x1:continue_scope::X*) injected [line 60, column 7]\n  EXIT_SCOPE(_,n$26,x1); [line 60, column 7]\n  APPLY_ABSTRACTION; [line 60, 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   VARIABLE_DECLARED(x1:continue_scope::X); [line 59, column 7]\n  n$29=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 59, column 9]\n  EXIT_SCOPE(n$29); [line 59, column 9]\n " shape="box"]
+	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_15" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_8" ;
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_16" [label="16:  DeclStmt \n   VARIABLE_DECLARED(x1:continue_scope::X); [line 59, column 7]\n  n$28=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 59, column 9]\n  EXIT_SCOPE(n$28); [line 59, 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   VARIABLE_DECLARED(vector:continue_scope::vec); [line 56, column 3]\n  n$33=_fun_continue_scope::vec::vec(&vector:continue_scope::vec*) [line 56, column 7]\n  EXIT_SCOPE(n$33); [line 56, column 7]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_17" [label="17:  DeclStmt \n   VARIABLE_DECLARED(vector:continue_scope::vec); [line 56, column 3]\n  n$32=_fun_continue_scope::vec::vec(&vector:continue_scope::vec*) [line 56, column 7]\n  EXIT_SCOPE(n$32); [line 56, 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:  __end1:continue_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$7:continue_scope::iterator __begin1: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  __range1:continue_scope::vec& x1:continue_scope::X vector:continue_scope::vec \n  " color=yellow style=filled]
+	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_17" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_7" ;
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_1" [label="1: Start continue_scope::test_for_range\nFormals:  b:_Bool\nLocals:  __end1:continue_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$10:continue_scope::iterator __begin1:continue_scope::iterator 0$?%__sil_tmpSIL_materialize_temp__n$16:continue_scope::iterator 0$?%__sil_tmp__temp_return_n$24:continue_scope::iterator x2:continue_scope::X x:continue_scope::X 0$?%__sil_tmpSIL_materialize_temp__n$37:continue_scope::X const  __range1:continue_scope::vec& x1:continue_scope::X vector:continue_scope::vec \n  " color=yellow style=filled]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_1" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_20" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_2" [label="2: Exit continue_scope::test_for_range \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$7); [line 53, column 1]\n  NULLIFY(&vector); [line 53, column 1]\n  NULLIFY(&__begin1); [line 53, column 1]\n  NULLIFY(&__end1); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_return_n$21); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$13); [line 53, column 1]\n  NULLIFY(&x2); [line 53, column 1]\n  NULLIFY(&x1); [line 53, column 1]\n  NULLIFY(&x); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$37); [line 53, column 1]\n " color=yellow style=filled]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_2" [label="2: Exit continue_scope::test_for_range \n   NULLIFY(&vector); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$16); [line 53, column 1]\n  NULLIFY(&__begin1); [line 53, column 1]\n  NULLIFY(&__end1); [line 53, column 1]\n  NULLIFY(&x2); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$10); [line 53, column 1]\n  NULLIFY(&x1); [line 53, column 1]\n  NULLIFY(&x); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$37); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_return_n$24); [line 53, column 1]\n " color=yellow style=filled]
 	
 
 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_3" [label="3:  Destruction(Scope) \n   _=*&x1:continue_scope::X [line 53, column 1]\n  n$1=_fun_continue_scope::X::~X(&x1:continue_scope::X*) injected [line 53, column 1]\n  _=*&vector:continue_scope::vec [line 53, column 1]\n  n$3=_fun_continue_scope::vec::~vec(&vector:continue_scope::vec*) injected [line 53, column 1]\n  EXIT_SCOPE(_,_,n$1,n$3,x1,vector); [line 53, column 1]\n  APPLY_ABSTRACTION; [line 53, column 1]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_3" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_2" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_4" [label="4: + \n  " ]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_4" [label="4:  Destruction(Scope) \n   _=*&__end1:continue_scope::iterator [line 52, column 3]\n  n$6=_fun_continue_scope::iterator::~iterator(&__end1:continue_scope::iterator*) injected [line 52, column 3]\n  _=*&__begin1:continue_scope::iterator [line 52, column 3]\n  n$8=_fun_continue_scope::iterator::~iterator(&__begin1:continue_scope::iterator*) injected [line 52, column 3]\n  EXIT_SCOPE(_,_,n$6,n$8,__end1,__begin1); [line 52, column 3]\n " shape="box"]
 	
 
-	 "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   VARIABLE_DECLARED(__end1:continue_scope::iterator); [line 47, column 12]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$7:continue_scope::iterator); [line 47, column 12]\n  n$8=*&__range1:continue_scope::vec& [line 47, column 12]\n  _=*n$8:continue_scope::vec [line 47, 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*) assign_last [line 47, column 12]\n  n$12=_fun_continue_scope::iterator::iterator(&__end1:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$7:continue_scope::iterator&) [line 47, column 12]\n  NULLIFY(&__range1); [line 47, column 12]\n  EXIT_SCOPE(_,n$8,n$11,n$12,__range1,0$?%__sil_tmpSIL_materialize_temp__n$7); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, column 12]\n " shape="box"]
+	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_4" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_3" ;
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_5" [label="5: + \n  " ]
 	
 
-	 "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   VARIABLE_DECLARED(__begin1:continue_scope::iterator); [line 47, column 12]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$13:continue_scope::iterator); [line 47, column 12]\n  n$14=*&__range1:continue_scope::vec& [line 47, column 12]\n  _=*n$14:continue_scope::vec [line 47, 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*) assign_last [line 47, column 12]\n  n$18=_fun_continue_scope::iterator::iterator(&__begin1:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$13:continue_scope::iterator&) [line 47, column 12]\n  EXIT_SCOPE(_,n$14,n$17,n$18,0$?%__sil_tmpSIL_materialize_temp__n$13); [line 47, column 12]\n " shape="box"]
+	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_5" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_9" ;
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(__end1:continue_scope::iterator); [line 47, column 12]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$10:continue_scope::iterator); [line 47, column 12]\n  n$11=*&__range1:continue_scope::vec& [line 47, column 12]\n  _=*n$11:continue_scope::vec [line 47, column 12]\n  n$14=_fun_continue_scope::vec::end(n$11:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$10:continue_scope::iterator*) assign_last [line 47, column 12]\n  n$15=_fun_continue_scope::iterator::iterator(&__end1:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$10:continue_scope::iterator&) [line 47, column 12]\n  NULLIFY(&__range1); [line 47, column 12]\n  EXIT_SCOPE(_,n$11,n$14,n$15,__range1,0$?%__sil_tmpSIL_materialize_temp__n$10); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, 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$22=_fun_continue_scope::iterator::operator++(&__begin1:continue_scope::iterator&,&0$?%__sil_tmp__temp_return_n$21:continue_scope::iterator*) assign_last [line 47, column 12]\n  EXIT_SCOPE(n$22,0$?%__sil_tmp__temp_return_n$21); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, column 12]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(__begin1:continue_scope::iterator); [line 47, column 12]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$16:continue_scope::iterator); [line 47, column 12]\n  n$17=*&__range1:continue_scope::vec& [line 47, column 12]\n  _=*n$17:continue_scope::vec [line 47, column 12]\n  n$20=_fun_continue_scope::vec::begin(n$17:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$16:continue_scope::iterator*) assign_last [line 47, column 12]\n  n$21=_fun_continue_scope::iterator::iterator(&__begin1:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$16:continue_scope::iterator&) [line 47, column 12]\n  EXIT_SCOPE(_,n$17,n$20,n$21,0$?%__sil_tmpSIL_materialize_temp__n$16); [line 47, 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$24=_fun_continue_scope::iterator::operator!=(&__begin1:continue_scope::iterator&,&__end1:continue_scope::iterator&) [line 47, column 12]\n " shape="box"]
+	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_7" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_6" ;
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_8" [label="8:  Call _fun_continue_scope::iterator::operator++ \n   n$25=_fun_continue_scope::iterator::operator++(&__begin1:continue_scope::iterator&,&0$?%__sil_tmp__temp_return_n$24:continue_scope::iterator*) assign_last [line 47, column 12]\n  EXIT_SCOPE(n$25,0$?%__sil_tmp__temp_return_n$24); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, 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$24, true); [line 47, column 12]\n  EXIT_SCOPE(n$24); [line 47, column 12]\n " shape="invhouse"]
+	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_8" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_5" ;
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_9" [label="9:  Call _fun_continue_scope::iterator::operator!= \n   n$27=_fun_continue_scope::iterator::operator!=(&__begin1:continue_scope::iterator&,&__end1:continue_scope::iterator&) [line 47, column 12]\n " shape="box"]
 	
 
-	 "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$24, false); [line 47, column 12]\n  EXIT_SCOPE(n$24,__end1,__begin1); [line 47, column 12]\n " shape="invhouse"]
+	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_9" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_10" ;
+	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_9" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_11" ;
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_10" [label="10: Prune (true branch, for loop) \n   PRUNE(n$27, true); [line 47, column 12]\n  EXIT_SCOPE(n$27); [line 47, column 12]\n " shape="invhouse"]
 	
 
-	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_10" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_3" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_11" [label="11: + \n  " ]
+	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_10" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_17" ;
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_11" [label="11: Prune (false branch, for loop) \n   PRUNE(!n$27, false); [line 47, column 12]\n  EXIT_SCOPE(n$27); [line 47, column 12]\n " shape="invhouse"]
 	
 
-	 "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$27=*&b:_Bool [line 48, column 9]\n  PRUNE(n$27, true); [line 48, column 9]\n  EXIT_SCOPE(n$27); [line 48, column 9]\n " shape="invhouse"]
+	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_11" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_4" ;
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_12" [label="12: + \n  " ]
 	
 
-	 "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$27=*&b:_Bool [line 48, column 9]\n  PRUNE(!n$27, false); [line 48, column 9]\n  EXIT_SCOPE(n$27,x); [line 48, column 9]\n  APPLY_ABSTRACTION; [line 48, column 9]\n " shape="invhouse"]
+	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_12" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_8" ;
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_13" [label="13: Prune (true branch, if) \n   n$28=*&b:_Bool [line 48, column 9]\n  PRUNE(n$28, true); [line 48, column 9]\n  EXIT_SCOPE(n$28); [line 48, 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(Scope) \n   _=*&x2:continue_scope::X [line 51, column 5]\n  n$29=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 51, column 5]\n  APPLY_ABSTRACTION; [line 51, column 5]\n " shape="box"]
+	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_13" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_16" ;
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_14" [label="14: Prune (false branch, if) \n   n$28=*&b:_Bool [line 48, column 9]\n  PRUNE(!n$28, false); [line 48, column 9]\n  EXIT_SCOPE(n$28,x); [line 48, column 9]\n " shape="invhouse"]
 	
 
-	 "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(continue) \n   _=*&x2:continue_scope::X [line 50, column 7]\n  n$32=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 50, column 7]\n  EXIT_SCOPE(_,n$32,x2); [line 50, column 7]\n  APPLY_ABSTRACTION; [line 50, column 7]\n " shape="box"]
+	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_14" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_12" ;
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_15" [label="15:  Destruction(continue) \n   _=*&x2:continue_scope::X [line 50, column 7]\n  n$30=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 50, column 7]\n  _=*&x:continue_scope::X [line 50, column 7]\n  n$32=_fun_continue_scope::X::~X(&x:continue_scope::X*) injected [line 50, column 7]\n  EXIT_SCOPE(_,_,n$30,n$32,x,x2); [line 50, column 7]\n  APPLY_ABSTRACTION; [line 50, 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   VARIABLE_DECLARED(x2:continue_scope::X); [line 49, column 7]\n  n$34=_fun_continue_scope::X::X(&x2:continue_scope::X*,&x:continue_scope::X&) [line 49, column 14]\n  EXIT_SCOPE(n$34,x); [line 49, column 14]\n " shape="box"]
+	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_15" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_8" ;
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_16" [label="16:  DeclStmt \n   VARIABLE_DECLARED(x2:continue_scope::X); [line 49, column 7]\n  n$34=_fun_continue_scope::X::X(&x2:continue_scope::X*,&x:continue_scope::X&) [line 49, column 14]\n  EXIT_SCOPE(n$34); [line 49, 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   VARIABLE_DECLARED(x:continue_scope::X); [line 47, column 8]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$37:continue_scope::X const ); [line 47, column 12]\n  n$40=_fun_continue_scope::iterator::operator*(&__begin1:continue_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$37:continue_scope::X*) assign_last [line 47, 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 47, column 12]\n  EXIT_SCOPE(n$40,n$41,0$?%__sil_tmpSIL_materialize_temp__n$37); [line 47, column 12]\n " shape="box"]
 	
 
-	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_17" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_12" ;
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_17" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_13" ;
+	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_17" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_14" ;
 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_18" [label="18:  DeclStmt \n   VARIABLE_DECLARED(__range1:continue_scope::vec&); [line 47, column 14]\n  *&__range1:continue_scope::vec&=&vector [line 47, column 14]\n " shape="box"]
 	
 
-	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_18" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_6" ;
+	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_18" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_7" ;
 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_19" [label="19:  DeclStmt \n   VARIABLE_DECLARED(x1:continue_scope::X); [line 46, column 3]\n  n$43=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 46, column 5]\n  EXIT_SCOPE(n$43); [line 46, column 5]\n " shape="box"]
 	
 
@@ -223,7 +219,7 @@ digraph cfg {
 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_1" [label="1: Start continue_scope::test_while1\nFormals:  a:_Bool b:_Bool\nLocals:  x2:continue_scope::X x4:continue_scope::X x1:continue_scope::X \n  " color=yellow style=filled]
 	
 
-	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_1" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_15" ;
+	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_1" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_14" ;
 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_2" [label="2: Exit continue_scope::test_while1 \n   NULLIFY(&x2); [line 76, column 1]\n  NULLIFY(&x1); [line 76, column 1]\n  NULLIFY(&x4); [line 76, column 1]\n " color=yellow style=filled]
 	
 
@@ -249,42 +245,38 @@ 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$5=*&b:_Bool [line 69, column 9]\n  PRUNE(n$5, true); [line 69, column 9]\n  EXIT_SCOPE(n$5); [line 69, 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$5=*&b:_Bool [line 69, column 9]\n  PRUNE(!n$5, false); [line 69, column 9]\n  EXIT_SCOPE(n$5); [line 69, column 9]\n " shape="invhouse"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_8" [label="8: Prune (true branch, if) \n   n$4=*&b:_Bool [line 69, column 9]\n  PRUNE(n$4, true); [line 69, column 9]\n  EXIT_SCOPE(n$4); [line 69, 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(Scope) \n   _=*&x2:continue_scope::X [line 72, column 5]\n  n$7=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 72, column 5]\n  APPLY_ABSTRACTION; [line 72, column 5]\n " shape="box"]
+	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_8" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_11" ;
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_9" [label="9: Prune (false branch, if) \n   n$4=*&b:_Bool [line 69, column 9]\n  PRUNE(!n$4, false); [line 69, column 9]\n  EXIT_SCOPE(n$4); [line 69, column 9]\n " shape="invhouse"]
 	
 
-	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_10" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_7" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_11" [label="11:  Destruction(continue) \n   _=*&x2:continue_scope::X [line 71, column 7]\n  n$10=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 71, column 7]\n  EXIT_SCOPE(_,n$10,x2); [line 71, column 7]\n  APPLY_ABSTRACTION; [line 71, column 7]\n " shape="box"]
+	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_9" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_13" ;
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_10" [label="10:  Destruction(continue) \n   _=*&x2:continue_scope::X [line 71, column 7]\n  n$6=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 71, column 7]\n  EXIT_SCOPE(_,n$6,x2); [line 71, column 7]\n  APPLY_ABSTRACTION; [line 71, 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   VARIABLE_DECLARED(x2:continue_scope::X); [line 70, column 7]\n  n$12=_fun_continue_scope::X::X(&x2:continue_scope::X*) [line 70, column 9]\n  EXIT_SCOPE(n$12); [line 70, column 9]\n " shape="box"]
+	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_10" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_4" ;
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(x2:continue_scope::X); [line 70, column 7]\n  n$8=_fun_continue_scope::X::X(&x2:continue_scope::X*) [line 70, column 9]\n  EXIT_SCOPE(n$8); [line 70, 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(Scope) \n   _=*&x4:continue_scope::X [line 74, column 5]\n  n$14=_fun_continue_scope::X::~X(&x4:continue_scope::X*) injected [line 74, column 5]\n  EXIT_SCOPE(_,n$14,x4); [line 74, column 5]\n  APPLY_ABSTRACTION; [line 74, column 5]\n " shape="box"]
+	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_11" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_10" ;
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_12" [label="12:  Destruction(Scope) \n   _=*&x4:continue_scope::X [line 74, column 5]\n  n$10=_fun_continue_scope::X::~X(&x4:continue_scope::X*) injected [line 74, column 5]\n  EXIT_SCOPE(_,n$10,x4); [line 74, 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   VARIABLE_DECLARED(x4:continue_scope::X); [line 73, column 7]\n  n$16=_fun_continue_scope::X::X(&x4:continue_scope::X*) [line 73, column 9]\n  EXIT_SCOPE(n$16); [line 73, column 9]\n " shape="box"]
+	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_12" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_7" ;
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x4:continue_scope::X); [line 73, column 7]\n  n$12=_fun_continue_scope::X::X(&x4:continue_scope::X*) [line 73, column 9]\n  EXIT_SCOPE(n$12); [line 73, 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   VARIABLE_DECLARED(x1:continue_scope::X); [line 67, column 3]\n  n$19=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 67, column 5]\n  EXIT_SCOPE(n$19); [line 67, column 5]\n  APPLY_ABSTRACTION; [line 67, column 5]\n " shape="box"]
+	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_13" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_12" ;
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x1:continue_scope::X); [line 67, column 3]\n  n$15=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 67, column 5]\n  EXIT_SCOPE(n$15); [line 67, column 5]\n  APPLY_ABSTRACTION; [line 67, column 5]\n " shape="box"]
 	
 
-	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_15" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_4" ;
+	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_14" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_4" ;
 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_1" [label="1: Start continue_scope::test_while2\nFormals:  a:_Bool b:_Bool\nLocals:  x3:continue_scope::X x2:continue_scope::X x1:continue_scope::X \n  " color=yellow style=filled]
 	
 
-	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_1" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_15" ;
+	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_1" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_14" ;
 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_2" [label="2: Exit continue_scope::test_while2 \n   NULLIFY(&x2); [line 100, column 1]\n  NULLIFY(&x1); [line 100, column 1]\n  NULLIFY(&x3); [line 100, column 1]\n " color=yellow style=filled]
 	
 
@@ -300,7 +292,7 @@ digraph cfg {
 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_5" [label="5: Prune (true branch, while) \n   n$3=*&a:_Bool [line 93, column 10]\n  PRUNE(n$3, true); [line 93, column 10]\n  EXIT_SCOPE(n$3); [line 93, 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_5" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_13" ;
 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_6" [label="6: Prune (false branch, while) \n   n$3=*&a:_Bool [line 93, column 10]\n  PRUNE(!n$3, false); [line 93, column 10]\n  NULLIFY(&a); [line 93, column 10]\n  EXIT_SCOPE(n$3,a); [line 93, column 10]\n " shape="invhouse"]
 	
 
@@ -317,31 +309,27 @@ digraph cfg {
 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_9" [label="9: Prune (true branch, while) \n   n$7=*&b:_Bool [line 95, column 12]\n  PRUNE(n$7, true); [line 95, column 12]\n  EXIT_SCOPE(n$7); [line 95, 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_9" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_12" ;
 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_10" [label="10: Prune (false branch, while) \n   n$7=*&b:_Bool [line 95, column 12]\n  PRUNE(!n$7, false); [line 95, column 12]\n  EXIT_SCOPE(n$7); [line 95, 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(Scope) \n   _=*&x3:continue_scope::X [line 98, column 5]\n  n$9=_fun_continue_scope::X::~X(&x3:continue_scope::X*) injected [line 98, column 5]\n  APPLY_ABSTRACTION; [line 98, column 5]\n " shape="box"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_11" [label="11:  Destruction(continue) \n   _=*&x3:continue_scope::X [line 97, column 7]\n  n$9=_fun_continue_scope::X::~X(&x3:continue_scope::X*) injected [line 97, column 7]\n  EXIT_SCOPE(_,n$9,x3); [line 97, column 7]\n  APPLY_ABSTRACTION; [line 97, column 7]\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(continue) \n   _=*&x3:continue_scope::X [line 97, column 7]\n  n$12=_fun_continue_scope::X::~X(&x3:continue_scope::X*) injected [line 97, column 7]\n  EXIT_SCOPE(_,n$12,x3); [line 97, column 7]\n  APPLY_ABSTRACTION; [line 97, 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   VARIABLE_DECLARED(x3:continue_scope::X); [line 96, column 7]\n  n$14=_fun_continue_scope::X::X(&x3:continue_scope::X*) [line 96, column 9]\n  EXIT_SCOPE(n$14); [line 96, column 9]\n " shape="box"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x3:continue_scope::X); [line 96, column 7]\n  n$11=_fun_continue_scope::X::X(&x3:continue_scope::X*) [line 96, column 9]\n  EXIT_SCOPE(n$11); [line 96, 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   VARIABLE_DECLARED(x2:continue_scope::X); [line 94, column 5]\n  n$16=_fun_continue_scope::X::X(&x2:continue_scope::X*) [line 94, column 7]\n  EXIT_SCOPE(n$16); [line 94, column 7]\n  APPLY_ABSTRACTION; [line 94, column 7]\n " shape="box"]
+	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_12" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_11" ;
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x2:continue_scope::X); [line 94, column 5]\n  n$13=_fun_continue_scope::X::X(&x2:continue_scope::X*) [line 94, column 7]\n  EXIT_SCOPE(n$13); [line 94, column 7]\n  APPLY_ABSTRACTION; [line 94, 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   VARIABLE_DECLARED(x1:continue_scope::X); [line 92, column 3]\n  n$18=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 92, column 5]\n  EXIT_SCOPE(n$18); [line 92, column 5]\n  APPLY_ABSTRACTION; [line 92, column 5]\n " shape="box"]
+	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_13" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_8" ;
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x1:continue_scope::X); [line 92, column 3]\n  n$15=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 92, column 5]\n  EXIT_SCOPE(n$15); [line 92, column 5]\n  APPLY_ABSTRACTION; [line 92, column 5]\n " shape="box"]
 	
 
-	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_15" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_4" ;
+	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_14" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_4" ;
 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_1" [label="1: Start continue_scope::test_while3\nFormals:  a:_Bool b:_Bool\nLocals:  x3:continue_scope::X x2:continue_scope::X x1:continue_scope::X \n  " color=yellow style=filled]
 	
 
@@ -387,11 +375,11 @@ digraph cfg {
 	
 
 	 "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   VARIABLE_DECLARED(x2:continue_scope::X); [line 105, column 5]\n  n$15=_fun_continue_scope::X::X(&x2:continue_scope::X*) [line 105, column 7]\n  EXIT_SCOPE(n$15); [line 105, column 7]\n  APPLY_ABSTRACTION; [line 105, column 7]\n " shape="box"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x2:continue_scope::X); [line 105, column 5]\n  n$13=_fun_continue_scope::X::X(&x2:continue_scope::X*) [line 105, column 7]\n  EXIT_SCOPE(n$13); [line 105, column 7]\n  APPLY_ABSTRACTION; [line 105, 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   VARIABLE_DECLARED(x1:continue_scope::X); [line 103, column 3]\n  n$17=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 103, column 5]\n  EXIT_SCOPE(n$17); [line 103, column 5]\n  APPLY_ABSTRACTION; [line 103, column 5]\n " shape="box"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x1:continue_scope::X); [line 103, column 3]\n  n$15=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 103, column 5]\n  EXIT_SCOPE(n$15); [line 103, column 5]\n  APPLY_ABSTRACTION; [line 103, column 5]\n " shape="box"]
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_13" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_5" ;
@@ -485,7 +473,7 @@ digraph cfg {
 	
 
 	 "operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_3" -> "operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_2" ;
-"operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_4" [label="4:  UnaryOperator \n   n$4=*&this:continue_scope::iterator* [line 23, column 5]\n  n$5=*n$4.position:int [line 23, column 5]\n  *n$4.position:int=(n$5 + 1) [line 23, column 5]\n  EXIT_SCOPE(n$4,n$5); [line 23, column 5]\n " shape="box"]
+"operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_4" [label="4:  UnaryOperator \n   n$3=*&this:continue_scope::iterator* [line 23, column 5]\n  n$4=*n$3.position:int [line 23, column 5]\n  *n$3.position:int=(n$4 + 1) [line 23, column 5]\n  EXIT_SCOPE(n$3,n$4); [line 23, column 5]\n " shape="box"]
 	
 
 	 "operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_4" -> "operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_3" ;
@@ -496,11 +484,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$2=*&this:continue_scope::iterator* [line 16, column 8]\n  n$3=*&__param_0:continue_scope::iterator& [line 16, column 8]\n  n$4=*n$3.vector:continue_scope::vec const * [line 16, column 8]\n  *n$2.vector:continue_scope::vec const *=n$4 [line 16, column 8]\n  NULLIFY(&this); [line 16, column 8]\n  NULLIFY(&__param_0); [line 16, column 8]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 16, column 8]\n  APPLY_ABSTRACTION; [line 16, column 8]\n " shape="box"]
+"iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::iterator* [line 16, column 8]\n  n$2=*&__param_0:continue_scope::iterator& [line 16, column 8]\n  n$3=*n$2.vector:continue_scope::vec const * [line 16, column 8]\n  *n$1.vector:continue_scope::vec const *=n$3 [line 16, column 8]\n  NULLIFY(&this); [line 16, column 8]\n  NULLIFY(&__param_0); [line 16, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 16, column 8]\n  APPLY_ABSTRACTION; [line 16, 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$5=*&this:continue_scope::iterator* [line 16, column 8]\n  n$6=*&__param_0:continue_scope::iterator& [line 16, column 8]\n  n$7=*n$6.position:int [line 16, column 8]\n  *n$5.position:int=n$7 [line 16, column 8]\n  EXIT_SCOPE(n$5,n$6,n$7); [line 16, column 8]\n " shape="box"]
+"iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_4" [label="4:  Constructor Init \n   n$4=*&this:continue_scope::iterator* [line 16, column 8]\n  n$5=*&__param_0:continue_scope::iterator& [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n  EXIT_SCOPE(n$4,n$5,n$6); [line 16, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_4" -> "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_3" ;
@@ -511,11 +499,11 @@ digraph cfg {
 "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_2" [label="2: Exit continue_scope::iterator::iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_3" [label="3:  Constructor Init \n   n$2=*&this:continue_scope::iterator* [line 20, column 52]\n  n$3=*&v:continue_scope::vec const * [line 20, column 59]\n  *n$2.vector:continue_scope::vec const *=n$3 [line 20, column 52]\n  NULLIFY(&v); [line 20, column 52]\n  NULLIFY(&this); [line 20, column 52]\n  EXIT_SCOPE(n$2,n$3,v,this); [line 20, column 52]\n  APPLY_ABSTRACTION; [line 20, column 52]\n " shape="box"]
+"iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::iterator* [line 20, column 52]\n  n$2=*&v:continue_scope::vec const * [line 20, column 59]\n  *n$1.vector:continue_scope::vec const *=n$2 [line 20, column 52]\n  NULLIFY(&v); [line 20, column 52]\n  NULLIFY(&this); [line 20, column 52]\n  EXIT_SCOPE(n$1,n$2,v,this); [line 20, column 52]\n  APPLY_ABSTRACTION; [line 20, column 52]\n " shape="box"]
 	
 
 	 "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_3" -> "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_2" ;
-"iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_4" [label="4:  Constructor Init \n   n$4=*&this:continue_scope::iterator* [line 20, column 37]\n  n$5=*&pos:int [line 20, column 46]\n  *n$4.position:int=n$5 [line 20, column 37]\n  NULLIFY(&pos); [line 20, column 37]\n  EXIT_SCOPE(n$4,n$5,pos); [line 20, column 37]\n " shape="box"]
+"iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_4" [label="4:  Constructor Init \n   n$3=*&this:continue_scope::iterator* [line 20, column 37]\n  n$4=*&pos:int [line 20, column 46]\n  *n$3.position:int=n$4 [line 20, column 37]\n  NULLIFY(&pos); [line 20, column 37]\n  EXIT_SCOPE(n$3,n$4,pos); [line 20, column 37]\n " shape="box"]
 	
 
 	 "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_4" -> "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_3" ;
@@ -526,11 +514,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$2=*&this:continue_scope::iterator* [line 16, column 8]\n  n$3=*&__param_0:continue_scope::iterator const & [line 16, column 8]\n  n$4=*n$3.vector:continue_scope::vec const * [line 16, column 8]\n  *n$2.vector:continue_scope::vec const *=n$4 [line 16, column 8]\n  NULLIFY(&this); [line 16, column 8]\n  NULLIFY(&__param_0); [line 16, column 8]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 16, column 8]\n  APPLY_ABSTRACTION; [line 16, column 8]\n " shape="box"]
+"iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::iterator* [line 16, column 8]\n  n$2=*&__param_0:continue_scope::iterator const & [line 16, column 8]\n  n$3=*n$2.vector:continue_scope::vec const * [line 16, column 8]\n  *n$1.vector:continue_scope::vec const *=n$3 [line 16, column 8]\n  NULLIFY(&this); [line 16, column 8]\n  NULLIFY(&__param_0); [line 16, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 16, column 8]\n  APPLY_ABSTRACTION; [line 16, 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$5=*&this:continue_scope::iterator* [line 16, column 8]\n  n$6=*&__param_0:continue_scope::iterator const & [line 16, column 8]\n  n$7=*n$6.position:int [line 16, column 8]\n  *n$5.position:int=n$7 [line 16, column 8]\n  EXIT_SCOPE(n$5,n$6,n$7); [line 16, column 8]\n " shape="box"]
+"iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_4" [label="4:  Constructor Init \n   n$4=*&this:continue_scope::iterator* [line 16, column 8]\n  n$5=*&__param_0:continue_scope::iterator const & [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n  EXIT_SCOPE(n$4,n$5,n$6); [line 16, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_4" -> "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_3" ;
@@ -574,7 +562,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$2=*&this:continue_scope::vec* [line 33, column 3]\n  n$3=_fun_continue_scope::X::X(n$2._data:continue_scope::X[10*1](*)) [line 33, column 3]\n  NULLIFY(&this); [line 33, column 3]\n  EXIT_SCOPE(n$2,n$3,this); [line 33, column 3]\n  APPLY_ABSTRACTION; [line 33, column 3]\n " shape="box"]
+"vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::vec* [line 33, column 3]\n  n$2=_fun_continue_scope::X::X(n$1._data:continue_scope::X[10*1](*)) [line 33, column 3]\n  NULLIFY(&this); [line 33, column 3]\n  EXIT_SCOPE(n$1,n$2,this); [line 33, column 3]\n  APPLY_ABSTRACTION; [line 33, column 3]\n " shape="box"]
 	
 
 	 "vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_3" -> "vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/destructors/destructor_bases.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/destructors/destructor_bases.cpp.dot
index 3942cea21..4df83fce6 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/destructors/destructor_bases.cpp.dot
+++ b/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$2=*&this:A* [line 14, column 7]\n  n$3=_fun_T::T(n$2:A*) [line 14, column 3]\n  NULLIFY(&this); [line 14, column 3]\n  EXIT_SCOPE(n$2,n$3,this); [line 14, column 3]\n  APPLY_ABSTRACTION; [line 14, column 3]\n " shape="box"]
+"A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_3" [label="3:  Constructor Init \n   n$1=*&this:A* [line 14, column 7]\n  n$2=_fun_T::T(n$1:A*) [line 14, column 3]\n  NULLIFY(&this); [line 14, column 3]\n  EXIT_SCOPE(n$1,n$2,this); [line 14, column 3]\n  APPLY_ABSTRACTION; [line 14, column 3]\n " shape="box"]
 	
 
 	 "A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_3" -> "A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_2" ;
@@ -36,11 +36,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$2=*&this:B* [line 19, column 3]\n  n$3=_fun_A::A(n$2:B*) [line 19, column 3]\n  NULLIFY(&this); [line 19, column 3]\n  EXIT_SCOPE(n$2,n$3,this); [line 19, column 3]\n  APPLY_ABSTRACTION; [line 19, column 3]\n " shape="box"]
+"B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_3" [label="3:  Constructor Init \n   n$1=*&this:B* [line 19, column 3]\n  n$2=_fun_A::A(n$1:B*) [line 19, column 3]\n  NULLIFY(&this); [line 19, column 3]\n  EXIT_SCOPE(n$1,n$2,this); [line 19, column 3]\n  APPLY_ABSTRACTION; [line 19, 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$4=*&this:B* [line 19, column 7]\n  n$5=_fun_T::T(n$4:B*) [line 19, column 3]\n  EXIT_SCOPE(n$4,n$5); [line 19, column 3]\n " shape="box"]
+"B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_4" [label="4:  Constructor Init \n   n$3=*&this:B* [line 19, column 7]\n  n$4=_fun_T::T(n$3:B*) [line 19, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 19, column 3]\n " shape="box"]
 	
 
 	 "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_4" -> "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_3" ;
@@ -94,19 +94,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$2=*&this:D* [line 30, column 3]\n  n$3=_fun_B::B(n$2.b:B*) [line 30, column 3]\n  NULLIFY(&this); [line 30, column 3]\n  EXIT_SCOPE(n$2,n$3,this); [line 30, column 3]\n  APPLY_ABSTRACTION; [line 30, column 3]\n " shape="box"]
+"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_3" [label="3:  Constructor Init \n   n$1=*&this:D* [line 30, column 3]\n  n$2=_fun_B::B(n$1.b:B*) [line 30, column 3]\n  NULLIFY(&this); [line 30, column 3]\n  EXIT_SCOPE(n$1,n$2,this); [line 30, column 3]\n  APPLY_ABSTRACTION; [line 30, 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$4=*&this:D* [line 30, column 3]\n  n$5=_fun_C::C(n$4:D*) [line 30, column 3]\n  EXIT_SCOPE(n$4,n$5); [line 30, column 3]\n " shape="box"]
+"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_4" [label="4:  Constructor Init \n   n$3=*&this:D* [line 30, column 3]\n  n$4=_fun_C::C(n$3:D*) [line 30, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 30, 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$6=*&this:D* [line 30, column 3]\n  n$7=_fun_A::A(n$6:D*) [line 30, column 3]\n  EXIT_SCOPE(n$6,n$7); [line 30, column 3]\n " shape="box"]
+"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_5" [label="5:  Constructor Init \n   n$5=*&this:D* [line 30, column 3]\n  n$6=_fun_A::A(n$5:D*) [line 30, column 3]\n  EXIT_SCOPE(n$5,n$6); [line 30, 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$8=*&this:D* [line 30, column 7]\n  n$9=_fun_T::T(n$8:D*) [line 30, column 3]\n  EXIT_SCOPE(n$8,n$9); [line 30, column 3]\n " shape="box"]
+"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_6" [label="6:  Constructor Init \n   n$7=*&this:D* [line 30, column 7]\n  n$8=_fun_T::T(n$7:D*) [line 30, column 3]\n  EXIT_SCOPE(n$7,n$8); [line 30, column 3]\n " shape="box"]
 	
 
 	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_6" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_5" ;
@@ -147,23 +147,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$2=*&this:E* [line 35, column 3]\n  n$3=_fun_D::D(n$2:E*) [line 35, column 3]\n  NULLIFY(&this); [line 35, column 3]\n  EXIT_SCOPE(n$2,n$3,this); [line 35, column 3]\n  APPLY_ABSTRACTION; [line 35, column 3]\n " shape="box"]
+"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_3" [label="3:  Constructor Init \n   n$1=*&this:E* [line 35, column 3]\n  n$2=_fun_D::D(n$1:E*) [line 35, column 3]\n  NULLIFY(&this); [line 35, column 3]\n  EXIT_SCOPE(n$1,n$2,this); [line 35, column 3]\n  APPLY_ABSTRACTION; [line 35, 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$4=*&this:E* [line 35, column 3]\n  n$5=_fun_C::C(n$4:E*) [line 35, column 3]\n  EXIT_SCOPE(n$4,n$5); [line 35, column 3]\n " shape="box"]
+"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_4" [label="4:  Constructor Init \n   n$3=*&this:E* [line 35, column 3]\n  n$4=_fun_C::C(n$3:E*) [line 35, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 35, 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$6=*&this:E* [line 35, column 3]\n  n$7=_fun_B::B(n$6:E*) [line 35, column 3]\n  EXIT_SCOPE(n$6,n$7); [line 35, column 3]\n " shape="box"]
+"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_5" [label="5:  Constructor Init \n   n$5=*&this:E* [line 35, column 3]\n  n$6=_fun_B::B(n$5:E*) [line 35, column 3]\n  EXIT_SCOPE(n$5,n$6); [line 35, 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$8=*&this:E* [line 35, column 3]\n  n$9=_fun_A::A(n$8:E*) [line 35, column 3]\n  EXIT_SCOPE(n$8,n$9); [line 35, column 3]\n " shape="box"]
+"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_6" [label="6:  Constructor Init \n   n$7=*&this:E* [line 35, column 3]\n  n$8=_fun_A::A(n$7:E*) [line 35, column 3]\n  EXIT_SCOPE(n$7,n$8); [line 35, 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$10=*&this:E* [line 35, column 7]\n  n$11=_fun_T::T(n$10:E*) [line 35, column 3]\n  EXIT_SCOPE(n$10,n$11); [line 35, column 3]\n " shape="box"]
+"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_7" [label="7:  Constructor Init \n   n$9=*&this:E* [line 35, column 7]\n  n$10=_fun_T::T(n$9:E*) [line 35, column 3]\n  EXIT_SCOPE(n$9,n$10); [line 35, column 3]\n " shape="box"]
 	
 
 	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_7" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_6" ;
@@ -196,23 +196,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$2=*&this:F* [line 40, column 3]\n  n$3=_fun_D::D(n$2:F*) [line 40, column 3]\n  NULLIFY(&this); [line 40, column 3]\n  EXIT_SCOPE(n$2,n$3,this); [line 40, column 3]\n  APPLY_ABSTRACTION; [line 40, column 3]\n " shape="box"]
+"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_3" [label="3:  Constructor Init \n   n$1=*&this:F* [line 40, column 3]\n  n$2=_fun_D::D(n$1:F*) [line 40, column 3]\n  NULLIFY(&this); [line 40, column 3]\n  EXIT_SCOPE(n$1,n$2,this); [line 40, column 3]\n  APPLY_ABSTRACTION; [line 40, 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$4=*&this:F* [line 40, column 3]\n  n$5=_fun_B::B(n$4:F*) [line 40, column 3]\n  EXIT_SCOPE(n$4,n$5); [line 40, column 3]\n " shape="box"]
+"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_4" [label="4:  Constructor Init \n   n$3=*&this:F* [line 40, column 3]\n  n$4=_fun_B::B(n$3:F*) [line 40, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 40, 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$6=*&this:F* [line 40, column 3]\n  n$7=_fun_C::C(n$6:F*) [line 40, column 3]\n  EXIT_SCOPE(n$6,n$7); [line 40, column 3]\n " shape="box"]
+"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_5" [label="5:  Constructor Init \n   n$5=*&this:F* [line 40, column 3]\n  n$6=_fun_C::C(n$5:F*) [line 40, column 3]\n  EXIT_SCOPE(n$5,n$6); [line 40, 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$8=*&this:F* [line 40, column 3]\n  n$9=_fun_A::A(n$8:F*) [line 40, column 3]\n  EXIT_SCOPE(n$8,n$9); [line 40, column 3]\n " shape="box"]
+"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_6" [label="6:  Constructor Init \n   n$7=*&this:F* [line 40, column 3]\n  n$8=_fun_A::A(n$7:F*) [line 40, column 3]\n  EXIT_SCOPE(n$7,n$8); [line 40, 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$10=*&this:F* [line 40, column 7]\n  n$11=_fun_T::T(n$10:F*) [line 40, column 3]\n  EXIT_SCOPE(n$10,n$11); [line 40, column 3]\n " shape="box"]
+"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_7" [label="7:  Constructor Init \n   n$9=*&this:F* [line 40, column 7]\n  n$10=_fun_T::T(n$9:F*) [line 40, column 3]\n  EXIT_SCOPE(n$9,n$10); [line 40, column 3]\n " shape="box"]
 	
 
 	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_7" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_6" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/destructors/pseudo_destructor_expr.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/destructors/pseudo_destructor_expr.cpp.dot
index e8caa915d..80a92006d 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/destructors/pseudo_destructor_expr.cpp.dot
+++ b/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$1=_fun___infer_skip_function() [line 17, column 3]\n  EXIT_SCOPE(n$1); [line 17, column 3]\n " shape="box"]
+"destroy<int_*>#14082686937760238422.8268959c48dc929d419568bc99a6b97b_4" [label="4:  Call _fun___infer_skip_function \n   n$0=_fun___infer_skip_function() [line 17, column 3]\n  EXIT_SCOPE(n$0); [line 17, 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$2=_fun___infer_skip_function() [line 11, column 3]\n  EXIT_SCOPE(n$2); [line 11, column 3]\n " shape="box"]
+"f#10188173399311638112.8cffce40f5525757e791edeba0985326_4" [label="4:  Call _fun___infer_skip_function \n   n$1=_fun___infer_skip_function() [line 11, column 3]\n  EXIT_SCOPE(n$1); [line 11, column 3]\n " shape="box"]
 	
 
 	 "f#10188173399311638112.8cffce40f5525757e791edeba0985326_4" -> "f#10188173399311638112.8cffce40f5525757e791edeba0985326_3" ;
-"f#10188173399311638112.8cffce40f5525757e791edeba0985326_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 10, column 3]\n  n$3=*&p:int* [line 10, column 12]\n  n$4=*n$3:int [line 10, column 11]\n  *&x:int=n$4 [line 10, column 3]\n  NULLIFY(&p); [line 10, column 3]\n  EXIT_SCOPE(n$3,n$4,p); [line 10, column 3]\n " shape="box"]
+"f#10188173399311638112.8cffce40f5525757e791edeba0985326_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 10, column 3]\n  n$2=*&p:int* [line 10, column 12]\n  n$3=*n$2:int [line 10, column 11]\n  *&x:int=n$3 [line 10, column 3]\n  NULLIFY(&p); [line 10, column 3]\n  EXIT_SCOPE(n$2,n$3,p); [line 10, 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   NULLIFY(&t); [line 24, column 1]\n " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Call _fun_destroy<int_*> \n   n$1=_fun_destroy<int_*>(&t:int**) [line 23, column 3]\n  EXIT_SCOPE(n$1,t); [line 23, column 3]\n  APPLY_ABSTRACTION; [line 23, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Call _fun_destroy<int_*> \n   n$0=_fun_destroy<int_*>(&t:int**) [line 23, column 3]\n  EXIT_SCOPE(n$0,t); [line 23, column 3]\n  APPLY_ABSTRACTION; [line 23, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/destructors/scope.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/destructors/scope.cpp.dot
index 4152af929..1cfbcb443 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/destructors/scope.cpp.dot
+++ b/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$2:destructor_scope::Z \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$1:destructor_scope::Z \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   NULLIFY(&0$?%__sil_tmp__temp_return_n$2); [line 82, column 27]\n " color=yellow style=filled]
+"callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_2" [label="2: Exit destructor_scope::callgetZ \n   NULLIFY(&0$?%__sil_tmp__temp_return_n$1); [line 82, column 27]\n " color=yellow style=filled]
 	
 
-"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*) assign_last [line 82, column 19]\n  EXIT_SCOPE(n$3,0$?%__sil_tmp__temp_return_n$2); [line 82, column 19]\n  APPLY_ABSTRACTION; [line 82, column 19]\n " shape="box"]
+"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*) assign_last [line 82, column 19]\n  EXIT_SCOPE(n$2,0$?%__sil_tmp__temp_return_n$1); [line 82, column 19]\n  APPLY_ABSTRACTION; [line 82, column 19]\n " shape="box"]
 	
 
 	 "callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_3" -> "callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_2" ;
@@ -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$2=*&this:destructor_scope::S* [line 19, column 8]\n  n$3=_fun_destructor_scope::X::X(n$2.x1:destructor_scope::X*) [line 19, column 8]\n  NULLIFY(&this); [line 19, column 8]\n  EXIT_SCOPE(n$2,n$3,this); [line 19, column 8]\n  APPLY_ABSTRACTION; [line 19, column 8]\n " shape="box"]
+"S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_3" [label="3:  Constructor Init \n   n$1=*&this:destructor_scope::S* [line 19, column 8]\n  n$2=_fun_destructor_scope::X::X(n$1.x1:destructor_scope::X*) [line 19, column 8]\n  NULLIFY(&this); [line 19, column 8]\n  EXIT_SCOPE(n$1,n$2,this); [line 19, column 8]\n  APPLY_ABSTRACTION; [line 19, column 8]\n " shape="box"]
 	
 
 	 "S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_3" -> "S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/destructors/simple_decl.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/destructors/simple_decl.cpp.dot
index d678e023c..0b62d02e4 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/destructors/simple_decl.cpp.dot
+++ b/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$3=*&this:A* [line 10, column 10]\n  *n$3.f:int=0 [line 10, column 10]\n  NULLIFY(&this); [line 10, column 10]\n  EXIT_SCOPE(n$3,this); [line 10, column 10]\n  APPLY_ABSTRACTION; [line 10, column 10]\n " shape="box"]
+"__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_3" [label="3:  BinaryOperatorStmt: Assign \n   n$2=*&this:A* [line 10, column 10]\n  *n$2.f:int=0 [line 10, column 10]\n  NULLIFY(&this); [line 10, column 10]\n  EXIT_SCOPE(n$2,this); [line 10, column 10]\n  APPLY_ABSTRACTION; [line 10, column 10]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_3" -> "__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_2" ;
@@ -29,7 +29,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$3=*&this:B* [line 18, column 11]\n  *n$3.f:int=1 [line 18, column 11]\n  NULLIFY(&this); [line 18, column 11]\n  EXIT_SCOPE(n$3,this); [line 18, column 11]\n  APPLY_ABSTRACTION; [line 18, column 11]\n " shape="box"]
+"__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_3" [label="3:  BinaryOperatorStmt: Assign \n   n$2=*&this:B* [line 18, column 11]\n  *n$2.f:int=1 [line 18, column 11]\n  NULLIFY(&this); [line 18, column 11]\n  EXIT_SCOPE(n$2,this); [line 18, column 11]\n  APPLY_ABSTRACTION; [line 18, column 11]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_3" -> "__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/globals/global_const1.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/globals/global_const1.cpp.dot
index e469a55f9..b7efee650 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/globals/global_const1.cpp.dot
+++ b/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   VARIABLE_DECLARED(local:int); [line 18, column 3]\n  n$2=*&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|ice>$v:int [line 18, column 15]\n  *&local:int=n$2 [line 18, column 3]\n  NULLIFY(&local); [line 18, column 3]\n  EXIT_SCOPE(n$2,local); [line 18, column 3]\n " shape="box"]
+"test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(local:int); [line 18, column 3]\n  n$1=*&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|ice>$v:int [line 18, column 15]\n  *&local:int=n$1 [line 18, column 3]\n  NULLIFY(&local); [line 18, column 3]\n  EXIT_SCOPE(n$1,local); [line 18, column 3]\n " shape="box"]
 	
 
 	 "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_4" -> "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_3" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/if.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/if.cpp.dot
index 4da525f8b..a4d37fd70 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/if.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/if.cpp.dot
@@ -15,20 +15,20 @@ digraph cfg {
 	
 
 	 "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_4" -> "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_3" ;
-"if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_5" [label="5:  BinaryOperatorStmt: EQ \n   n$1=*&x:int [line 17, column 7]\n " shape="box"]
+"if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_5" [label="5:  BinaryOperatorStmt: EQ \n   n$0=*&x:int [line 17, column 7]\n " shape="box"]
 	
 
 	 "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_5" -> "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_6" ;
 	 "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_5" -> "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_7" ;
-"if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_6" [label="6: Prune (true branch, if) \n   PRUNE((n$1 == 1234), true); [line 17, column 7]\n  EXIT_SCOPE(n$1); [line 17, column 7]\n " shape="invhouse"]
+"if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_6" [label="6: Prune (true branch, if) \n   PRUNE((n$0 == 1234), true); [line 17, column 7]\n  EXIT_SCOPE(n$0); [line 17, column 7]\n " shape="invhouse"]
 	
 
 	 "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_6" -> "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_8" ;
-"if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$1 == 1234), false); [line 17, column 7]\n  EXIT_SCOPE(n$1); [line 17, column 7]\n  APPLY_ABSTRACTION; [line 17, column 7]\n " shape="invhouse"]
+"if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$0 == 1234), false); [line 17, column 7]\n  EXIT_SCOPE(n$0); [line 17, column 7]\n  APPLY_ABSTRACTION; [line 17, column 7]\n " shape="invhouse"]
 	
 
 	 "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_7" -> "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_4" ;
-"if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_8" [label="8:  BinaryOperatorStmt: Assign \n   n$3=*&x:int [line 18, column 9]\n  *&y:int=n$3 [line 18, column 5]\n  NULLIFY(&y); [line 18, column 5]\n  NULLIFY(&x); [line 18, column 5]\n  EXIT_SCOPE(n$3,y,x); [line 18, column 5]\n  APPLY_ABSTRACTION; [line 18, column 5]\n " shape="box"]
+"if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_8" [label="8:  BinaryOperatorStmt: Assign \n   n$1=*&x:int [line 18, column 9]\n  *&y:int=n$1 [line 18, column 5]\n  NULLIFY(&y); [line 18, column 5]\n  NULLIFY(&x); [line 18, column 5]\n  EXIT_SCOPE(n$1,y,x); [line 18, column 5]\n  APPLY_ABSTRACTION; [line 18, column 5]\n " shape="box"]
 	
 
 	 "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_8" -> "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_4" ;
@@ -51,11 +51,11 @@ digraph cfg {
 	
 
 	 "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_4" -> "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_3" ;
-"if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_5" [label="5: Prune (true branch, if) \n   n$1=*&x:int [line 44, column 11]\n  PRUNE(n$1, true); [line 44, column 11]\n  EXIT_SCOPE(n$1); [line 44, column 11]\n " shape="invhouse"]
+"if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_5" [label="5: Prune (true branch, if) \n   n$0=*&x:int [line 44, column 11]\n  PRUNE(n$0, true); [line 44, column 11]\n  EXIT_SCOPE(n$0); [line 44, column 11]\n " shape="invhouse"]
 	
 
 	 "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_5" -> "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_8" ;
-"if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_6" [label="6: Prune (false branch, if) \n   n$1=*&x:int [line 44, column 11]\n  PRUNE(!n$1, false); [line 44, column 11]\n  NULLIFY(&x); [line 44, column 11]\n  EXIT_SCOPE(n$1,x); [line 44, column 11]\n  APPLY_ABSTRACTION; [line 44, column 11]\n " shape="invhouse"]
+"if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_6" [label="6: Prune (false branch, if) \n   n$0=*&x:int [line 44, column 11]\n  PRUNE(!n$0, false); [line 44, column 11]\n  NULLIFY(&x); [line 44, column 11]\n  EXIT_SCOPE(n$0,x); [line 44, column 11]\n  APPLY_ABSTRACTION; [line 44, column 11]\n " shape="invhouse"]
 	
 
 	 "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_6" -> "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_4" ;
@@ -64,7 +64,7 @@ digraph cfg {
 
 	 "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_7" -> "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_5" ;
 	 "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_7" -> "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_6" ;
-"if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_8" [label="8:  BinaryOperatorStmt: Assign \n   n$3=*&x:int [line 45, column 9]\n  *&y:int=n$3 [line 45, column 5]\n  NULLIFY(&x); [line 45, column 5]\n  NULLIFY(&y); [line 45, column 5]\n  EXIT_SCOPE(n$3,x,y); [line 45, column 5]\n  APPLY_ABSTRACTION; [line 45, column 5]\n " shape="box"]
+"if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_8" [label="8:  BinaryOperatorStmt: Assign \n   n$1=*&x:int [line 45, column 9]\n  *&y:int=n$1 [line 45, column 5]\n  NULLIFY(&x); [line 45, column 5]\n  NULLIFY(&y); [line 45, column 5]\n  EXIT_SCOPE(n$1,x,y); [line 45, column 5]\n  APPLY_ABSTRACTION; [line 45, column 5]\n " shape="box"]
 	
 
 	 "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_8" -> "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_4" ;
@@ -87,16 +87,16 @@ digraph cfg {
 	
 
 	 "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_4" -> "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_3" ;
-"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_5" [label="5:  BinaryOperatorStmt: EQ \n   n$1=*&x:int [line 34, column 7]\n  NULLIFY(&x); [line 34, column 7]\n  EXIT_SCOPE(x); [line 34, column 7]\n " shape="box"]
+"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_5" [label="5:  BinaryOperatorStmt: EQ \n   n$0=*&x:int [line 34, column 7]\n  NULLIFY(&x); [line 34, column 7]\n  EXIT_SCOPE(x); [line 34, column 7]\n " shape="box"]
 	
 
 	 "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_5" -> "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_6" ;
 	 "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_5" -> "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_7" ;
-"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_6" [label="6: Prune (true branch, if) \n   PRUNE((n$1 == 1234), true); [line 34, column 7]\n  EXIT_SCOPE(n$1); [line 34, column 7]\n " shape="invhouse"]
+"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_6" [label="6: Prune (true branch, if) \n   PRUNE((n$0 == 1234), true); [line 34, column 7]\n  EXIT_SCOPE(n$0); [line 34, column 7]\n " shape="invhouse"]
 	
 
 	 "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_6" -> "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_8" ;
-"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$1 == 1234), false); [line 34, column 7]\n  EXIT_SCOPE(n$1); [line 34, column 7]\n " shape="invhouse"]
+"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$0 == 1234), false); [line 34, column 7]\n  EXIT_SCOPE(n$0); [line 34, column 7]\n " shape="invhouse"]
 	
 
 	 "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_7" -> "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_9" ;
@@ -127,11 +127,11 @@ digraph cfg {
 	
 
 	 "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_4" -> "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_3" ;
-"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_5" [label="5: Prune (true branch, if) \n   n$1=*&x:int [line 52, column 11]\n  PRUNE(n$1, true); [line 52, column 11]\n  EXIT_SCOPE(n$1); [line 52, column 11]\n " shape="invhouse"]
+"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_5" [label="5: Prune (true branch, if) \n   n$0=*&x:int [line 52, column 11]\n  PRUNE(n$0, true); [line 52, column 11]\n  EXIT_SCOPE(n$0); [line 52, column 11]\n " shape="invhouse"]
 	
 
 	 "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_5" -> "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_8" ;
-"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_6" [label="6: Prune (false branch, if) \n   n$1=*&x:int [line 52, column 11]\n  PRUNE(!n$1, false); [line 52, column 11]\n  EXIT_SCOPE(n$1); [line 52, column 11]\n " shape="invhouse"]
+"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_6" [label="6: Prune (false branch, if) \n   n$0=*&x:int [line 52, column 11]\n  PRUNE(!n$0, false); [line 52, column 11]\n  EXIT_SCOPE(n$0); [line 52, column 11]\n " shape="invhouse"]
 	
 
 	 "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_6" -> "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_9" ;
@@ -140,11 +140,11 @@ digraph cfg {
 
 	 "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_7" -> "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_5" ;
 	 "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_7" -> "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_6" ;
-"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_8" [label="8:  BinaryOperatorStmt: Assign \n   n$3=*&x:int [line 53, column 9]\n  *&y:int=n$3 [line 53, column 5]\n  NULLIFY(&x); [line 53, column 5]\n  NULLIFY(&y); [line 53, column 5]\n  EXIT_SCOPE(n$3,x,y); [line 53, column 5]\n  APPLY_ABSTRACTION; [line 53, column 5]\n " shape="box"]
+"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_8" [label="8:  BinaryOperatorStmt: Assign \n   n$1=*&x:int [line 53, column 9]\n  *&y:int=n$1 [line 53, column 5]\n  NULLIFY(&x); [line 53, column 5]\n  NULLIFY(&y); [line 53, column 5]\n  EXIT_SCOPE(n$1,x,y); [line 53, column 5]\n  APPLY_ABSTRACTION; [line 53, column 5]\n " shape="box"]
 	
 
 	 "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_8" -> "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_4" ;
-"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_9" [label="9:  BinaryOperatorStmt: Assign \n   n$5=*&x:int [line 55, column 9]\n  *&y:int=(n$5 * 2) [line 55, column 5]\n  NULLIFY(&x); [line 55, column 5]\n  NULLIFY(&y); [line 55, column 5]\n  EXIT_SCOPE(n$5,x,y); [line 55, column 5]\n  APPLY_ABSTRACTION; [line 55, column 5]\n " shape="box"]
+"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_9" [label="9:  BinaryOperatorStmt: Assign \n   n$2=*&x:int [line 55, column 9]\n  *&y:int=(n$2 * 2) [line 55, column 5]\n  NULLIFY(&x); [line 55, column 5]\n  NULLIFY(&y); [line 55, column 5]\n  EXIT_SCOPE(n$2,x,y); [line 55, column 5]\n  APPLY_ABSTRACTION; [line 55, column 5]\n " shape="box"]
 	
 
 	 "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_9" -> "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_4" ;
@@ -167,16 +167,16 @@ digraph cfg {
 	
 
 	 "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_4" -> "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_2" ;
-"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_5" [label="5:  BinaryOperatorStmt: EQ \n   n$1=*&x:int [line 25, column 7]\n  NULLIFY(&x); [line 25, column 7]\n  EXIT_SCOPE(x); [line 25, column 7]\n " shape="box"]
+"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_5" [label="5:  BinaryOperatorStmt: EQ \n   n$0=*&x:int [line 25, column 7]\n  NULLIFY(&x); [line 25, column 7]\n  EXIT_SCOPE(x); [line 25, column 7]\n " shape="box"]
 	
 
 	 "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_5" -> "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_6" ;
 	 "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_5" -> "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_7" ;
-"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_6" [label="6: Prune (true branch, if) \n   PRUNE((n$1 == 1234), true); [line 25, column 7]\n  EXIT_SCOPE(n$1); [line 25, column 7]\n " shape="invhouse"]
+"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_6" [label="6: Prune (true branch, if) \n   PRUNE((n$0 == 1234), true); [line 25, column 7]\n  EXIT_SCOPE(n$0); [line 25, column 7]\n " shape="invhouse"]
 	
 
 	 "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_6" -> "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_8" ;
-"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$1 == 1234), false); [line 25, column 7]\n  EXIT_SCOPE(n$1); [line 25, column 7]\n " shape="invhouse"]
+"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$0 == 1234), false); [line 25, column 7]\n  EXIT_SCOPE(n$0); [line 25, column 7]\n " shape="invhouse"]
 	
 
 	 "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_7" -> "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_9" ;
@@ -207,20 +207,20 @@ digraph cfg {
 	
 
 	 "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_4" -> "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_2" ;
-"if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_5" [label="5:  BinaryOperatorStmt: EQ \n   n$1=*&x:int [line 62, column 18]\n " shape="box"]
+"if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_5" [label="5:  BinaryOperatorStmt: EQ \n   n$0=*&x:int [line 62, column 18]\n " shape="box"]
 	
 
 	 "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_5" -> "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_6" ;
 	 "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_5" -> "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_7" ;
-"if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_6" [label="6: Prune (true branch, if) \n   PRUNE((n$1 == 4), true); [line 62, column 18]\n  EXIT_SCOPE(n$1); [line 62, column 18]\n " shape="invhouse"]
+"if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_6" [label="6: Prune (true branch, if) \n   PRUNE((n$0 == 4), true); [line 62, column 18]\n  EXIT_SCOPE(n$0); [line 62, column 18]\n " shape="invhouse"]
 	
 
 	 "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_6" -> "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_8" ;
-"if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$1 == 4), false); [line 62, column 18]\n  NULLIFY(&x); [line 62, column 18]\n  EXIT_SCOPE(n$1,x); [line 62, column 18]\n  APPLY_ABSTRACTION; [line 62, column 18]\n " shape="invhouse"]
+"if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$0 == 4), false); [line 62, column 18]\n  NULLIFY(&x); [line 62, column 18]\n  EXIT_SCOPE(n$0,x); [line 62, column 18]\n  APPLY_ABSTRACTION; [line 62, column 18]\n " shape="invhouse"]
 	
 
 	 "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_7" -> "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_3" ;
-"if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_8" [label="8:  BinaryOperatorStmt: Assign \n   n$3=*&x:int [line 63, column 9]\n  *&y:int=n$3 [line 63, column 5]\n  NULLIFY(&x); [line 63, column 5]\n  NULLIFY(&y); [line 63, column 5]\n  EXIT_SCOPE(n$3,x,y); [line 63, column 5]\n  APPLY_ABSTRACTION; [line 63, column 5]\n " shape="box"]
+"if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_8" [label="8:  BinaryOperatorStmt: Assign \n   n$1=*&x:int [line 63, column 9]\n  *&y:int=n$1 [line 63, column 5]\n  NULLIFY(&x); [line 63, column 5]\n  NULLIFY(&y); [line 63, column 5]\n  EXIT_SCOPE(n$1,x,y); [line 63, column 5]\n  APPLY_ABSTRACTION; [line 63, column 5]\n " shape="box"]
 	
 
 	 "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_8" -> "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_3" ;
@@ -247,20 +247,20 @@ digraph cfg {
 	
 
 	 "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_4" -> "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_2" ;
-"if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_5" [label="5:  BinaryOperatorStmt: EQ \n   n$1=*&x:int [line 10, column 7]\n " shape="box"]
+"if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_5" [label="5:  BinaryOperatorStmt: EQ \n   n$0=*&x:int [line 10, column 7]\n " shape="box"]
 	
 
 	 "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_5" -> "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_6" ;
 	 "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_5" -> "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_7" ;
-"if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_6" [label="6: Prune (true branch, if) \n   PRUNE((n$1 == 1234), true); [line 10, column 7]\n  EXIT_SCOPE(n$1); [line 10, column 7]\n " shape="invhouse"]
+"if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_6" [label="6: Prune (true branch, if) \n   PRUNE((n$0 == 1234), true); [line 10, column 7]\n  EXIT_SCOPE(n$0); [line 10, column 7]\n " shape="invhouse"]
 	
 
 	 "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_6" -> "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_8" ;
-"if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$1 == 1234), false); [line 10, column 7]\n  EXIT_SCOPE(n$1); [line 10, column 7]\n  APPLY_ABSTRACTION; [line 10, column 7]\n " shape="invhouse"]
+"if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$0 == 1234), false); [line 10, column 7]\n  EXIT_SCOPE(n$0); [line 10, column 7]\n  APPLY_ABSTRACTION; [line 10, column 7]\n " shape="invhouse"]
 	
 
 	 "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_7" -> "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_3" ;
-"if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_8" [label="8:  BinaryOperatorStmt: Assign \n   n$3=*&x:int [line 11, column 9]\n  *&y:int=n$3 [line 11, column 5]\n  NULLIFY(&y); [line 11, column 5]\n  NULLIFY(&x); [line 11, column 5]\n  EXIT_SCOPE(n$3,y,x); [line 11, column 5]\n  APPLY_ABSTRACTION; [line 11, column 5]\n " shape="box"]
+"if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_8" [label="8:  BinaryOperatorStmt: Assign \n   n$1=*&x:int [line 11, column 9]\n  *&y:int=n$1 [line 11, column 5]\n  NULLIFY(&y); [line 11, column 5]\n  NULLIFY(&x); [line 11, column 5]\n  EXIT_SCOPE(n$1,y,x); [line 11, column 5]\n  APPLY_ABSTRACTION; [line 11, column 5]\n " shape="box"]
 	
 
 	 "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_8" -> "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_3" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/include_header/include_templ.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/include_header/include_templ.cpp.dot
index c916dfc10..c57445c66 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/include_header/include_templ.cpp.dot
+++ b/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   NULLIFY(&b); [line 19, column 1]\n " color=yellow style=filled]
 	
 
-"div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_3" [label="3:  Call _fun_B<A>::div0 \n   _=*&b:B<A> [line 18, column 3]\n  n$2=_fun_B<A>::div0(&b:B<A>&) [line 18, column 3]\n  EXIT_SCOPE(_,n$2,b); [line 18, column 3]\n  APPLY_ABSTRACTION; [line 18, column 3]\n " shape="box"]
+"div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_3" [label="3:  Call _fun_B<A>::div0 \n   _=*&b:B<A> [line 18, column 3]\n  n$1=_fun_B<A>::div0(&b:B<A>&) [line 18, column 3]\n  EXIT_SCOPE(_,n$1,b); [line 18, column 3]\n  APPLY_ABSTRACTION; [line 18, 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   VARIABLE_DECLARED(b:B<A>); [line 17, column 3]\n  n$3=_fun_B<A>::B(&b:B<A>*) [line 17, column 8]\n  EXIT_SCOPE(n$3); [line 17, column 8]\n " shape="box"]
+"div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(b:B<A>); [line 17, column 3]\n  n$2=_fun_B<A>::B(&b:B<A>*) [line 17, column 8]\n  EXIT_SCOPE(n$2); [line 17, 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   NULLIFY(&b); [line 14, column 1]\n " color=yellow style=filled]
 	
 
-"div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_3" [label="3:  Call _fun_B<int>::div0 \n   _=*&b:B<int> [line 13, column 3]\n  n$2=_fun_B<int>::div0(&b:B<int>&) [line 13, column 3]\n  EXIT_SCOPE(_,n$2,b); [line 13, column 3]\n  APPLY_ABSTRACTION; [line 13, column 3]\n " shape="box"]
+"div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_3" [label="3:  Call _fun_B<int>::div0 \n   _=*&b:B<int> [line 13, column 3]\n  n$1=_fun_B<int>::div0(&b:B<int>&) [line 13, column 3]\n  EXIT_SCOPE(_,n$1,b); [line 13, column 3]\n  APPLY_ABSTRACTION; [line 13, 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   VARIABLE_DECLARED(b:B<int>); [line 12, column 3]\n  n$3=_fun_B<int>::B(&b:B<int>*) [line 12, column 10]\n  EXIT_SCOPE(n$3); [line 12, column 10]\n " shape="box"]
+"div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(b:B<int>); [line 12, column 3]\n  n$2=_fun_B<int>::B(&b:B<int>*) [line 12, column 10]\n  EXIT_SCOPE(n$2); [line 12, 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$1=_fun_div0_templ<A>() [line 23, column 22]\n  EXIT_SCOPE(n$1); [line 23, column 22]\n  APPLY_ABSTRACTION; [line 23, column 22]\n " shape="box"]
+"div0_templ_A#15777392272986999827.c3e6f124c5921f718c539c423038b21a_3" [label="3:  Call _fun_div0_templ<A> \n   n$0=_fun_div0_templ<A>() [line 23, column 22]\n  EXIT_SCOPE(n$0); [line 23, column 22]\n  APPLY_ABSTRACTION; [line 23, 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$1=_fun_div0_templ<int>() [line 21, column 25]\n  EXIT_SCOPE(n$1); [line 21, column 25]\n  APPLY_ABSTRACTION; [line 21, column 25]\n " shape="box"]
+"div0_templ_int#6723189882400805523.156da066b41947aa58ec7afb9551dc47_3" [label="3:  Call _fun_div0_templ<int> \n   n$0=_fun_div0_templ<int>() [line 21, column 25]\n  EXIT_SCOPE(n$0); [line 21, column 25]\n  APPLY_ABSTRACTION; [line 21, column 25]\n " shape="box"]
 	
 
 	 "div0_templ_int#6723189882400805523.156da066b41947aa58ec7afb9551dc47_3" -> "div0_templ_int#6723189882400805523.156da066b41947aa58ec7afb9551dc47_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/initialization/inheriting_constructor.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/initialization/inheriting_constructor.cpp.dot
index 544ad4073..da7fe93d7 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/initialization/inheriting_constructor.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/initialization/inheriting_constructor.cpp.dot
@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n   NULLIFY(&b); [line 16, column 22]\n " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(b:B); [line 16, column 14]\n  n$1=_fun_B::A(&b:B*,5:int) [line 16, column 16]\n  EXIT_SCOPE(n$1,b); [line 16, column 16]\n  APPLY_ABSTRACTION; [line 16, column 16]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(b:B); [line 16, column 14]\n  n$0=_fun_B::A(&b:B*,5:int) [line 16, column 16]\n  EXIT_SCOPE(n$0,b); [line 16, column 16]\n  APPLY_ABSTRACTION; [line 16, column 16]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -32,7 +32,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$2=*&this:B* [line 13, column 12]\n  n$4=*&__param_0:int [line 13, column 12]\n  n$3=_fun_A::A(n$2:B*,n$4:int) [line 13, column 12]\n  NULLIFY(&this); [line 13, column 12]\n  NULLIFY(&__param_0); [line 13, column 12]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 13, column 12]\n  APPLY_ABSTRACTION; [line 13, column 12]\n " shape="box"]
+"A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_3" [label="3:  Constructor Init \n   n$1=*&this:B* [line 13, column 12]\n  n$3=*&__param_0:int [line 13, column 12]\n  n$2=_fun_A::A(n$1:B*,n$3:int) [line 13, column 12]\n  NULLIFY(&this); [line 13, column 12]\n  NULLIFY(&__param_0); [line 13, column 12]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 13, column 12]\n  APPLY_ABSTRACTION; [line 13, column 12]\n " shape="box"]
 	
 
 	 "A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_3" -> "A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/initialization/init_list.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/initialization/init_list.cpp.dot
index 7ccaca727..7f94628e0 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/initialization/init_list.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/initialization/init_list.cpp.dot
@@ -1,13 +1,13 @@
 /* @generated */
 digraph cfg {
-"init_in_binop#init_list#8348250075128359911.7adaa67964536570064366a92056cf46_1" [label="1: Start init_list::init_in_binop\nFormals:  x:int\nLocals:  0$?%__sil_tmpSIL_init_list__n$2:int \n  " color=yellow style=filled]
+"init_in_binop#init_list#8348250075128359911.7adaa67964536570064366a92056cf46_1" [label="1: Start init_list::init_in_binop\nFormals:  x:int\nLocals:  0$?%__sil_tmpSIL_init_list__n$1:int \n  " color=yellow style=filled]
 	
 
 	 "init_in_binop#init_list#8348250075128359911.7adaa67964536570064366a92056cf46_1" -> "init_in_binop#init_list#8348250075128359911.7adaa67964536570064366a92056cf46_3" ;
 "init_in_binop#init_list#8348250075128359911.7adaa67964536570064366a92056cf46_2" [label="2: Exit init_list::init_in_binop \n  " color=yellow style=filled]
 	
 
-"init_in_binop#init_list#8348250075128359911.7adaa67964536570064366a92056cf46_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&x:int [line 51, column 34]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_init_list__n$2:int); [line 51, column 42]\n  *&0$?%__sil_tmpSIL_init_list__n$2:int=0 [line 51, column 42]\n  *&x:int=(-n$1 & ~&0$?%__sil_tmpSIL_init_list__n$2) [line 51, column 29]\n  NULLIFY(&0$?%__sil_tmpSIL_init_list__n$2); [line 51, column 29]\n  NULLIFY(&x); [line 51, column 29]\n  EXIT_SCOPE(n$1,0$?%__sil_tmpSIL_init_list__n$2,x); [line 51, column 29]\n  APPLY_ABSTRACTION; [line 51, column 29]\n " shape="box"]
+"init_in_binop#init_list#8348250075128359911.7adaa67964536570064366a92056cf46_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&x:int [line 51, column 34]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_init_list__n$1:int); [line 51, column 42]\n  *&0$?%__sil_tmpSIL_init_list__n$1:int=0 [line 51, column 42]\n  *&x:int=(-n$0 & ~&0$?%__sil_tmpSIL_init_list__n$1) [line 51, column 29]\n  NULLIFY(&0$?%__sil_tmpSIL_init_list__n$1); [line 51, column 29]\n  NULLIFY(&x); [line 51, column 29]\n  EXIT_SCOPE(n$0,0$?%__sil_tmpSIL_init_list__n$1,x); [line 51, column 29]\n  APPLY_ABSTRACTION; [line 51, column 29]\n " shape="box"]
 	
 
 	 "init_in_binop#init_list#8348250075128359911.7adaa67964536570064366a92056cf46_3" -> "init_in_binop#init_list#8348250075128359911.7adaa67964536570064366a92056cf46_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_2" [label="2: Exit init_list::list_init \n   NULLIFY(&y); [line 49, column 1]\n  NULLIFY(&ty); [line 49, column 1]\n " color=yellow style=filled]
 	
 
-"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(ty:init_list::Y[3*24]); [line 48, column 3]\n  *&ty[0].z:int=1 [line 48, column 14]\n  *&ty[0].x.a:int=2 [line 48, column 18]\n  *&ty[0].x.p:int*=null [line 48, column 18]\n  n$1=_fun_init_list::Y::Y(&ty[1]:init_list::Y*,&y:init_list::Y&) [line 48, column 33]\n  n$2=*&yref:init_list::Y& [line 48, column 36]\n  n$3=_fun_init_list::Y::Y(&ty[2]:init_list::Y*,n$2:init_list::Y&) [line 48, column 36]\n  NULLIFY(&yref); [line 48, column 36]\n  EXIT_SCOPE(n$1,n$2,n$3,ty,y,yref); [line 48, column 36]\n  APPLY_ABSTRACTION; [line 48, column 36]\n " shape="box"]
+"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(ty:init_list::Y[3*24]); [line 48, column 3]\n  *&ty[0].z:int=1 [line 48, column 14]\n  *&ty[0].x.a:int=2 [line 48, column 18]\n  *&ty[0].x.p:int*=null [line 48, column 18]\n  n$0=_fun_init_list::Y::Y(&ty[1]:init_list::Y*,&y:init_list::Y&) [line 48, column 33]\n  n$1=*&yref:init_list::Y& [line 48, column 36]\n  n$2=_fun_init_list::Y::Y(&ty[2]:init_list::Y*,n$1:init_list::Y&) [line 48, column 36]\n  NULLIFY(&yref); [line 48, column 36]\n  EXIT_SCOPE(n$0,n$1,n$2,ty,y,yref); [line 48, column 36]\n  APPLY_ABSTRACTION; [line 48, column 36]\n " shape="box"]
 	
 
 	 "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_3" -> "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_2" ;
@@ -26,7 +26,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   VARIABLE_DECLARED(y:init_list::Y); [line 46, column 3]\n  n$4=_fun_init_list::Y::Y(&y:init_list::Y*) [line 46, column 5]\n  EXIT_SCOPE(n$4); [line 46, column 5]\n " shape="box"]
+"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(y:init_list::Y); [line 46, column 3]\n  n$3=_fun_init_list::Y::Y(&y:init_list::Y*) [line 46, column 5]\n  EXIT_SCOPE(n$3); [line 46, column 5]\n " shape="box"]
 	
 
 	 "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_5" -> "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_4" ;
@@ -113,11 +113,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$2=*&this:init_list::C* [line 22, column 43]\n  n$3=*&x:init_list::X const & [line 22, column 45]\n  n$4=_fun_init_list::X::X(n$2.x:init_list::X*,n$3:init_list::X const &) [line 22, column 43]\n  NULLIFY(&x); [line 22, column 43]\n  NULLIFY(&this); [line 22, column 43]\n  EXIT_SCOPE(n$2,n$3,n$4,x,this); [line 22, column 43]\n  APPLY_ABSTRACTION; [line 22, column 43]\n " shape="box"]
+"C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::C* [line 22, column 43]\n  n$2=*&x:init_list::X const & [line 22, column 45]\n  n$3=_fun_init_list::X::X(n$1.x:init_list::X*,n$2:init_list::X const &) [line 22, column 43]\n  NULLIFY(&x); [line 22, column 43]\n  NULLIFY(&this); [line 22, column 43]\n  EXIT_SCOPE(n$1,n$2,n$3,x,this); [line 22, column 43]\n  APPLY_ABSTRACTION; [line 22, 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$5=*&this:init_list::C* [line 22, column 33]\n  n$6=*&a:int [line 22, column 35]\n  n$7=*&b:int [line 22, column 39]\n  *n$5.z:int=(n$6 + n$7) [line 22, column 33]\n  NULLIFY(&a); [line 22, column 33]\n  NULLIFY(&b); [line 22, column 33]\n  EXIT_SCOPE(n$5,n$6,n$7,a,b); [line 22, column 33]\n " shape="box"]
+"C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_4" [label="4:  Constructor Init \n   n$4=*&this:init_list::C* [line 22, column 33]\n  n$5=*&a:int [line 22, column 35]\n  n$6=*&b:int [line 22, column 39]\n  *n$4.z:int=(n$5 + n$6) [line 22, column 33]\n  NULLIFY(&a); [line 22, column 33]\n  NULLIFY(&b); [line 22, column 33]\n  EXIT_SCOPE(n$4,n$5,n$6,a,b); [line 22, column 33]\n " shape="box"]
 	
 
 	 "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_4" -> "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_3" ;
@@ -128,7 +128,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$2=*&this:init_list::C* [line 19, column 6]\n  *n$2.x.a:int=0 [line 19, column 7]\n  *n$2.x.p:int*=null [line 19, column 7]\n  NULLIFY(&this); [line 19, column 7]\n  EXIT_SCOPE(n$2,this); [line 19, column 7]\n  APPLY_ABSTRACTION; [line 19, column 7]\n " shape="box"]
+"C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::C* [line 19, column 6]\n  *n$1.x.a:int=0 [line 19, column 7]\n  *n$1.x.p:int*=null [line 19, column 7]\n  NULLIFY(&this); [line 19, column 7]\n  EXIT_SCOPE(n$1,this); [line 19, column 7]\n  APPLY_ABSTRACTION; [line 19, column 7]\n " shape="box"]
 	
 
 	 "C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_3" -> "C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_2" ;
@@ -139,11 +139,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$2=*&this:init_list::X* [line 8, column 8]\n  n$3=*&__param_0:init_list::X const & [line 8, column 8]\n  n$4=*n$3.p:int* [line 8, column 8]\n  *n$2.p:int*=n$4 [line 8, column 8]\n  NULLIFY(&this); [line 8, column 8]\n  NULLIFY(&__param_0); [line 8, column 8]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 8, column 8]\n  APPLY_ABSTRACTION; [line 8, column 8]\n " shape="box"]
+"X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::X* [line 8, column 8]\n  n$2=*&__param_0:init_list::X const & [line 8, column 8]\n  n$3=*n$2.p:int* [line 8, column 8]\n  *n$1.p:int*=n$3 [line 8, column 8]\n  NULLIFY(&this); [line 8, column 8]\n  NULLIFY(&__param_0); [line 8, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 8, column 8]\n  APPLY_ABSTRACTION; [line 8, 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$5=*&this:init_list::X* [line 8, column 8]\n  n$6=*&__param_0:init_list::X const & [line 8, column 8]\n  n$7=*n$6.a:int [line 8, column 8]\n  *n$5.a:int=n$7 [line 8, column 8]\n  EXIT_SCOPE(n$5,n$6,n$7); [line 8, column 8]\n " shape="box"]
+"X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_4" [label="4:  Constructor Init \n   n$4=*&this:init_list::X* [line 8, column 8]\n  n$5=*&__param_0:init_list::X const & [line 8, column 8]\n  n$6=*n$5.a:int [line 8, column 8]\n  *n$4.a:int=n$6 [line 8, column 8]\n  EXIT_SCOPE(n$4,n$5,n$6); [line 8, column 8]\n " shape="box"]
 	
 
 	 "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_4" -> "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_3" ;
@@ -161,11 +161,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$2=*&this:init_list::Y* [line 12, column 8]\n  n$3=*&__param_0:init_list::Y const & [line 12, column 8]\n  n$4=_fun_init_list::X::X(n$2.x:init_list::X*,n$3.x:init_list::X&) [line 12, column 8]\n  NULLIFY(&this); [line 12, column 8]\n  NULLIFY(&__param_0); [line 12, column 8]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 12, column 8]\n  APPLY_ABSTRACTION; [line 12, column 8]\n " shape="box"]
+"Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::Y* [line 12, column 8]\n  n$2=*&__param_0:init_list::Y const & [line 12, column 8]\n  n$3=_fun_init_list::X::X(n$1.x:init_list::X*,n$2.x:init_list::X&) [line 12, column 8]\n  NULLIFY(&this); [line 12, column 8]\n  NULLIFY(&__param_0); [line 12, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 12, column 8]\n  APPLY_ABSTRACTION; [line 12, 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$5=*&this:init_list::Y* [line 12, column 8]\n  n$6=*&__param_0:init_list::Y const & [line 12, column 8]\n  n$7=*n$6.z:int [line 12, column 8]\n  *n$5.z:int=n$7 [line 12, column 8]\n  EXIT_SCOPE(n$5,n$6,n$7); [line 12, column 8]\n " shape="box"]
+"Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_4" [label="4:  Constructor Init \n   n$4=*&this:init_list::Y* [line 12, column 8]\n  n$5=*&__param_0:init_list::Y const & [line 12, column 8]\n  n$6=*n$5.z:int [line 12, column 8]\n  *n$4.z:int=n$6 [line 12, column 8]\n  EXIT_SCOPE(n$4,n$5,n$6); [line 12, column 8]\n " shape="box"]
 	
 
 	 "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_4" -> "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_3" ;
@@ -176,7 +176,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$2=*&this:init_list::Y* [line 12, column 8]\n  n$3=_fun_init_list::X::X(n$2.x:init_list::X*) [line 12, column 8]\n  NULLIFY(&this); [line 12, column 8]\n  EXIT_SCOPE(n$2,n$3,this); [line 12, column 8]\n  APPLY_ABSTRACTION; [line 12, column 8]\n " shape="box"]
+"Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::Y* [line 12, column 8]\n  n$2=_fun_init_list::X::X(n$1.x:init_list::X*) [line 12, column 8]\n  NULLIFY(&this); [line 12, column 8]\n  EXIT_SCOPE(n$1,n$2,this); [line 12, column 8]\n  APPLY_ABSTRACTION; [line 12, column 8]\n " shape="box"]
 	
 
 	 "Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_3" -> "Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/literals/scalar_value_init.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/literals/scalar_value_init.cpp.dot
index 4daa0e940..fcaba106b 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/literals/scalar_value_init.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/literals/scalar_value_init.cpp.dot
@@ -66,23 +66,23 @@ digraph cfg {
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 20, column 3]\n  n$1=_fun_get<ENUM>() [line 20, column 12]\n  *&x:int=n$1 [line 20, column 3]\n  NULLIFY(&x); [line 20, column 3]\n  EXIT_SCOPE(n$1,x); [line 20, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 20, column 3]\n  n$0=_fun_get<ENUM>() [line 20, column 12]\n  *&x:int=n$0 [line 20, column 3]\n  NULLIFY(&x); [line 20, column 3]\n  EXIT_SCOPE(n$0,x); [line 20, 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$2=_fun_get<void>() [line 19, column 3]\n  EXIT_SCOPE(n$2); [line 19, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  Call _fun_get<void> \n   n$1=_fun_get<void>() [line 19, column 3]\n  EXIT_SCOPE(n$1); [line 19, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(fp:float*); [line 18, column 3]\n  n$3=_fun_get<float_*>() [line 18, column 15]\n  *&fp:float*=n$3 [line 18, column 3]\n  NULLIFY(&fp); [line 18, column 3]\n  EXIT_SCOPE(n$3,fp); [line 18, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(fp:float*); [line 18, column 3]\n  n$2=_fun_get<float_*>() [line 18, column 15]\n  *&fp:float*=n$2 [line 18, column 3]\n  NULLIFY(&fp); [line 18, column 3]\n  EXIT_SCOPE(n$2,fp); [line 18, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(f:float); [line 17, column 3]\n  n$4=_fun_get<float>() [line 17, column 13]\n  *&f:float=n$4 [line 17, column 3]\n  NULLIFY(&f); [line 17, column 3]\n  EXIT_SCOPE(n$4,f); [line 17, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(f:float); [line 17, column 3]\n  n$3=_fun_get<float>() [line 17, column 13]\n  *&f:float=n$3 [line 17, column 3]\n  NULLIFY(&f); [line 17, column 3]\n  EXIT_SCOPE(n$3,f); [line 17, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 16, column 3]\n  n$5=_fun_get<int>() [line 16, column 11]\n  *&i:int=n$5 [line 16, column 3]\n  NULLIFY(&i); [line 16, column 3]\n  EXIT_SCOPE(n$5,i); [line 16, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 16, column 3]\n  n$4=_fun_get<int>() [line 16, column 11]\n  *&i:int=n$4 [line 16, column 3]\n  NULLIFY(&i); [line 16, column 3]\n  EXIT_SCOPE(n$4,i); [line 16, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/loops/do_while.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/loops/do_while.cpp.dot
index e3c7fc9d7..3bad956d9 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/loops/do_while.cpp.dot
+++ b/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$2=*&b:_Bool [line 19, column 12]\n  PRUNE(n$2, true); [line 19, column 12]\n  EXIT_SCOPE(n$2); [line 19, column 12]\n  APPLY_ABSTRACTION; [line 19, column 12]\n " shape="invhouse"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_5" [label="5: Prune (true branch, do while) \n   n$1=*&b:_Bool [line 19, column 12]\n  PRUNE(n$1, true); [line 19, column 12]\n  EXIT_SCOPE(n$1); [line 19, column 12]\n  APPLY_ABSTRACTION; [line 19, 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$2=*&b:_Bool [line 19, column 12]\n  PRUNE(!n$2, false); [line 19, column 12]\n  NULLIFY(&b); [line 19, column 12]\n  EXIT_SCOPE(n$2,b); [line 19, column 12]\n " shape="invhouse"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_6" [label="6: Prune (false branch, do while) \n   n$1=*&b:_Bool [line 19, column 12]\n  PRUNE(!n$1, false); [line 19, column 12]\n  NULLIFY(&b); [line 19, column 12]\n  EXIT_SCOPE(n$1,b); [line 19, column 12]\n " shape="invhouse"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_6" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_3" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_7" [label="7:  BinaryOperatorStmt: Assign \n   n$4=*&x:int [line 18, column 9]\n  *&x:int=(n$4 + 4) [line 18, column 5]\n  EXIT_SCOPE(n$4); [line 18, column 5]\n " shape="box"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_7" [label="7:  BinaryOperatorStmt: Assign \n   n$2=*&x:int [line 18, column 9]\n  *&x:int=(n$2 + 4) [line 18, column 5]\n  EXIT_SCOPE(n$2); [line 18, 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$5=*&a:_Bool [line 12, column 9]\n  PRUNE(n$5, true); [line 12, column 9]\n  EXIT_SCOPE(n$5); [line 12, column 9]\n " shape="invhouse"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_9" [label="9: Prune (true branch, if) \n   n$3=*&a:_Bool [line 12, column 9]\n  PRUNE(n$3, true); [line 12, column 9]\n  EXIT_SCOPE(n$3); [line 12, 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$5=*&a:_Bool [line 12, column 9]\n  PRUNE(!n$5, false); [line 12, column 9]\n  EXIT_SCOPE(n$5); [line 12, column 9]\n " shape="invhouse"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_10" [label="10: Prune (false branch, if) \n   n$3=*&a:_Bool [line 12, column 9]\n  PRUNE(!n$3, false); [line 12, column 9]\n  EXIT_SCOPE(n$3); [line 12, column 9]\n " shape="invhouse"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_10" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_12" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_11" [label="11:  BinaryOperatorStmt: Assign \n   n$9=*&x:int [line 13, column 11]\n  *&x:int=(n$9 + 2) [line 13, column 7]\n  EXIT_SCOPE(n$9); [line 13, column 7]\n " shape="box"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_11" [label="11:  BinaryOperatorStmt: Assign \n   n$5=*&x:int [line 13, column 11]\n  *&x:int=(n$5 + 2) [line 13, column 7]\n  EXIT_SCOPE(n$5); [line 13, 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$11=*&x:int [line 16, column 11]\n  *&x:int=(n$11 + 3) [line 16, column 7]\n  EXIT_SCOPE(n$11); [line 16, column 7]\n " shape="box"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_12" [label="12:  BinaryOperatorStmt: Assign \n   n$6=*&x:int [line 16, column 11]\n  *&x:int=(n$6 + 3) [line 16, column 7]\n  EXIT_SCOPE(n$6); [line 16, column 7]\n " shape="box"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_12" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_8" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_13" [label="13:  BinaryOperatorStmt: Assign \n   n$13=*&x:int [line 11, column 9]\n  *&x:int=(n$13 + 1) [line 11, column 5]\n  EXIT_SCOPE(n$13); [line 11, column 5]\n " shape="box"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_13" [label="13:  BinaryOperatorStmt: Assign \n   n$8=*&x:int [line 11, column 9]\n  *&x:int=(n$8 + 1) [line 11, column 5]\n  EXIT_SCOPE(n$8); [line 11, column 5]\n " shape="box"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_13" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_9" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/loops/foreach1.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/loops/foreach1.cpp.dot
index 9f4296cf5..fbc043b88 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/loops/foreach1.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/loops/foreach1.cpp.dot
@@ -36,58 +36,62 @@ digraph cfg {
 	
 
 	 "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_9" -> "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_1" [label="1: Start test\nFormals: \nLocals:  __end1:iterator 0$?%__sil_tmpSIL_materialize_temp__n$3:iterator __begin1: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 __range1:vec& vector:vec \n  " color=yellow style=filled]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_1" [label="1: Start test\nFormals: \nLocals:  __end1:iterator 0$?%__sil_tmpSIL_materialize_temp__n$5:iterator __begin1:iterator 0$?%__sil_tmpSIL_materialize_temp__n$11:iterator 0$?%__sil_tmp__temp_return_n$19:iterator 0$?%__sil_tmp__temp_construct_n$21:iterator 0$?%__sil_tmp__temp_construct_n$23:iterator temp:int value:int __range1:vec& vector:vec \n  " color=yellow style=filled]
 	
 
-	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_1" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_13" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n   NULLIFY(&0$?%__sil_tmp__temp_construct_n$21); [line 38, column 1]\n  NULLIFY(&__end1); [line 38, column 1]\n  NULLIFY(&__begin1); [line 38, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$9); [line 38, column 1]\n  NULLIFY(&vector); [line 38, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_return_n$17); [line 38, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$3); [line 38, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_construct_n$19); [line 38, column 1]\n " color=yellow style=filled]
+	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_1" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_14" ;
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n   NULLIFY(&0$?%__sil_tmp__temp_return_n$19); [line 38, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_construct_n$21); [line 38, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$11); [line 38, column 1]\n  NULLIFY(&__end1); [line 38, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_construct_n$23); [line 38, column 1]\n  NULLIFY(&__begin1); [line 38, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$5); [line 38, column 1]\n  NULLIFY(&vector); [line 38, column 1]\n " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3: + \n  " ]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Destruction(Scope) \n   _=*&__end1:iterator [line 37, column 3]\n  n$1=_fun_iterator::~iterator(&__end1:iterator*) injected [line 37, column 3]\n  _=*&__begin1:iterator [line 37, column 3]\n  n$3=_fun_iterator::~iterator(&__begin1:iterator*) injected [line 37, column 3]\n  EXIT_SCOPE(_,_,n$1,n$3,__begin1,__end1); [line 37, column 3]\n  APPLY_ABSTRACTION; [line 37, column 3]\n " shape="box"]
 	
 
-	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(__end1:iterator); [line 35, column 18]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$3:iterator); [line 35, column 18]\n  n$4=*&__range1:vec& [line 35, column 18]\n  _=*n$4:vec [line 35, column 18]\n  n$7=_fun_vec::end(n$4:vec&,&0$?%__sil_tmpSIL_materialize_temp__n$3:iterator*) assign_last [line 35, column 18]\n  n$8=_fun_iterator::iterator(&__end1:iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$3:iterator&) [line 35, column 18]\n  NULLIFY(&__range1); [line 35, column 18]\n  EXIT_SCOPE(_,n$4,n$7,n$8,0$?%__sil_tmpSIL_materialize_temp__n$3,__range1); [line 35, column 18]\n  APPLY_ABSTRACTION; [line 35, column 18]\n " shape="box"]
+	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4: + \n  " ]
 	
 
-	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(__begin1:iterator); [line 35, column 18]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$9:iterator); [line 35, column 18]\n  n$10=*&__range1:vec& [line 35, column 18]\n  _=*n$10:vec [line 35, column 18]\n  n$13=_fun_vec::begin(n$10:vec&,&0$?%__sil_tmpSIL_materialize_temp__n$9:iterator*) assign_last [line 35, column 18]\n  n$14=_fun_iterator::iterator(&__begin1:iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$9:iterator&) [line 35, column 18]\n  EXIT_SCOPE(_,n$10,n$13,n$14,0$?%__sil_tmpSIL_materialize_temp__n$9); [line 35, column 18]\n " shape="box"]
+	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" ;
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(__end1:iterator); [line 35, column 18]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$5:iterator); [line 35, column 18]\n  n$6=*&__range1:vec& [line 35, column 18]\n  _=*n$6:vec [line 35, column 18]\n  n$9=_fun_vec::end(n$6:vec&,&0$?%__sil_tmpSIL_materialize_temp__n$5:iterator*) assign_last [line 35, column 18]\n  n$10=_fun_iterator::iterator(&__end1:iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$5:iterator&) [line 35, column 18]\n  NULLIFY(&__range1); [line 35, column 18]\n  EXIT_SCOPE(_,n$6,n$9,n$10,0$?%__sil_tmpSIL_materialize_temp__n$5,__range1); [line 35, column 18]\n  APPLY_ABSTRACTION; [line 35, 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$18=_fun_iterator::operator++(&__begin1:iterator&,&0$?%__sil_tmp__temp_return_n$17:iterator*) assign_last [line 35, column 18]\n  EXIT_SCOPE(n$18,0$?%__sil_tmp__temp_return_n$17); [line 35, column 18]\n  APPLY_ABSTRACTION; [line 35, column 18]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(__begin1:iterator); [line 35, column 18]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$11:iterator); [line 35, column 18]\n  n$12=*&__range1:vec& [line 35, column 18]\n  _=*n$12:vec [line 35, column 18]\n  n$15=_fun_vec::begin(n$12:vec&,&0$?%__sil_tmpSIL_materialize_temp__n$11:iterator*) assign_last [line 35, column 18]\n  n$16=_fun_iterator::iterator(&__begin1:iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$11:iterator&) [line 35, column 18]\n  EXIT_SCOPE(_,n$12,n$15,n$16,0$?%__sil_tmpSIL_materialize_temp__n$11); [line 35, column 18]\n " shape="box"]
 	
 
-	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" [label="7:  Call _fun_operator!= \n   n$20=_fun_iterator::iterator(&0$?%__sil_tmp__temp_construct_n$19:iterator*,&__begin1:iterator&) [line 35, column 18]\n  n$22=_fun_iterator::iterator(&0$?%__sil_tmp__temp_construct_n$21:iterator*,&__end1:iterator&) [line 35, column 18]\n  n$23=_fun_operator!=(&0$?%__sil_tmp__temp_construct_n$19:iterator,&0$?%__sil_tmp__temp_construct_n$21:iterator) [line 35, column 18]\n  EXIT_SCOPE(n$20,n$22); [line 35, column 18]\n " shape="box"]
+	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" ;
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" [label="7:  Call _fun_iterator::operator++ \n   n$20=_fun_iterator::operator++(&__begin1:iterator&,&0$?%__sil_tmp__temp_return_n$19:iterator*) assign_last [line 35, column 18]\n  EXIT_SCOPE(n$20,0$?%__sil_tmp__temp_return_n$19); [line 35, column 18]\n  APPLY_ABSTRACTION; [line 35, 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$23, true); [line 35, column 18]\n  EXIT_SCOPE(n$23); [line 35, column 18]\n " shape="invhouse"]
+	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" [label="8:  Call _fun_operator!= \n   n$22=_fun_iterator::iterator(&0$?%__sil_tmp__temp_construct_n$21:iterator*,&__begin1:iterator&) [line 35, column 18]\n  n$24=_fun_iterator::iterator(&0$?%__sil_tmp__temp_construct_n$23:iterator*,&__end1:iterator&) [line 35, column 18]\n  n$25=_fun_operator!=(&0$?%__sil_tmp__temp_construct_n$21:iterator,&0$?%__sil_tmp__temp_construct_n$23:iterator) [line 35, column 18]\n  EXIT_SCOPE(n$22,n$24); [line 35, column 18]\n " shape="box"]
 	
 
-	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_11" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_9" [label="9: Prune (false branch, for loop) \n   PRUNE(!n$23, false); [line 35, column 18]\n  EXIT_SCOPE(n$23,__begin1,__end1); [line 35, column 18]\n  APPLY_ABSTRACTION; [line 35, column 18]\n " shape="invhouse"]
+	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_9" ;
+	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_10" ;
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_9" [label="9: Prune (true branch, for loop) \n   PRUNE(n$25, true); [line 35, column 18]\n  EXIT_SCOPE(n$25); [line 35, column 18]\n " shape="invhouse"]
 	
 
-	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_9" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(temp:int); [line 36, column 5]\n  n$26=*&value:int [line 36, column 16]\n  n$27=*&value:int [line 36, column 24]\n  *&temp:int=((n$26 * n$27) + 10) [line 36, column 5]\n  NULLIFY(&value); [line 36, column 5]\n  NULLIFY(&temp); [line 36, column 5]\n  EXIT_SCOPE(n$26,n$27,value,temp); [line 36, column 5]\n " shape="box"]
+	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_9" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_12" ;
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_10" [label="10: Prune (false branch, for loop) \n   PRUNE(!n$25, false); [line 35, column 18]\n  EXIT_SCOPE(n$25); [line 35, column 18]\n " shape="invhouse"]
 	
 
-	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_10" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(value:int); [line 35, column 8]\n  n$29=_fun_iterator::operator*(&__begin1:iterator&) [line 35, column 18]\n  *&value:int=n$29 [line 35, column 8]\n  EXIT_SCOPE(n$29); [line 35, column 8]\n " shape="box"]
+	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_10" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(temp:int); [line 36, column 5]\n  n$26=*&value:int [line 36, column 16]\n  n$27=*&value:int [line 36, column 24]\n  *&temp:int=((n$26 * n$27) + 10) [line 36, column 5]\n  NULLIFY(&value); [line 36, column 5]\n  NULLIFY(&temp); [line 36, column 5]\n  EXIT_SCOPE(n$26,n$27,value,temp); [line 36, column 5]\n " shape="box"]
 	
 
-	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_11" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_10" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(__range1:vec&); [line 35, column 20]\n  *&__range1:vec&=&vector [line 35, column 20]\n  EXIT_SCOPE(vector); [line 35, column 20]\n " shape="box"]
+	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_11" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" ;
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(value:int); [line 35, column 8]\n  n$29=_fun_iterator::operator*(&__begin1:iterator&) [line 35, column 18]\n  *&value:int=n$29 [line 35, column 8]\n  EXIT_SCOPE(n$29); [line 35, column 8]\n " shape="box"]
 	
 
-	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_12" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(vector:vec); [line 34, column 3]\n  n$31=_fun_vec::vec(&vector:vec*,10:int) [line 34, column 7]\n  EXIT_SCOPE(n$31); [line 34, column 7]\n " shape="box"]
+	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_12" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_11" ;
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(__range1:vec&); [line 35, column 20]\n  *&__range1:vec&=&vector [line 35, column 20]\n  EXIT_SCOPE(vector); [line 35, column 20]\n " shape="box"]
 	
 
-	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_13" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_12" ;
+	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_13" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" ;
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(vector:vec); [line 34, column 3]\n  n$31=_fun_vec::vec(&vector:vec*,10:int) [line 34, column 7]\n  EXIT_SCOPE(n$31); [line 34, column 7]\n " shape="box"]
+	
+
+	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_14" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_13" ;
 "operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_1" [label="1: Start iterator::operator++\nFormals:  this:iterator* __return_param:iterator*\nLocals:  \n  " color=yellow style=filled]
 	
 
@@ -99,7 +103,7 @@ digraph cfg {
 	
 
 	 "operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_3" -> "operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_2" ;
-"operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_4" [label="4:  BinaryOperatorStmt: AddAssign \n   n$4=*&this:iterator* [line 12, column 5]\n  n$5=*n$4.val:int [line 12, column 5]\n  *n$4.val:int=(n$5 + 1) [line 12, column 5]\n  EXIT_SCOPE(n$4,n$5); [line 12, column 5]\n " shape="box"]
+"operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_4" [label="4:  BinaryOperatorStmt: AddAssign \n   n$3=*&this:iterator* [line 12, column 5]\n  n$4=*n$3.val:int [line 12, column 5]\n  *n$3.val:int=(n$4 + 1) [line 12, column 5]\n  EXIT_SCOPE(n$3,n$4); [line 12, column 5]\n " shape="box"]
 	
 
 	 "operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_4" -> "operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_3" ;
@@ -121,7 +125,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$2=*&this:iterator* [line 9, column 8]\n  n$3=*&__param_0:iterator const & [line 9, column 8]\n  n$4=*n$3.val:int [line 9, column 8]\n  *n$2.val:int=n$4 [line 9, column 8]\n  NULLIFY(&this); [line 9, column 8]\n  NULLIFY(&__param_0); [line 9, column 8]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 9, column 8]\n  APPLY_ABSTRACTION; [line 9, column 8]\n " shape="box"]
+"iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_3" [label="3:  Constructor Init \n   n$1=*&this:iterator* [line 9, column 8]\n  n$2=*&__param_0:iterator const & [line 9, column 8]\n  n$3=*n$2.val:int [line 9, column 8]\n  *n$1.val:int=n$3 [line 9, column 8]\n  NULLIFY(&this); [line 9, column 8]\n  NULLIFY(&__param_0); [line 9, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 9, column 8]\n  APPLY_ABSTRACTION; [line 9, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_3" -> "iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_2" ;
@@ -139,7 +143,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$2=*&this:iterator* [line 9, column 8]\n  n$3=*&__param_0:iterator& [line 9, column 8]\n  n$4=*n$3.val:int [line 9, column 8]\n  *n$2.val:int=n$4 [line 9, column 8]\n  NULLIFY(&this); [line 9, column 8]\n  NULLIFY(&__param_0); [line 9, column 8]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 9, column 8]\n  APPLY_ABSTRACTION; [line 9, column 8]\n " shape="box"]
+"iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_3" [label="3:  Constructor Init \n   n$1=*&this:iterator* [line 9, column 8]\n  n$2=*&__param_0:iterator& [line 9, column 8]\n  n$3=*n$2.val:int [line 9, column 8]\n  *n$1.val:int=n$3 [line 9, column 8]\n  NULLIFY(&this); [line 9, column 8]\n  NULLIFY(&__param_0); [line 9, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 9, column 8]\n  APPLY_ABSTRACTION; [line 9, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_3" -> "iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_2" ;
@@ -172,19 +176,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$1=*&this:vec* [line 24, column 5]\n  n$2=*&size:int [line 24, column 16]\n  *n$1.end_.val:int=n$2 [line 24, column 5]\n  NULLIFY(&size); [line 24, column 5]\n  NULLIFY(&this); [line 24, column 5]\n  EXIT_SCOPE(n$1,n$2,size,this); [line 24, column 5]\n  APPLY_ABSTRACTION; [line 24, column 5]\n " shape="box"]
+"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:vec* [line 24, column 5]\n  n$1=*&size:int [line 24, column 16]\n  *n$0.end_.val:int=n$1 [line 24, column 5]\n  NULLIFY(&size); [line 24, column 5]\n  NULLIFY(&this); [line 24, column 5]\n  EXIT_SCOPE(n$0,n$1,size,this); [line 24, column 5]\n  APPLY_ABSTRACTION; [line 24, 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$3=*&this:vec* [line 23, column 5]\n  *n$3.begin_.val:int=0 [line 23, column 5]\n  EXIT_SCOPE(n$3); [line 23, column 5]\n " shape="box"]
+"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:vec* [line 23, column 5]\n  *n$2.begin_.val:int=0 [line 23, column 5]\n  EXIT_SCOPE(n$2); [line 23, 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$4=*&this:vec* [line 22, column 3]\n  n$5=_fun_iterator::iterator(n$4.end_:iterator*) [line 22, column 3]\n  EXIT_SCOPE(n$4,n$5); [line 22, column 3]\n " shape="box"]
+"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_5" [label="5:  Constructor Init \n   n$3=*&this:vec* [line 22, column 3]\n  n$4=_fun_iterator::iterator(n$3.end_:iterator*) [line 22, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 22, 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$6=*&this:vec* [line 22, column 3]\n  n$7=_fun_iterator::iterator(n$6.begin_:iterator*) [line 22, column 3]\n  EXIT_SCOPE(n$6,n$7); [line 22, column 3]\n " shape="box"]
+"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_6" [label="6:  Constructor Init \n   n$5=*&this:vec* [line 22, column 3]\n  n$6=_fun_iterator::iterator(n$5.begin_:iterator*) [line 22, column 3]\n  EXIT_SCOPE(n$5,n$6); [line 22, column 3]\n " shape="box"]
 	
 
 	 "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_6" -> "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_5" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/assign_in_condition.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/assign_in_condition.cpp.dot
index 6c985dde2..1acbce58b 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/assign_in_condition.cpp.dot
+++ b/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$1=*&p:int* [line 9, column 9]\n  *n$1:int=0 [line 9, column 8]\n  NULLIFY(&p); [line 9, column 8]\n  EXIT_SCOPE(p); [line 9, column 8]\n " shape="box"]
+"foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_5" [label="5:  BinaryOperatorStmt: Assign \n   n$0=*&p:int* [line 9, column 9]\n  *n$0:int=0 [line 9, column 8]\n  NULLIFY(&p); [line 9, column 8]\n  EXIT_SCOPE(p); [line 9, 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$2=*n$1:int [line 9, column 7]\n  PRUNE(n$2, true); [line 9, column 7]\n  EXIT_SCOPE(n$1,n$2); [line 9, column 7]\n " shape="invhouse"]
+"foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_6" [label="6: Prune (true branch, if) \n   n$1=*n$0:int [line 9, column 7]\n  PRUNE(n$1, true); [line 9, column 7]\n  EXIT_SCOPE(n$0,n$1); [line 9, 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$2=*n$1:int [line 9, column 7]\n  PRUNE(!n$2, false); [line 9, column 7]\n  EXIT_SCOPE(n$1,n$2); [line 9, column 7]\n " shape="invhouse"]
+"foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_7" [label="7: Prune (false branch, if) \n   n$1=*n$0:int [line 9, column 7]\n  PRUNE(!n$1, false); [line 9, column 7]\n  EXIT_SCOPE(n$0,n$1); [line 9, column 7]\n " shape="invhouse"]
 	
 
 	 "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_7" -> "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_4" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/assign_with_increment.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/assign_with_increment.cpp.dot
index d051b96cc..6c140a8e8 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/assign_with_increment.cpp.dot
+++ b/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   VARIABLE_DECLARED(e:int); [line 13, column 3]\n  n$1=*&a:int [line 13, column 11]\n  *&a:int=(n$1 - 1) [line 13, column 11]\n  *&e:int=n$1 [line 13, column 3]\n  NULLIFY(&a); [line 13, column 3]\n  NULLIFY(&e); [line 13, column 3]\n  EXIT_SCOPE(n$1,a,e); [line 13, column 3]\n  APPLY_ABSTRACTION; [line 13, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(e:int); [line 13, column 3]\n  n$0=*&a:int [line 13, column 11]\n  *&a:int=(n$0 - 1) [line 13, column 11]\n  *&e:int=n$0 [line 13, column 3]\n  NULLIFY(&a); [line 13, column 3]\n  NULLIFY(&e); [line 13, column 3]\n  EXIT_SCOPE(n$0,a,e); [line 13, column 3]\n  APPLY_ABSTRACTION; [line 13, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(d:int); [line 12, column 3]\n  n$2=*&a:int [line 12, column 11]\n  *&a:int=(n$2 - 1) [line 12, column 11]\n  n$3=*&a:int [line 12, column 11]\n  *&d:int=n$3 [line 12, column 3]\n  NULLIFY(&d); [line 12, column 3]\n  EXIT_SCOPE(n$2,n$3,d); [line 12, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(d:int); [line 12, column 3]\n  n$1=*&a:int [line 12, column 11]\n  *&a:int=(n$1 - 1) [line 12, column 11]\n  n$2=*&a:int [line 12, column 11]\n  *&d:int=n$2 [line 12, column 3]\n  NULLIFY(&d); [line 12, column 3]\n  EXIT_SCOPE(n$1,n$2,d); [line 12, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(c:int); [line 11, column 3]\n  n$4=*&a:int [line 11, column 11]\n  *&a:int=(n$4 + 1) [line 11, column 11]\n  *&c:int=n$4 [line 11, column 3]\n  NULLIFY(&c); [line 11, column 3]\n  EXIT_SCOPE(n$4,c); [line 11, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(c:int); [line 11, column 3]\n  n$3=*&a:int [line 11, column 11]\n  *&a:int=(n$3 + 1) [line 11, column 11]\n  *&c:int=n$3 [line 11, column 3]\n  NULLIFY(&c); [line 11, column 3]\n  EXIT_SCOPE(n$3,c); [line 11, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 10, column 3]\n  n$5=*&a:int [line 10, column 11]\n  *&a:int=(n$5 + 1) [line 10, column 11]\n  n$6=*&a:int [line 10, column 11]\n  *&b:int=n$6 [line 10, column 3]\n  NULLIFY(&b); [line 10, column 3]\n  EXIT_SCOPE(n$5,n$6,b); [line 10, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 10, column 3]\n  n$4=*&a:int [line 10, column 11]\n  *&a:int=(n$4 + 1) [line 10, column 11]\n  n$5=*&a:int [line 10, column 11]\n  *&b:int=n$5 [line 10, column 3]\n  NULLIFY(&b); [line 10, column 3]\n  EXIT_SCOPE(n$4,n$5,b); [line 10, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/union.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/union.cpp.dot
index 5d5cc42ca..c16840733 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/union.cpp.dot
+++ b/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$1=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$x:anonymous_struct_nestedoperators_union.cpp:8:1* [line 32, column 11]\n  n$2=*n$1.b:int [line 32, column 11]\n  *&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.g.w:int=n$2 [line 32, column 3]\n  EXIT_SCOPE(n$1,n$2); [line 32, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$x:anonymous_struct_nestedoperators_union.cpp:8:1* [line 32, column 11]\n  n$1=*n$0.b:int [line 32, column 11]\n  *&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.g.w:int=n$1 [line 32, column 3]\n  EXIT_SCOPE(n$0,n$1); [line 32, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$3=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.f:int [line 30, column 11]\n  *&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.g.u:int=n$3 [line 30, column 3]\n  EXIT_SCOPE(n$3); [line 30, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.f:int [line 30, column 11]\n  *&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.g.u:int=n$2 [line 30, column 3]\n  EXIT_SCOPE(n$2); [line 30, 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$4=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$x:anonymous_struct_nestedoperators_union.cpp:8:1* [line 28, column 3]\n  *n$4.a:int=1 [line 28, column 3]\n  EXIT_SCOPE(n$4); [line 28, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   n$3=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$x:anonymous_struct_nestedoperators_union.cpp:8:1* [line 28, column 3]\n  *n$3.a:int=1 [line 28, column 3]\n  EXIT_SCOPE(n$3); [line 28, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
diff --git a/infer/tests/codetoanalyze/cpp/pulse/basics.cpp b/infer/tests/codetoanalyze/cpp/pulse/basics.cpp
index 52927dbe0..d911a2a07 100644
--- a/infer/tests/codetoanalyze/cpp/pulse/basics.cpp
+++ b/infer/tests/codetoanalyze/cpp/pulse/basics.cpp
@@ -101,6 +101,48 @@ int struct_inside_loop_ok(std::vector<int> numbers) {
   return sum;
 }
 
+int struct_inside_loop_break_ok(std::vector<int> numbers) {
+  int sum;
+  for (auto number : numbers) {
+    A a = getA();
+    if (number < 0) {
+      break;
+    }
+    sum += a.f(number);
+  }
+  return sum;
+}
+
+int struct_inside_loop_continue_ok(std::vector<int> numbers) {
+  int sum;
+  for (auto number : numbers) {
+    A a = getA();
+    if (number < 0) {
+      continue;
+    }
+    sum += a.f(number);
+  }
+  return sum;
+}
+
+int return_from_inner_scope_ok(bool b) {
+  {
+    A a = getA();
+    if (b) {
+      return;
+    }
+  }
+}
+
+void return_inside_single_branch_if_in_loop_ok() {
+  while (true) {
+    if (true) {
+      A a;
+      return;
+    }
+  }
+}
+
 struct UseAfterSelfDestruct {
   A a_;
   int x_;
diff --git a/infer/tests/codetoanalyze/cpp/shared/attributes/annotate.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/attributes/annotate.cpp.dot
index ada322d79..e8e1dd543 100644
--- a/infer/tests/codetoanalyze/cpp/shared/attributes/annotate.cpp.dot
+++ b/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 89, column 3]\n  n$5=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 89, column 3]\n  EXIT_SCOPE(_,n$5); [line 89, column 3]\n " shape="box"]
+"getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 89, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 89, column 3]\n  EXIT_SCOPE(_,n$4); [line 89, 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   VARIABLE_DECLARED(t:int*); [line 88, column 3]\n  n$6=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 88, column 23]\n  EXIT_SCOPE(n$6); [line 88, column 23]\n " shape="box"]
+"getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 88, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 88, column 23]\n  EXIT_SCOPE(n$5); [line 88, 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 95, column 3]\n  n$5=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 95, column 3]\n  EXIT_SCOPE(_,n$5); [line 95, column 3]\n " shape="box"]
+"getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 95, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 95, column 3]\n  EXIT_SCOPE(_,n$4); [line 95, 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   VARIABLE_DECLARED(t:int*); [line 94, column 3]\n  n$6=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 94, column 23]\n  EXIT_SCOPE(n$6); [line 94, column 23]\n " shape="box"]
+"getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 94, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 94, column 23]\n  EXIT_SCOPE(n$5); [line 94, 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 102, column 3]\n  n$5=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,&a:int*) [line 102, column 3]\n  EXIT_SCOPE(_,n$5,a); [line 102, column 3]\n " shape="box"]
+"getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 102, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,&a:int*) [line 102, column 3]\n  EXIT_SCOPE(_,n$4,a); [line 102, 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   VARIABLE_DECLARED(t:int*); [line 101, column 3]\n  n$6=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 101, column 23]\n  EXIT_SCOPE(n$6); [line 101, column 23]\n " shape="box"]
+"getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 101, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 101, column 23]\n  EXIT_SCOPE(n$5); [line 101, 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 127, column 3]\n  n$5=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 127, column 3]\n  EXIT_SCOPE(_,n$5); [line 127, column 3]\n " shape="box"]
+"getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 127, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 127, column 3]\n  EXIT_SCOPE(_,n$4); [line 127, 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   VARIABLE_DECLARED(t:int*); [line 126, column 3]\n  n$6=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 126, column 23]\n  EXIT_SCOPE(n$6); [line 126, column 23]\n " shape="box"]
+"getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 126, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 126, column 23]\n  EXIT_SCOPE(n$5); [line 126, 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 133, column 3]\n  n$5=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 133, column 3]\n  EXIT_SCOPE(_,n$5); [line 133, column 3]\n " shape="box"]
+"getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 133, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 133, column 3]\n  EXIT_SCOPE(_,n$4); [line 133, 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   VARIABLE_DECLARED(t:int*); [line 132, column 3]\n  n$6=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 132, column 23]\n  EXIT_SCOPE(n$6); [line 132, column 23]\n " shape="box"]
+"getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 132, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 132, column 23]\n  EXIT_SCOPE(n$5); [line 132, 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 140, column 3]\n  n$5=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,&a:int*) [line 140, column 3]\n  EXIT_SCOPE(_,n$5,a); [line 140, column 3]\n " shape="box"]
+"getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 140, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,&a:int*) [line 140, column 3]\n  EXIT_SCOPE(_,n$4,a); [line 140, 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   VARIABLE_DECLARED(t:int*); [line 139, column 3]\n  n$6=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 139, column 23]\n  EXIT_SCOPE(n$6); [line 139, column 23]\n " shape="box"]
+"getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 139, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 139, column 23]\n  EXIT_SCOPE(n$5); [line 139, column 23]\n " shape="box"]
 	
 
 	 "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_5" -> "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_4" ;
@@ -252,11 +252,11 @@ digraph cfg {
 	
 
 	 "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 108, column 3]\n  n$5=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 108, column 3]\n  EXIT_SCOPE(_,n$5); [line 108, column 3]\n " shape="box"]
+"operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 108, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 108, column 3]\n  EXIT_SCOPE(_,n$4); [line 108, 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   VARIABLE_DECLARED(t:int*); [line 107, column 3]\n  n$6=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 107, column 23]\n  EXIT_SCOPE(n$6); [line 107, column 23]\n " shape="box"]
+"operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 107, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 107, column 23]\n  EXIT_SCOPE(n$5); [line 107, 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 114, column 3]\n  n$5=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 114, column 3]\n  EXIT_SCOPE(_,n$5); [line 114, column 3]\n " shape="box"]
+"operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 114, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 114, column 3]\n  EXIT_SCOPE(_,n$4); [line 114, 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   VARIABLE_DECLARED(t:int*); [line 113, column 3]\n  n$6=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 113, column 23]\n  EXIT_SCOPE(n$6); [line 113, column 23]\n " shape="box"]
+"operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 113, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 113, column 23]\n  EXIT_SCOPE(n$5); [line 113, 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 121, column 3]\n  n$5=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,&a:int*) [line 121, column 3]\n  EXIT_SCOPE(_,n$5,a); [line 121, column 3]\n " shape="box"]
+"operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 121, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,&a:int*) [line 121, column 3]\n  EXIT_SCOPE(_,n$4,a); [line 121, 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   VARIABLE_DECLARED(t:int*); [line 120, column 3]\n  n$6=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 120, column 23]\n  EXIT_SCOPE(n$6); [line 120, column 23]\n " shape="box"]
+"operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 120, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 120, column 23]\n  EXIT_SCOPE(n$5); [line 120, column 23]\n " shape="box"]
 	
 
 	 "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_5" -> "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_4" ;
@@ -312,7 +312,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$1=*&this:int** [line 84, column 34]\n  n$2=*&v:int* [line 84, column 43]\n  *n$1:void*=n$2 [line 84, column 23]\n  NULLIFY(&v); [line 84, column 23]\n  NULLIFY(&this); [line 84, column 23]\n  EXIT_SCOPE(n$1,n$2,v,this); [line 84, column 23]\n  APPLY_ABSTRACTION; [line 84, column 23]\n " shape="box"]
+"setPtr#TranslateAsPtr<int>#(11427652750021041520).3f4d983a0a5cf5a43b2e4fd66c30c6a9_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:int** [line 84, column 34]\n  n$1=*&v:int* [line 84, column 43]\n  *n$0:void*=n$1 [line 84, column 23]\n  NULLIFY(&v); [line 84, column 23]\n  NULLIFY(&this); [line 84, column 23]\n  EXIT_SCOPE(n$0,n$1,v,this); [line 84, column 23]\n  APPLY_ABSTRACTION; [line 84, column 23]\n " shape="box"]
 	
 
 	 "setPtr#TranslateAsPtr<int>#(11427652750021041520).3f4d983a0a5cf5a43b2e4fd66c30c6a9_3" -> "setPtr#TranslateAsPtr<int>#(11427652750021041520).3f4d983a0a5cf5a43b2e4fd66c30c6a9_2" ;
@@ -351,7 +351,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$1=*&this:int** [line 74, column 36]\n  _=*n$1:int* [line 74, column 36]\n  n$3=*&t:int* [line 74, column 43]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(n$1:int**,n$3:int*) [line 74, column 36]\n  NULLIFY(&t); [line 74, column 36]\n  NULLIFY(&this); [line 74, column 36]\n  EXIT_SCOPE(_,n$1,n$3,n$4,t,this); [line 74, column 36]\n  APPLY_ABSTRACTION; [line 74, column 36]\n " shape="box"]
+"TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_3" [label="3:  Call _fun_TranslateAsPtr<int>::setPtr \n   n$0=*&this:int** [line 74, column 36]\n  _=*n$0:int* [line 74, column 36]\n  n$2=*&t:int* [line 74, column 43]\n  n$3=_fun_TranslateAsPtr<int>::setPtr(n$0:int**,n$2:int*) [line 74, column 36]\n  NULLIFY(&t); [line 74, column 36]\n  NULLIFY(&this); [line 74, column 36]\n  EXIT_SCOPE(_,n$0,n$2,n$3,t,this); [line 74, column 36]\n  APPLY_ABSTRACTION; [line 74, column 36]\n " shape="box"]
 	
 
 	 "TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_3" -> "TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/conditional/lvalue_conditional.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/conditional/lvalue_conditional.cpp.dot
index 4ccac049b..633865325 100644
--- a/infer/tests/codetoanalyze/cpp/shared/conditional/lvalue_conditional.cpp.dot
+++ b/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$2:int& v2:int v1:int \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$1:int& v2:int v1:int \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$3=*&a:int [line 22, column 4]\n  PRUNE(n$3, true); [line 22, column 4]\n  NULLIFY(&a); [line 22, column 4]\n  EXIT_SCOPE(n$3,a,v2); [line 22, column 4]\n " shape="invhouse"]
+"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_5" [label="5: Prune (true branch, boolean exp) \n   n$2=*&a:int [line 22, column 4]\n  PRUNE(n$2, true); [line 22, column 4]\n  NULLIFY(&a); [line 22, column 4]\n  EXIT_SCOPE(n$2,a,v2); [line 22, 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$3=*&a:int [line 22, column 4]\n  PRUNE(!n$3, false); [line 22, column 4]\n  NULLIFY(&a); [line 22, column 4]\n  EXIT_SCOPE(n$3,a); [line 22, column 4]\n " shape="invhouse"]
+"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_6" [label="6: Prune (false branch, boolean exp) \n   n$2=*&a:int [line 22, column 4]\n  PRUNE(!n$2, false); [line 22, column 4]\n  NULLIFY(&a); [line 22, column 4]\n  EXIT_SCOPE(n$2,a); [line 22, column 4]\n " shape="invhouse"]
 	
 
 	 "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_6" -> "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_8" ;
-"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int&=&v1 [line 22, column 4]\n  APPLY_ABSTRACTION; [line 22, column 4]\n " shape="box"]
+"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int&=&v1 [line 22, column 4]\n  APPLY_ABSTRACTION; [line 22, column 4]\n " shape="box"]
 	
 
 	 "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_7" -> "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_4" ;
-"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int&=&v2 [line 22, column 4]\n  EXIT_SCOPE(v2); [line 22, column 4]\n  APPLY_ABSTRACTION; [line 22, column 4]\n " shape="box"]
+"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int&=&v2 [line 22, column 4]\n  EXIT_SCOPE(v2); [line 22, column 4]\n  APPLY_ABSTRACTION; [line 22, 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$4=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int& [line 22, column 4]\n  *n$4:int=1 [line 22, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$2); [line 22, column 3]\n  EXIT_SCOPE(n$4,0$?%__sil_tmpSIL_temp_conditional___n$2); [line 22, column 3]\n " shape="box"]
+"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_9" [label="9:  BinaryOperatorStmt: Assign \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int& [line 22, column 4]\n  *n$3:int=1 [line 22, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 22, column 3]\n  EXIT_SCOPE(n$3,0$?%__sil_tmpSIL_temp_conditional___n$1); [line 22, 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$2:int& v2:int v1:int \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$1:int& v2:int v1:int \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$3=*&a:int [line 10, column 12]\n  PRUNE(n$3, true); [line 10, column 12]\n  NULLIFY(&a); [line 10, column 12]\n  EXIT_SCOPE(n$3,v2,a); [line 10, column 12]\n " shape="invhouse"]
+"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_5" [label="5: Prune (true branch, boolean exp) \n   n$2=*&a:int [line 10, column 12]\n  PRUNE(n$2, true); [line 10, column 12]\n  NULLIFY(&a); [line 10, column 12]\n  EXIT_SCOPE(n$2,v2,a); [line 10, 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$3=*&a:int [line 10, column 12]\n  PRUNE(!n$3, false); [line 10, column 12]\n  NULLIFY(&a); [line 10, column 12]\n  EXIT_SCOPE(n$3,a,v1); [line 10, column 12]\n " shape="invhouse"]
+"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_6" [label="6: Prune (false branch, boolean exp) \n   n$2=*&a:int [line 10, column 12]\n  PRUNE(!n$2, false); [line 10, column 12]\n  NULLIFY(&a); [line 10, column 12]\n  EXIT_SCOPE(n$2,a,v1); [line 10, column 12]\n " shape="invhouse"]
 	
 
 	 "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_6" -> "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_8" ;
-"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int&=&v1 [line 10, column 12]\n  EXIT_SCOPE(v1); [line 10, column 12]\n  APPLY_ABSTRACTION; [line 10, column 12]\n " shape="box"]
+"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int&=&v1 [line 10, column 12]\n  EXIT_SCOPE(v1); [line 10, column 12]\n  APPLY_ABSTRACTION; [line 10, column 12]\n " shape="box"]
 	
 
 	 "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_7" -> "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_4" ;
-"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int&=&v2 [line 10, column 12]\n  EXIT_SCOPE(v2); [line 10, column 12]\n  APPLY_ABSTRACTION; [line 10, column 12]\n " shape="box"]
+"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int&=&v2 [line 10, column 12]\n  EXIT_SCOPE(v2); [line 10, column 12]\n  APPLY_ABSTRACTION; [line 10, column 12]\n " shape="box"]
 	
 
 	 "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_8" -> "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_4" ;
-"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(v3:int); [line 10, column 3]\n  n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int& [line 10, column 12]\n  n$5=*n$4:int [line 10, column 12]\n  *&v3:int=n$5 [line 10, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$2); [line 10, column 3]\n  EXIT_SCOPE(n$4,n$5,0$?%__sil_tmpSIL_temp_conditional___n$2); [line 10, column 3]\n " shape="box"]
+"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(v3:int); [line 10, column 3]\n  n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int& [line 10, column 12]\n  n$4=*n$3:int [line 10, column 12]\n  *&v3:int=n$4 [line 10, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 10, column 3]\n  EXIT_SCOPE(n$3,n$4,0$?%__sil_tmpSIL_temp_conditional___n$1); [line 10, 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$2:int v1:int \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$1:int v1:int \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$3=*&a:int [line 16, column 12]\n  PRUNE(n$3, true); [line 16, column 12]\n  NULLIFY(&a); [line 16, column 12]\n  EXIT_SCOPE(n$3,a); [line 16, column 12]\n " shape="invhouse"]
+"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_5" [label="5: Prune (true branch, boolean exp) \n   n$2=*&a:int [line 16, column 12]\n  PRUNE(n$2, true); [line 16, column 12]\n  NULLIFY(&a); [line 16, column 12]\n  EXIT_SCOPE(n$2,a); [line 16, 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$3=*&a:int [line 16, column 12]\n  PRUNE(!n$3, false); [line 16, column 12]\n  NULLIFY(&a); [line 16, column 12]\n  NULLIFY(&v1); [line 16, column 12]\n  EXIT_SCOPE(n$3,a,v1); [line 16, column 12]\n " shape="invhouse"]
+"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_6" [label="6: Prune (false branch, boolean exp) \n   n$2=*&a:int [line 16, column 12]\n  PRUNE(!n$2, false); [line 16, column 12]\n  NULLIFY(&a); [line 16, column 12]\n  NULLIFY(&v1); [line 16, column 12]\n  EXIT_SCOPE(n$2,a,v1); [line 16, column 12]\n " shape="invhouse"]
 	
 
 	 "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_6" -> "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_8" ;
-"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_7" [label="7:  ConditionalStmt Branch \n   n$4=*&v1:int [line 16, column 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$4 [line 16, column 12]\n  NULLIFY(&v1); [line 16, column 12]\n  EXIT_SCOPE(n$4,v1); [line 16, column 12]\n  APPLY_ABSTRACTION; [line 16, column 12]\n " shape="box"]
+"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_7" [label="7:  ConditionalStmt Branch \n   n$3=*&v1:int [line 16, column 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$3 [line 16, column 12]\n  NULLIFY(&v1); [line 16, column 12]\n  EXIT_SCOPE(n$3,v1); [line 16, column 12]\n  APPLY_ABSTRACTION; [line 16, column 12]\n " shape="box"]
 	
 
 	 "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_7" -> "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_4" ;
-"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 16, column 12]\n  APPLY_ABSTRACTION; [line 16, column 12]\n " shape="box"]
+"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 16, column 12]\n  APPLY_ABSTRACTION; [line 16, column 12]\n " shape="box"]
 	
 
 	 "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_8" -> "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_4" ;
-"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(v3:int); [line 16, column 3]\n  n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 16, column 12]\n  *&v3:int=n$5 [line 16, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$2); [line 16, column 3]\n  EXIT_SCOPE(n$5,0$?%__sil_tmpSIL_temp_conditional___n$2); [line 16, column 3]\n " shape="box"]
+"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(v3:int); [line 16, column 3]\n  n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 16, column 12]\n  *&v3:int=n$4 [line 16, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 16, column 3]\n  EXIT_SCOPE(n$4,0$?%__sil_tmpSIL_temp_conditional___n$1); [line 16, column 3]\n " shape="box"]
 	
 
 	 "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_9" -> "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_3" ;
@@ -216,12 +216,12 @@ 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$4:int 0$?%__sil_tmpSIL_materialize_temp__n$3:int const  \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$3:int 0$?%__sil_tmpSIL_materialize_temp__n$2:int const  \n  " color=yellow style=filled]
 	
 
 	 "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_1" -> "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_5" ;
 	 "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_1" -> "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_6" ;
-"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_2" [label="2: Exit div_temp_lvalue \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$3); [line 29, column 1]\n " color=yellow style=filled]
+"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_2" [label="2: Exit div_temp_lvalue \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$2); [line 29, column 1]\n " color=yellow style=filled]
 	
 
 "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_3" [label="3:  Return Stmt \n   n$0=*&r:int const & [line 28, column 14]\n  n$1=*n$0:int [line 28, column 14]\n  *&return:int=(1 / n$1) [line 28, column 3]\n  NULLIFY(&r); [line 28, column 3]\n  EXIT_SCOPE(n$0,n$1,r); [line 28, column 3]\n  APPLY_ABSTRACTION; [line 28, column 3]\n " shape="box"]
@@ -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$5=*&a:int [line 27, column 18]\n  PRUNE(n$5, true); [line 27, column 18]\n  NULLIFY(&a); [line 27, column 18]\n  EXIT_SCOPE(n$5,a); [line 27, column 18]\n " shape="invhouse"]
+"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_5" [label="5: Prune (true branch, boolean exp) \n   n$4=*&a:int [line 27, column 18]\n  PRUNE(n$4, true); [line 27, column 18]\n  NULLIFY(&a); [line 27, column 18]\n  EXIT_SCOPE(n$4,a); [line 27, 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$5=*&a:int [line 27, column 18]\n  PRUNE(!n$5, false); [line 27, column 18]\n  NULLIFY(&a); [line 27, column 18]\n  EXIT_SCOPE(n$5,a); [line 27, column 18]\n " shape="invhouse"]
+"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_6" [label="6: Prune (false branch, boolean exp) \n   n$4=*&a:int [line 27, column 18]\n  PRUNE(!n$4, false); [line 27, column 18]\n  NULLIFY(&a); [line 27, column 18]\n  EXIT_SCOPE(n$4,a); [line 27, 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:  ConditionalStmt Branch \n   n$6=*&b:int [line 27, column 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=n$6 [line 27, column 18]\n  NULLIFY(&b); [line 27, column 18]\n  EXIT_SCOPE(n$6,b); [line 27, column 18]\n  APPLY_ABSTRACTION; [line 27, column 18]\n " shape="box"]
+"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_7" [label="7:  ConditionalStmt Branch \n   n$5=*&b:int [line 27, column 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=n$5 [line 27, column 18]\n  NULLIFY(&b); [line 27, column 18]\n  EXIT_SCOPE(n$5,b); [line 27, column 18]\n  APPLY_ABSTRACTION; [line 27, 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:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=1 [line 27, column 18]\n  APPLY_ABSTRACTION; [line 27, column 18]\n " shape="box"]
+"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 27, column 18]\n  APPLY_ABSTRACTION; [line 27, 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   VARIABLE_DECLARED(r:int const &); [line 27, column 3]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$3:int const ); [line 27, column 18]\n  n$7=*&0$?%__sil_tmpSIL_temp_conditional___n$4:int [line 27, column 18]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$3:int=n$7 [line 27, column 18]\n  *&r:int const &=&0$?%__sil_tmpSIL_materialize_temp__n$3 [line 27, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$4); [line 27, column 3]\n  EXIT_SCOPE(n$7,0$?%__sil_tmpSIL_materialize_temp__n$3,0$?%__sil_tmpSIL_temp_conditional___n$4); [line 27, column 3]\n " shape="box"]
+"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(r:int const &); [line 27, column 3]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$2:int const ); [line 27, column 18]\n  n$6=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 27, column 18]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$2:int=n$6 [line 27, column 18]\n  *&r:int const &=&0$?%__sil_tmpSIL_materialize_temp__n$2 [line 27, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$3); [line 27, column 3]\n  EXIT_SCOPE(n$6,0$?%__sil_tmpSIL_materialize_temp__n$2,0$?%__sil_tmpSIL_temp_conditional___n$3); [line 27, column 3]\n " shape="box"]
 	
 
 	 "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_9" -> "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_3" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_array.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_array.cpp.dot
index a3a25eae3..3995e3d33 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_array.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_array.cpp.dot
@@ -1,17 +1,17 @@
 /* @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$2:Person 0$?%__sil_tmpSIL_materialize_temp__n$5:Person 0$?%__sil_tmpSIL_materialize_temp__n$8:Person \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$1:Person 0$?%__sil_tmpSIL_materialize_temp__n$4:Person 0$?%__sil_tmpSIL_materialize_temp__n$7:Person \n  " color=yellow style=filled]
 	
 
 	 "array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_1" -> "array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_4" ;
-"array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_2" [label="2: Exit array_of_person \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$2); [line 18, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$5); [line 18, column 1]\n  NULLIFY(&arr); [line 18, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$8); [line 18, column 1]\n " color=yellow style=filled]
+"array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_2" [label="2: Exit array_of_person \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$7); [line 18, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 18, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$4); [line 18, column 1]\n  NULLIFY(&arr); [line 18, column 1]\n " color=yellow style=filled]
 	
 
 "array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_3" [label="3:  Return Stmt \n   n$0=*&arr[0].x:int [line 17, column 10]\n  *&return:int=n$0 [line 17, column 3]\n  EXIT_SCOPE(n$0,arr); [line 17, column 3]\n  APPLY_ABSTRACTION; [line 17, column 3]\n " shape="box"]
 	
 
 	 "array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_3" -> "array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_2" ;
-"array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(arr:Person[10*4]); [line 16, column 3]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$2:Person); [line 16, column 21]\n  n$3=_fun_Person::Person(&0$?%__sil_tmpSIL_materialize_temp__n$2:Person*) [line 16, column 21]\n  n$4=_fun_Person::Person(&arr[0]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$2:Person&) [line 16, column 21]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$5:Person); [line 16, column 31]\n  n$6=_fun_Person::Person(&0$?%__sil_tmpSIL_materialize_temp__n$5:Person*) [line 16, column 31]\n  n$7=_fun_Person::Person(&arr[1]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$5:Person&) [line 16, column 31]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$8:Person); [line 16, column 41]\n  n$9=_fun_Person::Person(&0$?%__sil_tmpSIL_materialize_temp__n$8:Person*) [line 16, column 41]\n  n$10=_fun_Person::Person(&arr[2]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$8:Person&) [line 16, column 41]\n  EXIT_SCOPE(n$3,n$4,n$6,n$7,n$9,n$10,0$?%__sil_tmpSIL_materialize_temp__n$8,0$?%__sil_tmpSIL_materialize_temp__n$5,0$?%__sil_tmpSIL_materialize_temp__n$2); [line 16, column 41]\n " shape="box"]
+"array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(arr:Person[10*4]); [line 16, column 3]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$1:Person); [line 16, column 21]\n  n$2=_fun_Person::Person(&0$?%__sil_tmpSIL_materialize_temp__n$1:Person*) [line 16, column 21]\n  n$3=_fun_Person::Person(&arr[0]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$1:Person&) [line 16, column 21]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$4:Person); [line 16, column 31]\n  n$5=_fun_Person::Person(&0$?%__sil_tmpSIL_materialize_temp__n$4:Person*) [line 16, column 31]\n  n$6=_fun_Person::Person(&arr[1]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$4:Person&) [line 16, column 31]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$7:Person); [line 16, column 41]\n  n$8=_fun_Person::Person(&0$?%__sil_tmpSIL_materialize_temp__n$7:Person*) [line 16, column 41]\n  n$9=_fun_Person::Person(&arr[2]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$7:Person&) [line 16, column 41]\n  EXIT_SCOPE(n$2,n$3,n$5,n$6,n$8,n$9,0$?%__sil_tmpSIL_materialize_temp__n$4,0$?%__sil_tmpSIL_materialize_temp__n$1,0$?%__sil_tmpSIL_materialize_temp__n$7); [line 16, 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   NULLIFY(&z2); [line 33, column 1]\n " color=yellow style=filled]
 	
 
-"initialization_c_style#16495589501342328206.0d90448020e72c05f693b9221dac03f8_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(z2:Z); [line 32, column 3]\n  n$1=_fun_Z::Z(&z2:Z*) [line 32, column 12]\n  EXIT_SCOPE(n$1,z2); [line 32, column 12]\n  APPLY_ABSTRACTION; [line 32, column 12]\n " shape="box"]
+"initialization_c_style#16495589501342328206.0d90448020e72c05f693b9221dac03f8_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(z2:Z); [line 32, column 3]\n  n$0=_fun_Z::Z(&z2:Z*) [line 32, column 12]\n  EXIT_SCOPE(n$0,z2); [line 32, column 12]\n  APPLY_ABSTRACTION; [line 32, column 12]\n " shape="box"]
 	
 
 	 "initialization_c_style#16495589501342328206.0d90448020e72c05f693b9221dac03f8_3" -> "initialization_c_style#16495589501342328206.0d90448020e72c05f693b9221dac03f8_2" ;
@@ -37,30 +37,30 @@ digraph cfg {
 "initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_2" [label="2: Exit initialization_mixed_styles_not_handled_correctly \n   NULLIFY(&old); [line 41, column 1]\n  NULLIFY(&z); [line 41, column 1]\n  NULLIFY(&z2); [line 41, column 1]\n " color=yellow style=filled]
 	
 
-"initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(z2:Z); [line 40, column 3]\n  n$1=_fun_Z::Z(&z2:Z*) [line 40, column 12]\n  EXIT_SCOPE(n$1,z2); [line 40, column 12]\n  APPLY_ABSTRACTION; [line 40, column 12]\n " shape="box"]
+"initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(z2:Z); [line 40, column 3]\n  n$0=_fun_Z::Z(&z2:Z*) [line 40, column 12]\n  EXIT_SCOPE(n$0,z2); [line 40, column 12]\n  APPLY_ABSTRACTION; [line 40, 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   VARIABLE_DECLARED(z:Z[2*8]); [line 39, column 3]\n  *&z[0].a:int=1 [line 39, column 20]\n  *&z[0].b:int=2 [line 39, column 20]\n  n$2=_fun_Z::Z(&z[1]:Z*,&old:Z&) [line 39, column 28]\n  EXIT_SCOPE(n$2,z,old); [line 39, column 28]\n " shape="box"]
+"initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(z:Z[2*8]); [line 39, column 3]\n  *&z[0].a:int=1 [line 39, column 20]\n  *&z[0].b:int=2 [line 39, column 20]\n  n$1=_fun_Z::Z(&z[1]:Z*,&old:Z&) [line 39, column 28]\n  EXIT_SCOPE(n$1,z,old); [line 39, 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   VARIABLE_DECLARED(old:Z); [line 38, column 3]\n  n$3=_fun_Z::Z(&old:Z*) [line 38, column 12]\n  EXIT_SCOPE(n$3); [line 38, column 12]\n " shape="box"]
+"initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(old:Z); [line 38, column 3]\n  n$2=_fun_Z::Z(&old:Z*) [line 38, column 12]\n  EXIT_SCOPE(n$2); [line 38, 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$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  " 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$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  " color=yellow style=filled]
 	
 
 	 "matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_1" -> "matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_4" ;
-"matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_2" [label="2: Exit matrix_of_person \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$2); [line 23, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$11); [line 23, column 1]\n  NULLIFY(&arr); [line 23, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$5); [line 23, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$8); [line 23, column 1]\n " color=yellow style=filled]
+"matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_2" [label="2: Exit matrix_of_person \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$7); [line 23, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 23, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$4); [line 23, column 1]\n  NULLIFY(&arr); [line 23, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$10); [line 23, column 1]\n " color=yellow style=filled]
 	
 
 "matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_3" [label="3:  Return Stmt \n   n$0=*&arr[0][1].x:int [line 22, column 10]\n  *&return:int=n$0 [line 22, column 3]\n  EXIT_SCOPE(n$0,arr); [line 22, column 3]\n  APPLY_ABSTRACTION; [line 22, column 3]\n " shape="box"]
 	
 
 	 "matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_3" -> "matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_2" ;
-"matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(arr:Person[2*4][2*8]); [line 21, column 3]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$2:Person); [line 21, column 23]\n  n$3=_fun_Person::Person(&0$?%__sil_tmpSIL_materialize_temp__n$2:Person*) [line 21, column 23]\n  n$4=_fun_Person::Person(&arr[0][0]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$2:Person&) [line 21, column 23]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$5:Person); [line 21, column 33]\n  n$6=_fun_Person::Person(&0$?%__sil_tmpSIL_materialize_temp__n$5:Person*) [line 21, column 33]\n  n$7=_fun_Person::Person(&arr[0][1]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$5:Person&) [line 21, column 33]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$8:Person); [line 21, column 43]\n  n$9=_fun_Person::Person(&0$?%__sil_tmpSIL_materialize_temp__n$8:Person*) [line 21, column 43]\n  n$10=_fun_Person::Person(&arr[1][0]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$8:Person&) [line 21, column 43]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$11:Person); [line 21, column 53]\n  n$12=_fun_Person::Person(&0$?%__sil_tmpSIL_materialize_temp__n$11:Person*) [line 21, column 53]\n  n$13=_fun_Person::Person(&arr[1][1]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$11:Person&) [line 21, column 53]\n  EXIT_SCOPE(n$3,n$4,n$6,n$7,n$9,n$10,n$12,n$13,0$?%__sil_tmpSIL_materialize_temp__n$8,0$?%__sil_tmpSIL_materialize_temp__n$5,0$?%__sil_tmpSIL_materialize_temp__n$11,0$?%__sil_tmpSIL_materialize_temp__n$2); [line 21, column 53]\n " shape="box"]
+"matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(arr:Person[2*4][2*8]); [line 21, column 3]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$1:Person); [line 21, column 23]\n  n$2=_fun_Person::Person(&0$?%__sil_tmpSIL_materialize_temp__n$1:Person*) [line 21, column 23]\n  n$3=_fun_Person::Person(&arr[0][0]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$1:Person&) [line 21, column 23]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$4:Person); [line 21, column 33]\n  n$5=_fun_Person::Person(&0$?%__sil_tmpSIL_materialize_temp__n$4:Person*) [line 21, column 33]\n  n$6=_fun_Person::Person(&arr[0][1]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$4:Person&) [line 21, column 33]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$7:Person); [line 21, column 43]\n  n$8=_fun_Person::Person(&0$?%__sil_tmpSIL_materialize_temp__n$7:Person*) [line 21, column 43]\n  n$9=_fun_Person::Person(&arr[1][0]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$7:Person&) [line 21, column 43]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$10:Person); [line 21, column 53]\n  n$11=_fun_Person::Person(&0$?%__sil_tmpSIL_materialize_temp__n$10:Person*) [line 21, column 53]\n  n$12=_fun_Person::Person(&arr[1][1]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$10:Person&) [line 21, column 53]\n  EXIT_SCOPE(n$2,n$3,n$5,n$6,n$8,n$9,n$11,n$12,0$?%__sil_tmpSIL_materialize_temp__n$10,0$?%__sil_tmpSIL_materialize_temp__n$4,0$?%__sil_tmpSIL_materialize_temp__n$1,0$?%__sil_tmpSIL_materialize_temp__n$7); [line 21, 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$1=*&this:Person* [line 10, column 19]\n  n$2=*&i:int [line 10, column 23]\n  *n$1.x:int=n$2 [line 10, column 19]\n  NULLIFY(&this); [line 10, column 19]\n  NULLIFY(&i); [line 10, column 19]\n  EXIT_SCOPE(n$1,n$2,this,i); [line 10, column 19]\n  APPLY_ABSTRACTION; [line 10, column 19]\n " shape="box"]
+"Person#Person#{13294170998561185799}.33e91269ce59e5b361de941ed03c6643_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:Person* [line 10, column 19]\n  n$1=*&i:int [line 10, column 23]\n  *n$0.x:int=n$1 [line 10, column 19]\n  NULLIFY(&this); [line 10, column 19]\n  NULLIFY(&i); [line 10, column 19]\n  EXIT_SCOPE(n$0,n$1,this,i); [line 10, column 19]\n  APPLY_ABSTRACTION; [line 10, 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$2=*&this:Person* [line 8, column 7]\n  n$3=*&__param_0:Person& [line 8, column 7]\n  n$4=*n$3.x:int [line 8, column 7]\n  *n$2.x:int=n$4 [line 8, column 7]\n  NULLIFY(&this); [line 8, column 7]\n  NULLIFY(&__param_0); [line 8, column 7]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 8, column 7]\n  APPLY_ABSTRACTION; [line 8, column 7]\n " shape="box"]
+"Person#Person#{14928211719836437323|constexpr}.702b3fbc6c128973c192111cbb802edd_3" [label="3:  Constructor Init \n   n$1=*&this:Person* [line 8, column 7]\n  n$2=*&__param_0:Person& [line 8, column 7]\n  n$3=*n$2.x:int [line 8, column 7]\n  *n$1.x:int=n$3 [line 8, column 7]\n  NULLIFY(&this); [line 8, column 7]\n  NULLIFY(&__param_0); [line 8, column 7]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 8, column 7]\n  APPLY_ABSTRACTION; [line 8, 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$2=*&this:Z* [line 25, column 8]\n  n$3=*&__param_0:Z const & [line 25, column 8]\n  n$4=*n$3.b:int [line 25, column 8]\n  *n$2.b:int=n$4 [line 25, column 8]\n  NULLIFY(&this); [line 25, column 8]\n  NULLIFY(&__param_0); [line 25, column 8]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 25, column 8]\n  APPLY_ABSTRACTION; [line 25, column 8]\n " shape="box"]
+"Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_3" [label="3:  Constructor Init \n   n$1=*&this:Z* [line 25, column 8]\n  n$2=*&__param_0:Z const & [line 25, column 8]\n  n$3=*n$2.b:int [line 25, column 8]\n  *n$1.b:int=n$3 [line 25, column 8]\n  NULLIFY(&this); [line 25, column 8]\n  NULLIFY(&__param_0); [line 25, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 25, column 8]\n  APPLY_ABSTRACTION; [line 25, 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$5=*&this:Z* [line 25, column 8]\n  n$6=*&__param_0:Z const & [line 25, column 8]\n  n$7=*n$6.a:int [line 25, column 8]\n  *n$5.a:int=n$7 [line 25, column 8]\n  EXIT_SCOPE(n$5,n$6,n$7); [line 25, column 8]\n " shape="box"]
+"Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_4" [label="4:  Constructor Init \n   n$4=*&this:Z* [line 25, column 8]\n  n$5=*&__param_0:Z const & [line 25, column 8]\n  n$6=*n$5.a:int [line 25, column 8]\n  *n$4.a:int=n$6 [line 25, column 8]\n  EXIT_SCOPE(n$4,n$5,n$6); [line 25, column 8]\n " shape="box"]
 	
 
 	 "Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_4" -> "Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_3" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_default_arg.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_default_arg.cpp.dot
index b154d85ee..349f17fe1 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_default_arg.cpp.dot
+++ b/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   NULLIFY(&x3); [line 22, column 1]\n  NULLIFY(&x1); [line 22, column 1]\n  NULLIFY(&x2); [line 22, column 1]\n " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(x3:X); [line 21, column 3]\n  n$1=_fun_X::X(&x3:X*,0:int,1:int) [line 21, column 5]\n  EXIT_SCOPE(n$1,x3); [line 21, column 5]\n  APPLY_ABSTRACTION; [line 21, column 5]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(x3:X); [line 21, column 3]\n  n$0=_fun_X::X(&x3:X*,0:int,1:int) [line 21, column 5]\n  EXIT_SCOPE(n$0,x3); [line 21, column 5]\n  APPLY_ABSTRACTION; [line 21, column 5]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x2:X); [line 20, column 3]\n  n$2=_fun_X::X(&x2:X*,1:int,0:int) [line 20, column 5]\n  EXIT_SCOPE(n$2,x2); [line 20, column 5]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x2:X); [line 20, column 3]\n  n$1=_fun_X::X(&x2:X*,1:int,0:int) [line 20, column 5]\n  EXIT_SCOPE(n$1,x2); [line 20, column 5]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x1:X); [line 19, column 3]\n  n$3=_fun_X::X(&x1:X*,0:int,0:int) [line 19, column 5]\n  EXIT_SCOPE(n$3,x1); [line 19, column 5]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x1:X); [line 19, column 3]\n  n$2=_fun_X::X(&x1:X*,0:int,0:int) [line 19, column 5]\n  EXIT_SCOPE(n$2,x1); [line 19, column 5]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;
@@ -37,7 +37,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$1=*&this:X* [line 16, column 22]\n  n$2=*&a:int [line 16, column 26]\n  n$3=*&b:int [line 16, column 30]\n  *n$1.f:int=(n$2 + n$3) [line 16, column 22]\n  NULLIFY(&a); [line 16, column 22]\n  NULLIFY(&b); [line 16, column 22]\n  NULLIFY(&this); [line 16, column 22]\n  EXIT_SCOPE(n$1,n$2,n$3,a,b,this); [line 16, column 22]\n  APPLY_ABSTRACTION; [line 16, column 22]\n " shape="box"]
+"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:X* [line 16, column 22]\n  n$1=*&a:int [line 16, column 26]\n  n$2=*&b:int [line 16, column 30]\n  *n$0.f:int=(n$1 + n$2) [line 16, column 22]\n  NULLIFY(&a); [line 16, column 22]\n  NULLIFY(&b); [line 16, column 22]\n  NULLIFY(&this); [line 16, column 22]\n  EXIT_SCOPE(n$0,n$1,n$2,a,b,this); [line 16, column 22]\n  APPLY_ABSTRACTION; [line 16, column 22]\n " shape="box"]
 	
 
 	 "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_3" -> "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_init.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_init.cpp.dot
index abb6d221c..f4b0d7d60 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_init.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_init.cpp.dot
@@ -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$2=*&this:A* [line 10, column 14]\n  n$3=*&f:int [line 10, column 16]\n  *n$2.f:int=n$3 [line 10, column 14]\n  NULLIFY(&f); [line 10, column 14]\n  NULLIFY(&this); [line 10, column 14]\n  EXIT_SCOPE(n$2,n$3,f,this); [line 10, column 14]\n  APPLY_ABSTRACTION; [line 10, column 14]\n " shape="box"]
+"A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_3" [label="3:  Constructor Init \n   n$1=*&this:A* [line 10, column 14]\n  n$2=*&f:int [line 10, column 16]\n  *n$1.f:int=n$2 [line 10, column 14]\n  NULLIFY(&f); [line 10, column 14]\n  NULLIFY(&this); [line 10, column 14]\n  EXIT_SCOPE(n$1,n$2,f,this); [line 10, column 14]\n  APPLY_ABSTRACTION; [line 10, 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$2=*&this:B* [line 20, column 27]\n  n$3=*&a:int [line 20, column 29]\n  n$4=_fun_B::T::T(n$2.t:B::T*,n$3:int) [line 20, column 27]\n  NULLIFY(&a); [line 20, column 27]\n  NULLIFY(&this); [line 20, column 27]\n  EXIT_SCOPE(n$2,n$3,n$4,a,this); [line 20, column 27]\n  APPLY_ABSTRACTION; [line 20, column 27]\n " shape="box"]
+"B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_3" [label="3:  Constructor Init \n   n$1=*&this:B* [line 20, column 27]\n  n$2=*&a:int [line 20, column 29]\n  n$3=_fun_B::T::T(n$1.t:B::T*,n$2:int) [line 20, column 27]\n  NULLIFY(&a); [line 20, column 27]\n  NULLIFY(&this); [line 20, column 27]\n  EXIT_SCOPE(n$1,n$2,n$3,a,this); [line 20, column 27]\n  APPLY_ABSTRACTION; [line 20, 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$5=*&this:B* [line 20, column 20]\n  n$6=*&a:int [line 20, column 23]\n  *n$5.f2:int=n$6 [line 20, column 20]\n  EXIT_SCOPE(n$5,n$6); [line 20, column 20]\n " shape="box"]
+"B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_4" [label="4:  Constructor Init \n   n$4=*&this:B* [line 20, column 20]\n  n$5=*&a:int [line 20, column 23]\n  *n$4.f2:int=n$5 [line 20, column 20]\n  EXIT_SCOPE(n$4,n$5); [line 20, 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$7=*&this:B* [line 20, column 14]\n  n$8=*&a:int [line 20, column 16]\n  n$9=_fun_A::A(n$7:B*,n$8:int) [line 20, column 14]\n  EXIT_SCOPE(n$7,n$8,n$9); [line 20, column 14]\n " shape="box"]
+"B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_5" [label="5:  Constructor Init \n   n$6=*&this:B* [line 20, column 14]\n  n$7=*&a:int [line 20, column 16]\n  n$8=_fun_A::A(n$6:B*,n$7:int) [line 20, column 14]\n  EXIT_SCOPE(n$6,n$7,n$8); [line 20, 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$1=*&this:B* [line 22, column 32]\n  n$2=*&b:int [line 22, column 37]\n  *n$1.f2:int=n$2 [line 22, column 32]\n  NULLIFY(&b); [line 22, column 32]\n  NULLIFY(&this); [line 22, column 32]\n  EXIT_SCOPE(n$1,n$2,b,this); [line 22, column 32]\n  APPLY_ABSTRACTION; [line 22, column 32]\n " shape="box"]
+"B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:B* [line 22, column 32]\n  n$1=*&b:int [line 22, column 37]\n  *n$0.f2:int=n$1 [line 22, column 32]\n  NULLIFY(&b); [line 22, column 32]\n  NULLIFY(&this); [line 22, column 32]\n  EXIT_SCOPE(n$0,n$1,b,this); [line 22, column 32]\n  APPLY_ABSTRACTION; [line 22, 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$3=*&this:B* [line 22, column 21]\n  n$4=*&a:int [line 22, column 23]\n  n$5=*&b:int [line 22, column 27]\n  n$6=_fun_B::B(n$3:B*,(n$4 + n$5):int) [line 22, column 21]\n  NULLIFY(&a); [line 22, column 21]\n  EXIT_SCOPE(n$3,n$4,n$5,n$6,a); [line 22, column 21]\n " shape="box"]
+"B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_4" [label="4:  Constructor Init \n   n$2=*&this:B* [line 22, column 21]\n  n$3=*&a:int [line 22, column 23]\n  n$4=*&b:int [line 22, column 27]\n  n$5=_fun_B::B(n$2:B*,(n$3 + n$4):int) [line 22, column 21]\n  NULLIFY(&a); [line 22, column 21]\n  EXIT_SCOPE(n$2,n$3,n$4,n$5,a); [line 22, 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$2=*&this:B::T* [line 16, column 16]\n  n$3=*&v:int [line 16, column 18]\n  *n$2.v:int=n$3 [line 16, column 16]\n  NULLIFY(&v); [line 16, column 16]\n  NULLIFY(&this); [line 16, column 16]\n  EXIT_SCOPE(n$2,n$3,v,this); [line 16, column 16]\n  APPLY_ABSTRACTION; [line 16, column 16]\n " shape="box"]
+"T#T#B#{10782891829941482898}.2f080fd8e7f17199a0e7ff14c49d6dba_3" [label="3:  Constructor Init \n   n$1=*&this:B::T* [line 16, column 16]\n  n$2=*&v:int [line 16, column 18]\n  *n$1.v:int=n$2 [line 16, column 16]\n  NULLIFY(&v); [line 16, column 16]\n  NULLIFY(&this); [line 16, column 16]\n  EXIT_SCOPE(n$1,n$2,v,this); [line 16, column 16]\n  APPLY_ABSTRACTION; [line 16, column 16]\n " shape="box"]
 	
 
 	 "T#T#B#{10782891829941482898}.2f080fd8e7f17199a0e7ff14c49d6dba_3" -> "T#T#B#{10782891829941482898}.2f080fd8e7f17199a0e7ff14c49d6dba_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_new.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_new.cpp.dot
index 0ababa684..188312352 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_new.cpp.dot
+++ b/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$1:int \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$0:int \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$2=_fun_constructor_new::getValue(5:int) [line 89, column 31]\n " shape="box"]
+"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 89, 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$2 == 5), true); [line 89, column 31]\n  EXIT_SCOPE(n$2); [line 89, 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$1 == 5), true); [line 89, column 31]\n  EXIT_SCOPE(n$1); [line 89, 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$2 == 5), false); [line 89, column 31]\n  EXIT_SCOPE(n$2); [line 89, 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$1 == 5), false); [line 89, column 31]\n  EXIT_SCOPE(n$1); [line 89, 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:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=5 [line 89, column 31]\n  APPLY_ABSTRACTION; [line 89, 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$0:int=5 [line 89, column 31]\n  APPLY_ABSTRACTION; [line 89, 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:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=3 [line 89, column 31]\n  APPLY_ABSTRACTION; [line 89, 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$0:int=3 [line 89, column 31]\n  APPLY_ABSTRACTION; [line 89, 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   VARIABLE_DECLARED(tarray:constructor_new::Person*); [line 89, column 3]\n  n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 89, column 31]\n  n$4=_fun___new_array((sizeof(t=constructor_new::Person) * n$3):unsigned long) [line 89, column 20]\n  *&tarray:constructor_new::Person*=n$4 [line 89, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 89, column 3]\n  NULLIFY(&tarray); [line 89, column 3]\n  EXIT_SCOPE(n$3,n$4,0$?%__sil_tmpSIL_temp_conditional___n$1,tarray); [line 89, column 3]\n  APPLY_ABSTRACTION; [line 89, column 3]\n " shape="box"]
+"array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(tarray:constructor_new::Person*); [line 89, column 3]\n  n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 89, column 31]\n  n$3=_fun___new_array((sizeof(t=constructor_new::Person) * n$2):unsigned long) [line 89, column 20]\n  *&tarray:constructor_new::Person*=n$3 [line 89, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 89, column 3]\n  NULLIFY(&tarray); [line 89, column 3]\n  EXIT_SCOPE(n$2,n$3,0$?%__sil_tmpSIL_temp_conditional___n$0,tarray); [line 89, column 3]\n  APPLY_ABSTRACTION; [line 89, 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   VARIABLE_DECLARED(tarray:constructor_new::Person*); [line 93, column 45]\n  n$1=_fun___new_array((sizeof(t=constructor_new::Person) * 10):unsigned long) [line 93, column 62]\n  n$2=_fun_constructor_new::Person::Person(n$1[0]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  n$3=_fun_constructor_new::Person::Person(n$1[1]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  n$4=_fun_constructor_new::Person::Person(n$1[2]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  n$5=_fun_constructor_new::Person::Person(n$1[3]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  n$6=_fun_constructor_new::Person::Person(n$1[4]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  n$7=_fun_constructor_new::Person::Person(n$1[5]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  n$8=_fun_constructor_new::Person::Person(n$1[6]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  n$9=_fun_constructor_new::Person::Person(n$1[7]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  n$10=_fun_constructor_new::Person::Person(n$1[8]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  n$11=_fun_constructor_new::Person::Person(n$1[9]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  *&tarray:constructor_new::Person*=n$1 [line 93, column 45]\n  NULLIFY(&tarray); [line 93, column 45]\n  EXIT_SCOPE(n$1,n$2,n$3,n$4,n$5,n$6,n$7,n$8,n$9,n$10,n$11,tarray); [line 93, column 45]\n  APPLY_ABSTRACTION; [line 93, column 45]\n " shape="box"]
+"array_of_person_with_constant_size#constructor_new#10198805942353567956.2cf0ba8d0780ec60bbcca4089ec2aee6_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(tarray:constructor_new::Person*); [line 93, column 45]\n  n$0=_fun___new_array((sizeof(t=constructor_new::Person) * 10):unsigned long) [line 93, column 62]\n  n$1=_fun_constructor_new::Person::Person(n$0[0]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  n$2=_fun_constructor_new::Person::Person(n$0[1]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  n$3=_fun_constructor_new::Person::Person(n$0[2]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  n$4=_fun_constructor_new::Person::Person(n$0[3]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  n$5=_fun_constructor_new::Person::Person(n$0[4]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  n$6=_fun_constructor_new::Person::Person(n$0[5]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  n$7=_fun_constructor_new::Person::Person(n$0[6]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  n$8=_fun_constructor_new::Person::Person(n$0[7]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  n$9=_fun_constructor_new::Person::Person(n$0[8]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  n$10=_fun_constructor_new::Person::Person(n$0[9]:constructor_new::Person[_*_](*)) [line 93, column 66]\n  *&tarray:constructor_new::Person*=n$0 [line 93, column 45]\n  NULLIFY(&tarray); [line 93, column 45]\n  EXIT_SCOPE(n$0,n$1,n$2,n$3,n$4,n$5,n$6,n$7,n$8,n$9,n$10,tarray); [line 93, column 45]\n  APPLY_ABSTRACTION; [line 93, 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   VARIABLE_DECLARED(p:constructor_new::Person*); [line 28, column 3]\n  n$3=_fun___new(sizeof(t=constructor_new::Person):unsigned long) [line 28, column 15]\n  n$4=_fun_constructor_new::Person::Person(n$3:constructor_new::Person*,5:int) [line 28, column 19]\n  *&p:constructor_new::Person*=n$3 [line 28, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 28, column 3]\n " shape="box"]
+"constructor_1_arg_new_div0#constructor_new#798841234716809588.2c010a7c7293e961b9ed8149c3f3debe_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(p:constructor_new::Person*); [line 28, column 3]\n  n$2=_fun___new(sizeof(t=constructor_new::Person):unsigned long) [line 28, column 15]\n  n$3=_fun_constructor_new::Person::Person(n$2:constructor_new::Person*,5:int) [line 28, column 19]\n  *&p:constructor_new::Person*=n$2 [line 28, column 3]\n  EXIT_SCOPE(n$2,n$3); [line 28, 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   VARIABLE_DECLARED(p:constructor_new::Person*); [line 33, column 3]\n  n$3=_fun___new(sizeof(t=constructor_new::Person):unsigned long) [line 33, column 15]\n  n$4=_fun_constructor_new::Person::Person(n$3:constructor_new::Person*,5:int,6:int,7:int) [line 33, column 19]\n  *&p:constructor_new::Person*=n$3 [line 33, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 33, column 3]\n " shape="box"]
+"constructor_3_args_new_div0#constructor_new#13438839859480315932.2122014ebac449e6fb981ba75ba0617e_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(p:constructor_new::Person*); [line 33, column 3]\n  n$2=_fun___new(sizeof(t=constructor_new::Person):unsigned long) [line 33, column 15]\n  n$3=_fun_constructor_new::Person::Person(n$2:constructor_new::Person*,5:int,6:int,7:int) [line 33, column 19]\n  *&p:constructor_new::Person*=n$2 [line 33, column 3]\n  EXIT_SCOPE(n$2,n$3); [line 33, 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$4:int z:int \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$3:int z:int \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$5=_fun_constructor_new::getValue(0:int) [line 71, column 26]\n " shape="box"]
+"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_5" [label="5:  Call _fun_constructor_new::getValue \n   n$4=_fun_constructor_new::getValue(0:int) [line 71, 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$5, true); [line 71, column 26]\n  NULLIFY(&z); [line 71, column 26]\n  EXIT_SCOPE(n$5,z); [line 71, column 26]\n " shape="invhouse"]
+"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_6" [label="6: Prune (true branch, boolean exp) \n   PRUNE(n$4, true); [line 71, column 26]\n  NULLIFY(&z); [line 71, column 26]\n  EXIT_SCOPE(n$4,z); [line 71, 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$5, false); [line 71, column 26]\n  EXIT_SCOPE(n$5); [line 71, column 26]\n " shape="invhouse"]
+"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_7" [label="7: Prune (false branch, boolean exp) \n   PRUNE(!n$4, false); [line 71, column 26]\n  EXIT_SCOPE(n$4); [line 71, 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:  ConditionalStmt Branch \n   n$6=_fun_constructor_new::getValue(1:int) [line 71, column 40]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=n$6 [line 71, column 26]\n  EXIT_SCOPE(n$6); [line 71, column 26]\n  APPLY_ABSTRACTION; [line 71, column 26]\n " shape="box"]
+"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_8" [label="8:  ConditionalStmt Branch \n   n$5=_fun_constructor_new::getValue(1:int) [line 71, column 40]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=n$5 [line 71, column 26]\n  EXIT_SCOPE(n$5); [line 71, column 26]\n  APPLY_ABSTRACTION; [line 71, 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:  ConditionalStmt Branch \n   n$7=*&z:int [line 71, column 58]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=(1 + n$7) [line 71, column 26]\n  NULLIFY(&z); [line 71, column 26]\n  EXIT_SCOPE(n$7,z); [line 71, column 26]\n  APPLY_ABSTRACTION; [line 71, column 26]\n " shape="box"]
+"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_9" [label="9:  ConditionalStmt Branch \n   n$6=*&z:int [line 71, column 58]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=(1 + n$6) [line 71, column 26]\n  NULLIFY(&z); [line 71, column 26]\n  EXIT_SCOPE(n$6,z); [line 71, column 26]\n  APPLY_ABSTRACTION; [line 71, 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   VARIABLE_DECLARED(p:constructor_new::Person*); [line 71, column 3]\n  n$3=_fun___new(sizeof(t=constructor_new::Person):unsigned long) [line 71, column 15]\n  n$8=*&0$?%__sil_tmpSIL_temp_conditional___n$4:int [line 71, column 26]\n  n$9=_fun_constructor_new::Person::Person(n$3:constructor_new::Person*,n$8:int) [line 71, column 19]\n  *&p:constructor_new::Person*=n$3 [line 71, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$4); [line 71, column 3]\n  EXIT_SCOPE(n$3,n$8,n$9,0$?%__sil_tmpSIL_temp_conditional___n$4); [line 71, column 3]\n " shape="box"]
+"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(p:constructor_new::Person*); [line 71, column 3]\n  n$2=_fun___new(sizeof(t=constructor_new::Person):unsigned long) [line 71, column 15]\n  n$7=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 71, column 26]\n  n$8=_fun_constructor_new::Person::Person(n$2:constructor_new::Person*,n$7:int) [line 71, column 19]\n  *&p:constructor_new::Person*=n$2 [line 71, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$3); [line 71, column 3]\n  EXIT_SCOPE(n$2,n$7,n$8,0$?%__sil_tmpSIL_temp_conditional___n$3); [line 71, 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   VARIABLE_DECLARED(x1:float*); [line 43, column 3]\n  n$3=_fun___new(sizeof(t=float):unsigned long) [line 43, column 15]\n  *n$3:float=5.4 [line 43, column 15]\n  *&x1:float*=n$3 [line 43, column 3]\n  EXIT_SCOPE(n$3); [line 43, column 3]\n " shape="box"]
+"float_init_number#constructor_new#3988440966025503299.b1d13528d0a983c1943c8fdd13e58be6_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x1:float*); [line 43, column 3]\n  n$2=_fun___new(sizeof(t=float):unsigned long) [line 43, column 15]\n  *n$2:float=5.4 [line 43, column 15]\n  *&x1:float*=n$2 [line 43, column 3]\n  EXIT_SCOPE(n$2); [line 43, 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$7:int \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$6:int \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$5=*&x2:int* [line 78, column 3]\n  *n$5[1]:int=2 [line 78, column 3]\n  EXIT_SCOPE(n$5); [line 78, column 3]\n " shape="box"]
+"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_4" [label="4:  BinaryOperatorStmt: Assign \n   n$4=*&x2:int* [line 78, column 3]\n  *n$4[1]:int=2 [line 78, column 3]\n  EXIT_SCOPE(n$4); [line 78, 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$6=*&x2:int* [line 77, column 3]\n  *n$6[0]:int=1 [line 77, column 3]\n  EXIT_SCOPE(n$6); [line 77, column 3]\n " shape="box"]
+"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_5" [label="5:  BinaryOperatorStmt: Assign \n   n$5=*&x2:int* [line 77, column 3]\n  *n$5[0]:int=1 [line 77, column 3]\n  EXIT_SCOPE(n$5); [line 77, 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$8=_fun_constructor_new::getValue(5:int) [line 76, column 21]\n " shape="box"]
+"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_7" [label="7:  Call _fun_constructor_new::getValue \n   n$7=_fun_constructor_new::getValue(5:int) [line 76, 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$8, true); [line 76, column 21]\n  EXIT_SCOPE(n$8); [line 76, column 21]\n " shape="invhouse"]
+"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_8" [label="8: Prune (true branch, boolean exp) \n   PRUNE(n$7, true); [line 76, column 21]\n  EXIT_SCOPE(n$7); [line 76, 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$8, false); [line 76, column 21]\n  EXIT_SCOPE(n$8); [line 76, column 21]\n " shape="invhouse"]
+"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_9" [label="9: Prune (false branch, boolean exp) \n   PRUNE(!n$7, false); [line 76, column 21]\n  EXIT_SCOPE(n$7); [line 76, 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:  ConditionalStmt Branch \n   n$9=_fun_constructor_new::getValue(5:int) [line 76, column 35]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=n$9 [line 76, column 21]\n  EXIT_SCOPE(n$9); [line 76, column 21]\n  APPLY_ABSTRACTION; [line 76, column 21]\n " shape="box"]
+"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_10" [label="10:  ConditionalStmt Branch \n   n$8=_fun_constructor_new::getValue(5:int) [line 76, column 35]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=n$8 [line 76, column 21]\n  EXIT_SCOPE(n$8); [line 76, column 21]\n  APPLY_ABSTRACTION; [line 76, 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:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=3 [line 76, column 21]\n  APPLY_ABSTRACTION; [line 76, column 21]\n " shape="box"]
+"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_11" [label="11:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=3 [line 76, column 21]\n  APPLY_ABSTRACTION; [line 76, 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   VARIABLE_DECLARED(x2:int*); [line 76, column 3]\n  n$10=*&0$?%__sil_tmpSIL_temp_conditional___n$7:int [line 76, column 21]\n  n$11=_fun___new_array((sizeof(t=int;nbytes=4) * n$10):unsigned long) [line 76, column 13]\n  *&x2:int*=n$11 [line 76, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$7); [line 76, column 3]\n  EXIT_SCOPE(n$10,n$11,0$?%__sil_tmpSIL_temp_conditional___n$7); [line 76, column 3]\n " shape="box"]
+"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x2:int*); [line 76, column 3]\n  n$9=*&0$?%__sil_tmpSIL_temp_conditional___n$6:int [line 76, column 21]\n  n$10=_fun___new_array((sizeof(t=int;nbytes=4) * n$9):unsigned long) [line 76, column 13]\n  *&x2:int*=n$10 [line 76, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$6); [line 76, column 3]\n  EXIT_SCOPE(n$9,n$10,0$?%__sil_tmpSIL_temp_conditional___n$6); [line 76, 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   VARIABLE_DECLARED(arr:int*); [line 83, column 3]\n  n$11=_fun___new_array((sizeof(t=int;nbytes=4) * 100):unsigned long) [line 83, column 14]\n  *n$11[0]:int=1 [line 83, column 26]\n  *n$11[1]:int=2 [line 83, column 26]\n  *n$11[2]:int=3 [line 83, column 26]\n  *n$11[3]:int=4 [line 83, column 26]\n  *n$11[4]:int=5 [line 83, column 26]\n  *n$11[5]:int=6 [line 83, column 26]\n  *n$11[6]:int=7 [line 83, column 26]\n  *n$11[7]:int=8 [line 83, column 26]\n  *n$11[8]:int=9 [line 83, column 26]\n  *n$11[9]:int=10 [line 83, column 26]\n  *&arr:int*=n$11 [line 83, column 3]\n  EXIT_SCOPE(n$11); [line 83, column 3]\n " shape="box"]
+"int_array_init#constructor_new#14099932616230884357.69a63438c3aee293029f068d373c29c3_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(arr:int*); [line 83, column 3]\n  n$10=_fun___new_array((sizeof(t=int;nbytes=4) * 100):unsigned long) [line 83, column 14]\n  *n$10[0]:int=1 [line 83, column 26]\n  *n$10[1]:int=2 [line 83, column 26]\n  *n$10[2]:int=3 [line 83, column 26]\n  *n$10[3]:int=4 [line 83, column 26]\n  *n$10[4]:int=5 [line 83, column 26]\n  *n$10[5]:int=6 [line 83, column 26]\n  *n$10[6]:int=7 [line 83, column 26]\n  *n$10[7]:int=8 [line 83, column 26]\n  *n$10[8]:int=9 [line 83, column 26]\n  *n$10[9]:int=10 [line 83, column 26]\n  *&arr:int*=n$10 [line 83, column 3]\n  EXIT_SCOPE(n$10); [line 83, 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   VARIABLE_DECLARED(x1:int*); [line 48, column 3]\n  n$3=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 48, column 13]\n  *n$3:int=0 [line 48, column 21]\n  *&x1:int*=n$3 [line 48, column 3]\n  EXIT_SCOPE(n$3); [line 48, column 3]\n " shape="box"]
+"int_init_empty#constructor_new#15413029864213743197.d5b807871fe4ea10e898a381f0edef4d_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x1:int*); [line 48, column 3]\n  n$2=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 48, column 13]\n  *n$2:int=0 [line 48, column 21]\n  *&x1:int*=n$2 [line 48, column 3]\n  EXIT_SCOPE(n$2); [line 48, 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   VARIABLE_DECLARED(x1:int*); [line 58, column 3]\n  n$3=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 58, column 13]\n  *n$3:int=0 [line 58, column 13]\n  *&x1:int*=n$3 [line 58, column 3]\n  EXIT_SCOPE(n$3); [line 58, column 3]\n " shape="box"]
+"int_init_empty_list_new#constructor_new#18093274870234850959.e77c2840901e6e789e52d55ac81db88f_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x1:int*); [line 58, column 3]\n  n$2=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 58, column 13]\n  *n$2:int=0 [line 58, column 13]\n  *&x1:int*=n$2 [line 58, column 3]\n  EXIT_SCOPE(n$2); [line 58, 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$4:int y:int* z:int \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$3:int y:int* z:int \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$5=_fun_constructor_new::getValue(0:int) [line 65, column 20]\n " shape="box"]
+"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 65, 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$5, true); [line 65, column 20]\n  NULLIFY(&y); [line 65, column 20]\n  EXIT_SCOPE(n$5,y); [line 65, column 20]\n " shape="invhouse"]
+"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_6" [label="6: Prune (true branch, boolean exp) \n   PRUNE(n$4, true); [line 65, column 20]\n  NULLIFY(&y); [line 65, column 20]\n  EXIT_SCOPE(n$4,y); [line 65, 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$5, false); [line 65, column 20]\n  EXIT_SCOPE(n$5); [line 65, column 20]\n " shape="invhouse"]
+"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_7" [label="7: Prune (false branch, boolean exp) \n   PRUNE(!n$4, false); [line 65, column 20]\n  EXIT_SCOPE(n$4); [line 65, 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:  ConditionalStmt Branch \n   n$6=_fun_constructor_new::getValue(1:int) [line 65, column 34]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=n$6 [line 65, column 20]\n  EXIT_SCOPE(n$6); [line 65, column 20]\n  APPLY_ABSTRACTION; [line 65, column 20]\n " shape="box"]
+"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_8" [label="8:  ConditionalStmt Branch \n   n$5=_fun_constructor_new::getValue(1:int) [line 65, column 34]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=n$5 [line 65, column 20]\n  EXIT_SCOPE(n$5); [line 65, column 20]\n  APPLY_ABSTRACTION; [line 65, 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:  ConditionalStmt Branch \n   n$7=*&y:int* [line 65, column 53]\n  n$8=*n$7:int [line 65, column 52]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=(1 + n$8) [line 65, column 20]\n  NULLIFY(&y); [line 65, column 20]\n  EXIT_SCOPE(n$7,n$8,y); [line 65, column 20]\n  APPLY_ABSTRACTION; [line 65, column 20]\n " shape="box"]
+"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_9" [label="9:  ConditionalStmt Branch \n   n$6=*&y:int* [line 65, column 53]\n  n$7=*n$6:int [line 65, column 52]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=(1 + n$7) [line 65, column 20]\n  NULLIFY(&y); [line 65, column 20]\n  EXIT_SCOPE(n$6,n$7,y); [line 65, column 20]\n  APPLY_ABSTRACTION; [line 65, 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   VARIABLE_DECLARED(x:int*); [line 65, column 3]\n  n$3=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 65, column 12]\n  n$9=*&0$?%__sil_tmpSIL_temp_conditional___n$4:int [line 65, column 20]\n  *n$3:int=n$9 [line 65, column 12]\n  *&x:int*=n$3 [line 65, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$4); [line 65, column 3]\n  EXIT_SCOPE(n$3,n$9,0$?%__sil_tmpSIL_temp_conditional___n$4); [line 65, column 3]\n " shape="box"]
+"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(x:int*); [line 65, column 3]\n  n$2=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 65, column 12]\n  n$8=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 65, column 20]\n  *n$2:int=n$8 [line 65, column 12]\n  *&x:int*=n$2 [line 65, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$3); [line 65, column 3]\n  EXIT_SCOPE(n$2,n$8,0$?%__sil_tmpSIL_temp_conditional___n$3); [line 65, 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   VARIABLE_DECLARED(y:int*); [line 64, column 3]\n  n$10=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 64, column 12]\n  n$11=_fun_constructor_new::getValue(4:int) [line 64, column 20]\n  *n$10:int=n$11 [line 64, column 12]\n  *&y:int*=n$10 [line 64, column 3]\n  EXIT_SCOPE(n$10,n$11); [line 64, column 3]\n " shape="box"]
+"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(y:int*); [line 64, column 3]\n  n$9=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 64, column 12]\n  n$10=_fun_constructor_new::getValue(4:int) [line 64, column 20]\n  *n$9:int=n$10 [line 64, column 12]\n  *&y:int*=n$9 [line 64, column 3]\n  EXIT_SCOPE(n$9,n$10); [line 64, 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   VARIABLE_DECLARED(x1:int*); [line 38, column 3]\n  n$3=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 38, column 13]\n  *n$3:int=5 [line 38, column 13]\n  *&x1:int*=n$3 [line 38, column 3]\n  EXIT_SCOPE(n$3); [line 38, column 3]\n " shape="box"]
+"int_init_number#constructor_new#16564762083428359974.2a1c04c2e924068dd02b097712efe518_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x1:int*); [line 38, column 3]\n  n$2=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 38, column 13]\n  *n$2:int=5 [line 38, column 13]\n  *&x1:int*=n$2 [line 38, column 3]\n  EXIT_SCOPE(n$2); [line 38, 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$1=*&tarray:constructor_new::Person** [line 98, column 3]\n  n$2=_fun___new_array((sizeof(t=constructor_new::Person) * 10):unsigned long) [line 98, column 15]\n  n$3=_fun_constructor_new::Person::Person(n$2[0]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  n$4=_fun_constructor_new::Person::Person(n$2[1]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  n$5=_fun_constructor_new::Person::Person(n$2[2]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  n$6=_fun_constructor_new::Person::Person(n$2[3]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  n$7=_fun_constructor_new::Person::Person(n$2[4]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  n$8=_fun_constructor_new::Person::Person(n$2[5]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  n$9=_fun_constructor_new::Person::Person(n$2[6]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  n$10=_fun_constructor_new::Person::Person(n$2[7]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  n$11=_fun_constructor_new::Person::Person(n$2[8]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  n$12=_fun_constructor_new::Person::Person(n$2[9]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  *n$1[0]:constructor_new::Person*=n$2 [line 98, column 3]\n  NULLIFY(&tarray); [line 98, column 3]\n  EXIT_SCOPE(n$1,n$2,n$3,n$4,n$5,n$6,n$7,n$8,n$9,n$10,n$11,n$12,tarray); [line 98, column 3]\n  APPLY_ABSTRACTION; [line 98, column 3]\n " shape="box"]
+"matrix_of_person#constructor_new#930045482638918044.730172056e08027af32de0bd9a490291_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&tarray:constructor_new::Person** [line 98, column 3]\n  n$1=_fun___new_array((sizeof(t=constructor_new::Person) * 10):unsigned long) [line 98, column 15]\n  n$2=_fun_constructor_new::Person::Person(n$1[0]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  n$3=_fun_constructor_new::Person::Person(n$1[1]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  n$4=_fun_constructor_new::Person::Person(n$1[2]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  n$5=_fun_constructor_new::Person::Person(n$1[3]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  n$6=_fun_constructor_new::Person::Person(n$1[4]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  n$7=_fun_constructor_new::Person::Person(n$1[5]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  n$8=_fun_constructor_new::Person::Person(n$1[6]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  n$9=_fun_constructor_new::Person::Person(n$1[7]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  n$10=_fun_constructor_new::Person::Person(n$1[8]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  n$11=_fun_constructor_new::Person::Person(n$1[9]:constructor_new::Person[_*_](*)) [line 98, column 19]\n  *n$0[0]:constructor_new::Person*=n$1 [line 98, column 3]\n  NULLIFY(&tarray); [line 98, column 3]\n  EXIT_SCOPE(n$0,n$1,n$2,n$3,n$4,n$5,n$6,n$7,n$8,n$9,n$10,n$11,tarray); [line 98, column 3]\n  APPLY_ABSTRACTION; [line 98, 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   VARIABLE_DECLARED(tarray:constructor_new::Person**); [line 97, column 3]\n  n$13=_fun___new_array((sizeof(t=constructor_new::Person*) * 10):unsigned long) [line 97, column 21]\n  *&tarray:constructor_new::Person**=n$13 [line 97, column 3]\n  EXIT_SCOPE(n$13); [line 97, column 3]\n " shape="box"]
+"matrix_of_person#constructor_new#930045482638918044.730172056e08027af32de0bd9a490291_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(tarray:constructor_new::Person**); [line 97, column 3]\n  n$12=_fun___new_array((sizeof(t=constructor_new::Person*) * 10):unsigned long) [line 97, column 21]\n  *&tarray:constructor_new::Person**=n$12 [line 97, column 3]\n  EXIT_SCOPE(n$12); [line 97, 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$1=*&this:constructor_new::Person* [line 18, column 5]\n  n$2=*&k:int [line 18, column 9]\n  *n$1.z:int=n$2 [line 18, column 5]\n  NULLIFY(&this); [line 18, column 5]\n  NULLIFY(&k); [line 18, column 5]\n  EXIT_SCOPE(n$1,n$2,this,k); [line 18, column 5]\n  APPLY_ABSTRACTION; [line 18, column 5]\n " shape="box"]
+"Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:constructor_new::Person* [line 18, column 5]\n  n$1=*&k:int [line 18, column 9]\n  *n$0.z:int=n$1 [line 18, column 5]\n  NULLIFY(&this); [line 18, column 5]\n  NULLIFY(&k); [line 18, column 5]\n  EXIT_SCOPE(n$0,n$1,this,k); [line 18, column 5]\n  APPLY_ABSTRACTION; [line 18, 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$3=*&this:constructor_new::Person* [line 17, column 5]\n  n$4=*&j:int [line 17, column 9]\n  *n$3.y:int=n$4 [line 17, column 5]\n  NULLIFY(&j); [line 17, column 5]\n  EXIT_SCOPE(n$3,n$4,j); [line 17, column 5]\n " shape="box"]
+"Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:constructor_new::Person* [line 17, column 5]\n  n$3=*&j:int [line 17, column 9]\n  *n$2.y:int=n$3 [line 17, column 5]\n  NULLIFY(&j); [line 17, column 5]\n  EXIT_SCOPE(n$2,n$3,j); [line 17, 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$5=*&this:constructor_new::Person* [line 16, column 5]\n  n$6=*&i:int [line 16, column 9]\n  *n$5.x:int=n$6 [line 16, column 5]\n  NULLIFY(&i); [line 16, column 5]\n  EXIT_SCOPE(n$5,n$6,i); [line 16, column 5]\n " shape="box"]
+"Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_5" [label="5:  BinaryOperatorStmt: Assign \n   n$4=*&this:constructor_new::Person* [line 16, column 5]\n  n$5=*&i:int [line 16, column 9]\n  *n$4.x:int=n$5 [line 16, column 5]\n  NULLIFY(&i); [line 16, column 5]\n  EXIT_SCOPE(n$4,n$5,i); [line 16, 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$1=*&this:constructor_new::Person* [line 13, column 19]\n  n$2=*&i:int [line 13, column 23]\n  *n$1.x:int=n$2 [line 13, column 19]\n  NULLIFY(&this); [line 13, column 19]\n  NULLIFY(&i); [line 13, column 19]\n  EXIT_SCOPE(n$1,n$2,this,i); [line 13, column 19]\n  APPLY_ABSTRACTION; [line 13, column 19]\n " shape="box"]
+"Person#Person#constructor_new#{6016517870629270534}.75bb70b834543e18977cd4fa8f8022a7_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:constructor_new::Person* [line 13, column 19]\n  n$1=*&i:int [line 13, column 23]\n  *n$0.x:int=n$1 [line 13, column 19]\n  NULLIFY(&this); [line 13, column 19]\n  NULLIFY(&i); [line 13, column 19]\n  EXIT_SCOPE(n$0,n$1,this,i); [line 13, column 19]\n  APPLY_ABSTRACTION; [line 13, 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$1=*&this:constructor_new::Person* [line 12, column 14]\n  *n$1.x:int=0 [line 12, column 14]\n  NULLIFY(&this); [line 12, column 14]\n  EXIT_SCOPE(n$1,this); [line 12, column 14]\n  APPLY_ABSTRACTION; [line 12, column 14]\n " shape="box"]
+"Person#Person#constructor_new#{6016547557443232231}.129098d47d79a7d06a2d6927fa32f467_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:constructor_new::Person* [line 12, column 14]\n  *n$0.x:int=0 [line 12, column 14]\n  NULLIFY(&this); [line 12, column 14]\n  EXIT_SCOPE(n$0,this); [line 12, column 14]\n  APPLY_ABSTRACTION; [line 12, column 14]\n " shape="box"]
 	
 
 	 "Person#Person#constructor_new#{6016547557443232231}.129098d47d79a7d06a2d6927fa32f467_3" -> "Person#Person#constructor_new#{6016547557443232231}.129098d47d79a7d06a2d6927fa32f467_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_struct_init_list.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_struct_init_list.cpp.dot
index 927ca8f2a..df7c28bd6 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_struct_init_list.cpp.dot
+++ b/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$1:Insets \n  " color=yellow style=filled]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_1" [label="1: Start test\nFormals: \nLocals:  p:Person 0$?%__sil_tmpSIL_init_list__n$0:Insets \n  " color=yellow style=filled]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_1" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n   NULLIFY(&p); [line 17, column 29]\n " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(p:Person); [line 17, column 15]\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  NULLIFY(&0$?%__sil_tmpSIL_init_list__n$1); [line 17, column 22]\n  EXIT_SCOPE(n$2,p,0$?%__sil_tmpSIL_init_list__n$1); [line 17, column 22]\n  APPLY_ABSTRACTION; [line 17, column 22]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(p:Person); [line 17, column 15]\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  NULLIFY(&0$?%__sil_tmpSIL_init_list__n$0); [line 17, column 22]\n  EXIT_SCOPE(n$1,p,0$?%__sil_tmpSIL_init_list__n$0); [line 17, column 22]\n  APPLY_ABSTRACTION; [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$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  NULLIFY(&l); [line 14, column 28]\n  NULLIFY(&this); [line 14, column 28]\n  EXIT_SCOPE(n$2,n$3,n$4,l,this); [line 14, column 28]\n  APPLY_ABSTRACTION; [line 14, column 28]\n " shape="box"]
+"Person#Person#{5857402560744521252}.6ef0efc697f825c2030746b71de7fd56_3" [label="3:  Constructor Init \n   n$1=*&this:Person* [line 14, column 28]\n  n$2=*&l:Insets const & [line 14, column 32]\n  n$3=*n$2.top:int [line 14, column 32]\n  *n$1.age:int=n$3 [line 14, column 28]\n  NULLIFY(&l); [line 14, column 28]\n  NULLIFY(&this); [line 14, column 28]\n  EXIT_SCOPE(n$1,n$2,n$3,l,this); [line 14, column 28]\n  APPLY_ABSTRACTION; [line 14, column 28]\n " shape="box"]
 	
 
 	 "Person#Person#{5857402560744521252}.6ef0efc697f825c2030746b71de7fd56_3" -> "Person#Person#{5857402560744521252}.6ef0efc697f825c2030746b71de7fd56_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_with_body.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_with_body.cpp.dot
index 7fb64c604..c991014bb 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_with_body.cpp.dot
+++ b/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   NULLIFY(&x); [line 31, column 1]\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 30, column 3]\n  n$2=_fun_constructor_with_body::X::div(&x:constructor_with_body::X&) [line 30, column 3]\n  EXIT_SCOPE(_,n$2,x); [line 30, column 3]\n  APPLY_ABSTRACTION; [line 30, 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 30, column 3]\n  n$1=_fun_constructor_with_body::X::div(&x:constructor_with_body::X&) [line 30, column 3]\n  EXIT_SCOPE(_,n$1,x); [line 30, column 3]\n  APPLY_ABSTRACTION; [line 30, 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   VARIABLE_DECLARED(x:constructor_with_body::X); [line 29, column 3]\n  n$3=_fun_constructor_with_body::X::X(&x:constructor_with_body::X*,-2:int,2:int) [line 29, column 5]\n  EXIT_SCOPE(n$3); [line 29, column 5]\n " shape="box"]
+"test_div0#constructor_with_body#14177342253516869661.07f5b28b5e0b5cf0bd1b639da4232d5e_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:constructor_with_body::X); [line 29, column 3]\n  n$2=_fun_constructor_with_body::X::X(&x:constructor_with_body::X*,-2:int,2:int) [line 29, column 5]\n  EXIT_SCOPE(n$2); [line 29, 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   NULLIFY(&x); [line 36, column 1]\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 35, column 3]\n  n$2=_fun_constructor_with_body::X::div(&x:constructor_with_body::X&) [line 35, column 3]\n  EXIT_SCOPE(_,n$2,x); [line 35, column 3]\n  APPLY_ABSTRACTION; [line 35, 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 35, column 3]\n  n$1=_fun_constructor_with_body::X::div(&x:constructor_with_body::X&) [line 35, column 3]\n  EXIT_SCOPE(_,n$1,x); [line 35, column 3]\n  APPLY_ABSTRACTION; [line 35, 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   VARIABLE_DECLARED(x:constructor_with_body::X); [line 34, column 3]\n  n$3=_fun_constructor_with_body::X::X(&x:constructor_with_body::X*) [line 34, column 5]\n  EXIT_SCOPE(n$3); [line 34, column 5]\n " shape="box"]
+"test_div0_default_constructor#constructor_with_body#13388399293672727772.2d6a8a159f30a2a66b86eb8aec3b9543_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:constructor_with_body::X); [line 34, column 3]\n  n$2=_fun_constructor_with_body::X::X(&x:constructor_with_body::X*) [line 34, column 5]\n  EXIT_SCOPE(n$2); [line 34, 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   NULLIFY(&x); [line 41, column 1]\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 40, column 3]\n  n$2=_fun_constructor_with_body::X::div(&x:constructor_with_body::X&) [line 40, column 3]\n  EXIT_SCOPE(_,n$2,x); [line 40, column 3]\n  APPLY_ABSTRACTION; [line 40, 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 40, column 3]\n  n$1=_fun_constructor_with_body::X::div(&x:constructor_with_body::X&) [line 40, column 3]\n  EXIT_SCOPE(_,n$1,x); [line 40, column 3]\n  APPLY_ABSTRACTION; [line 40, 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   VARIABLE_DECLARED(x:constructor_with_body::X); [line 39, column 3]\n  n$3=_fun_constructor_with_body::X::X(&x:constructor_with_body::X*,0:int,1:int) [line 39, column 5]\n  EXIT_SCOPE(n$3); [line 39, column 5]\n " shape="box"]
+"test_div1#constructor_with_body#14807027065269407206.e5673561e7edf9eb35b296211ab8d37d_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:constructor_with_body::X); [line 39, column 3]\n  n$2=_fun_constructor_with_body::X::X(&x:constructor_with_body::X*,0:int,1:int) [line 39, column 5]\n  EXIT_SCOPE(n$2); [line 39, 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 {
 "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$1=*&this:constructor_with_body::X* [line 12, column 17]\n  *n$1.f:int=0 [line 12, column 17]\n  NULLIFY(&this); [line 12, column 17]\n  EXIT_SCOPE(n$1,this); [line 12, column 17]\n  APPLY_ABSTRACTION; [line 12, column 17]\n " shape="box"]
+"init#X#constructor_with_body#(11920920673411078151).40e39840a696bef95297e1afb2f57392_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:constructor_with_body::X* [line 12, column 17]\n  *n$0.f:int=0 [line 12, column 17]\n  NULLIFY(&this); [line 12, column 17]\n  EXIT_SCOPE(n$0,this); [line 12, column 17]\n  APPLY_ABSTRACTION; [line 12, column 17]\n " shape="box"]
 	
 
 	 "init#X#constructor_with_body#(11920920673411078151).40e39840a696bef95297e1afb2f57392_3" -> "init#X#constructor_with_body#(11920920673411078151).40e39840a696bef95297e1afb2f57392_2" ;
@@ -74,7 +74,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$1=*&this:constructor_with_body::X* [line 15, column 9]\n  _=*n$1:constructor_with_body::X [line 15, column 9]\n  n$3=_fun_constructor_with_body::X::init(n$1:constructor_with_body::X*) [line 15, column 9]\n  NULLIFY(&this); [line 15, column 9]\n  EXIT_SCOPE(_,n$1,n$3,this); [line 15, column 9]\n  APPLY_ABSTRACTION; [line 15, column 9]\n " shape="box"]
+"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 15, column 9]\n  _=*n$0:constructor_with_body::X [line 15, column 9]\n  n$2=_fun_constructor_with_body::X::init(n$0:constructor_with_body::X*) [line 15, column 9]\n  NULLIFY(&this); [line 15, column 9]\n  EXIT_SCOPE(_,n$0,n$2,this); [line 15, column 9]\n  APPLY_ABSTRACTION; [line 15, column 9]\n " shape="box"]
 	
 
 	 "X#X#constructor_with_body#{16871729092574880817}.54f479ca84639d148c4b988a7530253a_3" -> "X#X#constructor_with_body#{16871729092574880817}.54f479ca84639d148c4b988a7530253a_2" ;
@@ -85,15 +85,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$1=*&this:constructor_with_body::X* [line 25, column 3]\n  n$2=*&c:int [line 25, column 7]\n  *n$1.f:int=n$2 [line 25, column 3]\n  NULLIFY(&c); [line 25, column 3]\n  NULLIFY(&this); [line 25, column 3]\n  EXIT_SCOPE(n$1,n$2,c,this); [line 25, column 3]\n  APPLY_ABSTRACTION; [line 25, column 3]\n " shape="box"]
+"X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:constructor_with_body::X* [line 25, column 3]\n  n$1=*&c:int [line 25, column 7]\n  *n$0.f:int=n$1 [line 25, column 3]\n  NULLIFY(&c); [line 25, column 3]\n  NULLIFY(&this); [line 25, column 3]\n  EXIT_SCOPE(n$0,n$1,c,this); [line 25, column 3]\n  APPLY_ABSTRACTION; [line 25, 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$3=*&this:constructor_with_body::X* [line 24, column 3]\n  _=*n$3:constructor_with_body::X [line 24, column 3]\n  n$5=_fun_constructor_with_body::X::init(n$3:constructor_with_body::X*) [line 24, column 3]\n  EXIT_SCOPE(_,n$3,n$5); [line 24, column 3]\n " shape="box"]
+"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 24, column 3]\n  _=*n$2:constructor_with_body::X [line 24, column 3]\n  n$4=_fun_constructor_with_body::X::init(n$2:constructor_with_body::X*) [line 24, column 3]\n  EXIT_SCOPE(_,n$2,n$4); [line 24, 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   VARIABLE_DECLARED(c:int); [line 23, column 3]\n  n$6=*&a:int [line 23, column 11]\n  n$7=*&b:int [line 23, column 15]\n  *&c:int=(n$6 + n$7) [line 23, column 3]\n  NULLIFY(&a); [line 23, column 3]\n  NULLIFY(&b); [line 23, column 3]\n  EXIT_SCOPE(n$6,n$7,a,b); [line 23, column 3]\n " shape="box"]
+"X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(c:int); [line 23, column 3]\n  n$5=*&a:int [line 23, column 11]\n  n$6=*&b:int [line 23, column 15]\n  *&c:int=(n$5 + n$6) [line 23, column 3]\n  NULLIFY(&a); [line 23, column 3]\n  NULLIFY(&b); [line 23, column 3]\n  EXIT_SCOPE(n$5,n$6,a,b); [line 23, column 3]\n " shape="box"]
 	
 
 	 "X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_5" -> "X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_4" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/copy_array_field.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/copy_array_field.cpp.dot
index aae32a1da..c73db332f 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/copy_array_field.cpp.dot
+++ b/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   VARIABLE_DECLARED(x2:copy_array_field::X); [line 24, column 3]\n  n$3=_fun_copy_array_field::X::X(&x2:copy_array_field::X*,&x1:copy_array_field::X&) [line 24, column 10]\n  EXIT_SCOPE(n$3,x1); [line 24, column 10]\n " shape="box"]
+"no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x2:copy_array_field::X); [line 24, column 3]\n  n$2=_fun_copy_array_field::X::X(&x2:copy_array_field::X*,&x1:copy_array_field::X&) [line 24, column 10]\n  EXIT_SCOPE(n$2,x1); [line 24, 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   VARIABLE_DECLARED(x1:copy_array_field::X); [line 22, column 3]\n  n$4=_fun_copy_array_field::X::X(&x1:copy_array_field::X*) [line 22, column 5]\n  EXIT_SCOPE(n$4); [line 22, column 5]\n " shape="box"]
+"no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(x1:copy_array_field::X); [line 22, column 3]\n  n$3=_fun_copy_array_field::X::X(&x1:copy_array_field::X*) [line 22, column 5]\n  EXIT_SCOPE(n$3); [line 22, 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   VARIABLE_DECLARED(x2:copy_array_field::X); [line 16, column 3]\n  n$3=_fun_copy_array_field::X::X(&x2:copy_array_field::X*,&x1:copy_array_field::X&) [line 16, column 10]\n  EXIT_SCOPE(n$3,x1); [line 16, column 10]\n " shape="box"]
+"npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x2:copy_array_field::X); [line 16, column 3]\n  n$2=_fun_copy_array_field::X::X(&x2:copy_array_field::X*,&x1:copy_array_field::X&) [line 16, column 10]\n  EXIT_SCOPE(n$2,x1); [line 16, 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   VARIABLE_DECLARED(x1:copy_array_field::X); [line 14, column 3]\n  n$4=_fun_copy_array_field::X::X(&x1:copy_array_field::X*) [line 14, column 5]\n  EXIT_SCOPE(n$4); [line 14, column 5]\n " shape="box"]
+"npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(x1:copy_array_field::X); [line 14, column 3]\n  n$3=_fun_copy_array_field::X::X(&x1:copy_array_field::X*) [line 14, column 5]\n  EXIT_SCOPE(n$3); [line 14, 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$2=*&this:copy_array_field::X* [line 8, column 8]\n  *n$2.x:void=n$3 [line 8, column 8]\n  NULLIFY(&this); [line 8, column 8]\n  EXIT_SCOPE(n$2,n$3,this); [line 8, column 8]\n  APPLY_ABSTRACTION; [line 8, column 8]\n " shape="box"]
+"X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_3" [label="3:  Constructor Init \n   n$1=*&this:copy_array_field::X* [line 8, column 8]\n  *n$1.x:void=n$2 [line 8, column 8]\n  NULLIFY(&this); [line 8, column 8]\n  EXIT_SCOPE(n$1,n$2,this); [line 8, column 8]\n  APPLY_ABSTRACTION; [line 8, 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$4=*&this:copy_array_field::X* [line 8, column 8]\n  n$5=*&__param_0:copy_array_field::X const & [line 8, column 8]\n  n$6=*n$5.p:int* [line 8, column 8]\n  *n$4.p:int*=n$6 [line 8, column 8]\n  NULLIFY(&__param_0); [line 8, column 8]\n  EXIT_SCOPE(n$4,n$5,n$6,__param_0); [line 8, column 8]\n " shape="box"]
+"X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_4" [label="4:  Constructor Init \n   n$3=*&this:copy_array_field::X* [line 8, column 8]\n  n$4=*&__param_0:copy_array_field::X const & [line 8, column 8]\n  n$5=*n$4.p:int* [line 8, column 8]\n  *n$3.p:int*=n$5 [line 8, column 8]\n  NULLIFY(&__param_0); [line 8, column 8]\n  EXIT_SCOPE(n$3,n$4,n$5,__param_0); [line 8, column 8]\n " shape="box"]
 	
 
 	 "X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_4" -> "X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_3" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/copy_move_constructor.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/copy_move_constructor.cpp.dot
index 2d8376136..e7d1e653f 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/copy_move_constructor.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/constructors/copy_move_constructor.cpp.dot
@@ -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$2=*&this:copy_move_constructor::X* [line 13, column 8]\n  n$3=*&__param_0:copy_move_constructor::X& [line 13, column 8]\n  n$4=*n$3.f:int [line 13, column 8]\n  *n$2.f:int=n$4 [line 13, column 8]\n  NULLIFY(&this); [line 13, column 8]\n  NULLIFY(&__param_0); [line 13, column 8]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 13, column 8]\n  APPLY_ABSTRACTION; [line 13, column 8]\n " shape="box"]
+"X#X#copy_move_constructor#{10174102600918728520|constexpr}.7f1f4443383b6eabdf400de956c7f6af_3" [label="3:  Constructor Init \n   n$1=*&this:copy_move_constructor::X* [line 13, column 8]\n  n$2=*&__param_0:copy_move_constructor::X& [line 13, column 8]\n  n$3=*n$2.f:int [line 13, column 8]\n  *n$1.f:int=n$3 [line 13, column 8]\n  NULLIFY(&this); [line 13, column 8]\n  NULLIFY(&__param_0); [line 13, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 13, column 8]\n  APPLY_ABSTRACTION; [line 13, 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$2=*&this:copy_move_constructor::X* [line 13, column 8]\n  n$3=*&__param_0:copy_move_constructor::X const & [line 13, column 8]\n  n$4=*n$3.f:int [line 13, column 8]\n  *n$2.f:int=n$4 [line 13, column 8]\n  NULLIFY(&this); [line 13, column 8]\n  NULLIFY(&__param_0); [line 13, column 8]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 13, column 8]\n  APPLY_ABSTRACTION; [line 13, column 8]\n " shape="box"]
+"X#X#copy_move_constructor#{11461885598838954204|constexpr}.8b245330f9990df6f1e3d0622b3e7433_3" [label="3:  Constructor Init \n   n$1=*&this:copy_move_constructor::X* [line 13, column 8]\n  n$2=*&__param_0:copy_move_constructor::X const & [line 13, column 8]\n  n$3=*n$2.f:int [line 13, column 8]\n  *n$1.f:int=n$3 [line 13, column 8]\n  NULLIFY(&this); [line 13, column 8]\n  NULLIFY(&__param_0); [line 13, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 13, column 8]\n  APPLY_ABSTRACTION; [line 13, 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$2=*&this:copy_move_constructor::Y* [line 24, column 20]\n  n$3=*&y:copy_move_constructor::Y const & [line 24, column 22]\n  n$4=*n$3.f:int [line 24, column 22]\n  *n$2.f:int=(n$4 - 1) [line 24, column 20]\n  NULLIFY(&y); [line 24, column 20]\n  NULLIFY(&this); [line 24, column 20]\n  EXIT_SCOPE(n$2,n$3,n$4,y,this); [line 24, column 20]\n  APPLY_ABSTRACTION; [line 24, column 20]\n " shape="box"]
+"Y#Y#copy_move_constructor#{18272181401462210540}.6215678d929da0a4d67ea5f3b952308e_3" [label="3:  Constructor Init \n   n$1=*&this:copy_move_constructor::Y* [line 24, column 20]\n  n$2=*&y:copy_move_constructor::Y const & [line 24, column 22]\n  n$3=*n$2.f:int [line 24, column 22]\n  *n$1.f:int=(n$3 - 1) [line 24, column 20]\n  NULLIFY(&y); [line 24, column 20]\n  NULLIFY(&this); [line 24, column 20]\n  EXIT_SCOPE(n$1,n$2,n$3,y,this); [line 24, column 20]\n  APPLY_ABSTRACTION; [line 24, 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$2=*&this:copy_move_constructor::Y* [line 22, column 3]\n  n$3=*&y:copy_move_constructor::Y const & [line 22, column 3]\n  n$4=*n$3.f:int [line 22, column 3]\n  *n$2.f:int=n$4 [line 22, column 3]\n  NULLIFY(&y); [line 22, column 3]\n  NULLIFY(&this); [line 22, column 3]\n  EXIT_SCOPE(n$2,n$3,n$4,y,this); [line 22, column 3]\n  APPLY_ABSTRACTION; [line 22, column 3]\n " shape="box"]
+"Y#Y#copy_move_constructor#{2644368372854768795|constexpr}.992ebae8b36e68c2e1b5e338a4c29705_3" [label="3:  Constructor Init \n   n$1=*&this:copy_move_constructor::Y* [line 22, column 3]\n  n$2=*&y:copy_move_constructor::Y const & [line 22, column 3]\n  n$3=*n$2.f:int [line 22, column 3]\n  *n$1.f:int=n$3 [line 22, column 3]\n  NULLIFY(&y); [line 22, column 3]\n  NULLIFY(&this); [line 22, column 3]\n  EXIT_SCOPE(n$1,n$2,n$3,y,this); [line 22, column 3]\n  APPLY_ABSTRACTION; [line 22, column 3]\n " shape="box"]
 	
 
 	 "Y#Y#copy_move_constructor#{2644368372854768795|constexpr}.992ebae8b36e68c2e1b5e338a4c29705_3" -> "Y#Y#copy_move_constructor#{2644368372854768795|constexpr}.992ebae8b36e68c2e1b5e338a4c29705_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/default_field_init.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/default_field_init.cpp.dot
index cc90d645c..f1f2c5c29 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/default_field_init.cpp.dot
+++ b/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   NULLIFY(&y); [line 23, column 20]\n " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(y:Y); [line 23, column 15]\n  n$1=_fun_Y::Y(&y:Y*) [line 23, column 17]\n  EXIT_SCOPE(n$1,y); [line 23, column 17]\n  APPLY_ABSTRACTION; [line 23, column 17]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(y:Y); [line 23, column 15]\n  n$0=_fun_Y::Y(&y:Y*) [line 23, column 17]\n  EXIT_SCOPE(n$0,y); [line 23, column 17]\n  APPLY_ABSTRACTION; [line 23, 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$2=*&this:X* [line 11, column 8]\n  *n$2.c:int=0 [line 11, column 8]\n  NULLIFY(&this); [line 11, column 8]\n  EXIT_SCOPE(n$2,this); [line 11, column 8]\n  APPLY_ABSTRACTION; [line 11, column 8]\n " shape="box"]
+"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_3" [label="3:  Constructor Init \n   n$1=*&this:X* [line 11, column 8]\n  *n$1.c:int=0 [line 11, column 8]\n  NULLIFY(&this); [line 11, column 8]\n  EXIT_SCOPE(n$1,this); [line 11, column 8]\n  APPLY_ABSTRACTION; [line 11, 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$3=*&this:X* [line 10, column 8]\n  *n$3.b:int=-2 [line 10, column 8]\n  EXIT_SCOPE(n$3); [line 10, column 8]\n " shape="box"]
+"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_4" [label="4:  Constructor Init \n   n$2=*&this:X* [line 10, column 8]\n  *n$2.b:int=-2 [line 10, column 8]\n  EXIT_SCOPE(n$2); [line 10, 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$4=*&this:X* [line 14, column 21]\n  n$5=*&a:int [line 14, column 23]\n  n$6=*&b:int [line 14, column 27]\n  *n$4.a:int=(n$5 + n$6) [line 14, column 21]\n  NULLIFY(&a); [line 14, column 21]\n  NULLIFY(&b); [line 14, column 21]\n  EXIT_SCOPE(n$4,n$5,n$6,a,b); [line 14, column 21]\n " shape="box"]
+"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_5" [label="5:  Constructor Init \n   n$3=*&this:X* [line 14, column 21]\n  n$4=*&a:int [line 14, column 23]\n  n$5=*&b:int [line 14, column 27]\n  *n$3.a:int=(n$4 + n$5) [line 14, column 21]\n  NULLIFY(&a); [line 14, column 21]\n  NULLIFY(&b); [line 14, column 21]\n  EXIT_SCOPE(n$3,n$4,n$5,a,b); [line 14, 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$2=*&this:X* [line 11, column 8]\n  *n$2.c:int=0 [line 11, column 8]\n  NULLIFY(&this); [line 11, column 8]\n  EXIT_SCOPE(n$2,this); [line 11, column 8]\n  APPLY_ABSTRACTION; [line 11, column 8]\n " shape="box"]
+"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_3" [label="3:  Constructor Init \n   n$1=*&this:X* [line 11, column 8]\n  *n$1.c:int=0 [line 11, column 8]\n  NULLIFY(&this); [line 11, column 8]\n  EXIT_SCOPE(n$1,this); [line 11, column 8]\n  APPLY_ABSTRACTION; [line 11, 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$3=*&this:X* [line 10, column 8]\n  *n$3.b:int=-2 [line 10, column 8]\n  EXIT_SCOPE(n$3); [line 10, column 8]\n " shape="box"]
+"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_4" [label="4:  Constructor Init \n   n$2=*&this:X* [line 10, column 8]\n  *n$2.b:int=-2 [line 10, column 8]\n  EXIT_SCOPE(n$2); [line 10, 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$4=*&this:X* [line 9, column 11]\n  *n$4.a:int=-1 [line 9, column 11]\n  EXIT_SCOPE(n$4); [line 9, column 11]\n " shape="box"]
+"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_5" [label="5:  Constructor Init \n   n$3=*&this:X* [line 9, column 11]\n  *n$3.a:int=-1 [line 9, column 11]\n  EXIT_SCOPE(n$3); [line 9, 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$2=*&this:Y* [line 17, column 8]\n  n$3=_fun_X::X(n$2.x3:X*) [line 17, column 8]\n  NULLIFY(&this); [line 17, column 8]\n  EXIT_SCOPE(n$2,n$3,this); [line 17, column 8]\n  APPLY_ABSTRACTION; [line 17, column 8]\n " shape="box"]
+"Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_3" [label="3:  Constructor Init \n   n$1=*&this:Y* [line 17, column 8]\n  n$2=_fun_X::X(n$1.x3:X*) [line 17, column 8]\n  NULLIFY(&this); [line 17, column 8]\n  EXIT_SCOPE(n$1,n$2,this); [line 17, column 8]\n  APPLY_ABSTRACTION; [line 17, 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$4=*&this:Y* [line 19, column 7]\n  n$5=_fun_X::X(n$4.x2:X*) [line 19, column 7]\n  EXIT_SCOPE(n$4,n$5); [line 19, column 7]\n " shape="box"]
+"Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_4" [label="4:  Constructor Init \n   n$3=*&this:Y* [line 19, column 7]\n  n$4=_fun_X::X(n$3.x2:X*) [line 19, column 7]\n  EXIT_SCOPE(n$3,n$4); [line 19, 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$6=*&this:Y* [line 18, column 7]\n  n$7=_fun_X::X(n$6.x1:X*,1:int,2:int) [line 18, column 7]\n  EXIT_SCOPE(n$6,n$7); [line 18, column 7]\n " shape="box"]
+"Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_5" [label="5:  Constructor Init \n   n$5=*&this:Y* [line 18, column 7]\n  n$6=_fun_X::X(n$5.x1:X*,1:int,2:int) [line 18, column 7]\n  EXIT_SCOPE(n$5,n$6); [line 18, column 7]\n " shape="box"]
 	
 
 	 "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_5" -> "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_4" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/std_init_list.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/std_init_list.cpp.dot
index 86847cc38..360ca0207 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/std_init_list.cpp.dot
+++ b/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$1:int const [5*4] const  \n  " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  x:X 0$?%__sil_tmpSIL_materialize_temp__n$0:int const [5*4] const  \n  " color=yellow style=filled]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n   NULLIFY(&x); [line 22, column 37]\n " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(x:X); [line 22, column 14]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$1:int const [5*4] const ); [line 22, column 20]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$1[0]:int=1 [line 22, column 20]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$1[1]:int=2 [line 22, column 20]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$1[2]:int=3 [line 22, column 20]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$1[3]:int=4 [line 22, column 20]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$1[4]:int=5 [line 22, column 20]\n  n$2=_fun___infer_skip_function(&0$?%__sil_tmpSIL_materialize_temp__n$1:int const [5*4] const ) [line 22, column 20]\n  n$3=_fun_X::X(&x:X*,n$2:std::initializer_list<int>) [line 22, column 20]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 22, column 20]\n  EXIT_SCOPE(n$2,n$3,x,0$?%__sil_tmpSIL_materialize_temp__n$1); [line 22, column 20]\n  APPLY_ABSTRACTION; [line 22, column 20]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(x:X); [line 22, column 14]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$0:int const [5*4] const ); [line 22, column 20]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0[0]:int=1 [line 22, column 20]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0[1]:int=2 [line 22, column 20]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0[2]:int=3 [line 22, column 20]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0[3]:int=4 [line 22, column 20]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0[4]:int=5 [line 22, column 20]\n  n$1=_fun___infer_skip_function(&0$?%__sil_tmpSIL_materialize_temp__n$0:int const [5*4] const ) [line 22, column 20]\n  n$2=_fun_X::X(&x:X*,n$1:std::initializer_list<int>) [line 22, column 20]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 22, column 20]\n  EXIT_SCOPE(n$1,n$2,x,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 22, column 20]\n  APPLY_ABSTRACTION; [line 22, 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   VARIABLE_DECLARED(i:int const *); [line 13, column 10]\n  n$1=*&list:std::initializer_list<int>& [line 13, column 19]\n  _=*n$1:std::initializer_list<int> [line 13, column 19]\n  n$3=_fun_std::initializer_list<int>::begin(n$1:std::initializer_list<int>&) [line 13, column 19]\n  *&i:int const *=n$3 [line 13, column 10]\n  EXIT_SCOPE(_,n$1,n$3); [line 13, column 10]\n  APPLY_ABSTRACTION; [line 13, column 10]\n " shape="box"]
+"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(i:int const *); [line 13, column 10]\n  n$0=*&list:std::initializer_list<int>& [line 13, column 19]\n  _=*n$0:std::initializer_list<int> [line 13, column 19]\n  n$2=_fun_std::initializer_list<int>::begin(n$0:std::initializer_list<int>&) [line 13, column 19]\n  *&i:int const *=n$2 [line 13, column 10]\n  EXIT_SCOPE(_,n$0,n$2); [line 13, column 10]\n  APPLY_ABSTRACTION; [line 13, 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$4=*&i:int const * [line 13, column 50]\n  *&i:int const *=(n$4 + 1) [line 13, column 50]\n  EXIT_SCOPE(n$4); [line 13, column 50]\n  APPLY_ABSTRACTION; [line 13, column 50]\n " shape="box"]
+"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_5" [label="5:  UnaryOperator \n   n$3=*&i:int const * [line 13, column 50]\n  *&i:int const *=(n$3 + 1) [line 13, column 50]\n  EXIT_SCOPE(n$3); [line 13, column 50]\n  APPLY_ABSTRACTION; [line 13, 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$5=*&i:int const * [line 13, column 33]\n  n$6=*&list:std::initializer_list<int>& [line 13, column 38]\n  _=*n$6:std::initializer_list<int> [line 13, column 38]\n  n$8=_fun_std::initializer_list<int>::end(n$6:std::initializer_list<int>&) [line 13, column 38]\n  EXIT_SCOPE(_,n$6); [line 13, column 38]\n " shape="box"]
+"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_6" [label="6:  BinaryOperatorStmt: NE \n   n$4=*&i:int const * [line 13, column 33]\n  n$5=*&list:std::initializer_list<int>& [line 13, column 38]\n  _=*n$5:std::initializer_list<int> [line 13, column 38]\n  n$7=_fun_std::initializer_list<int>::end(n$5:std::initializer_list<int>&) [line 13, column 38]\n  EXIT_SCOPE(_,n$5); [line 13, 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$5 != n$8), true); [line 13, column 33]\n  EXIT_SCOPE(n$5,n$8); [line 13, column 33]\n " shape="invhouse"]
+"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_7" [label="7: Prune (true branch, for loop) \n   PRUNE((n$4 != n$7), true); [line 13, column 33]\n  EXIT_SCOPE(n$4,n$7); [line 13, 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$5 != n$8), false); [line 13, column 33]\n  NULLIFY(&i); [line 13, column 33]\n  EXIT_SCOPE(n$5,n$8,i); [line 13, column 33]\n  APPLY_ABSTRACTION; [line 13, column 33]\n " shape="invhouse"]
+"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_8" [label="8: Prune (false branch, for loop) \n   PRUNE(!(n$4 != n$7), false); [line 13, column 33]\n  NULLIFY(&i); [line 13, column 33]\n  EXIT_SCOPE(n$4,n$7,i); [line 13, column 33]\n  APPLY_ABSTRACTION; [line 13, 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$10=*&this:X* [line 14, column 7]\n  n$11=*&this:X* [line 14, column 13]\n  n$12=*n$11.sum:int [line 14, column 13]\n  n$13=*&i:int const * [line 14, column 20]\n  n$14=*n$13:int [line 14, column 19]\n  *n$10.sum:int=(n$12 + n$14) [line 14, column 7]\n  EXIT_SCOPE(n$10,n$11,n$12,n$13,n$14); [line 14, column 7]\n " shape="box"]
+"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_9" [label="9:  BinaryOperatorStmt: Assign \n   n$8=*&this:X* [line 14, column 7]\n  n$9=*&this:X* [line 14, column 13]\n  n$10=*n$9.sum:int [line 14, column 13]\n  n$11=*&i:int const * [line 14, column 20]\n  n$12=*n$11:int [line 14, column 19]\n  *n$8.sum:int=(n$10 + n$12) [line 14, column 7]\n  EXIT_SCOPE(n$8,n$9,n$10,n$11,n$12); [line 14, column 7]\n " shape="box"]
 	
 
 	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_9" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_5" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/temp_object.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/temp_object.cpp.dot
index 8ee6402c9..960e6d580 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/temp_object.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/constructors/temp_object.cpp.dot
@@ -132,7 +132,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$1=*&this:temp_object::X* [line 14, column 19]\n  n$2=*&x:temp_object::X const & [line 14, column 23]\n  n$3=*n$2.f:int [line 14, column 23]\n  *n$1.f:int=n$3 [line 14, column 19]\n  NULLIFY(&x); [line 14, column 19]\n  NULLIFY(&this); [line 14, column 19]\n  EXIT_SCOPE(n$1,n$2,n$3,x,this); [line 14, column 19]\n  APPLY_ABSTRACTION; [line 14, column 19]\n " shape="box"]
+"X#X#temp_object#{5376484276992466061}.a1cfaf9ee9d8c713d3d1751acbb77f32_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:temp_object::X* [line 14, column 19]\n  n$1=*&x:temp_object::X const & [line 14, column 23]\n  n$2=*n$1.f:int [line 14, column 23]\n  *n$0.f:int=n$2 [line 14, column 19]\n  NULLIFY(&x); [line 14, column 19]\n  NULLIFY(&this); [line 14, column 19]\n  EXIT_SCOPE(n$0,n$1,n$2,x,this); [line 14, column 19]\n  APPLY_ABSTRACTION; [line 14, column 19]\n " shape="box"]
 	
 
 	 "X#X#temp_object#{5376484276992466061}.a1cfaf9ee9d8c713d3d1751acbb77f32_3" -> "X#X#temp_object#{5376484276992466061}.a1cfaf9ee9d8c713d3d1751acbb77f32_2" ;
@@ -143,7 +143,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$1=*&this:temp_object::X* [line 12, column 21]\n  n$2=*&a:int [line 12, column 25]\n  *n$1.f:int=n$2 [line 12, column 21]\n  NULLIFY(&a); [line 12, column 21]\n  NULLIFY(&this); [line 12, column 21]\n  EXIT_SCOPE(n$1,n$2,a,this); [line 12, column 21]\n  APPLY_ABSTRACTION; [line 12, column 21]\n " shape="box"]
+"X#X#temp_object#{8598480124712426466}.7071c692af425a15518693ebe50ba781_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:temp_object::X* [line 12, column 21]\n  n$1=*&a:int [line 12, column 25]\n  *n$0.f:int=n$1 [line 12, column 21]\n  NULLIFY(&a); [line 12, column 21]\n  NULLIFY(&this); [line 12, column 21]\n  EXIT_SCOPE(n$0,n$1,a,this); [line 12, column 21]\n  APPLY_ABSTRACTION; [line 12, column 21]\n " shape="box"]
 	
 
 	 "X#X#temp_object#{8598480124712426466}.7071c692af425a15518693ebe50ba781_3" -> "X#X#temp_object#{8598480124712426466}.7071c692af425a15518693ebe50ba781_2" ;
@@ -154,7 +154,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$1=*&this:temp_object::X* [line 11, column 14]\n  n$2=*&a:int [line 11, column 18]\n  *n$1.f:int=n$2 [line 11, column 14]\n  NULLIFY(&a); [line 11, column 14]\n  NULLIFY(&this); [line 11, column 14]\n  EXIT_SCOPE(n$1,n$2,a,this); [line 11, column 14]\n  APPLY_ABSTRACTION; [line 11, column 14]\n " shape="box"]
+"X#X#temp_object#{9561113765655638015}.59d66724d587fdb6aca1a26e1f705f23_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:temp_object::X* [line 11, column 14]\n  n$1=*&a:int [line 11, column 18]\n  *n$0.f:int=n$1 [line 11, column 14]\n  NULLIFY(&a); [line 11, column 14]\n  NULLIFY(&this); [line 11, column 14]\n  EXIT_SCOPE(n$0,n$1,a,this); [line 11, column 14]\n  APPLY_ABSTRACTION; [line 11, column 14]\n " shape="box"]
 	
 
 	 "X#X#temp_object#{9561113765655638015}.59d66724d587fdb6aca1a26e1f705f23_3" -> "X#X#temp_object#{9561113765655638015}.59d66724d587fdb6aca1a26e1f705f23_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/exceptions/Exceptions.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/exceptions/Exceptions.cpp.dot
index 968f51f23..e2c3b07b4 100644
--- a/infer/tests/codetoanalyze/cpp/shared/exceptions/Exceptions.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/exceptions/Exceptions.cpp.dot
@@ -1,22 +1,22 @@
 /* @generated */
 digraph cfg {
-"FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_1" [label="1: Start FN_deref_null_after_catch_bad\nFormals:  i:int*\nLocals:  0$?%__sil_tmp__temp_construct_n$4:std::runtime_error 0$?%__sil_tmpSIL_materialize_temp__n$5:std::runtime_error const  \n  " color=yellow style=filled]
+"FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_1" [label="1: Start FN_deref_null_after_catch_bad\nFormals:  i:int*\nLocals:  0$?%__sil_tmp__temp_construct_n$2:std::runtime_error 0$?%__sil_tmpSIL_materialize_temp__n$3:std::runtime_error const  \n  " color=yellow style=filled]
 	
 
 	 "FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_1" -> "FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_5" ;
-"FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_2" [label="2: Exit FN_deref_null_after_catch_bad \n   NULLIFY(&0$?%__sil_tmp__temp_construct_n$4); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$5); [line 53, column 1]\n " color=yellow style=filled]
+"FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_2" [label="2: Exit FN_deref_null_after_catch_bad \n   NULLIFY(&0$?%__sil_tmp__temp_construct_n$2); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$3); [line 53, column 1]\n " color=yellow style=filled]
 	
 
 "FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_3" [label="3:  Return Stmt \n   n$0=*&i:int* [line 52, column 11]\n  n$1=*n$0:int [line 52, column 10]\n  *&return:int=n$1 [line 52, column 3]\n  NULLIFY(&i); [line 52, column 3]\n  EXIT_SCOPE(n$0,n$1,i); [line 52, column 3]\n  APPLY_ABSTRACTION; [line 52, column 3]\n " shape="box"]
 	
 
 	 "FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_3" -> "FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_2" ;
-"FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_4" [label="4:  ObjCCPPThrow \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$5:std::runtime_error const ); [line 48, column 11]\n  n$6=_fun_std::runtime_error::runtime_error(&0$?%__sil_tmpSIL_materialize_temp__n$5:std::runtime_error const *,\"error\":char const *) [line 48, column 11]\n  n$7=_fun_std::runtime_error::runtime_error(&0$?%__sil_tmp__temp_construct_n$4:std::runtime_error*,&0$?%__sil_tmpSIL_materialize_temp__n$5:std::runtime_error const &) [line 48, column 11]\n  n$8=_fun___infer_objc_cpp_throw(&0$?%__sil_tmp__temp_construct_n$4:std::runtime_error) [line 48, column 5]\n  EXIT_SCOPE(n$6,n$7,n$8,0$?%__sil_tmpSIL_materialize_temp__n$5); [line 48, column 5]\n  APPLY_ABSTRACTION; [line 48, column 5]\n " shape="box"]
+"FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_4" [label="4:  ObjCCPPThrow \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$3:std::runtime_error const ); [line 48, column 11]\n  n$4=_fun_std::runtime_error::runtime_error(&0$?%__sil_tmpSIL_materialize_temp__n$3:std::runtime_error const *,\"error\":char const *) [line 48, column 11]\n  n$5=_fun_std::runtime_error::runtime_error(&0$?%__sil_tmp__temp_construct_n$2:std::runtime_error*,&0$?%__sil_tmpSIL_materialize_temp__n$3:std::runtime_error const &) [line 48, column 11]\n  n$6=_fun___infer_objc_cpp_throw(&0$?%__sil_tmp__temp_construct_n$2:std::runtime_error) [line 48, column 5]\n  EXIT_SCOPE(n$4,n$5,n$6,0$?%__sil_tmpSIL_materialize_temp__n$3); [line 48, column 5]\n  APPLY_ABSTRACTION; [line 48, column 5]\n " shape="box"]
 	
 
 	 "FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_4" -> "FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_3" ;
 	 "FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_4" -> "FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_6" [color="red" ];
-"FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_5" [label="5:  BinaryOperatorStmt: Assign \n   n$9=*&i:int* [line 47, column 6]\n  *n$9:int=2 [line 47, column 5]\n  EXIT_SCOPE(n$9); [line 47, column 5]\n " shape="box"]
+"FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_5" [label="5:  BinaryOperatorStmt: Assign \n   n$7=*&i:int* [line 47, column 6]\n  *n$7:int=2 [line 47, column 5]\n  EXIT_SCOPE(n$7); [line 47, column 5]\n " shape="box"]
 	
 
 	 "FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_5" -> "FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_4" ;
@@ -24,23 +24,23 @@ digraph cfg {
 	
 
 	 "FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_6" -> "FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_3" ;
-"FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_1" [label="1: Start FN_deref_null_in_catch_bad\nFormals: \nLocals:  0$?%__sil_tmp__temp_construct_n$2:std::runtime_error 0$?%__sil_tmpSIL_materialize_temp__n$3:std::runtime_error const  i:int* \n  " color=yellow style=filled]
+"FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_1" [label="1: Start FN_deref_null_in_catch_bad\nFormals: \nLocals:  0$?%__sil_tmp__temp_construct_n$0:std::runtime_error 0$?%__sil_tmpSIL_materialize_temp__n$1:std::runtime_error const  i:int* \n  " color=yellow style=filled]
 	
 
 	 "FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_1" -> "FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_6" ;
-"FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_2" [label="2: Exit FN_deref_null_in_catch_bad \n   NULLIFY(&0$?%__sil_tmp__temp_construct_n$2); [line 43, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$3); [line 43, column 1]\n " color=yellow style=filled]
+"FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_2" [label="2: Exit FN_deref_null_in_catch_bad \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 43, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_construct_n$0); [line 43, column 1]\n " color=yellow style=filled]
 	
 
 "FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_3" [label="3:  Return Stmt \n   *&return:int=0 [line 42, column 3]\n  NULLIFY(&i); [line 42, column 3]\n  EXIT_SCOPE(i); [line 42, column 3]\n  APPLY_ABSTRACTION; [line 42, column 3]\n " shape="box"]
 	
 
 	 "FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_3" -> "FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_2" ;
-"FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_4" [label="4:  ObjCCPPThrow \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$3:std::runtime_error const ); [line 38, column 11]\n  n$4=_fun_std::runtime_error::runtime_error(&0$?%__sil_tmpSIL_materialize_temp__n$3:std::runtime_error const *,\"error\":char const *) [line 38, column 11]\n  n$5=_fun_std::runtime_error::runtime_error(&0$?%__sil_tmp__temp_construct_n$2:std::runtime_error*,&0$?%__sil_tmpSIL_materialize_temp__n$3:std::runtime_error const &) [line 38, column 11]\n  n$6=_fun___infer_objc_cpp_throw(&0$?%__sil_tmp__temp_construct_n$2:std::runtime_error) [line 38, column 5]\n  EXIT_SCOPE(n$4,n$5,n$6,0$?%__sil_tmpSIL_materialize_temp__n$3); [line 38, column 5]\n " shape="box"]
+"FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_4" [label="4:  ObjCCPPThrow \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$1:std::runtime_error const ); [line 38, column 11]\n  n$2=_fun_std::runtime_error::runtime_error(&0$?%__sil_tmpSIL_materialize_temp__n$1:std::runtime_error const *,\"error\":char const *) [line 38, column 11]\n  n$3=_fun_std::runtime_error::runtime_error(&0$?%__sil_tmp__temp_construct_n$0:std::runtime_error*,&0$?%__sil_tmpSIL_materialize_temp__n$1:std::runtime_error const &) [line 38, column 11]\n  n$4=_fun___infer_objc_cpp_throw(&0$?%__sil_tmp__temp_construct_n$0:std::runtime_error) [line 38, column 5]\n  EXIT_SCOPE(n$2,n$3,n$4,0$?%__sil_tmpSIL_materialize_temp__n$1); [line 38, column 5]\n " shape="box"]
 	
 
 	 "FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_4" -> "FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_3" ;
 	 "FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_4" -> "FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_5" [color="red" ];
-"FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_5" [label="5:  Return Stmt \n   n$8=*&i:int* [line 40, column 13]\n  n$9=*n$8:int [line 40, column 12]\n  *&return:int=n$9 [line 40, column 5]\n  NULLIFY(&i); [line 40, column 5]\n  EXIT_SCOPE(n$8,n$9,i); [line 40, column 5]\n  APPLY_ABSTRACTION; [line 40, column 5]\n " shape="box"]
+"FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_5" [label="5:  Return Stmt \n   n$5=*&i:int* [line 40, column 13]\n  n$6=*n$5:int [line 40, column 12]\n  *&return:int=n$6 [line 40, column 5]\n  NULLIFY(&i); [line 40, column 5]\n  EXIT_SCOPE(n$5,n$6,i); [line 40, column 5]\n  APPLY_ABSTRACTION; [line 40, column 5]\n " shape="box"]
 	
 
 	 "FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_5" -> "FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_2" ;
@@ -48,11 +48,11 @@ digraph cfg {
 	
 
 	 "FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_6" -> "FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_4" ;
-"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_1" [label="1: Start FN_multiple_catches_bad\nFormals:  b:_Bool\nLocals:  0$?%__sil_tmp__temp_construct_n$4:std::length_error 0$?%__sil_tmpSIL_materialize_temp__n$5:std::length_error const  0$?%__sil_tmp__temp_construct_n$10:std::range_error 0$?%__sil_tmpSIL_materialize_temp__n$11:std::range_error const  j:int* i:int* \n  " color=yellow style=filled]
+"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_1" [label="1: Start FN_multiple_catches_bad\nFormals:  b:_Bool\nLocals:  0$?%__sil_tmp__temp_construct_n$1:std::length_error 0$?%__sil_tmpSIL_materialize_temp__n$2:std::length_error const  0$?%__sil_tmp__temp_construct_n$6:std::range_error 0$?%__sil_tmpSIL_materialize_temp__n$7:std::range_error const  j:int* i:int* \n  " color=yellow style=filled]
 	
 
 	 "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_1" -> "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_12" ;
-"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_2" [label="2: Exit FN_multiple_catches_bad \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$11); [line 70, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_construct_n$4); [line 70, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$5); [line 70, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_construct_n$10); [line 70, column 1]\n " color=yellow style=filled]
+"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_2" [label="2: Exit FN_multiple_catches_bad \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$7); [line 70, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$2); [line 70, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_construct_n$6); [line 70, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_construct_n$1); [line 70, column 1]\n " color=yellow style=filled]
 	
 
 "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_3" [label="3:  Return Stmt \n   *&return:int=0 [line 69, column 3]\n  NULLIFY(&i); [line 69, column 3]\n  NULLIFY(&j); [line 69, column 3]\n  EXIT_SCOPE(i,j); [line 69, column 3]\n  APPLY_ABSTRACTION; [line 69, column 3]\n " shape="box"]
@@ -65,27 +65,27 @@ digraph cfg {
 	 "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_4" -> "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_3" ;
 	 "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_4" -> "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_10" [color="red" ];
 	 "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_4" -> "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_9" [color="red" ];
-"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_5" [label="5: Prune (true branch, if) \n   n$2=*&b:_Bool [line 59, column 9]\n  PRUNE(n$2, true); [line 59, column 9]\n  NULLIFY(&b); [line 59, column 9]\n  EXIT_SCOPE(n$2,b); [line 59, column 9]\n " shape="invhouse"]
+"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_5" [label="5: Prune (true branch, if) \n   n$0=*&b:_Bool [line 59, column 9]\n  PRUNE(n$0, true); [line 59, column 9]\n  NULLIFY(&b); [line 59, column 9]\n  EXIT_SCOPE(n$0,b); [line 59, column 9]\n " shape="invhouse"]
 	
 
 	 "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_5" -> "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_7" ;
-"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_6" [label="6: Prune (false branch, if) \n   n$2=*&b:_Bool [line 59, column 9]\n  PRUNE(!n$2, false); [line 59, column 9]\n  NULLIFY(&b); [line 59, column 9]\n  EXIT_SCOPE(n$2,b); [line 59, column 9]\n " shape="invhouse"]
+"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_6" [label="6: Prune (false branch, if) \n   n$0=*&b:_Bool [line 59, column 9]\n  PRUNE(!n$0, false); [line 59, column 9]\n  NULLIFY(&b); [line 59, column 9]\n  EXIT_SCOPE(n$0,b); [line 59, column 9]\n " shape="invhouse"]
 	
 
 	 "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_6" -> "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_8" ;
-"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_7" [label="7:  ObjCCPPThrow \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$5:std::length_error const ); [line 60, column 13]\n  n$6=_fun_std::length_error::length_error(&0$?%__sil_tmpSIL_materialize_temp__n$5:std::length_error const *,\"error\":char const *) [line 60, column 13]\n  n$7=_fun_std::length_error::length_error(&0$?%__sil_tmp__temp_construct_n$4:std::length_error*,&0$?%__sil_tmpSIL_materialize_temp__n$5:std::length_error const &) [line 60, column 13]\n  n$8=_fun___infer_objc_cpp_throw(&0$?%__sil_tmp__temp_construct_n$4:std::length_error) [line 60, column 7]\n  EXIT_SCOPE(n$6,n$7,n$8,0$?%__sil_tmpSIL_materialize_temp__n$5); [line 60, column 7]\n  APPLY_ABSTRACTION; [line 60, column 7]\n " shape="box"]
+"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_7" [label="7:  ObjCCPPThrow \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$2:std::length_error const ); [line 60, column 13]\n  n$3=_fun_std::length_error::length_error(&0$?%__sil_tmpSIL_materialize_temp__n$2:std::length_error const *,\"error\":char const *) [line 60, column 13]\n  n$4=_fun_std::length_error::length_error(&0$?%__sil_tmp__temp_construct_n$1:std::length_error*,&0$?%__sil_tmpSIL_materialize_temp__n$2:std::length_error const &) [line 60, column 13]\n  n$5=_fun___infer_objc_cpp_throw(&0$?%__sil_tmp__temp_construct_n$1:std::length_error) [line 60, column 7]\n  EXIT_SCOPE(n$3,n$4,n$5,0$?%__sil_tmpSIL_materialize_temp__n$2); [line 60, column 7]\n  APPLY_ABSTRACTION; [line 60, column 7]\n " shape="box"]
 	
 
 	 "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_7" -> "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_4" ;
-"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_8" [label="8:  ObjCCPPThrow \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$11:std::range_error const ); [line 62, column 13]\n  n$12=_fun_std::range_error::range_error(&0$?%__sil_tmpSIL_materialize_temp__n$11:std::range_error const *,\"error\":char const *) [line 62, column 13]\n  n$13=_fun_std::range_error::range_error(&0$?%__sil_tmp__temp_construct_n$10:std::range_error*,&0$?%__sil_tmpSIL_materialize_temp__n$11:std::range_error const &) [line 62, column 13]\n  n$14=_fun___infer_objc_cpp_throw(&0$?%__sil_tmp__temp_construct_n$10:std::range_error) [line 62, column 7]\n  EXIT_SCOPE(n$12,n$13,n$14,0$?%__sil_tmpSIL_materialize_temp__n$11); [line 62, column 7]\n  APPLY_ABSTRACTION; [line 62, column 7]\n " shape="box"]
+"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_8" [label="8:  ObjCCPPThrow \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$7:std::range_error const ); [line 62, column 13]\n  n$8=_fun_std::range_error::range_error(&0$?%__sil_tmpSIL_materialize_temp__n$7:std::range_error const *,\"error\":char const *) [line 62, column 13]\n  n$9=_fun_std::range_error::range_error(&0$?%__sil_tmp__temp_construct_n$6:std::range_error*,&0$?%__sil_tmpSIL_materialize_temp__n$7:std::range_error const &) [line 62, column 13]\n  n$10=_fun___infer_objc_cpp_throw(&0$?%__sil_tmp__temp_construct_n$6:std::range_error) [line 62, column 7]\n  EXIT_SCOPE(n$8,n$9,n$10,0$?%__sil_tmpSIL_materialize_temp__n$7); [line 62, column 7]\n  APPLY_ABSTRACTION; [line 62, column 7]\n " shape="box"]
 	
 
 	 "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_8" -> "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_4" ;
-"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_9" [label="9:  Return Stmt \n   n$17=*&i:int* [line 65, column 13]\n  n$18=*n$17:int [line 65, column 12]\n  *&return:int=n$18 [line 65, column 5]\n  NULLIFY(&i); [line 65, column 5]\n  NULLIFY(&j); [line 65, column 5]\n  EXIT_SCOPE(n$17,n$18,i,j); [line 65, column 5]\n  APPLY_ABSTRACTION; [line 65, column 5]\n " shape="box"]
+"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_9" [label="9:  Return Stmt \n   n$12=*&i:int* [line 65, column 13]\n  n$13=*n$12:int [line 65, column 12]\n  *&return:int=n$13 [line 65, column 5]\n  NULLIFY(&i); [line 65, column 5]\n  NULLIFY(&j); [line 65, column 5]\n  EXIT_SCOPE(n$12,n$13,i,j); [line 65, column 5]\n  APPLY_ABSTRACTION; [line 65, column 5]\n " shape="box"]
 	
 
 	 "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_9" -> "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_2" ;
-"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_10" [label="10:  Return Stmt \n   n$21=*&j:int* [line 67, column 13]\n  n$22=*n$21:int [line 67, column 12]\n  *&return:int=n$22 [line 67, column 5]\n  NULLIFY(&i); [line 67, column 5]\n  NULLIFY(&j); [line 67, column 5]\n  EXIT_SCOPE(n$21,n$22,i,j); [line 67, column 5]\n  APPLY_ABSTRACTION; [line 67, column 5]\n " shape="box"]
+"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_10" [label="10:  Return Stmt \n   n$14=*&j:int* [line 67, column 13]\n  n$15=*n$14:int [line 67, column 12]\n  *&return:int=n$15 [line 67, column 5]\n  NULLIFY(&i); [line 67, column 5]\n  NULLIFY(&j); [line 67, column 5]\n  EXIT_SCOPE(n$14,n$15,i,j); [line 67, column 5]\n  APPLY_ABSTRACTION; [line 67, column 5]\n " shape="box"]
 	
 
 	 "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_10" -> "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_2" ;
@@ -98,14 +98,14 @@ digraph cfg {
 	
 
 	 "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_12" -> "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_11" ;
-"basic_throw_ok#10529188890980782893.c9e1b8dd080b2621cfca65612331859d_1" [label="1: Start basic_throw_ok\nFormals: \nLocals:  0$?%__sil_tmp__temp_construct_n$1:std::runtime_error 0$?%__sil_tmpSIL_materialize_temp__n$2:std::runtime_error const  \n  " color=yellow style=filled]
+"basic_throw_ok#10529188890980782893.c9e1b8dd080b2621cfca65612331859d_1" [label="1: Start basic_throw_ok\nFormals: \nLocals:  0$?%__sil_tmp__temp_construct_n$0:std::runtime_error 0$?%__sil_tmpSIL_materialize_temp__n$1:std::runtime_error const  \n  " color=yellow style=filled]
 	
 
 	 "basic_throw_ok#10529188890980782893.c9e1b8dd080b2621cfca65612331859d_1" -> "basic_throw_ok#10529188890980782893.c9e1b8dd080b2621cfca65612331859d_3" ;
-"basic_throw_ok#10529188890980782893.c9e1b8dd080b2621cfca65612331859d_2" [label="2: Exit basic_throw_ok \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$2); [line 27, column 64]\n  NULLIFY(&0$?%__sil_tmp__temp_construct_n$1); [line 27, column 64]\n " color=yellow style=filled]
+"basic_throw_ok#10529188890980782893.c9e1b8dd080b2621cfca65612331859d_2" [label="2: Exit basic_throw_ok \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 27, column 64]\n  NULLIFY(&0$?%__sil_tmp__temp_construct_n$0); [line 27, column 64]\n " color=yellow style=filled]
 	
 
-"basic_throw_ok#10529188890980782893.c9e1b8dd080b2621cfca65612331859d_3" [label="3:  ObjCCPPThrow \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$2:std::runtime_error const ); [line 27, column 31]\n  n$3=_fun_std::runtime_error::runtime_error(&0$?%__sil_tmpSIL_materialize_temp__n$2:std::runtime_error const *,\"throwing!\":char const *) [line 27, column 31]\n  n$4=_fun_std::runtime_error::runtime_error(&0$?%__sil_tmp__temp_construct_n$1:std::runtime_error*,&0$?%__sil_tmpSIL_materialize_temp__n$2:std::runtime_error const &) [line 27, column 31]\n  n$5=_fun___infer_objc_cpp_throw(&0$?%__sil_tmp__temp_construct_n$1:std::runtime_error) [line 27, column 25]\n  EXIT_SCOPE(n$3,n$4,n$5,0$?%__sil_tmpSIL_materialize_temp__n$2); [line 27, column 25]\n  APPLY_ABSTRACTION; [line 27, column 25]\n " shape="box"]
+"basic_throw_ok#10529188890980782893.c9e1b8dd080b2621cfca65612331859d_3" [label="3:  ObjCCPPThrow \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$1:std::runtime_error const ); [line 27, column 31]\n  n$2=_fun_std::runtime_error::runtime_error(&0$?%__sil_tmpSIL_materialize_temp__n$1:std::runtime_error const *,\"throwing!\":char const *) [line 27, column 31]\n  n$3=_fun_std::runtime_error::runtime_error(&0$?%__sil_tmp__temp_construct_n$0:std::runtime_error*,&0$?%__sil_tmpSIL_materialize_temp__n$1:std::runtime_error const &) [line 27, column 31]\n  n$4=_fun___infer_objc_cpp_throw(&0$?%__sil_tmp__temp_construct_n$0:std::runtime_error) [line 27, column 25]\n  EXIT_SCOPE(n$2,n$3,n$4,0$?%__sil_tmpSIL_materialize_temp__n$1); [line 27, column 25]\n  APPLY_ABSTRACTION; [line 27, column 25]\n " shape="box"]
 	
 
 	 "basic_throw_ok#10529188890980782893.c9e1b8dd080b2621cfca65612331859d_3" -> "basic_throw_ok#10529188890980782893.c9e1b8dd080b2621cfca65612331859d_2" ;
@@ -116,22 +116,22 @@ 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$1=_fun_deref_null(null:int*) [line 25, column 30]\n  EXIT_SCOPE(n$1); [line 25, column 30]\n  APPLY_ABSTRACTION; [line 25, column 30]\n " shape="box"]
+"call_deref_with_null#4611966425999531792.6346543307e9a799421a89e451b917c2_3" [label="3:  Call _fun_deref_null \n   n$0=_fun_deref_null(null:int*) [line 25, column 30]\n  EXIT_SCOPE(n$0); [line 25, column 30]\n  APPLY_ABSTRACTION; [line 25, column 30]\n " shape="box"]
 	
 
 	 "call_deref_with_null#4611966425999531792.6346543307e9a799421a89e451b917c2_3" -> "call_deref_with_null#4611966425999531792.6346543307e9a799421a89e451b917c2_2" ;
-"dead_deref_null_after_throw_ok#12025371096822526715.42d41c040f3a321bb94f60bf7b55d001_1" [label="1: Start dead_deref_null_after_throw_ok\nFormals: \nLocals:  0$?%__sil_tmp__temp_construct_n$3:std::runtime_error 0$?%__sil_tmpSIL_materialize_temp__n$4:std::runtime_error const  i:int* \n  " color=yellow style=filled]
+"dead_deref_null_after_throw_ok#12025371096822526715.42d41c040f3a321bb94f60bf7b55d001_1" [label="1: Start dead_deref_null_after_throw_ok\nFormals: \nLocals:  0$?%__sil_tmp__temp_construct_n$2:std::runtime_error 0$?%__sil_tmpSIL_materialize_temp__n$3:std::runtime_error const  i:int* \n  " color=yellow style=filled]
 	
 
 	 "dead_deref_null_after_throw_ok#12025371096822526715.42d41c040f3a321bb94f60bf7b55d001_1" -> "dead_deref_null_after_throw_ok#12025371096822526715.42d41c040f3a321bb94f60bf7b55d001_5" ;
-"dead_deref_null_after_throw_ok#12025371096822526715.42d41c040f3a321bb94f60bf7b55d001_2" [label="2: Exit dead_deref_null_after_throw_ok \n   NULLIFY(&0$?%__sil_tmp__temp_construct_n$3); [line 33, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$4); [line 33, column 1]\n " color=yellow style=filled]
+"dead_deref_null_after_throw_ok#12025371096822526715.42d41c040f3a321bb94f60bf7b55d001_2" [label="2: Exit dead_deref_null_after_throw_ok \n   NULLIFY(&0$?%__sil_tmp__temp_construct_n$2); [line 33, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$3); [line 33, column 1]\n " color=yellow style=filled]
 	
 
 "dead_deref_null_after_throw_ok#12025371096822526715.42d41c040f3a321bb94f60bf7b55d001_3" [label="3:  Return Stmt \n   n$0=*&i:int* [line 32, column 11]\n  n$1=*n$0:int [line 32, column 10]\n  *&return:int=n$1 [line 32, column 3]\n  NULLIFY(&i); [line 32, column 3]\n  EXIT_SCOPE(n$0,n$1,i); [line 32, column 3]\n  APPLY_ABSTRACTION; [line 32, column 3]\n " shape="box"]
 	
 
 	 "dead_deref_null_after_throw_ok#12025371096822526715.42d41c040f3a321bb94f60bf7b55d001_3" -> "dead_deref_null_after_throw_ok#12025371096822526715.42d41c040f3a321bb94f60bf7b55d001_2" ;
-"dead_deref_null_after_throw_ok#12025371096822526715.42d41c040f3a321bb94f60bf7b55d001_4" [label="4:  ObjCCPPThrow \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$4:std::runtime_error const ); [line 31, column 9]\n  n$5=_fun_std::runtime_error::runtime_error(&0$?%__sil_tmpSIL_materialize_temp__n$4:std::runtime_error const *,\"throwing!\":char const *) [line 31, column 9]\n  n$6=_fun_std::runtime_error::runtime_error(&0$?%__sil_tmp__temp_construct_n$3:std::runtime_error*,&0$?%__sil_tmpSIL_materialize_temp__n$4:std::runtime_error const &) [line 31, column 9]\n  n$7=_fun___infer_objc_cpp_throw(&0$?%__sil_tmp__temp_construct_n$3:std::runtime_error) [line 31, column 3]\n  EXIT_SCOPE(n$5,n$6,n$7,0$?%__sil_tmpSIL_materialize_temp__n$4); [line 31, column 3]\n " shape="box"]
+"dead_deref_null_after_throw_ok#12025371096822526715.42d41c040f3a321bb94f60bf7b55d001_4" [label="4:  ObjCCPPThrow \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$3:std::runtime_error const ); [line 31, column 9]\n  n$4=_fun_std::runtime_error::runtime_error(&0$?%__sil_tmpSIL_materialize_temp__n$3:std::runtime_error const *,\"throwing!\":char const *) [line 31, column 9]\n  n$5=_fun_std::runtime_error::runtime_error(&0$?%__sil_tmp__temp_construct_n$2:std::runtime_error*,&0$?%__sil_tmpSIL_materialize_temp__n$3:std::runtime_error const &) [line 31, column 9]\n  n$6=_fun___infer_objc_cpp_throw(&0$?%__sil_tmp__temp_construct_n$2:std::runtime_error) [line 31, column 3]\n  EXIT_SCOPE(n$4,n$5,n$6,0$?%__sil_tmpSIL_materialize_temp__n$3); [line 31, column 3]\n " shape="box"]
 	
 
 	 "dead_deref_null_after_throw_ok#12025371096822526715.42d41c040f3a321bb94f60bf7b55d001_4" -> "dead_deref_null_after_throw_ok#12025371096822526715.42d41c040f3a321bb94f60bf7b55d001_3" ;
@@ -154,20 +154,20 @@ digraph cfg {
 	
 
 	 "deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_4" -> "deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_3" ;
-"deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_5" [label="5:  BinaryOperatorStmt: EQ \n   n$3=*&p:int* [line 12, column 7]\n " shape="box"]
+"deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_5" [label="5:  BinaryOperatorStmt: EQ \n   n$2=*&p:int* [line 12, 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$3 == null), true); [line 12, column 7]\n  EXIT_SCOPE(n$3); [line 12, column 7]\n " shape="invhouse"]
+"deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_6" [label="6: Prune (true branch, if) \n   PRUNE((n$2 == null), true); [line 12, column 7]\n  EXIT_SCOPE(n$2); [line 12, 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$3 == null), false); [line 12, column 7]\n  EXIT_SCOPE(n$3); [line 12, column 7]\n  APPLY_ABSTRACTION; [line 12, column 7]\n " shape="invhouse"]
+"deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$2 == null), false); [line 12, column 7]\n  EXIT_SCOPE(n$2); [line 12, column 7]\n  APPLY_ABSTRACTION; [line 12, column 7]\n " shape="invhouse"]
 	
 
 	 "deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_7" -> "deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_4" ;
-"deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_8" [label="8:  ObjCCPPThrow \n   n$5=_fun___infer_objc_cpp_throw(\"Null pointer!\":char const *) [line 13, column 5]\n  EXIT_SCOPE(n$5); [line 13, column 5]\n  APPLY_ABSTRACTION; [line 13, column 5]\n " shape="box"]
+"deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_8" [label="8:  ObjCCPPThrow \n   n$3=_fun___infer_objc_cpp_throw(\"Null pointer!\":char const *) [line 13, column 5]\n  EXIT_SCOPE(n$3); [line 13, column 5]\n  APPLY_ABSTRACTION; [line 13, column 5]\n " shape="box"]
 	
 
 	 "deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_8" -> "deref#13506892413034678690.824465c4193ad2288eb512b1083edab3_4" ;
@@ -178,7 +178,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$1=*&p:int* [line 20, column 13]\n  n$2=*n$1:int [line 20, column 12]\n  *&return:int=n$2 [line 20, column 5]\n  NULLIFY(&p); [line 20, column 5]\n  EXIT_SCOPE(n$1,n$2,p); [line 20, column 5]\n  APPLY_ABSTRACTION; [line 20, column 5]\n " shape="box"]
+"deref_null#11536394632240553702.ea4eed042da22ab7ceb619ec1b7f73bb_3" [label="3:  Return Stmt \n   n$0=*&p:int* [line 20, column 13]\n  n$1=*n$0:int [line 20, column 12]\n  *&return:int=n$1 [line 20, column 5]\n  NULLIFY(&p); [line 20, column 5]\n  EXIT_SCOPE(n$0,n$1,p); [line 20, column 5]\n  APPLY_ABSTRACTION; [line 20, column 5]\n " shape="box"]
 	
 
 	 "deref_null#11536394632240553702.ea4eed042da22ab7ceb619ec1b7f73bb_3" -> "deref_null#11536394632240553702.ea4eed042da22ab7ceb619ec1b7f73bb_2" ;
@@ -189,7 +189,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   n$1=_fun_deref(null:int*) [line 74, column 12]\n  *&return:int=n$1 [line 74, column 5]\n  EXIT_SCOPE(n$1); [line 74, column 5]\n  APPLY_ABSTRACTION; [line 74, column 5]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   n$0=_fun_deref(null:int*) [line 74, column 12]\n  *&return:int=n$0 [line 74, column 5]\n  EXIT_SCOPE(n$0); [line 74, column 5]\n  APPLY_ABSTRACTION; [line 74, column 5]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/lambda/lambda1.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/lambda/lambda1.cpp.dot
index 0416382ab..68d217ccf 100644
--- a/infer/tests/codetoanalyze/cpp/shared/lambda/lambda1.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/lambda/lambda1.cpp.dot
@@ -15,18 +15,18 @@ digraph cfg {
 	
 
 	 "bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_4" -> "bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_3" ;
-"capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_1" [label="1: Start capture_by_ref\nFormals: \nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$3:capture_by_ref::lambda_shared_lambda_lambda1.cpp:36:3 x:int \n  " color=yellow style=filled]
+"capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_1" [label="1: Start capture_by_ref\nFormals: \nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$2:capture_by_ref::lambda_shared_lambda_lambda1.cpp:36:3 x:int \n  " color=yellow style=filled]
 	
 
 	 "capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_1" -> "capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_5" ;
-"capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_2" [label="2: Exit capture_by_ref \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$3); [line 38, column 1]\n " color=yellow style=filled]
+"capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_2" [label="2: Exit capture_by_ref \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$2); [line 38, column 1]\n " color=yellow style=filled]
 	
 
 "capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 37, column 10]\n  *&return:int=n$0 [line 37, column 3]\n  NULLIFY(&x); [line 37, column 3]\n  EXIT_SCOPE(n$0,x); [line 37, column 3]\n  APPLY_ABSTRACTION; [line 37, column 3]\n " shape="box"]
 	
 
 	 "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:36:3::operator() \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$3:capture_by_ref::lambda_shared_lambda_lambda1.cpp:36:3); [line 36, column 3]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$3:capture_by_ref::lambda_shared_lambda_lambda1.cpp:36:3=(_fun_capture_by_ref::lambda_shared_lambda_lambda1.cpp:36:3::operator(),&x) [line 36, column 3]\n  n$4=_fun_capture_by_ref::lambda_shared_lambda_lambda1.cpp:36:3::operator()(&0$?%__sil_tmpSIL_materialize_temp__n$3:capture_by_ref::lambda_shared_lambda_lambda1.cpp:36:3&) [line 36, column 3]\n  EXIT_SCOPE(n$4,0$?%__sil_tmpSIL_materialize_temp__n$3); [line 36, column 3]\n " shape="box"]
+"capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_4" [label="4:  Call _fun_capture_by_ref::lambda_shared_lambda_lambda1.cpp:36:3::operator() \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$2:capture_by_ref::lambda_shared_lambda_lambda1.cpp:36:3); [line 36, column 3]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$2:capture_by_ref::lambda_shared_lambda_lambda1.cpp:36:3=(_fun_capture_by_ref::lambda_shared_lambda_lambda1.cpp:36:3::operator(),&x) [line 36, column 3]\n  n$3=_fun_capture_by_ref::lambda_shared_lambda_lambda1.cpp:36:3::operator()(&0$?%__sil_tmpSIL_materialize_temp__n$2:capture_by_ref::lambda_shared_lambda_lambda1.cpp:36:3&) [line 36, column 3]\n  EXIT_SCOPE(n$3,0$?%__sil_tmpSIL_materialize_temp__n$2); [line 36, column 3]\n " shape="box"]
 	
 
 	 "capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_4" -> "capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_3" ;
@@ -233,7 +233,7 @@ digraph cfg {
 "SomeStruct#SomeStruct#{11805166137496297040|constexpr}.1073d62b309830aceab7dd0d11fb9801_2" [label="2: Exit SomeStruct::SomeStruct \n  " color=yellow style=filled]
 	
 
-"SomeStruct#SomeStruct#{11805166137496297040|constexpr}.1073d62b309830aceab7dd0d11fb9801_3" [label="3:  Constructor Init \n   n$2=*&this:SomeStruct* [line 69, column 8]\n  n$3=*&__param_0:SomeStruct const & [line 69, column 8]\n  n$4=*n$3.f:int [line 69, column 8]\n  *n$2.f:int=n$4 [line 69, column 8]\n  NULLIFY(&this); [line 69, column 8]\n  NULLIFY(&__param_0); [line 69, column 8]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 69, column 8]\n  APPLY_ABSTRACTION; [line 69, column 8]\n " shape="box"]
+"SomeStruct#SomeStruct#{11805166137496297040|constexpr}.1073d62b309830aceab7dd0d11fb9801_3" [label="3:  Constructor Init \n   n$1=*&this:SomeStruct* [line 69, column 8]\n  n$2=*&__param_0:SomeStruct const & [line 69, column 8]\n  n$3=*n$2.f:int [line 69, column 8]\n  *n$1.f:int=n$3 [line 69, column 8]\n  NULLIFY(&this); [line 69, column 8]\n  NULLIFY(&__param_0); [line 69, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 69, column 8]\n  APPLY_ABSTRACTION; [line 69, column 8]\n " shape="box"]
 	
 
 	 "SomeStruct#SomeStruct#{11805166137496297040|constexpr}.1073d62b309830aceab7dd0d11fb9801_3" -> "SomeStruct#SomeStruct#{11805166137496297040|constexpr}.1073d62b309830aceab7dd0d11fb9801_2" ;
@@ -316,7 +316,7 @@ digraph cfg {
 "operator()#lambda_shared_lambda_lambda1.cpp:36:3#capture_by_ref#(17277454583786497390).328aa336808e9a777a5cd630eb1ef54f_2" [label="2: Exit capture_by_ref::lambda_shared_lambda_lambda1.cpp:36:3::operator() \n  " color=yellow style=filled]
 	
 
-"operator()#lambda_shared_lambda_lambda1.cpp:36:3#capture_by_ref#(17277454583786497390).328aa336808e9a777a5cd630eb1ef54f_3" [label="3:  UnaryOperator \n   n$1=*&x:int [line 36, column 12]\n  *&x:int=(n$1 + 1) [line 36, column 12]\n  NULLIFY(&x); [line 36, column 12]\n  EXIT_SCOPE(n$1,x); [line 36, column 12]\n  APPLY_ABSTRACTION; [line 36, column 12]\n " shape="box"]
+"operator()#lambda_shared_lambda_lambda1.cpp:36:3#capture_by_ref#(17277454583786497390).328aa336808e9a777a5cd630eb1ef54f_3" [label="3:  UnaryOperator \n   n$0=*&x:int [line 36, column 12]\n  *&x:int=(n$0 + 1) [line 36, column 12]\n  NULLIFY(&x); [line 36, column 12]\n  EXIT_SCOPE(n$0,x); [line 36, column 12]\n  APPLY_ABSTRACTION; [line 36, column 12]\n " shape="box"]
 	
 
 	 "operator()#lambda_shared_lambda_lambda1.cpp:36:3#capture_by_ref#(17277454583786497390).328aa336808e9a777a5cd630eb1ef54f_3" -> "operator()#lambda_shared_lambda_lambda1.cpp:36:3#capture_by_ref#(17277454583786497390).328aa336808e9a777a5cd630eb1ef54f_2" ;
@@ -360,7 +360,7 @@ digraph cfg {
 "#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{15581681824770184595|constexp.7bc69d386faff7f8ffc9dc392a5988cf_2" [label="2: Exit Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19:: \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{15581681824770184595|constexp.7bc69d386faff7f8ffc9dc392a5988cf_3" [label="3:  Constructor Init \n   n$2=*&this:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19* [line 51, column 19]\n  n$3=*&__param_0:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19& [line 51, column 19]\n  n$4=*n$3.__anon_field_0:Capture* [line 51, column 19]\n  *n$2.__anon_field_0:Capture*=n$4 [line 51, column 19]\n  NULLIFY(&this); [line 51, column 19]\n  NULLIFY(&__param_0); [line 51, column 19]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 51, column 19]\n  APPLY_ABSTRACTION; [line 51, column 19]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{15581681824770184595|constexp.7bc69d386faff7f8ffc9dc392a5988cf_3" [label="3:  Constructor Init \n   n$1=*&this:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19* [line 51, column 19]\n  n$2=*&__param_0:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19& [line 51, column 19]\n  n$3=*n$2.__anon_field_0:Capture* [line 51, column 19]\n  *n$1.__anon_field_0:Capture*=n$3 [line 51, column 19]\n  NULLIFY(&this); [line 51, column 19]\n  NULLIFY(&__param_0); [line 51, column 19]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 51, column 19]\n  APPLY_ABSTRACTION; [line 51, column 19]\n " shape="box"]
 	
 
 	 "#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{15581681824770184595|constexp.7bc69d386faff7f8ffc9dc392a5988cf_3" -> "#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{15581681824770184595|constexp.7bc69d386faff7f8ffc9dc392a5988cf_2" ;
@@ -378,7 +378,7 @@ digraph cfg {
 "#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{9456129203468966420|constexpr}.524c805f606049237b74db978143df13_2" [label="2: Exit Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19:: \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{9456129203468966420|constexpr}.524c805f606049237b74db978143df13_3" [label="3:  Constructor Init \n   n$2=*&this:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19* [line 55, column 19]\n  n$3=*&__param_0:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19& [line 55, column 19]\n  n$4=_fun_Capture::Capture(n$2.__anon_field_0:Capture*,n$3.__anon_field_0:Capture&) [line 55, column 19]\n  NULLIFY(&this); [line 55, column 19]\n  NULLIFY(&__param_0); [line 55, column 19]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 55, column 19]\n  APPLY_ABSTRACTION; [line 55, column 19]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{9456129203468966420|constexpr}.524c805f606049237b74db978143df13_3" [label="3:  Constructor Init \n   n$1=*&this:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19* [line 55, column 19]\n  n$2=*&__param_0:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19& [line 55, column 19]\n  n$3=_fun_Capture::Capture(n$1.__anon_field_0:Capture*,n$2.__anon_field_0:Capture&) [line 55, column 19]\n  NULLIFY(&this); [line 55, column 19]\n  NULLIFY(&__param_0); [line 55, column 19]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 55, column 19]\n  APPLY_ABSTRACTION; [line 55, column 19]\n " shape="box"]
 	
 
 	 "#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{9456129203468966420|constexpr}.524c805f606049237b74db978143df13_3" -> "#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{9456129203468966420|constexpr}.524c805f606049237b74db978143df13_2" ;
@@ -400,7 +400,7 @@ digraph cfg {
 "#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{16013381636753347826|conste.5c764d68be3baa1f6ef1128e1dbea59f_2" [label="2: Exit Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19:: \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{16013381636753347826|conste.5c764d68be3baa1f6ef1128e1dbea59f_3" [label="3:  Constructor Init \n   n$2=*&this:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19* [line 61, column 19]\n  n$3=*&__param_0:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19& [line 61, column 19]\n  n$4=*n$3.__anon_field_0:Capture* [line 61, column 19]\n  *n$2.__anon_field_0:Capture*=n$4 [line 61, column 19]\n  NULLIFY(&this); [line 61, column 19]\n  NULLIFY(&__param_0); [line 61, column 19]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 61, column 19]\n  APPLY_ABSTRACTION; [line 61, column 19]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{16013381636753347826|conste.5c764d68be3baa1f6ef1128e1dbea59f_3" [label="3:  Constructor Init \n   n$1=*&this:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19* [line 61, column 19]\n  n$2=*&__param_0:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19& [line 61, column 19]\n  n$3=*n$2.__anon_field_0:Capture* [line 61, column 19]\n  *n$1.__anon_field_0:Capture*=n$3 [line 61, column 19]\n  NULLIFY(&this); [line 61, column 19]\n  NULLIFY(&__param_0); [line 61, column 19]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 61, column 19]\n  APPLY_ABSTRACTION; [line 61, column 19]\n " shape="box"]
 	
 
 	 "#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{16013381636753347826|conste.5c764d68be3baa1f6ef1128e1dbea59f_3" -> "#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{16013381636753347826|conste.5c764d68be3baa1f6ef1128e1dbea59f_2" ;
@@ -422,7 +422,7 @@ digraph cfg {
 "#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{10854495330849287568|constex.920289afd6e5ecdf220f6692ec06788a_2" [label="2: Exit Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19:: \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{10854495330849287568|constex.920289afd6e5ecdf220f6692ec06788a_3" [label="3:  Constructor Init \n   n$2=*&this:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19* [line 65, column 19]\n  n$3=*&__param_0:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19& [line 65, column 19]\n  n$4=*n$3.__anon_field_0:Capture* [line 65, column 19]\n  *n$2.__anon_field_0:Capture*=n$4 [line 65, column 19]\n  NULLIFY(&this); [line 65, column 19]\n  NULLIFY(&__param_0); [line 65, column 19]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 65, column 19]\n  APPLY_ABSTRACTION; [line 65, column 19]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{10854495330849287568|constex.920289afd6e5ecdf220f6692ec06788a_3" [label="3:  Constructor Init \n   n$1=*&this:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19* [line 65, column 19]\n  n$2=*&__param_0:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19& [line 65, column 19]\n  n$3=*n$2.__anon_field_0:Capture* [line 65, column 19]\n  *n$1.__anon_field_0:Capture*=n$3 [line 65, column 19]\n  NULLIFY(&this); [line 65, column 19]\n  NULLIFY(&__param_0); [line 65, column 19]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 65, column 19]\n  APPLY_ABSTRACTION; [line 65, column 19]\n " shape="box"]
 	
 
 	 "#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{10854495330849287568|constex.920289afd6e5ecdf220f6692ec06788a_3" -> "#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{10854495330849287568|constex.920289afd6e5ecdf220f6692ec06788a_2" ;
@@ -444,11 +444,11 @@ digraph cfg {
 "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_2" [label="2: Exit struct_capture::lambda_shared_lambda_lambda1.cpp:77:12:: \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_3" [label="3:  Constructor Init \n   n$2=*&this:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12* [line 77, column 12]\n  n$3=*&__param_0:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12& [line 77, column 12]\n  n$4=_fun_SomeStruct::SomeStruct(n$2.__anon_field_1:SomeStruct*,n$3.__anon_field_1:SomeStruct&) [line 77, column 12]\n  NULLIFY(&this); [line 77, column 12]\n  NULLIFY(&__param_0); [line 77, column 12]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 77, column 12]\n  APPLY_ABSTRACTION; [line 77, column 12]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_3" [label="3:  Constructor Init \n   n$1=*&this:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12* [line 77, column 12]\n  n$2=*&__param_0:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12& [line 77, column 12]\n  n$3=_fun_SomeStruct::SomeStruct(n$1.__anon_field_1:SomeStruct*,n$2.__anon_field_1:SomeStruct&) [line 77, column 12]\n  NULLIFY(&this); [line 77, column 12]\n  NULLIFY(&__param_0); [line 77, column 12]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 77, column 12]\n  APPLY_ABSTRACTION; [line 77, column 12]\n " shape="box"]
 	
 
 	 "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_3" -> "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_2" ;
-"#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_4" [label="4:  Constructor Init \n   n$5=*&this:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12* [line 77, column 12]\n  n$6=*&__param_0:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12& [line 77, column 12]\n  n$7=_fun_SomeStruct::SomeStruct(n$5.__anon_field_0:SomeStruct*,n$6.__anon_field_0:SomeStruct&) [line 77, column 12]\n  EXIT_SCOPE(n$5,n$6,n$7); [line 77, column 12]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_4" [label="4:  Constructor Init \n   n$4=*&this:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12* [line 77, column 12]\n  n$5=*&__param_0:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12& [line 77, column 12]\n  n$6=_fun_SomeStruct::SomeStruct(n$4.__anon_field_0:SomeStruct*,n$5.__anon_field_0:SomeStruct&) [line 77, column 12]\n  EXIT_SCOPE(n$4,n$5,n$6); [line 77, column 12]\n " shape="box"]
 	
 
 	 "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_4" -> "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_3" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/methods/byvals.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/methods/byvals.cpp.dot
index 869519f8c..f21035372 100644
--- a/infer/tests/codetoanalyze/cpp/shared/methods/byvals.cpp.dot
+++ b/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$2=*&this:pass_by_val::PlainStruct* [line 11, column 8]\n  n$3=*&__param_0:pass_by_val::PlainStruct const & [line 11, column 8]\n  n$4=*n$3.y:int* [line 11, column 8]\n  *n$2.y:int*=n$4 [line 11, column 8]\n  NULLIFY(&this); [line 11, column 8]\n  NULLIFY(&__param_0); [line 11, column 8]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 11, column 8]\n  APPLY_ABSTRACTION; [line 11, column 8]\n " shape="box"]
+"PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_3" [label="3:  Constructor Init \n   n$1=*&this:pass_by_val::PlainStruct* [line 11, column 8]\n  n$2=*&__param_0:pass_by_val::PlainStruct const & [line 11, column 8]\n  n$3=*n$2.y:int* [line 11, column 8]\n  *n$1.y:int*=n$3 [line 11, column 8]\n  NULLIFY(&this); [line 11, column 8]\n  NULLIFY(&__param_0); [line 11, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 11, column 8]\n  APPLY_ABSTRACTION; [line 11, 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$5=*&this:pass_by_val::PlainStruct* [line 11, column 8]\n  n$6=*&__param_0:pass_by_val::PlainStruct const & [line 11, column 8]\n  n$7=*n$6.x:int [line 11, column 8]\n  *n$5.x:int=n$7 [line 11, column 8]\n  EXIT_SCOPE(n$5,n$6,n$7); [line 11, column 8]\n " shape="box"]
+"PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_4" [label="4:  Constructor Init \n   n$4=*&this:pass_by_val::PlainStruct* [line 11, column 8]\n  n$5=*&__param_0:pass_by_val::PlainStruct const & [line 11, column 8]\n  n$6=*n$5.x:int [line 11, column 8]\n  *n$4.x:int=n$6 [line 11, column 8]\n  EXIT_SCOPE(n$4,n$5,n$6); [line 11, column 8]\n " shape="box"]
 	
 
 	 "PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_4" -> "PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_3" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/methods/conversion_operator.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/methods/conversion_operator.cpp.dot
index 4849599ca..4576984ee 100644
--- a/infer/tests/codetoanalyze/cpp/shared/methods/conversion_operator.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/methods/conversion_operator.cpp.dot
@@ -120,11 +120,11 @@ digraph cfg {
 	
 
 	 "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_tmpSIL_materialize_temp__n$1:conversion_operator::X const  0$?%__sil_tmpSIL_materialize_temp__n$0:conversion_operator::X 0$?%__sil_tmpSIL_materialize_temp__n$10:conversion_operator::X const  0$?%__sil_tmpSIL_materialize_temp__n$9:conversion_operator::X v:int 0$?%__sil_tmpSIL_materialize_temp__n$20:conversion_operator::X const  0$?%__sil_tmpSIL_materialize_temp__n$19:conversion_operator::X y:conversion_operator::Y \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_tmpSIL_materialize_temp__n$1:conversion_operator::X const  0$?%__sil_tmpSIL_materialize_temp__n$0:conversion_operator::X 0$?%__sil_tmpSIL_materialize_temp__n$9:conversion_operator::X const  0$?%__sil_tmpSIL_materialize_temp__n$8:conversion_operator::X v:int 0$?%__sil_tmpSIL_materialize_temp__n$18:conversion_operator::X const  0$?%__sil_tmpSIL_materialize_temp__n$17:conversion_operator::X y:conversion_operator::Y \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   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 50, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 50, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$20); [line 50, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$19); [line 50, column 1]\n  NULLIFY(&y); [line 50, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$10); [line 50, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$9); [line 50, column 1]\n " color=yellow style=filled]
+"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_2" [label="2: Exit conversion_operator::y_branch_div0 \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 50, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$18); [line 50, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 50, column 1]\n  NULLIFY(&y); [line 50, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$17); [line 50, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$9); [line 50, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$8); [line 50, column 1]\n " color=yellow style=filled]
 	
 
 "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_3" [label="3:  Return Stmt \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$0:conversion_operator::X); [line 49, column 10]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X const ); [line 49, column 13]\n  _=*&y:conversion_operator::Y [line 49, 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*) assign_last [line 49, column 13]\n  n$5=_fun_conversion_operator::X::X(&0$?%__sil_tmpSIL_materialize_temp__n$0:conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X const &) [line 49, column 10]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$0:conversion_operator::X [line 49, column 10]\n  n$7=_fun_conversion_operator::X::operator_int(&0$?%__sil_tmpSIL_materialize_temp__n$0:conversion_operator::X&) [line 49, column 10]\n  *&return:int=n$7 [line 49, column 3]\n  EXIT_SCOPE(_,_,n$4,n$5,n$7,y,0$?%__sil_tmpSIL_materialize_temp__n$0,0$?%__sil_tmpSIL_materialize_temp__n$1); [line 49, column 3]\n  APPLY_ABSTRACTION; [line 49, column 3]\n " shape="box"]
@@ -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   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$9:conversion_operator::X); [line 45, column 7]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$10:conversion_operator::X const ); [line 45, column 10]\n  _=*&y:conversion_operator::Y [line 45, column 10]\n  n$13=_fun_conversion_operator::Y::operator_X(&y:conversion_operator::Y&,&0$?%__sil_tmpSIL_materialize_temp__n$10:conversion_operator::X*) assign_last [line 45, column 10]\n  n$14=_fun_conversion_operator::X::X(&0$?%__sil_tmpSIL_materialize_temp__n$9:conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$10:conversion_operator::X const &) [line 45, column 7]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$9:conversion_operator::X [line 45, column 7]\n  n$16=_fun_conversion_operator::X::operator_bool(&0$?%__sil_tmpSIL_materialize_temp__n$9:conversion_operator::X&) [line 45, column 7]\n  EXIT_SCOPE(_,_,n$13,n$14,0$?%__sil_tmpSIL_materialize_temp__n$9,0$?%__sil_tmpSIL_materialize_temp__n$10); [line 45, column 7]\n " shape="box"]
+"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_5" [label="5:  Call _fun_conversion_operator::X::operator_bool \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$8:conversion_operator::X); [line 45, column 7]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$9:conversion_operator::X const ); [line 45, column 10]\n  _=*&y:conversion_operator::Y [line 45, 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*) assign_last [line 45, column 10]\n  n$13=_fun_conversion_operator::X::X(&0$?%__sil_tmpSIL_materialize_temp__n$8:conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$9:conversion_operator::X const &) [line 45, column 7]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$8:conversion_operator::X [line 45, column 7]\n  n$15=_fun_conversion_operator::X::operator_bool(&0$?%__sil_tmpSIL_materialize_temp__n$8:conversion_operator::X&) [line 45, column 7]\n  EXIT_SCOPE(_,_,n$12,n$13,0$?%__sil_tmpSIL_materialize_temp__n$8,0$?%__sil_tmpSIL_materialize_temp__n$9); [line 45, 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$16, true); [line 45, column 7]\n  EXIT_SCOPE(n$16); [line 45, column 7]\n " shape="invhouse"]
+"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_6" [label="6: Prune (true branch, if) \n   PRUNE(n$15, true); [line 45, column 7]\n  EXIT_SCOPE(n$15); [line 45, 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$16, false); [line 45, column 7]\n  EXIT_SCOPE(n$16); [line 45, column 7]\n " shape="invhouse"]
+"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_7" [label="7: Prune (false branch, if) \n   PRUNE(!n$15, false); [line 45, column 7]\n  EXIT_SCOPE(n$15); [line 45, 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$17=*&v:int [line 47, column 16]\n  *&return:int=(1 / n$17) [line 47, column 5]\n  NULLIFY(&v); [line 47, column 5]\n  EXIT_SCOPE(n$17,v); [line 47, column 5]\n  APPLY_ABSTRACTION; [line 47, column 5]\n " shape="box"]
+"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_8" [label="8:  Return Stmt \n   n$16=*&v:int [line 47, column 16]\n  *&return:int=(1 / n$16) [line 47, column 5]\n  NULLIFY(&v); [line 47, column 5]\n  EXIT_SCOPE(n$16,v); [line 47, column 5]\n  APPLY_ABSTRACTION; [line 47, 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   VARIABLE_DECLARED(v:int); [line 46, column 5]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$19:conversion_operator::X); [line 46, column 13]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$20:conversion_operator::X const ); [line 46, column 16]\n  _=*&y:conversion_operator::Y [line 46, column 16]\n  n$23=_fun_conversion_operator::Y::operator_X(&y:conversion_operator::Y&,&0$?%__sil_tmpSIL_materialize_temp__n$20:conversion_operator::X*) assign_last [line 46, column 16]\n  n$24=_fun_conversion_operator::X::X(&0$?%__sil_tmpSIL_materialize_temp__n$19:conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$20:conversion_operator::X const &) [line 46, column 13]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$19:conversion_operator::X [line 46, column 13]\n  n$26=_fun_conversion_operator::X::operator_int(&0$?%__sil_tmpSIL_materialize_temp__n$19:conversion_operator::X&) [line 46, column 13]\n  *&v:int=n$26 [line 46, column 5]\n  EXIT_SCOPE(_,_,n$23,n$24,n$26,y,0$?%__sil_tmpSIL_materialize_temp__n$19,0$?%__sil_tmpSIL_materialize_temp__n$20); [line 46, column 5]\n " shape="box"]
+"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(v:int); [line 46, column 5]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$17:conversion_operator::X); [line 46, column 13]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$18:conversion_operator::X const ); [line 46, column 16]\n  _=*&y:conversion_operator::Y [line 46, 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*) assign_last [line 46, column 16]\n  n$22=_fun_conversion_operator::X::X(&0$?%__sil_tmpSIL_materialize_temp__n$17:conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$18:conversion_operator::X const &) [line 46, column 13]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$17:conversion_operator::X [line 46, column 13]\n  n$24=_fun_conversion_operator::X::operator_int(&0$?%__sil_tmpSIL_materialize_temp__n$17:conversion_operator::X&) [line 46, column 13]\n  *&v:int=n$24 [line 46, column 5]\n  EXIT_SCOPE(_,_,n$21,n$22,n$24,0$?%__sil_tmpSIL_materialize_temp__n$17,y,0$?%__sil_tmpSIL_materialize_temp__n$18); [line 46, 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   VARIABLE_DECLARED(y:conversion_operator::Y); [line 42, column 3]\n  n$29=_fun_conversion_operator::Y::Y(&y:conversion_operator::Y*) [line 42, column 5]\n  EXIT_SCOPE(n$29); [line 42, column 5]\n " shape="box"]
+"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(y:conversion_operator::Y); [line 42, column 3]\n  n$27=_fun_conversion_operator::Y::Y(&y:conversion_operator::Y*) [line 42, column 5]\n  EXIT_SCOPE(n$27); [line 42, column 5]\n " shape="box"]
 	
 
 	 "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_12" -> "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_11" ;
@@ -197,11 +197,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$1=*&this:conversion_operator::X* [line 21, column 5]\n  n$2=*&x:conversion_operator::X const & [line 21, column 10]\n  n$3=*n$2.b_:_Bool [line 21, column 10]\n  *n$1.b_:_Bool=n$3 [line 21, column 5]\n  NULLIFY(&x); [line 21, column 5]\n  NULLIFY(&this); [line 21, column 5]\n  EXIT_SCOPE(n$1,n$2,n$3,x,this); [line 21, column 5]\n  APPLY_ABSTRACTION; [line 21, column 5]\n " shape="box"]
+"X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:conversion_operator::X* [line 21, column 5]\n  n$1=*&x:conversion_operator::X const & [line 21, column 10]\n  n$2=*n$1.b_:_Bool [line 21, column 10]\n  *n$0.b_:_Bool=n$2 [line 21, column 5]\n  NULLIFY(&x); [line 21, column 5]\n  NULLIFY(&this); [line 21, column 5]\n  EXIT_SCOPE(n$0,n$1,n$2,x,this); [line 21, column 5]\n  APPLY_ABSTRACTION; [line 21, 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$4=*&this:conversion_operator::X* [line 20, column 5]\n  n$5=*&x:conversion_operator::X const & [line 20, column 10]\n  n$6=*n$5.f_:int [line 20, column 10]\n  *n$4.f_:int=n$6 [line 20, column 5]\n  EXIT_SCOPE(n$4,n$5,n$6); [line 20, column 5]\n " shape="box"]
+"X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=*&this:conversion_operator::X* [line 20, column 5]\n  n$4=*&x:conversion_operator::X const & [line 20, column 10]\n  n$5=*n$4.f_:int [line 20, column 10]\n  *n$3.f_:int=n$5 [line 20, column 5]\n  EXIT_SCOPE(n$3,n$4,n$5); [line 20, column 5]\n " shape="box"]
 	
 
 	 "X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_4" -> "X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_3" ;
@@ -212,11 +212,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$1=*&this:conversion_operator::X* [line 17, column 5]\n  n$2=*&b:_Bool [line 17, column 10]\n  *n$1.b_:_Bool=n$2 [line 17, column 5]\n  NULLIFY(&b); [line 17, column 5]\n  NULLIFY(&this); [line 17, column 5]\n  EXIT_SCOPE(n$1,n$2,b,this); [line 17, column 5]\n  APPLY_ABSTRACTION; [line 17, column 5]\n " shape="box"]
+"X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:conversion_operator::X* [line 17, column 5]\n  n$1=*&b:_Bool [line 17, column 10]\n  *n$0.b_:_Bool=n$1 [line 17, column 5]\n  NULLIFY(&b); [line 17, column 5]\n  NULLIFY(&this); [line 17, column 5]\n  EXIT_SCOPE(n$0,n$1,b,this); [line 17, column 5]\n  APPLY_ABSTRACTION; [line 17, 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$3=*&this:conversion_operator::X* [line 16, column 5]\n  n$4=*&f:int [line 16, column 10]\n  *n$3.f_:int=n$4 [line 16, column 5]\n  NULLIFY(&f); [line 16, column 5]\n  EXIT_SCOPE(n$3,n$4,f); [line 16, column 5]\n " shape="box"]
+"X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:conversion_operator::X* [line 16, column 5]\n  n$3=*&f:int [line 16, column 10]\n  *n$2.f_:int=n$3 [line 16, column 5]\n  NULLIFY(&f); [line 16, column 5]\n  EXIT_SCOPE(n$2,n$3,f); [line 16, column 5]\n " shape="box"]
 	
 
 	 "X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_4" -> "X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_3" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/methods/default_parameters.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/methods/default_parameters.cpp.dot
index 376c39fea..20d00cadc 100644
--- a/infer/tests/codetoanalyze/cpp/shared/methods/default_parameters.cpp.dot
+++ b/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$1=*&a_ptr:A* [line 18, column 3]\n  _=*n$1:A [line 18, column 3]\n  n$3=_fun_A::fun_default(n$1:A*,1:int,10:int,20:int) [line 18, column 3]\n  NULLIFY(&a_ptr); [line 18, column 3]\n  EXIT_SCOPE(_,n$1,n$3,a_ptr); [line 18, column 3]\n  APPLY_ABSTRACTION; [line 18, column 3]\n " shape="box"]
+"call_method_with_default_parameters#7436997991634263214.eaaed1a0020d12e677ebd0f9049f2e4a_3" [label="3:  Call _fun_A::fun_default \n   n$0=*&a_ptr:A* [line 18, column 3]\n  _=*n$0:A [line 18, column 3]\n  n$2=_fun_A::fun_default(n$0:A*,1:int,10:int,20:int) [line 18, column 3]\n  NULLIFY(&a_ptr); [line 18, column 3]\n  EXIT_SCOPE(_,n$0,n$2,a_ptr); [line 18, column 3]\n  APPLY_ABSTRACTION; [line 18, 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$4=*&a_ptr:A* [line 17, column 3]\n  _=*n$4:A [line 17, column 3]\n  n$6=_fun_A::fun_default(n$4:A*,1:int,2:int,20:int) [line 17, column 3]\n  EXIT_SCOPE(_,n$4,n$6); [line 17, column 3]\n " shape="box"]
+"call_method_with_default_parameters#7436997991634263214.eaaed1a0020d12e677ebd0f9049f2e4a_4" [label="4:  Call _fun_A::fun_default \n   n$3=*&a_ptr:A* [line 17, column 3]\n  _=*n$3:A [line 17, column 3]\n  n$5=_fun_A::fun_default(n$3:A*,1:int,2:int,20:int) [line 17, column 3]\n  EXIT_SCOPE(_,n$3,n$5); [line 17, 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$7=*&a_ptr:A* [line 16, column 3]\n  _=*n$7:A [line 16, column 3]\n  n$9=_fun_A::fun_default(n$7:A*,1:int,2:int,3:int) [line 16, column 3]\n  EXIT_SCOPE(_,n$7,n$9); [line 16, column 3]\n " shape="box"]
+"call_method_with_default_parameters#7436997991634263214.eaaed1a0020d12e677ebd0f9049f2e4a_5" [label="5:  Call _fun_A::fun_default \n   n$6=*&a_ptr:A* [line 16, column 3]\n  _=*n$6:A [line 16, column 3]\n  n$8=_fun_A::fun_default(n$6:A*,1:int,2:int,3:int) [line 16, column 3]\n  EXIT_SCOPE(_,n$6,n$8); [line 16, column 3]\n " shape="box"]
 	
 
 	 "call_method_with_default_parameters#7436997991634263214.eaaed1a0020d12e677ebd0f9049f2e4a_5" -> "call_method_with_default_parameters#7436997991634263214.eaaed1a0020d12e677ebd0f9049f2e4a_4" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/methods/dereference_this.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/methods/dereference_this.cpp.dot
index b76a37b42..24ae50098 100644
--- a/infer/tests/codetoanalyze/cpp/shared/methods/dereference_this.cpp.dot
+++ b/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$1=*&a_ptr:A* [line 23, column 3]\n  _=*n$1:A [line 23, column 3]\n  n$3=_fun_A::method(n$1:A*) [line 23, column 3]\n  NULLIFY(&a_ptr); [line 23, column 3]\n  EXIT_SCOPE(_,n$1,n$3,a_ptr); [line 23, column 3]\n  APPLY_ABSTRACTION; [line 23, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Call _fun_A::method \n   n$0=*&a_ptr:A* [line 23, column 3]\n  _=*n$0:A [line 23, column 3]\n  n$2=_fun_A::method(n$0:A*) [line 23, column 3]\n  NULLIFY(&a_ptr); [line 23, column 3]\n  EXIT_SCOPE(_,n$0,n$2,a_ptr); [line 23, column 3]\n  APPLY_ABSTRACTION; [line 23, 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$1=*&this:A* [line 12, column 24]\n  n$2=*&val:int [line 12, column 32]\n  *n$1.field:int=n$2 [line 12, column 24]\n  NULLIFY(&val); [line 12, column 24]\n  NULLIFY(&this); [line 12, column 24]\n  EXIT_SCOPE(n$1,n$2,val,this); [line 12, column 24]\n  APPLY_ABSTRACTION; [line 12, column 24]\n " shape="box"]
+"init#A#(11888841587519675340).79bf6a1702f6a90708acc2d560532750_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:A* [line 12, column 24]\n  n$1=*&val:int [line 12, column 32]\n  *n$0.field:int=n$1 [line 12, column 24]\n  NULLIFY(&val); [line 12, column 24]\n  NULLIFY(&this); [line 12, column 24]\n  EXIT_SCOPE(n$0,n$1,val,this); [line 12, column 24]\n  APPLY_ABSTRACTION; [line 12, 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$3=*&this:A* [line 17, column 3]\n  _=*n$3:A [line 17, column 3]\n  n$5=_fun_A::init(n$3:A*,10:int) [line 17, column 3]\n  EXIT_SCOPE(_,n$3,n$5); [line 17, column 3]\n " shape="box"]
+"method#A#(5340410962252776012).be8cb65bc6e38d687825fbc80265a66c_4" [label="4:  Call _fun_A::init \n   n$2=*&this:A* [line 17, column 3]\n  _=*n$2:A [line 17, column 3]\n  n$4=_fun_A::init(n$2:A*,10:int) [line 17, column 3]\n  EXIT_SCOPE(_,n$2,n$4); [line 17, column 3]\n " shape="box"]
 	
 
 	 "method#A#(5340410962252776012).be8cb65bc6e38d687825fbc80265a66c_4" -> "method#A#(5340410962252776012).be8cb65bc6e38d687825fbc80265a66c_3" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/methods/inline_method.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/methods/inline_method.cpp.dot
index f48aede86..85f431376 100644
--- a/infer/tests/codetoanalyze/cpp/shared/methods/inline_method.cpp.dot
+++ b/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$1=*&a_ptr:A* [line 24, column 3]\n  n$2=*n$1.in:A::AIn* [line 24, column 3]\n  _=*n$2:A::AIn [line 24, column 3]\n  n$4=_fun_A::AIn::fun(n$2:A::AIn*) [line 24, column 3]\n  NULLIFY(&a_ptr); [line 24, column 3]\n  EXIT_SCOPE(_,n$1,n$2,n$4,a_ptr); [line 24, column 3]\n  APPLY_ABSTRACTION; [line 24, column 3]\n " shape="box"]
+"test_call#15378839304774239070.15b3496769d2a65d506975ce94efc03a_3" [label="3:  Call _fun_A::AIn::fun \n   n$0=*&a_ptr:A* [line 24, column 3]\n  n$1=*n$0.in:A::AIn* [line 24, column 3]\n  _=*n$1:A::AIn [line 24, column 3]\n  n$3=_fun_A::AIn::fun(n$1:A::AIn*) [line 24, column 3]\n  NULLIFY(&a_ptr); [line 24, column 3]\n  EXIT_SCOPE(_,n$0,n$1,n$3,a_ptr); [line 24, column 3]\n  APPLY_ABSTRACTION; [line 24, 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$5=*&a_ptr:A* [line 23, column 3]\n  _=*n$5:A [line 23, column 3]\n  n$7=_fun_A::fun(n$5:A*) [line 23, column 3]\n  EXIT_SCOPE(_,n$5,n$7); [line 23, column 3]\n " shape="box"]
+"test_call#15378839304774239070.15b3496769d2a65d506975ce94efc03a_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*) [line 23, column 3]\n  EXIT_SCOPE(_,n$4,n$6); [line 23, column 3]\n " shape="box"]
 	
 
 	 "test_call#15378839304774239070.15b3496769d2a65d506975ce94efc03a_4" -> "test_call#15378839304774239070.15b3496769d2a65d506975ce94efc03a_3" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/methods/overloading.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/methods/overloading.cpp.dot
index e8a8ae281..2d3f0e1b9 100644
--- a/infer/tests/codetoanalyze/cpp/shared/methods/overloading.cpp.dot
+++ b/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$1=*&a_ptr:A* [line 22, column 3]\n  _=*n$1:A [line 22, column 3]\n  n$3=_fun_A::fun(n$1:A*,1:int,2:int,3:int) [line 22, column 3]\n  NULLIFY(&a_ptr); [line 22, column 3]\n  EXIT_SCOPE(_,n$1,n$3,a_ptr); [line 22, column 3]\n  APPLY_ABSTRACTION; [line 22, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Call _fun_A::fun \n   n$0=*&a_ptr:A* [line 22, column 3]\n  _=*n$0:A [line 22, column 3]\n  n$2=_fun_A::fun(n$0:A*,1:int,2:int,3:int) [line 22, column 3]\n  NULLIFY(&a_ptr); [line 22, column 3]\n  EXIT_SCOPE(_,n$0,n$2,a_ptr); [line 22, column 3]\n  APPLY_ABSTRACTION; [line 22, 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$4=*&a_ptr:A* [line 21, column 3]\n  _=*n$4:A [line 21, column 3]\n  n$6=_fun_A::fun(n$4:A*,1:int,2:int) [line 21, column 3]\n  EXIT_SCOPE(_,n$4,n$6); [line 21, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  Call _fun_A::fun \n   n$3=*&a_ptr:A* [line 21, column 3]\n  _=*n$3:A [line 21, column 3]\n  n$5=_fun_A::fun(n$3:A*,1:int,2:int) [line 21, column 3]\n  EXIT_SCOPE(_,n$3,n$5); [line 21, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/methods/return_struct.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/methods/return_struct.cpp.dot
index bbd93defb..96f000ec5 100644
--- a/infer/tests/codetoanalyze/cpp/shared/methods/return_struct.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/methods/return_struct.cpp.dot
@@ -37,7 +37,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$2=*&this:X* [line 8, column 8]\n  n$3=*&__param_0:X& [line 8, column 8]\n  n$4=*n$3.f:int [line 8, column 8]\n  *n$2.f:int=n$4 [line 8, column 8]\n  NULLIFY(&this); [line 8, column 8]\n  NULLIFY(&__param_0); [line 8, column 8]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 8, column 8]\n  APPLY_ABSTRACTION; [line 8, column 8]\n " shape="box"]
+"X#X#{4662457305382278389|constexpr}.7a0af4be288b205dc1c04f6801938150_3" [label="3:  Constructor Init \n   n$1=*&this:X* [line 8, column 8]\n  n$2=*&__param_0:X& [line 8, column 8]\n  n$3=*n$2.f:int [line 8, column 8]\n  *n$1.f:int=n$3 [line 8, column 8]\n  NULLIFY(&this); [line 8, column 8]\n  NULLIFY(&__param_0); [line 8, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 8, column 8]\n  APPLY_ABSTRACTION; [line 8, column 8]\n " shape="box"]
 	
 
 	 "X#X#{4662457305382278389|constexpr}.7a0af4be288b205dc1c04f6801938150_3" -> "X#X#{4662457305382278389|constexpr}.7a0af4be288b205dc1c04f6801938150_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/methods/static.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/methods/static.cpp.dot
index 6737f9c4e..b86dd4056 100644
--- a/infer/tests/codetoanalyze/cpp/shared/methods/static.cpp.dot
+++ b/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$2=_fun_A::fun(0:int) [line 15, column 21]\n  EXIT_SCOPE(n$2); [line 15, column 21]\n  APPLY_ABSTRACTION; [line 15, column 21]\n " shape="box"]
+"div0_class#4984704850372216251.260ce38d809793fc3e38787f8d1eb4d6_3" [label="3:  Call _fun_A::fun \n   n$1=_fun_A::fun(0:int) [line 15, column 21]\n  EXIT_SCOPE(n$1); [line 15, column 21]\n  APPLY_ABSTRACTION; [line 15, column 21]\n " shape="box"]
 	
 
 	 "div0_class#4984704850372216251.260ce38d809793fc3e38787f8d1eb4d6_3" -> "div0_class#4984704850372216251.260ce38d809793fc3e38787f8d1eb4d6_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "div0_instance(class A)#13376949534750090437.fc775825a5031b981817dd20651240b0_2" [label="2: Exit div0_instance \n  " color=yellow style=filled]
 	
 
-"div0_instance(class A)#13376949534750090437.fc775825a5031b981817dd20651240b0_3" [label="3:  Call _fun_A::fun \n   n$1=*&a:A* [line 19, column 3]\n  n$3=_fun_A::fun(0:int) [line 19, column 3]\n  NULLIFY(&a); [line 19, column 3]\n  EXIT_SCOPE(n$1,n$3,a); [line 19, column 3]\n  APPLY_ABSTRACTION; [line 19, column 3]\n " shape="box"]
+"div0_instance(class A)#13376949534750090437.fc775825a5031b981817dd20651240b0_3" [label="3:  Call _fun_A::fun \n   n$0=*&a:A* [line 19, column 3]\n  n$2=_fun_A::fun(0:int) [line 19, column 3]\n  NULLIFY(&a); [line 19, column 3]\n  EXIT_SCOPE(n$0,n$2,a); [line 19, column 3]\n  APPLY_ABSTRACTION; [line 19, column 3]\n " shape="box"]
 	
 
 	 "div0_instance(class A)#13376949534750090437.fc775825a5031b981817dd20651240b0_3" -> "div0_instance(class A)#13376949534750090437.fc775825a5031b981817dd20651240b0_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/methods/virtual_methods.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/methods/virtual_methods.cpp.dot
index 6d9a5130e..eb2bb4275 100644
--- a/infer/tests/codetoanalyze/cpp/shared/methods/virtual_methods.cpp.dot
+++ b/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$1=*&trgl:Polygon* [line 70, column 10]\n  n$2=_fun___delete(n$1:Polygon*) [line 70, column 3]\n  NULLIFY(&trgl); [line 70, column 3]\n  EXIT_SCOPE(n$1,n$2,trgl); [line 70, column 3]\n  APPLY_ABSTRACTION; [line 70, column 3]\n " shape="box"]
+"call_virtual_destructor#6847397116347440235.d267757a410b72cac399f5e3d0ee0f45_3" [label="3:  Call delete \n   n$0=*&trgl:Polygon* [line 70, column 10]\n  n$1=_fun___delete(n$0:Polygon*) [line 70, column 3]\n  NULLIFY(&trgl); [line 70, column 3]\n  EXIT_SCOPE(n$0,n$1,trgl); [line 70, column 3]\n  APPLY_ABSTRACTION; [line 70, 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   VARIABLE_DECLARED(trgl:Polygon*); [line 69, column 3]\n  n$3=_fun___new(sizeof(t=Triangle):unsigned long) [line 69, column 19]\n  n$4=_fun_Triangle::Triangle(n$3:Triangle*) [line 69, column 23]\n  *&trgl:Triangle*=n$3 [line 69, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 69, column 3]\n " shape="box"]
+"call_virtual_destructor#6847397116347440235.d267757a410b72cac399f5e3d0ee0f45_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(trgl:Polygon*); [line 69, column 3]\n  n$2=_fun___new(sizeof(t=Triangle):unsigned long) [line 69, column 19]\n  n$3=_fun_Triangle::Triangle(n$2:Triangle*) [line 69, column 23]\n  *&trgl:Triangle*=n$2 [line 69, column 3]\n  EXIT_SCOPE(n$2,n$3); [line 69, column 3]\n " shape="box"]
 	
 
 	 "call_virtual_destructor#6847397116347440235.d267757a410b72cac399f5e3d0ee0f45_4" -> "call_virtual_destructor#6847397116347440235.d267757a410b72cac399f5e3d0ee0f45_3" ;
@@ -129,11 +129,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$1=*&this:Polygon* [line 16, column 5]\n  n$2=*&b:int [line 16, column 14]\n  *n$1.height:int=n$2 [line 16, column 5]\n  NULLIFY(&b); [line 16, column 5]\n  NULLIFY(&this); [line 16, column 5]\n  EXIT_SCOPE(n$1,n$2,b,this); [line 16, column 5]\n  APPLY_ABSTRACTION; [line 16, column 5]\n " shape="box"]
+"set_values#Polygon#(2698446688876490094).f9216ba6d3085c8bce59aeddec27f348_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:Polygon* [line 16, column 5]\n  n$1=*&b:int [line 16, column 14]\n  *n$0.height:int=n$1 [line 16, column 5]\n  NULLIFY(&b); [line 16, column 5]\n  NULLIFY(&this); [line 16, column 5]\n  EXIT_SCOPE(n$0,n$1,b,this); [line 16, column 5]\n  APPLY_ABSTRACTION; [line 16, 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$3=*&this:Polygon* [line 15, column 5]\n  n$4=*&a:int [line 15, column 13]\n  *n$3.width:int=n$4 [line 15, column 5]\n  NULLIFY(&a); [line 15, column 5]\n  EXIT_SCOPE(n$3,n$4,a); [line 15, column 5]\n " shape="box"]
+"set_values#Polygon#(2698446688876490094).f9216ba6d3085c8bce59aeddec27f348_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:Polygon* [line 15, column 5]\n  n$3=*&a:int [line 15, column 13]\n  *n$2.width:int=n$3 [line 15, column 5]\n  NULLIFY(&a); [line 15, column 5]\n  EXIT_SCOPE(n$2,n$3,a); [line 15, column 5]\n " shape="box"]
 	
 
 	 "set_values#Polygon#(2698446688876490094).f9216ba6d3085c8bce59aeddec27f348_4" -> "set_values#Polygon#(2698446688876490094).f9216ba6d3085c8bce59aeddec27f348_3" ;
@@ -162,7 +162,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$2=*&this:Rectangle* [line 21, column 7]\n  n$3=_fun_Polygon::Polygon(n$2:Rectangle*) [line 21, column 7]\n  NULLIFY(&this); [line 21, column 7]\n  EXIT_SCOPE(n$2,n$3,this); [line 21, column 7]\n  APPLY_ABSTRACTION; [line 21, column 7]\n " shape="box"]
+"Rectangle#Rectangle#{548993796743293985}.386f89cceb4c14e4fc014bcc1ec86f4b_3" [label="3:  Constructor Init \n   n$1=*&this:Rectangle* [line 21, column 7]\n  n$2=_fun_Polygon::Polygon(n$1:Rectangle*) [line 21, column 7]\n  NULLIFY(&this); [line 21, column 7]\n  EXIT_SCOPE(n$1,n$2,this); [line 21, column 7]\n  APPLY_ABSTRACTION; [line 21, column 7]\n " shape="box"]
 	
 
 	 "Rectangle#Rectangle#{548993796743293985}.386f89cceb4c14e4fc014bcc1ec86f4b_3" -> "Rectangle#Rectangle#{548993796743293985}.386f89cceb4c14e4fc014bcc1ec86f4b_2" ;
@@ -177,7 +177,7 @@ digraph cfg {
 	
 
 	 "area#Triangle#(14534668876010564879).b2c96bbb8f170e9d12180637dc0d6da3_3" -> "area#Triangle#(14534668876010564879).b2c96bbb8f170e9d12180637dc0d6da3_2" ;
-"area#Triangle#(14534668876010564879).b2c96bbb8f170e9d12180637dc0d6da3_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 31, column 5]\n  n$2=*&this:Triangle* [line 31, column 13]\n  n$3=*n$2.width:int [line 31, column 13]\n  n$4=*&this:Triangle* [line 31, column 21]\n  n$5=*n$4.height:int [line 31, column 21]\n  *&x:int=(n$3 * n$5) [line 31, column 5]\n  NULLIFY(&this); [line 31, column 5]\n  EXIT_SCOPE(n$2,n$3,n$4,n$5,this); [line 31, column 5]\n " shape="box"]
+"area#Triangle#(14534668876010564879).b2c96bbb8f170e9d12180637dc0d6da3_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 31, column 5]\n  n$1=*&this:Triangle* [line 31, column 13]\n  n$2=*n$1.width:int [line 31, column 13]\n  n$3=*&this:Triangle* [line 31, column 21]\n  n$4=*n$3.height:int [line 31, column 21]\n  *&x:int=(n$2 * n$4) [line 31, column 5]\n  NULLIFY(&this); [line 31, column 5]\n  EXIT_SCOPE(n$1,n$2,n$3,n$4,this); [line 31, column 5]\n " shape="box"]
 	
 
 	 "area#Triangle#(14534668876010564879).b2c96bbb8f170e9d12180637dc0d6da3_4" -> "area#Triangle#(14534668876010564879).b2c96bbb8f170e9d12180637dc0d6da3_3" ;
@@ -188,7 +188,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$2=*&this:Triangle* [line 27, column 7]\n  n$3=_fun_Polygon::Polygon(n$2:Triangle*) [line 27, column 7]\n  NULLIFY(&this); [line 27, column 7]\n  EXIT_SCOPE(n$2,n$3,this); [line 27, column 7]\n  APPLY_ABSTRACTION; [line 27, column 7]\n " shape="box"]
+"Triangle#Triangle#{15421032765127472541}.26bfd28d102273793a62fe013a50a7d1_3" [label="3:  Constructor Init \n   n$1=*&this:Triangle* [line 27, column 7]\n  n$2=_fun_Polygon::Polygon(n$1:Triangle*) [line 27, column 7]\n  NULLIFY(&this); [line 27, column 7]\n  EXIT_SCOPE(n$1,n$2,this); [line 27, column 7]\n  APPLY_ABSTRACTION; [line 27, column 7]\n " shape="box"]
 	
 
 	 "Triangle#Triangle#{15421032765127472541}.26bfd28d102273793a62fe013a50a7d1_3" -> "Triangle#Triangle#{15421032765127472541}.26bfd28d102273793a62fe013a50a7d1_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/namespace/namespace.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/namespace/namespace.cpp.dot
index 83a1c9871..2608b93bf 100644
--- a/infer/tests/codetoanalyze/cpp/shared/namespace/namespace.cpp.dot
+++ b/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$1=*&#GB<codetoanalyze/cpp/shared/namespace/namespace.cpp|ice>$bar::pi:double [line 55, column 7]\n  *&j:double=n$1 [line 55, column 3]\n  NULLIFY(&j); [line 55, column 3]\n  EXIT_SCOPE(n$1,j); [line 55, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&#GB<codetoanalyze/cpp/shared/namespace/namespace.cpp|ice>$bar::pi:double [line 55, column 7]\n  *&j:double=n$0 [line 55, column 3]\n  NULLIFY(&j); [line 55, column 3]\n  EXIT_SCOPE(n$0,j); [line 55, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=_fun_bar::value() [line 54, column 7]\n  *&i:int=n$2 [line 54, column 3]\n  NULLIFY(&i); [line 54, column 3]\n  EXIT_SCOPE(n$2,i); [line 54, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$1=_fun_bar::value() [line 54, column 7]\n  *&i:int=n$1 [line 54, column 3]\n  NULLIFY(&i); [line 54, column 3]\n  EXIT_SCOPE(n$1,i); [line 54, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   n$3=_fun_foo::value() [line 53, column 7]\n  *&i:int=n$3 [line 53, column 3]\n  NULLIFY(&i); [line 53, column 3]\n  EXIT_SCOPE(n$3,i); [line 53, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   n$2=_fun_foo::value() [line 53, column 7]\n  *&i:int=n$2 [line 53, column 3]\n  NULLIFY(&i); [line 53, column 3]\n  EXIT_SCOPE(n$2,i); [line 53, 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 50, column 3]\n  n$5=_fun_foo::Rectangle::set_values(&rect2:foo::Rectangle&,7:int,10:int) [line 50, column 3]\n  EXIT_SCOPE(_,n$5,rect2); [line 50, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  Call _fun_foo::Rectangle::set_values \n   _=*&rect2:foo::Rectangle [line 50, column 3]\n  n$4=_fun_foo::Rectangle::set_values(&rect2:foo::Rectangle&,7:int,10:int) [line 50, column 3]\n  EXIT_SCOPE(_,n$4,rect2); [line 50, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(rect2:foo::Rectangle); [line 49, column 3]\n  n$6=_fun_foo::Rectangle::Rectangle(&rect2:foo::Rectangle*) [line 49, column 18]\n  EXIT_SCOPE(n$6); [line 49, column 18]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(rect2:foo::Rectangle); [line 49, column 3]\n  n$5=_fun_foo::Rectangle::Rectangle(&rect2:foo::Rectangle*) [line 49, column 18]\n  EXIT_SCOPE(n$5); [line 49, 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 47, column 3]\n  n$8=_fun_bar::Rectangle::set_values(&rect1:bar::Rectangle&,3:int,4:int) [line 47, column 3]\n  EXIT_SCOPE(_,n$8,rect1); [line 47, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  Call _fun_bar::Rectangle::set_values \n   _=*&rect1:bar::Rectangle [line 47, column 3]\n  n$7=_fun_bar::Rectangle::set_values(&rect1:bar::Rectangle&,3:int,4:int) [line 47, column 3]\n  EXIT_SCOPE(_,n$7,rect1); [line 47, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(rect1:bar::Rectangle); [line 46, column 3]\n  n$9=_fun_bar::Rectangle::Rectangle(&rect1:bar::Rectangle*) [line 46, column 18]\n  EXIT_SCOPE(n$9); [line 46, column 18]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(rect1:bar::Rectangle); [line 46, column 3]\n  n$8=_fun_bar::Rectangle::Rectangle(&rect1:bar::Rectangle*) [line 46, column 18]\n  EXIT_SCOPE(n$8); [line 46, column 18]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x:foo::my_record); [line 44, column 3]\n  n$10=_fun_foo::my_record::(&x:foo::my_record*) [line 44, column 18]\n  EXIT_SCOPE(n$10); [line 44, column 18]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x:foo::my_record); [line 44, column 3]\n  n$9=_fun_foo::my_record::(&x:foo::my_record*) [line 44, column 18]\n  EXIT_SCOPE(n$9); [line 44, column 18]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/nestedoperators/var_decl_inside_for.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/nestedoperators/var_decl_inside_for.cpp.dot
index 986374959..702666433 100644
--- a/infer/tests/codetoanalyze/cpp/shared/nestedoperators/var_decl_inside_for.cpp.dot
+++ b/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$1=*&i:int [line 17, column 31]\n  *&i:int=(n$1 - 1) [line 17, column 31]\n  EXIT_SCOPE(n$1); [line 17, column 31]\n  APPLY_ABSTRACTION; [line 17, column 31]\n " shape="box"]
+"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_5" [label="5:  UnaryOperator \n   n$0=*&i:int [line 17, column 31]\n  *&i:int=(n$0 - 1) [line 17, column 31]\n  EXIT_SCOPE(n$0); [line 17, column 31]\n  APPLY_ABSTRACTION; [line 17, 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$2=*&x:int [line 17, column 24]\n  PRUNE(n$2, true); [line 17, column 24]\n  EXIT_SCOPE(n$2); [line 17, column 24]\n " shape="invhouse"]
+"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_6" [label="6: Prune (true branch, for loop) \n   n$1=*&x:int [line 17, column 24]\n  PRUNE(n$1, true); [line 17, column 24]\n  EXIT_SCOPE(n$1); [line 17, 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$2=*&x:int [line 17, column 24]\n  PRUNE(!n$2, false); [line 17, column 24]\n  NULLIFY(&x); [line 17, column 24]\n  NULLIFY(&i); [line 17, column 24]\n  NULLIFY(&result); [line 17, column 24]\n  EXIT_SCOPE(n$2,x,i,result); [line 17, column 24]\n  APPLY_ABSTRACTION; [line 17, column 24]\n " shape="invhouse"]
+"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_7" [label="7: Prune (false branch, for loop) \n   n$1=*&x:int [line 17, column 24]\n  PRUNE(!n$1, false); [line 17, column 24]\n  NULLIFY(&x); [line 17, column 24]\n  NULLIFY(&i); [line 17, column 24]\n  NULLIFY(&result); [line 17, column 24]\n  EXIT_SCOPE(n$1,x,i,result); [line 17, column 24]\n  APPLY_ABSTRACTION; [line 17, 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   VARIABLE_DECLARED(x:int); [line 17, column 20]\n  n$3=*&i:int [line 17, column 28]\n  *&x:int=n$3 [line 17, column 20]\n  EXIT_SCOPE(n$3); [line 17, column 20]\n " shape="box"]
+"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 17, column 20]\n  n$2=*&i:int [line 17, column 28]\n  *&x:int=n$2 [line 17, column 20]\n  EXIT_SCOPE(n$2); [line 17, 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$5=*&x:int [line 18, column 15]\n  n$6=*&result:int [line 18, column 5]\n  *&result:int=(n$6 + n$5) [line 18, column 5]\n  NULLIFY(&x); [line 18, column 5]\n  EXIT_SCOPE(n$5,n$6,x); [line 18, column 5]\n " shape="box"]
+"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_9" [label="9:  BinaryOperatorStmt: AddAssign \n   n$3=*&x:int [line 18, column 15]\n  n$4=*&result:int [line 18, column 5]\n  *&result:int=(n$4 + n$3) [line 18, column 5]\n  NULLIFY(&x); [line 18, column 5]\n  EXIT_SCOPE(n$3,n$4,x); [line 18, 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$1=*&i:int [line 10, column 30]\n  *&i:int=(n$1 + 1) [line 10, column 30]\n  EXIT_SCOPE(n$1); [line 10, column 30]\n  APPLY_ABSTRACTION; [line 10, column 30]\n " shape="box"]
+"simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_5" [label="5:  UnaryOperator \n   n$0=*&i:int [line 10, column 30]\n  *&i:int=(n$0 + 1) [line 10, column 30]\n  EXIT_SCOPE(n$0); [line 10, column 30]\n  APPLY_ABSTRACTION; [line 10, 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$2=*&x:int [line 10, column 23]\n  PRUNE(n$2, true); [line 10, column 23]\n  EXIT_SCOPE(n$2); [line 10, column 23]\n " shape="invhouse"]
+"simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_6" [label="6: Prune (true branch, for loop) \n   n$1=*&x:int [line 10, column 23]\n  PRUNE(n$1, true); [line 10, column 23]\n  EXIT_SCOPE(n$1); [line 10, 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$2=*&x:int [line 10, column 23]\n  PRUNE(!n$2, false); [line 10, column 23]\n  NULLIFY(&i); [line 10, column 23]\n  NULLIFY(&x); [line 10, column 23]\n  NULLIFY(&result); [line 10, column 23]\n  EXIT_SCOPE(n$2,i,x,result); [line 10, column 23]\n  APPLY_ABSTRACTION; [line 10, column 23]\n " shape="invhouse"]
+"simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_7" [label="7: Prune (false branch, for loop) \n   n$1=*&x:int [line 10, column 23]\n  PRUNE(!n$1, false); [line 10, column 23]\n  NULLIFY(&i); [line 10, column 23]\n  NULLIFY(&x); [line 10, column 23]\n  NULLIFY(&result); [line 10, column 23]\n  EXIT_SCOPE(n$1,i,x,result); [line 10, column 23]\n  APPLY_ABSTRACTION; [line 10, 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$4=*&x:int [line 11, column 15]\n  n$5=*&result:int [line 11, column 5]\n  *&result:int=(n$5 + n$4) [line 11, column 5]\n  NULLIFY(&x); [line 11, column 5]\n  EXIT_SCOPE(n$4,n$5,x); [line 11, column 5]\n " shape="box"]
+"simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_9" [label="9:  BinaryOperatorStmt: AddAssign \n   n$2=*&x:int [line 11, column 15]\n  n$3=*&result:int [line 11, column 5]\n  *&result:int=(n$3 + n$2) [line 11, column 5]\n  NULLIFY(&x); [line 11, column 5]\n  EXIT_SCOPE(n$2,n$3,x); [line 11, column 5]\n " shape="box"]
 	
 
 	 "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_9" -> "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_5" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/nestedoperators/var_decl_inside_if.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/nestedoperators/var_decl_inside_if.cpp.dot
index b3bbe7b37..7a7f4cc1f 100644
--- a/infer/tests/codetoanalyze/cpp/shared/nestedoperators/var_decl_inside_if.cpp.dot
+++ b/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$2:int \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$1:int \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$1=*&a:int [line 41, column 11]\n  PRUNE(n$1, true); [line 41, column 11]\n  EXIT_SCOPE(n$1); [line 41, column 11]\n " shape="invhouse"]
+"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_5" [label="5: Prune (true branch, if) \n   n$0=*&a:int [line 41, column 11]\n  PRUNE(n$0, true); [line 41, column 11]\n  EXIT_SCOPE(n$0); [line 41, 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$1=*&a:int [line 41, column 11]\n  PRUNE(!n$1, false); [line 41, column 11]\n  NULLIFY(&a); [line 41, column 11]\n  EXIT_SCOPE(n$1,a); [line 41, column 11]\n " shape="invhouse"]
+"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_6" [label="6: Prune (false branch, if) \n   n$0=*&a:int [line 41, column 11]\n  PRUNE(!n$0, false); [line 41, column 11]\n  NULLIFY(&a); [line 41, column 11]\n  EXIT_SCOPE(n$0,a); [line 41, 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:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 41, column 15]\n  APPLY_ABSTRACTION; [line 41, column 15]\n " shape="box"]
+"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_10" [label="10:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 41, column 15]\n  APPLY_ABSTRACTION; [line 41, 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:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=0 [line 41, column 15]\n  APPLY_ABSTRACTION; [line 41, column 15]\n " shape="box"]
+"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_11" [label="11:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=0 [line 41, column 15]\n  APPLY_ABSTRACTION; [line 41, 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   VARIABLE_DECLARED(a:int); [line 41, column 7]\n  n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 41, column 15]\n  *&a:int=n$3 [line 41, column 7]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$2); [line 41, column 7]\n  EXIT_SCOPE(n$3,0$?%__sil_tmpSIL_temp_conditional___n$2); [line 41, column 7]\n " shape="box"]
+"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 41, column 7]\n  n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 41, column 15]\n  *&a:int=n$2 [line 41, column 7]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 41, column 7]\n  EXIT_SCOPE(n$2,0$?%__sil_tmpSIL_temp_conditional___n$1); [line 41, 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$4=*&a:int [line 42, column 17]\n  *&return:int=(1 / (n$4 - 1)) [line 42, column 5]\n  NULLIFY(&a); [line 42, column 5]\n  EXIT_SCOPE(n$4,a); [line 42, column 5]\n  APPLY_ABSTRACTION; [line 42, column 5]\n " shape="box"]
+"conditional_init_div0#15409862859031639280.1a402395676f14cae9f26917a820e9ed_13" [label="13:  Return Stmt \n   n$3=*&a:int [line 42, column 17]\n  *&return:int=(1 / (n$3 - 1)) [line 42, column 5]\n  NULLIFY(&a); [line 42, column 5]\n  EXIT_SCOPE(n$3,a); [line 42, column 5]\n  APPLY_ABSTRACTION; [line 42, 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$1=*&a:int [line 35, column 11]\n  PRUNE(n$1, true); [line 35, column 11]\n  EXIT_SCOPE(n$1); [line 35, column 11]\n " shape="invhouse"]
+"function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_5" [label="5: Prune (true branch, if) \n   n$0=*&a:int [line 35, column 11]\n  PRUNE(n$0, true); [line 35, column 11]\n  EXIT_SCOPE(n$0); [line 35, 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$1=*&a:int [line 35, column 11]\n  PRUNE(!n$1, false); [line 35, column 11]\n  NULLIFY(&a); [line 35, column 11]\n  EXIT_SCOPE(n$1,a); [line 35, column 11]\n " shape="invhouse"]
+"function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_6" [label="6: Prune (false branch, if) \n   n$0=*&a:int [line 35, column 11]\n  PRUNE(!n$0, false); [line 35, column 11]\n  NULLIFY(&a); [line 35, column 11]\n  EXIT_SCOPE(n$0,a); [line 35, 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   VARIABLE_DECLARED(a:int); [line 35, column 7]\n  n$2=_fun_get1() [line 35, column 15]\n  *&a:int=n$2 [line 35, column 7]\n  EXIT_SCOPE(n$2); [line 35, column 7]\n " shape="box"]
+"function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 35, column 7]\n  n$1=_fun_get1() [line 35, column 15]\n  *&a:int=n$1 [line 35, column 7]\n  EXIT_SCOPE(n$1); [line 35, 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$3=*&a:int [line 36, column 17]\n  *&return:int=(1 / (n$3 - 1)) [line 36, column 5]\n  NULLIFY(&a); [line 36, column 5]\n  EXIT_SCOPE(n$3,a); [line 36, column 5]\n  APPLY_ABSTRACTION; [line 36, column 5]\n " shape="box"]
+"function_call_init_div0#7458225874916439501.0ec340f42ffbe340a808e1b8bee4f555_8" [label="8:  Return Stmt \n   n$2=*&a:int [line 36, column 17]\n  *&return:int=(1 / (n$2 - 1)) [line 36, column 5]\n  NULLIFY(&a); [line 36, column 5]\n  EXIT_SCOPE(n$2,a); [line 36, column 5]\n  APPLY_ABSTRACTION; [line 36, 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$2=*&a:int& [line 48, column 12]\n  n$3=*n$2:int [line 48, column 12]\n  PRUNE(n$3, true); [line 48, column 12]\n  EXIT_SCOPE(n$2,n$3); [line 48, column 12]\n " shape="invhouse"]
+"reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_5" [label="5: Prune (true branch, if) \n   n$1=*&a:int& [line 48, column 12]\n  n$2=*n$1:int [line 48, column 12]\n  PRUNE(n$2, true); [line 48, column 12]\n  EXIT_SCOPE(n$1,n$2); [line 48, 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$2=*&a:int& [line 48, column 12]\n  n$3=*n$2:int [line 48, column 12]\n  PRUNE(!n$3, false); [line 48, column 12]\n  NULLIFY(&a); [line 48, column 12]\n  EXIT_SCOPE(n$2,n$3,a); [line 48, column 12]\n  APPLY_ABSTRACTION; [line 48, column 12]\n " shape="invhouse"]
+"reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_6" [label="6: Prune (false branch, if) \n   n$1=*&a:int& [line 48, column 12]\n  n$2=*n$1:int [line 48, column 12]\n  PRUNE(!n$2, false); [line 48, column 12]\n  NULLIFY(&a); [line 48, column 12]\n  EXIT_SCOPE(n$1,n$2,a); [line 48, column 12]\n  APPLY_ABSTRACTION; [line 48, 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$5=*&a:int& [line 49, column 5]\n  *n$5:int=0 [line 49, column 5]\n  NULLIFY(&a); [line 49, column 5]\n  EXIT_SCOPE(n$5,a); [line 49, column 5]\n  APPLY_ABSTRACTION; [line 49, column 5]\n " shape="box"]
+"reference_init_div0#8765531464226376816.66e8a6545ef6e4641561744b4125ae49_8" [label="8:  BinaryOperatorStmt: Assign \n   n$3=*&a:int& [line 49, column 5]\n  *n$3:int=0 [line 49, column 5]\n  NULLIFY(&a); [line 49, column 5]\n  EXIT_SCOPE(n$3,a); [line 49, column 5]\n  APPLY_ABSTRACTION; [line 49, 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$1=*&a:int [line 23, column 11]\n  PRUNE(n$1, true); [line 23, column 11]\n  NULLIFY(&a); [line 23, column 11]\n  EXIT_SCOPE(n$1,a); [line 23, column 11]\n " shape="invhouse"]
+"simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_5" [label="5: Prune (true branch, if) \n   n$0=*&a:int [line 23, column 11]\n  PRUNE(n$0, true); [line 23, column 11]\n  NULLIFY(&a); [line 23, column 11]\n  EXIT_SCOPE(n$0,a); [line 23, 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$1=*&a:int [line 23, column 11]\n  PRUNE(!n$1, false); [line 23, column 11]\n  EXIT_SCOPE(n$1); [line 23, column 11]\n " shape="invhouse"]
+"simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_6" [label="6: Prune (false branch, if) \n   n$0=*&a:int [line 23, column 11]\n  PRUNE(!n$0, false); [line 23, column 11]\n  EXIT_SCOPE(n$0); [line 23, 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$3=*&b:int [line 25, column 18]\n  PRUNE(n$3, true); [line 25, column 18]\n  NULLIFY(&b); [line 25, column 18]\n  NULLIFY(&a); [line 25, column 18]\n  EXIT_SCOPE(n$3,b,a); [line 25, column 18]\n " shape="invhouse"]
+"simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_10" [label="10: Prune (true branch, if) \n   n$1=*&b:int [line 25, column 18]\n  PRUNE(n$1, true); [line 25, column 18]\n  NULLIFY(&b); [line 25, column 18]\n  NULLIFY(&a); [line 25, column 18]\n  EXIT_SCOPE(n$1,b,a); [line 25, 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$3=*&b:int [line 25, column 18]\n  PRUNE(!n$3, false); [line 25, column 18]\n  EXIT_SCOPE(n$3); [line 25, column 18]\n " shape="invhouse"]
+"simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_11" [label="11: Prune (false branch, if) \n   n$1=*&b:int [line 25, column 18]\n  PRUNE(!n$1, false); [line 25, column 18]\n  EXIT_SCOPE(n$1); [line 25, 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$5=*&a:int [line 28, column 17]\n  n$6=*&b:int [line 28, column 21]\n  *&return:int=(1 / (n$5 + n$6)) [line 28, column 5]\n  NULLIFY(&b); [line 28, column 5]\n  NULLIFY(&a); [line 28, column 5]\n  EXIT_SCOPE(n$5,n$6,b,a); [line 28, column 5]\n  APPLY_ABSTRACTION; [line 28, column 5]\n " shape="box"]
+"simple_inif_elseif_div0#1757541495273878703.c8ccefe72cee28b41298deb3c0060bd6_14" [label="14:  Return Stmt \n   n$2=*&a:int [line 28, column 17]\n  n$3=*&b:int [line 28, column 21]\n  *&return:int=(1 / (n$2 + n$3)) [line 28, column 5]\n  NULLIFY(&b); [line 28, column 5]\n  NULLIFY(&a); [line 28, column 5]\n  EXIT_SCOPE(n$2,n$3,b,a); [line 28, column 5]\n  APPLY_ABSTRACTION; [line 28, 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$1=*&a:int [line 15, column 11]\n  PRUNE(n$1, true); [line 15, column 11]\n  EXIT_SCOPE(n$1); [line 15, column 11]\n " shape="invhouse"]
+"simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_5" [label="5: Prune (true branch, if) \n   n$0=*&a:int [line 15, column 11]\n  PRUNE(n$0, true); [line 15, column 11]\n  EXIT_SCOPE(n$0); [line 15, 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$1=*&a:int [line 15, column 11]\n  PRUNE(!n$1, false); [line 15, column 11]\n  EXIT_SCOPE(n$1); [line 15, column 11]\n " shape="invhouse"]
+"simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_6" [label="6: Prune (false branch, if) \n   n$0=*&a:int [line 15, column 11]\n  PRUNE(!n$0, false); [line 15, column 11]\n  EXIT_SCOPE(n$0); [line 15, 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$2=*&a:int [line 16, column 12]\n  *&return:int=n$2 [line 16, column 5]\n  NULLIFY(&a); [line 16, column 5]\n  EXIT_SCOPE(n$2,a); [line 16, column 5]\n  APPLY_ABSTRACTION; [line 16, column 5]\n " shape="box"]
+"simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_8" [label="8:  Return Stmt \n   n$1=*&a:int [line 16, column 12]\n  *&return:int=n$1 [line 16, column 5]\n  NULLIFY(&a); [line 16, column 5]\n  EXIT_SCOPE(n$1,a); [line 16, column 5]\n  APPLY_ABSTRACTION; [line 16, 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$4=*&a:int [line 18, column 16]\n  *&return:int=(1 / n$4) [line 18, column 5]\n  NULLIFY(&a); [line 18, column 5]\n  EXIT_SCOPE(n$4,a); [line 18, column 5]\n  APPLY_ABSTRACTION; [line 18, column 5]\n " shape="box"]
+"simple_init_div0#11745425529376514034.212fa73086397a0d668498a9c8eff99e_9" [label="9:  Return Stmt \n   n$2=*&a:int [line 18, column 16]\n  *&return:int=(1 / n$2) [line 18, column 5]\n  NULLIFY(&a); [line 18, column 5]\n  EXIT_SCOPE(n$2,a); [line 18, column 5]\n  APPLY_ABSTRACTION; [line 18, 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$1=*&a:int [line 9, column 11]\n  PRUNE(n$1, true); [line 9, column 11]\n  EXIT_SCOPE(n$1); [line 9, column 11]\n " shape="invhouse"]
+"simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_5" [label="5: Prune (true branch, if) \n   n$0=*&a:int [line 9, column 11]\n  PRUNE(n$0, true); [line 9, column 11]\n  EXIT_SCOPE(n$0); [line 9, 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$1=*&a:int [line 9, column 11]\n  PRUNE(!n$1, false); [line 9, column 11]\n  NULLIFY(&a); [line 9, column 11]\n  EXIT_SCOPE(n$1,a); [line 9, column 11]\n " shape="invhouse"]
+"simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_6" [label="6: Prune (false branch, if) \n   n$0=*&a:int [line 9, column 11]\n  PRUNE(!n$0, false); [line 9, column 11]\n  NULLIFY(&a); [line 9, column 11]\n  EXIT_SCOPE(n$0,a); [line 9, 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$2=*&a:int [line 10, column 16]\n  *&return:int=(1 / n$2) [line 10, column 5]\n  NULLIFY(&a); [line 10, column 5]\n  EXIT_SCOPE(n$2,a); [line 10, column 5]\n  APPLY_ABSTRACTION; [line 10, column 5]\n " shape="box"]
+"simple_init_div1#11746272153330047279.0563640869475a4683e824c15c85a68a_8" [label="8:  Return Stmt \n   n$1=*&a:int [line 10, column 16]\n  *&return:int=(1 / n$1) [line 10, column 5]\n  NULLIFY(&a); [line 10, column 5]\n  EXIT_SCOPE(n$1,a); [line 10, column 5]\n  APPLY_ABSTRACTION; [line 10, 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$1=*&p:int* [line 55, column 12]\n  PRUNE(n$1, true); [line 55, column 12]\n  NULLIFY(&p); [line 55, column 12]\n  EXIT_SCOPE(n$1,p); [line 55, column 12]\n " shape="invhouse"]
+"simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_5" [label="5: Prune (true branch, if) \n   n$0=*&p:int* [line 55, column 12]\n  PRUNE(n$0, true); [line 55, column 12]\n  NULLIFY(&p); [line 55, column 12]\n  EXIT_SCOPE(n$0,p); [line 55, 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$1=*&p:int* [line 55, column 12]\n  PRUNE(!n$1, false); [line 55, column 12]\n  EXIT_SCOPE(n$1); [line 55, column 12]\n " shape="invhouse"]
+"simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_6" [label="6: Prune (false branch, if) \n   n$0=*&p:int* [line 55, column 12]\n  PRUNE(!n$0, false); [line 55, column 12]\n  EXIT_SCOPE(n$0); [line 55, 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$3=*&p:int* [line 58, column 13]\n  n$4=*n$3:int [line 58, column 12]\n  *&return:int=n$4 [line 58, column 5]\n  NULLIFY(&p); [line 58, column 5]\n  EXIT_SCOPE(n$3,n$4,p); [line 58, column 5]\n  APPLY_ABSTRACTION; [line 58, column 5]\n " shape="box"]
+"simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_9" [label="9:  Return Stmt \n   n$1=*&p:int* [line 58, column 13]\n  n$2=*n$1:int [line 58, column 12]\n  *&return:int=n$2 [line 58, column 5]\n  NULLIFY(&p); [line 58, column 5]\n  EXIT_SCOPE(n$1,n$2,p); [line 58, column 5]\n  APPLY_ABSTRACTION; [line 58, column 5]\n " shape="box"]
 	
 
 	 "simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_9" -> "simple_init_null_deref#4388790903269166010.3931bff4c48c8b02a470a54ec37db174_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/nestedoperators/var_decl_inside_switch.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/nestedoperators/var_decl_inside_switch.cpp.dot
index 620489520..e92dd346f 100644
--- a/infer/tests/codetoanalyze/cpp/shared/nestedoperators/var_decl_inside_switch.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/nestedoperators/var_decl_inside_switch.cpp.dot
@@ -7,16 +7,16 @@ digraph cfg {
 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_2" [label="2: Exit get \n  " color=yellow style=filled]
 	
 
-"get#10177141129833125794.403aae26476e3a02c544075e122228e0_3" [label="3:  SwitchStmt \n   n$1=*&x:int [line 9, column 15]\n " shape="box"]
+"get#10177141129833125794.403aae26476e3a02c544075e122228e0_3" [label="3:  SwitchStmt \n   n$0=*&x:int [line 9, column 15]\n " shape="box"]
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_3" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_12" ;
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_3" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_13" ;
-"get#10177141129833125794.403aae26476e3a02c544075e122228e0_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 9, column 11]\n  n$2=*&a:int [line 9, column 19]\n  *&x:int=n$2 [line 9, column 11]\n  NULLIFY(&a); [line 9, column 11]\n  EXIT_SCOPE(n$2,a); [line 9, column 11]\n " shape="box"]
+"get#10177141129833125794.403aae26476e3a02c544075e122228e0_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 9, column 11]\n  n$1=*&a:int [line 9, column 19]\n  *&x:int=n$1 [line 9, column 11]\n  NULLIFY(&a); [line 9, column 11]\n  EXIT_SCOPE(n$1,a); [line 9, column 11]\n " shape="box"]
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_4" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_3" ;
-"get#10177141129833125794.403aae26476e3a02c544075e122228e0_5" [label="5:  Return Stmt \n   n$4=*&x:int [line 16, column 14]\n  *&return:int=n$4 [line 16, column 7]\n  NULLIFY(&x); [line 16, column 7]\n  EXIT_SCOPE(n$4,x); [line 16, column 7]\n  APPLY_ABSTRACTION; [line 16, column 7]\n " shape="box"]
+"get#10177141129833125794.403aae26476e3a02c544075e122228e0_5" [label="5:  Return Stmt \n   n$2=*&x:int [line 16, column 14]\n  *&return:int=n$2 [line 16, column 7]\n  NULLIFY(&x); [line 16, column 7]\n  EXIT_SCOPE(n$2,x); [line 16, column 7]\n  APPLY_ABSTRACTION; [line 16, column 7]\n " shape="box"]
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_5" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_2" ;
@@ -28,28 +28,28 @@ digraph cfg {
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_7" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_2" ;
-"get#10177141129833125794.403aae26476e3a02c544075e122228e0_8" [label="8: Prune (true branch, switch) \n   PRUNE((n$1 == 2), true); [line 13, column 5]\n  NULLIFY(&x); [line 13, column 5]\n  EXIT_SCOPE(n$1,x); [line 13, column 5]\n " shape="invhouse"]
+"get#10177141129833125794.403aae26476e3a02c544075e122228e0_8" [label="8: Prune (true branch, switch) \n   PRUNE((n$0 == 2), true); [line 13, column 5]\n  NULLIFY(&x); [line 13, column 5]\n  EXIT_SCOPE(n$0,x); [line 13, column 5]\n " shape="invhouse"]
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_8" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_6" ;
-"get#10177141129833125794.403aae26476e3a02c544075e122228e0_9" [label="9: Prune (false branch, switch) \n   PRUNE(!(n$1 == 2), false); [line 13, column 5]\n  EXIT_SCOPE(n$1); [line 13, column 5]\n " shape="invhouse"]
+"get#10177141129833125794.403aae26476e3a02c544075e122228e0_9" [label="9: Prune (false branch, switch) \n   PRUNE(!(n$0 == 2), false); [line 13, column 5]\n  EXIT_SCOPE(n$0); [line 13, column 5]\n " shape="invhouse"]
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_9" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_5" ;
-"get#10177141129833125794.403aae26476e3a02c544075e122228e0_10" [label="10: Prune (true branch, switch) \n   PRUNE((n$1 == 1), true); [line 11, column 5]\n  NULLIFY(&x); [line 11, column 5]\n  EXIT_SCOPE(n$1,x); [line 11, column 5]\n  APPLY_ABSTRACTION; [line 11, column 5]\n " shape="invhouse"]
+"get#10177141129833125794.403aae26476e3a02c544075e122228e0_10" [label="10: Prune (true branch, switch) \n   PRUNE((n$0 == 1), true); [line 11, column 5]\n  NULLIFY(&x); [line 11, column 5]\n  EXIT_SCOPE(n$0,x); [line 11, column 5]\n  APPLY_ABSTRACTION; [line 11, column 5]\n " shape="invhouse"]
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_10" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_7" ;
-"get#10177141129833125794.403aae26476e3a02c544075e122228e0_11" [label="11: Prune (false branch, switch) \n   PRUNE(!(n$1 == 1), false); [line 11, column 5]\n " shape="invhouse"]
+"get#10177141129833125794.403aae26476e3a02c544075e122228e0_11" [label="11: Prune (false branch, switch) \n   PRUNE(!(n$0 == 1), false); [line 11, column 5]\n " shape="invhouse"]
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_11" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_8" ;
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_11" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_9" ;
-"get#10177141129833125794.403aae26476e3a02c544075e122228e0_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$1 == 0), true); [line 10, column 5]\n  NULLIFY(&x); [line 10, column 5]\n  EXIT_SCOPE(n$1,x); [line 10, column 5]\n  APPLY_ABSTRACTION; [line 10, column 5]\n " shape="invhouse"]
+"get#10177141129833125794.403aae26476e3a02c544075e122228e0_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$0 == 0), true); [line 10, column 5]\n  NULLIFY(&x); [line 10, column 5]\n  EXIT_SCOPE(n$0,x); [line 10, column 5]\n  APPLY_ABSTRACTION; [line 10, column 5]\n " shape="invhouse"]
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_12" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_7" ;
-"get#10177141129833125794.403aae26476e3a02c544075e122228e0_13" [label="13: Prune (false branch, switch) \n   PRUNE(!(n$1 == 0), false); [line 10, column 5]\n " shape="invhouse"]
+"get#10177141129833125794.403aae26476e3a02c544075e122228e0_13" [label="13: Prune (false branch, switch) \n   PRUNE(!(n$0 == 0), false); [line 10, column 5]\n " shape="invhouse"]
 	
 
 	 "get#10177141129833125794.403aae26476e3a02c544075e122228e0_13" -> "get#10177141129833125794.403aae26476e3a02c544075e122228e0_10" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/nestedoperators/var_decl_inside_while.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/nestedoperators/var_decl_inside_while.cpp.dot
index 21b26a046..daed52fc7 100644
--- a/infer/tests/codetoanalyze/cpp/shared/nestedoperators/var_decl_inside_while.cpp.dot
+++ b/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$2:int result:int x:int \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$1:int result:int x:int \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$1=*&a:int [line 21, column 14]\n  PRUNE(n$1, true); [line 21, column 14]\n  EXIT_SCOPE(n$1); [line 21, column 14]\n " shape="invhouse"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_5" [label="5: Prune (true branch, while) \n   n$0=*&a:int [line 21, column 14]\n  PRUNE(n$0, true); [line 21, column 14]\n  EXIT_SCOPE(n$0); [line 21, 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$1=*&a:int [line 21, column 14]\n  PRUNE(!n$1, false); [line 21, column 14]\n  NULLIFY(&a); [line 21, column 14]\n  NULLIFY(&result); [line 21, column 14]\n  NULLIFY(&x); [line 21, column 14]\n  EXIT_SCOPE(n$1,a,result,x); [line 21, column 14]\n " shape="invhouse"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_6" [label="6: Prune (false branch, while) \n   n$0=*&a:int [line 21, column 14]\n  PRUNE(!n$0, false); [line 21, column 14]\n  NULLIFY(&a); [line 21, column 14]\n  NULLIFY(&result); [line 21, column 14]\n  NULLIFY(&x); [line 21, column 14]\n  EXIT_SCOPE(n$0,a,result,x); [line 21, 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$3=*&x:int [line 21, column 18]\n " shape="box"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_8" [label="8:  BinaryOperatorStmt: GT \n   n$2=*&x:int [line 21, 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$3 > 0), true); [line 21, column 18]\n  EXIT_SCOPE(n$3); [line 21, column 18]\n " shape="invhouse"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_9" [label="9: Prune (true branch, boolean exp) \n   PRUNE((n$2 > 0), true); [line 21, column 18]\n  EXIT_SCOPE(n$2); [line 21, 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$3 > 0), false); [line 21, column 18]\n  EXIT_SCOPE(n$3); [line 21, column 18]\n " shape="invhouse"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_10" [label="10: Prune (false branch, boolean exp) \n   PRUNE(!(n$2 > 0), false); [line 21, column 18]\n  EXIT_SCOPE(n$2); [line 21, column 18]\n " shape="invhouse"]
 	
 
 	 "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_10" -> "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_12" ;
-"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_11" [label="11:  ConditionalStmt Branch \n   n$4=*&x:int [line 21, column 26]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$4 [line 21, column 18]\n  EXIT_SCOPE(n$4); [line 21, column 18]\n  APPLY_ABSTRACTION; [line 21, column 18]\n " shape="box"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_11" [label="11:  ConditionalStmt Branch \n   n$3=*&x:int [line 21, column 26]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$3 [line 21, column 18]\n  EXIT_SCOPE(n$3); [line 21, column 18]\n  APPLY_ABSTRACTION; [line 21, column 18]\n " shape="box"]
 	
 
 	 "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_11" -> "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_7" ;
-"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_12" [label="12:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=0 [line 21, column 18]\n  APPLY_ABSTRACTION; [line 21, column 18]\n " shape="box"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_12" [label="12:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=0 [line 21, column 18]\n  APPLY_ABSTRACTION; [line 21, column 18]\n " shape="box"]
 	
 
 	 "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_12" -> "conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_7" ;
-"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 21, column 10]\n  n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 21, column 18]\n  *&a:int=n$5 [line 21, column 10]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$2); [line 21, column 10]\n  EXIT_SCOPE(n$5,0$?%__sil_tmpSIL_temp_conditional___n$2); [line 21, column 10]\n " shape="box"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 21, column 10]\n  n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 21, column 18]\n  *&a:int=n$4 [line 21, column 10]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 21, column 10]\n  EXIT_SCOPE(n$4,0$?%__sil_tmpSIL_temp_conditional___n$1); [line 21, 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$7=*&x:int [line 23, column 5]\n  *&x:int=(n$7 - 1) [line 23, column 5]\n  EXIT_SCOPE(n$7); [line 23, column 5]\n  APPLY_ABSTRACTION; [line 23, column 5]\n " shape="box"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_14" [label="14:  BinaryOperatorStmt: SubAssign \n   n$5=*&x:int [line 23, column 5]\n  *&x:int=(n$5 - 1) [line 23, column 5]\n  EXIT_SCOPE(n$5); [line 23, column 5]\n  APPLY_ABSTRACTION; [line 23, 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$8=*&a:int [line 22, column 15]\n  n$9=*&result:int [line 22, column 5]\n  *&result:int=(n$9 + n$8) [line 22, column 5]\n  NULLIFY(&a); [line 22, column 5]\n  EXIT_SCOPE(n$8,n$9,a); [line 22, column 5]\n " shape="box"]
+"conditional_assignment#8950169167588471442.be2d62cec5392b85b8d4d274664d86c5_15" [label="15:  BinaryOperatorStmt: AddAssign \n   n$6=*&a:int [line 22, column 15]\n  n$7=*&result:int [line 22, column 5]\n  *&result:int=(n$7 + n$6) [line 22, column 5]\n  NULLIFY(&a); [line 22, column 5]\n  EXIT_SCOPE(n$6,n$7,a); [line 22, 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$1=*&a:int [line 11, column 14]\n  PRUNE(n$1, true); [line 11, column 14]\n  EXIT_SCOPE(n$1); [line 11, column 14]\n " shape="invhouse"]
+"simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_5" [label="5: Prune (true branch, while) \n   n$0=*&a:int [line 11, column 14]\n  PRUNE(n$0, true); [line 11, column 14]\n  EXIT_SCOPE(n$0); [line 11, 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$1=*&a:int [line 11, column 14]\n  PRUNE(!n$1, false); [line 11, column 14]\n  NULLIFY(&result); [line 11, column 14]\n  NULLIFY(&a); [line 11, column 14]\n  NULLIFY(&x); [line 11, column 14]\n  EXIT_SCOPE(n$1,result,a,x); [line 11, column 14]\n " shape="invhouse"]
+"simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_6" [label="6: Prune (false branch, while) \n   n$0=*&a:int [line 11, column 14]\n  PRUNE(!n$0, false); [line 11, column 14]\n  NULLIFY(&result); [line 11, column 14]\n  NULLIFY(&a); [line 11, column 14]\n  NULLIFY(&x); [line 11, column 14]\n  EXIT_SCOPE(n$0,result,a,x); [line 11, column 14]\n " shape="invhouse"]
 	
 
 	 "simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_6" -> "simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_3" ;
-"simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 11, column 10]\n  n$2=*&x:int [line 11, column 18]\n  *&a:int=n$2 [line 11, column 10]\n  EXIT_SCOPE(n$2); [line 11, column 10]\n " shape="box"]
+"simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 11, column 10]\n  n$1=*&x:int [line 11, column 18]\n  *&a:int=n$1 [line 11, column 10]\n  EXIT_SCOPE(n$1); [line 11, 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$4=*&x:int [line 13, column 5]\n  *&x:int=(n$4 - 1) [line 13, column 5]\n  EXIT_SCOPE(n$4); [line 13, column 5]\n  APPLY_ABSTRACTION; [line 13, column 5]\n " shape="box"]
+"simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_8" [label="8:  BinaryOperatorStmt: SubAssign \n   n$2=*&x:int [line 13, column 5]\n  *&x:int=(n$2 - 1) [line 13, column 5]\n  EXIT_SCOPE(n$2); [line 13, column 5]\n  APPLY_ABSTRACTION; [line 13, 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$5=*&a:int [line 12, column 15]\n  n$6=*&result:int [line 12, column 5]\n  *&result:int=(n$6 + n$5) [line 12, column 5]\n  NULLIFY(&a); [line 12, column 5]\n  EXIT_SCOPE(n$5,n$6,a); [line 12, column 5]\n " shape="box"]
+"simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_9" [label="9:  BinaryOperatorStmt: AddAssign \n   n$3=*&a:int [line 12, column 15]\n  n$4=*&result:int [line 12, column 5]\n  *&result:int=(n$4 + n$3) [line 12, column 5]\n  NULLIFY(&a); [line 12, column 5]\n  EXIT_SCOPE(n$3,n$4,a); [line 12, column 5]\n " shape="box"]
 	
 
 	 "simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_9" -> "simple_assignment#6454162814810356464.3b57619dd6c2d612798bc9ac9e7cf8ee_8" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/npe/method_call.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/npe/method_call.cpp.dot
index 115c0b0c6..c0e296064 100644
--- a/infer/tests/codetoanalyze/cpp/shared/npe/method_call.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/npe/method_call.cpp.dot
@@ -7,7 +7,7 @@ digraph cfg {
 "call_with_forward_declaration(class XForward)#16178135517860387666.c1f98de069e5c7098edbbc8efaea56a0_2" [label="2: Exit call_with_forward_declaration \n  " color=yellow style=filled]
 	
 
-"call_with_forward_declaration(class XForward)#16178135517860387666.c1f98de069e5c7098edbbc8efaea56a0_3" [label="3:  Call _fun_XForward::call \n   n$1=*&x:XForward* [line 33, column 51]\n  _=*n$1:XForward [line 33, column 51]\n  n$3=_fun_XForward::call(n$1:XForward*) [line 33, column 51]\n  NULLIFY(&x); [line 33, column 51]\n  EXIT_SCOPE(_,n$1,n$3,x); [line 33, column 51]\n  APPLY_ABSTRACTION; [line 33, column 51]\n " shape="box"]
+"call_with_forward_declaration(class XForward)#16178135517860387666.c1f98de069e5c7098edbbc8efaea56a0_3" [label="3:  Call _fun_XForward::call \n   n$0=*&x:XForward* [line 33, column 51]\n  _=*n$0:XForward [line 33, column 51]\n  n$2=_fun_XForward::call(n$0:XForward*) [line 33, column 51]\n  NULLIFY(&x); [line 33, column 51]\n  EXIT_SCOPE(_,n$0,n$2,x); [line 33, column 51]\n  APPLY_ABSTRACTION; [line 33, column 51]\n " shape="box"]
 	
 
 	 "call_with_forward_declaration(class XForward)#16178135517860387666.c1f98de069e5c7098edbbc8efaea56a0_3" -> "call_with_forward_declaration(class XForward)#16178135517860387666.c1f98de069e5c7098edbbc8efaea56a0_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$1=_fun_getX() [line 20, column 30]\n  _=*n$1:X [line 20, column 30]\n  n$3=_fun_X::call(n$1:X*) [line 20, column 30]\n  EXIT_SCOPE(_,n$1,n$3); [line 20, column 30]\n  APPLY_ABSTRACTION; [line 20, column 30]\n " shape="box"]
+"npe_call_after_call#8140813350794705532.fd3a6d06275def8a130284a430f22a3d_3" [label="3:  Call _fun_X::call \n   n$0=_fun_getX() [line 20, column 30]\n  _=*n$0:X [line 20, column 30]\n  n$2=_fun_X::call(n$0:X*) [line 20, column 30]\n  EXIT_SCOPE(_,n$0,n$2); [line 20, column 30]\n  APPLY_ABSTRACTION; [line 20, 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$1=_fun_call_with_forward_declaration(null:XForward*) [line 36, column 3]\n  EXIT_SCOPE(n$1); [line 36, column 3]\n  APPLY_ABSTRACTION; [line 36, column 3]\n " shape="box"]
+"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 36, column 3]\n  EXIT_SCOPE(n$0); [line 36, column 3]\n  APPLY_ABSTRACTION; [line 36, column 3]\n " shape="box"]
 	
 
 	 "npe_call_with_forward_declaration#12046983290123510130.5e902eb9a8f96f74e83d527b422bd861_3" -> "npe_call_with_forward_declaration#12046983290123510130.5e902eb9a8f96f74e83d527b422bd861_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/reference/increment.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/reference/increment.cpp.dot
index aa24bc837..c8ddb1dcf 100644
--- a/infer/tests/codetoanalyze/cpp/shared/reference/increment.cpp.dot
+++ b/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   NULLIFY(&v); [line 19, column 1]\n " color=yellow style=filled]
 	
 
-"using_ref#11585308534136333375.096010b8466cdacb12ca24c30d2a7334_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(q:int&); [line 18, column 3]\n  n$1=*&vr:int& [line 18, column 14]\n  n$2=*n$1:int [line 18, column 12]\n  *n$1:int=(n$2 - 1) [line 18, column 12]\n  *&q:int&=n$1 [line 18, column 3]\n  NULLIFY(&vr); [line 18, column 3]\n  NULLIFY(&q); [line 18, column 3]\n  EXIT_SCOPE(n$1,n$2,vr,q); [line 18, column 3]\n  APPLY_ABSTRACTION; [line 18, column 3]\n " shape="box"]
+"using_ref#11585308534136333375.096010b8466cdacb12ca24c30d2a7334_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(q:int&); [line 18, column 3]\n  n$0=*&vr:int& [line 18, column 14]\n  n$1=*n$0:int [line 18, column 12]\n  *n$0:int=(n$1 - 1) [line 18, column 12]\n  *&q:int&=n$0 [line 18, column 3]\n  NULLIFY(&vr); [line 18, column 3]\n  NULLIFY(&q); [line 18, column 3]\n  EXIT_SCOPE(n$0,n$1,vr,q); [line 18, column 3]\n  APPLY_ABSTRACTION; [line 18, column 3]\n " shape="box"]
 	
 
 	 "using_ref#11585308534136333375.096010b8466cdacb12ca24c30d2a7334_3" -> "using_ref#11585308534136333375.096010b8466cdacb12ca24c30d2a7334_2" ;
-"using_ref#11585308534136333375.096010b8466cdacb12ca24c30d2a7334_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(r:int&); [line 17, column 3]\n  n$3=*&vr:int& [line 17, column 14]\n  n$4=*n$3:int [line 17, column 12]\n  *n$3:int=(n$4 + 1) [line 17, column 12]\n  *&r:int&=n$3 [line 17, column 3]\n  NULLIFY(&r); [line 17, column 3]\n  EXIT_SCOPE(n$3,n$4,r); [line 17, column 3]\n " shape="box"]
+"using_ref#11585308534136333375.096010b8466cdacb12ca24c30d2a7334_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(r:int&); [line 17, column 3]\n  n$2=*&vr:int& [line 17, column 14]\n  n$3=*n$2:int [line 17, column 12]\n  *n$2:int=(n$3 + 1) [line 17, column 12]\n  *&r:int&=n$2 [line 17, column 3]\n  NULLIFY(&r); [line 17, column 3]\n  EXIT_SCOPE(n$2,n$3,r); [line 17, 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   NULLIFY(&v); [line 12, column 1]\n " color=yellow style=filled]
 	
 
-"using_value#13692921440907975250.fad67099f85ea68eb3281c85bd0ca170_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(q:int&); [line 11, column 3]\n  n$1=*&v:int [line 11, column 12]\n  *&v:int=(n$1 - 1) [line 11, column 12]\n  *&q:int&=&v [line 11, column 3]\n  NULLIFY(&q); [line 11, column 3]\n  EXIT_SCOPE(n$1,q,v); [line 11, column 3]\n  APPLY_ABSTRACTION; [line 11, column 3]\n " shape="box"]
+"using_value#13692921440907975250.fad67099f85ea68eb3281c85bd0ca170_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(q:int&); [line 11, column 3]\n  n$0=*&v:int [line 11, column 12]\n  *&v:int=(n$0 - 1) [line 11, column 12]\n  *&q:int&=&v [line 11, column 3]\n  NULLIFY(&q); [line 11, column 3]\n  EXIT_SCOPE(n$0,q,v); [line 11, column 3]\n  APPLY_ABSTRACTION; [line 11, column 3]\n " shape="box"]
 	
 
 	 "using_value#13692921440907975250.fad67099f85ea68eb3281c85bd0ca170_3" -> "using_value#13692921440907975250.fad67099f85ea68eb3281c85bd0ca170_2" ;
-"using_value#13692921440907975250.fad67099f85ea68eb3281c85bd0ca170_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(r:int&); [line 10, column 3]\n  n$2=*&v:int [line 10, column 12]\n  *&v:int=(n$2 + 1) [line 10, column 12]\n  *&r:int&=&v [line 10, column 3]\n  NULLIFY(&r); [line 10, column 3]\n  EXIT_SCOPE(n$2,r); [line 10, column 3]\n " shape="box"]
+"using_value#13692921440907975250.fad67099f85ea68eb3281c85bd0ca170_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(r:int&); [line 10, column 3]\n  n$1=*&v:int [line 10, column 12]\n  *&v:int=(n$1 + 1) [line 10, column 12]\n  *&r:int&=&v [line 10, column 3]\n  NULLIFY(&r); [line 10, column 3]\n  EXIT_SCOPE(n$1,r); [line 10, column 3]\n " shape="box"]
 	
 
 	 "using_value#13692921440907975250.fad67099f85ea68eb3281c85bd0ca170_4" -> "using_value#13692921440907975250.fad67099f85ea68eb3281c85bd0ca170_3" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/reference/init.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/reference/init.cpp.dot
index 9039cad6a..abffa3710 100644
--- a/infer/tests/codetoanalyze/cpp/shared/reference/init.cpp.dot
+++ b/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   VARIABLE_DECLARED(p:int*); [line 23, column 3]\n  n$1=*&par:int* [line 23, column 12]\n  *&p:int*=n$1 [line 23, column 3]\n  NULLIFY(&par); [line 23, column 3]\n  NULLIFY(&p); [line 23, column 3]\n  EXIT_SCOPE(n$1,par,p); [line 23, column 3]\n  APPLY_ABSTRACTION; [line 23, column 3]\n " shape="box"]
+"init_from_ptr#9521990274512470149.d27094f3cfd0d42c143fba9593870578_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(p:int*); [line 23, column 3]\n  n$0=*&par:int* [line 23, column 12]\n  *&p:int*=n$0 [line 23, column 3]\n  NULLIFY(&par); [line 23, column 3]\n  NULLIFY(&p); [line 23, column 3]\n  EXIT_SCOPE(n$0,par,p); [line 23, column 3]\n  APPLY_ABSTRACTION; [line 23, 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   VARIABLE_DECLARED(d:int&); [line 22, column 3]\n  n$2=*&par:int* [line 22, column 13]\n  *&d:int&=n$2 [line 22, column 3]\n  NULLIFY(&d); [line 22, column 3]\n  EXIT_SCOPE(n$2,d); [line 22, column 3]\n " shape="box"]
+"init_from_ptr#9521990274512470149.d27094f3cfd0d42c143fba9593870578_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(d:int&); [line 22, column 3]\n  n$1=*&par:int* [line 22, column 13]\n  *&d:int&=n$1 [line 22, column 3]\n  NULLIFY(&d); [line 22, column 3]\n  EXIT_SCOPE(n$1,d); [line 22, 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   VARIABLE_DECLARED(v:int); [line 21, column 3]\n  n$3=*&par:int* [line 21, column 12]\n  n$4=*n$3:int [line 21, column 11]\n  *&v:int=n$4 [line 21, column 3]\n  NULLIFY(&v); [line 21, column 3]\n  EXIT_SCOPE(n$3,n$4,v); [line 21, column 3]\n " shape="box"]
+"init_from_ptr#9521990274512470149.d27094f3cfd0d42c143fba9593870578_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(v:int); [line 21, column 3]\n  n$2=*&par:int* [line 21, column 12]\n  n$3=*n$2:int [line 21, column 11]\n  *&v:int=n$3 [line 21, column 3]\n  NULLIFY(&v); [line 21, column 3]\n  EXIT_SCOPE(n$2,n$3,v); [line 21, 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   VARIABLE_DECLARED(p:int*); [line 11, column 3]\n  n$1=*&par:int& [line 11, column 13]\n  *&p:int*=n$1 [line 11, column 3]\n  NULLIFY(&p); [line 11, column 3]\n  NULLIFY(&par); [line 11, column 3]\n  EXIT_SCOPE(n$1,p,par); [line 11, column 3]\n  APPLY_ABSTRACTION; [line 11, column 3]\n " shape="box"]
+"init_from_ref#17239877270654219020.166550b98b7cafba1c908639121bced8_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(p:int*); [line 11, column 3]\n  n$0=*&par:int& [line 11, column 13]\n  *&p:int*=n$0 [line 11, column 3]\n  NULLIFY(&p); [line 11, column 3]\n  NULLIFY(&par); [line 11, column 3]\n  EXIT_SCOPE(n$0,p,par); [line 11, column 3]\n  APPLY_ABSTRACTION; [line 11, 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   VARIABLE_DECLARED(d:int&); [line 10, column 3]\n  n$2=*&par:int& [line 10, column 12]\n  *&d:int&=n$2 [line 10, column 3]\n  NULLIFY(&d); [line 10, column 3]\n  EXIT_SCOPE(n$2,d); [line 10, column 3]\n " shape="box"]
+"init_from_ref#17239877270654219020.166550b98b7cafba1c908639121bced8_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(d:int&); [line 10, column 3]\n  n$1=*&par:int& [line 10, column 12]\n  *&d:int&=n$1 [line 10, column 3]\n  NULLIFY(&d); [line 10, column 3]\n  EXIT_SCOPE(n$1,d); [line 10, 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   VARIABLE_DECLARED(v:int); [line 9, column 3]\n  n$3=*&par:int& [line 9, column 11]\n  n$4=*n$3:int [line 9, column 11]\n  *&v:int=n$4 [line 9, column 3]\n  NULLIFY(&v); [line 9, column 3]\n  EXIT_SCOPE(n$3,n$4,v); [line 9, column 3]\n " shape="box"]
+"init_from_ref#17239877270654219020.166550b98b7cafba1c908639121bced8_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(v:int); [line 9, column 3]\n  n$2=*&par:int& [line 9, column 11]\n  n$3=*n$2:int [line 9, column 11]\n  *&v:int=n$3 [line 9, column 3]\n  NULLIFY(&v); [line 9, column 3]\n  EXIT_SCOPE(n$2,n$3,v); [line 9, 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   VARIABLE_DECLARED(v:int); [line 15, column 3]\n  n$1=*&par:int [line 15, column 11]\n  *&v:int=n$1 [line 15, column 3]\n  NULLIFY(&v); [line 15, column 3]\n  EXIT_SCOPE(n$1,v); [line 15, column 3]\n " shape="box"]
+"init_from_val#14538961741925123970.e5e29991fa3b6aa0a341c0c9f54754a7_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(v:int); [line 15, column 3]\n  n$0=*&par:int [line 15, column 11]\n  *&v:int=n$0 [line 15, column 3]\n  NULLIFY(&v); [line 15, column 3]\n  EXIT_SCOPE(n$0,v); [line 15, column 3]\n " shape="box"]
 	
 
 	 "init_from_val#14538961741925123970.e5e29991fa3b6aa0a341c0c9f54754a7_5" -> "init_from_val#14538961741925123970.e5e29991fa3b6aa0a341c0c9f54754a7_4" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/reference/member_access.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/reference/member_access.cpp.dot
index 64eeb5316..c00a8620b 100644
--- a/infer/tests/codetoanalyze/cpp/shared/reference/member_access.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/reference/member_access.cpp.dot
@@ -7,11 +7,11 @@ digraph cfg {
 "access_ptr(class X)#15321479508398739907.a2d5fea3989ac28d8e0f2d82bdcf9e45_2" [label="2: Exit access_ptr \n  " color=yellow style=filled]
 	
 
-"access_ptr(class X)#15321479508398739907.a2d5fea3989ac28d8e0f2d82bdcf9e45_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(c:int); [line 20, column 3]\n  n$1=*&x:X* [line 20, column 11]\n  _=*n$1:X [line 20, column 11]\n  n$3=_fun_X::call(n$1:X*) [line 20, column 11]\n  *&c:int=n$3 [line 20, column 3]\n  NULLIFY(&c); [line 20, column 3]\n  NULLIFY(&x); [line 20, column 3]\n  EXIT_SCOPE(_,n$1,n$3,c,x); [line 20, column 3]\n  APPLY_ABSTRACTION; [line 20, column 3]\n " shape="box"]
+"access_ptr(class X)#15321479508398739907.a2d5fea3989ac28d8e0f2d82bdcf9e45_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(c:int); [line 20, column 3]\n  n$0=*&x:X* [line 20, column 11]\n  _=*n$0:X [line 20, column 11]\n  n$2=_fun_X::call(n$0:X*) [line 20, column 11]\n  *&c:int=n$2 [line 20, column 3]\n  NULLIFY(&c); [line 20, column 3]\n  NULLIFY(&x); [line 20, column 3]\n  EXIT_SCOPE(_,n$0,n$2,c,x); [line 20, column 3]\n  APPLY_ABSTRACTION; [line 20, column 3]\n " shape="box"]
 	
 
 	 "access_ptr(class X)#15321479508398739907.a2d5fea3989ac28d8e0f2d82bdcf9e45_3" -> "access_ptr(class X)#15321479508398739907.a2d5fea3989ac28d8e0f2d82bdcf9e45_2" ;
-"access_ptr(class X)#15321479508398739907.a2d5fea3989ac28d8e0f2d82bdcf9e45_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(f:int); [line 19, column 3]\n  n$4=*&x:X* [line 19, column 11]\n  n$5=*n$4.f:int [line 19, column 11]\n  *&f:int=n$5 [line 19, column 3]\n  NULLIFY(&f); [line 19, column 3]\n  EXIT_SCOPE(n$4,n$5,f); [line 19, column 3]\n " shape="box"]
+"access_ptr(class X)#15321479508398739907.a2d5fea3989ac28d8e0f2d82bdcf9e45_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(f:int); [line 19, column 3]\n  n$3=*&x:X* [line 19, column 11]\n  n$4=*n$3.f:int [line 19, column 11]\n  *&f:int=n$4 [line 19, column 3]\n  NULLIFY(&f); [line 19, column 3]\n  EXIT_SCOPE(n$3,n$4,f); [line 19, column 3]\n " shape="box"]
 	
 
 	 "access_ptr(class X)#15321479508398739907.a2d5fea3989ac28d8e0f2d82bdcf9e45_4" -> "access_ptr(class X)#15321479508398739907.a2d5fea3989ac28d8e0f2d82bdcf9e45_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   VARIABLE_DECLARED(c:int); [line 15, column 3]\n  n$1=*&x:X& [line 15, column 11]\n  _=*n$1:X [line 15, column 11]\n  n$3=_fun_X::call(n$1:X&) [line 15, column 11]\n  *&c:int=n$3 [line 15, column 3]\n  NULLIFY(&x); [line 15, column 3]\n  NULLIFY(&c); [line 15, column 3]\n  EXIT_SCOPE(_,n$1,n$3,x,c); [line 15, column 3]\n  APPLY_ABSTRACTION; [line 15, column 3]\n " shape="box"]
+"access_ref#4794488565171451856.2c0cb1f039897d6498c9fea4cbfec99e_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(c:int); [line 15, column 3]\n  n$0=*&x:X& [line 15, column 11]\n  _=*n$0:X [line 15, column 11]\n  n$2=_fun_X::call(n$0:X&) [line 15, column 11]\n  *&c:int=n$2 [line 15, column 3]\n  NULLIFY(&x); [line 15, column 3]\n  NULLIFY(&c); [line 15, column 3]\n  EXIT_SCOPE(_,n$0,n$2,x,c); [line 15, column 3]\n  APPLY_ABSTRACTION; [line 15, column 3]\n " shape="box"]
 	
 
 	 "access_ref#4794488565171451856.2c0cb1f039897d6498c9fea4cbfec99e_3" -> "access_ref#4794488565171451856.2c0cb1f039897d6498c9fea4cbfec99e_2" ;
-"access_ref#4794488565171451856.2c0cb1f039897d6498c9fea4cbfec99e_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(f:int); [line 14, column 3]\n  n$4=*&x:X& [line 14, column 11]\n  n$5=*n$4.f:int [line 14, column 11]\n  *&f:int=n$5 [line 14, column 3]\n  NULLIFY(&f); [line 14, column 3]\n  EXIT_SCOPE(n$4,n$5,f); [line 14, column 3]\n " shape="box"]
+"access_ref#4794488565171451856.2c0cb1f039897d6498c9fea4cbfec99e_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(f:int); [line 14, column 3]\n  n$3=*&x:X& [line 14, column 11]\n  n$4=*n$3.f:int [line 14, column 11]\n  *&f:int=n$4 [line 14, column 3]\n  NULLIFY(&f); [line 14, column 3]\n  EXIT_SCOPE(n$3,n$4,f); [line 14, column 3]\n " shape="box"]
 	
 
 	 "access_ref#4794488565171451856.2c0cb1f039897d6498c9fea4cbfec99e_4" -> "access_ref#4794488565171451856.2c0cb1f039897d6498c9fea4cbfec99e_3" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/reference/member_access_from_return.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/reference/member_access_from_return.cpp.dot
index 6d9250d6f..5beeb1889 100644
--- a/infer/tests/codetoanalyze/cpp/shared/reference/member_access_from_return.cpp.dot
+++ b/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   VARIABLE_DECLARED(c:int); [line 24, column 3]\n  n$1=_fun_get_ptr() [line 24, column 11]\n  _=*n$1:X [line 24, column 11]\n  n$3=_fun_X::call(n$1:X*) [line 24, column 11]\n  *&c:int=n$3 [line 24, column 3]\n  NULLIFY(&c); [line 24, column 3]\n  EXIT_SCOPE(_,n$1,n$3,c); [line 24, column 3]\n  APPLY_ABSTRACTION; [line 24, column 3]\n " shape="box"]
+"test_ptr#11416786403465510397.fe356f46dccde5545eadf0c661f4974d_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(c:int); [line 24, column 3]\n  n$0=_fun_get_ptr() [line 24, column 11]\n  _=*n$0:X [line 24, column 11]\n  n$2=_fun_X::call(n$0:X*) [line 24, column 11]\n  *&c:int=n$2 [line 24, column 3]\n  NULLIFY(&c); [line 24, column 3]\n  EXIT_SCOPE(_,n$0,n$2,c); [line 24, column 3]\n  APPLY_ABSTRACTION; [line 24, column 3]\n " shape="box"]
 	
 
 	 "test_ptr#11416786403465510397.fe356f46dccde5545eadf0c661f4974d_3" -> "test_ptr#11416786403465510397.fe356f46dccde5545eadf0c661f4974d_2" ;
-"test_ptr#11416786403465510397.fe356f46dccde5545eadf0c661f4974d_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(f:int); [line 23, column 3]\n  n$4=_fun_get_ptr() [line 23, column 11]\n  n$5=*n$4.f:int [line 23, column 11]\n  *&f:int=n$5 [line 23, column 3]\n  NULLIFY(&f); [line 23, column 3]\n  EXIT_SCOPE(n$4,n$5,f); [line 23, column 3]\n " shape="box"]
+"test_ptr#11416786403465510397.fe356f46dccde5545eadf0c661f4974d_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(f:int); [line 23, column 3]\n  n$3=_fun_get_ptr() [line 23, column 11]\n  n$4=*n$3.f:int [line 23, column 11]\n  *&f:int=n$4 [line 23, column 3]\n  NULLIFY(&f); [line 23, column 3]\n  EXIT_SCOPE(n$3,n$4,f); [line 23, 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   VARIABLE_DECLARED(c:int); [line 19, column 3]\n  n$1=_fun_get_ref() [line 19, column 11]\n  _=*n$1:X [line 19, column 11]\n  n$3=_fun_X::call(n$1:X&) [line 19, column 11]\n  *&c:int=n$3 [line 19, column 3]\n  NULLIFY(&c); [line 19, column 3]\n  EXIT_SCOPE(_,n$1,n$3,c); [line 19, column 3]\n  APPLY_ABSTRACTION; [line 19, column 3]\n " shape="box"]
+"test_ref#7021555814503032268.9c735d5eedd26e3009ec35c4af427db4_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(c:int); [line 19, column 3]\n  n$0=_fun_get_ref() [line 19, column 11]\n  _=*n$0:X [line 19, column 11]\n  n$2=_fun_X::call(n$0:X&) [line 19, column 11]\n  *&c:int=n$2 [line 19, column 3]\n  NULLIFY(&c); [line 19, column 3]\n  EXIT_SCOPE(_,n$0,n$2,c); [line 19, column 3]\n  APPLY_ABSTRACTION; [line 19, column 3]\n " shape="box"]
 	
 
 	 "test_ref#7021555814503032268.9c735d5eedd26e3009ec35c4af427db4_3" -> "test_ref#7021555814503032268.9c735d5eedd26e3009ec35c4af427db4_2" ;
-"test_ref#7021555814503032268.9c735d5eedd26e3009ec35c4af427db4_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(f:int); [line 18, column 3]\n  n$4=_fun_get_ref() [line 18, column 11]\n  n$5=*n$4.f:int [line 18, column 11]\n  *&f:int=n$5 [line 18, column 3]\n  NULLIFY(&f); [line 18, column 3]\n  EXIT_SCOPE(n$4,n$5,f); [line 18, column 3]\n " shape="box"]
+"test_ref#7021555814503032268.9c735d5eedd26e3009ec35c4af427db4_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(f:int); [line 18, column 3]\n  n$3=_fun_get_ref() [line 18, column 11]\n  n$4=*n$3.f:int [line 18, column 11]\n  *&f:int=n$4 [line 18, column 3]\n  NULLIFY(&f); [line 18, column 3]\n  EXIT_SCOPE(n$3,n$4,f); [line 18, column 3]\n " shape="box"]
 	
 
 	 "test_ref#7021555814503032268.9c735d5eedd26e3009ec35c4af427db4_4" -> "test_ref#7021555814503032268.9c735d5eedd26e3009ec35c4af427db4_3" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/reference/nested_assignment.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/reference/nested_assignment.cpp.dot
index fff17f360..8c32e42a1 100644
--- a/infer/tests/codetoanalyze/cpp/shared/reference/nested_assignment.cpp.dot
+++ b/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   NULLIFY(&a); [line 28, column 1]\n " color=yellow style=filled]
 	
 
-"crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(ref_from_ref:int&); [line 27, column 3]\n  n$1=*&ref_from_val:int& [line 27, column 23]\n  *&b:int=5 [line 27, column 38]\n  n$2=*&b:int [line 27, column 38]\n  *n$1:int=n$2 [line 27, column 23]\n  *&ref_from_ref:int&=n$1 [line 27, column 3]\n  NULLIFY(&b); [line 27, column 3]\n  NULLIFY(&ref_from_val); [line 27, column 3]\n  NULLIFY(&ref_from_ref); [line 27, column 3]\n  EXIT_SCOPE(n$1,n$2,b,ref_from_val,ref_from_ref); [line 27, column 3]\n  APPLY_ABSTRACTION; [line 27, column 3]\n " shape="box"]
+"crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(ref_from_ref:int&); [line 27, column 3]\n  n$0=*&ref_from_val:int& [line 27, column 23]\n  *&b:int=5 [line 27, column 38]\n  n$1=*&b:int [line 27, column 38]\n  *n$0:int=n$1 [line 27, column 23]\n  *&ref_from_ref:int&=n$0 [line 27, column 3]\n  NULLIFY(&b); [line 27, column 3]\n  NULLIFY(&ref_from_val); [line 27, column 3]\n  NULLIFY(&ref_from_ref); [line 27, column 3]\n  EXIT_SCOPE(n$0,n$1,b,ref_from_val,ref_from_ref); [line 27, column 3]\n  APPLY_ABSTRACTION; [line 27, column 3]\n " shape="box"]
 	
 
 	 "crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_3" -> "crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_2" ;
-"crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(ref_from_val:int&); [line 26, column 3]\n  *&b:int=4 [line 26, column 27]\n  n$3=*&b:int [line 26, column 27]\n  *&a:int=n$3 [line 26, column 23]\n  *&ref_from_val:int&=&a [line 26, column 3]\n  NULLIFY(&b); [line 26, column 3]\n  EXIT_SCOPE(n$3,b,a); [line 26, column 3]\n " shape="box"]
+"crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(ref_from_val:int&); [line 26, column 3]\n  *&b:int=4 [line 26, column 27]\n  n$2=*&b:int [line 26, column 27]\n  *&a:int=n$2 [line 26, column 23]\n  *&ref_from_val:int&=&a [line 26, column 3]\n  NULLIFY(&b); [line 26, column 3]\n  EXIT_SCOPE(n$2,b,a); [line 26, column 3]\n " shape="box"]
 	
 
 	 "crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_4" -> "crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_3" ;
-"crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 22, column 3]\n  n$4=*&a:int [line 22, column 11]\n  *&b:int=n$4 [line 22, column 3]\n  NULLIFY(&b); [line 22, column 3]\n  EXIT_SCOPE(n$4,b,a); [line 22, column 3]\n " shape="box"]
+"crazy_nested#10001276026471322284.a3162fff8adcb89d9e3fa84dea455e7f_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 22, column 3]\n  n$3=*&a:int [line 22, column 11]\n  *&b:int=n$3 [line 22, column 3]\n  NULLIFY(&b); [line 22, column 3]\n  EXIT_SCOPE(n$3,b,a); [line 22, 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   NULLIFY(&a); [line 18, column 1]\n " color=yellow style=filled]
 	
 
-"nested#4768179933025409429.17c34afcb279e8ad08f7f8afaad41585_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(ref_from_ref:int&); [line 17, column 3]\n  n$1=*&ref_from_val:int& [line 17, column 23]\n  *n$1:int=6 [line 17, column 23]\n  *&ref_from_ref:int&=n$1 [line 17, column 3]\n  NULLIFY(&ref_from_val); [line 17, column 3]\n  NULLIFY(&ref_from_ref); [line 17, column 3]\n  EXIT_SCOPE(n$1,ref_from_val,ref_from_ref); [line 17, column 3]\n  APPLY_ABSTRACTION; [line 17, column 3]\n " shape="box"]
+"nested#4768179933025409429.17c34afcb279e8ad08f7f8afaad41585_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(ref_from_ref:int&); [line 17, column 3]\n  n$0=*&ref_from_val:int& [line 17, column 23]\n  *n$0:int=6 [line 17, column 23]\n  *&ref_from_ref:int&=n$0 [line 17, column 3]\n  NULLIFY(&ref_from_val); [line 17, column 3]\n  NULLIFY(&ref_from_ref); [line 17, column 3]\n  EXIT_SCOPE(n$0,ref_from_val,ref_from_ref); [line 17, column 3]\n  APPLY_ABSTRACTION; [line 17, 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   NULLIFY(&a); [line 12, column 1]\n " color=yellow style=filled]
 	
 
-"normal#16009437256715545217.c7cd9ebbb6d7cc9f4987cf90ce12a044_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(ref_from_ref:int&); [line 11, column 3]\n  n$1=*&ref_from_val:int& [line 11, column 23]\n  *&ref_from_ref:int&=n$1 [line 11, column 3]\n  NULLIFY(&ref_from_ref); [line 11, column 3]\n  NULLIFY(&ref_from_val); [line 11, column 3]\n  EXIT_SCOPE(n$1,ref_from_ref,ref_from_val); [line 11, column 3]\n  APPLY_ABSTRACTION; [line 11, column 3]\n " shape="box"]
+"normal#16009437256715545217.c7cd9ebbb6d7cc9f4987cf90ce12a044_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(ref_from_ref:int&); [line 11, column 3]\n  n$0=*&ref_from_val:int& [line 11, column 23]\n  *&ref_from_ref:int&=n$0 [line 11, column 3]\n  NULLIFY(&ref_from_ref); [line 11, column 3]\n  NULLIFY(&ref_from_val); [line 11, column 3]\n  EXIT_SCOPE(n$0,ref_from_ref,ref_from_val); [line 11, column 3]\n  APPLY_ABSTRACTION; [line 11, column 3]\n " shape="box"]
 	
 
 	 "normal#16009437256715545217.c7cd9ebbb6d7cc9f4987cf90ce12a044_3" -> "normal#16009437256715545217.c7cd9ebbb6d7cc9f4987cf90ce12a044_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/reference/ptr_mem.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/reference/ptr_mem.cpp.dot
index ef8d54789..05cad2d8d 100644
--- a/infer/tests/codetoanalyze/cpp/shared/reference/ptr_mem.cpp.dot
+++ b/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   NULLIFY(&i); [line 36, column 1]\n " color=yellow style=filled]
 	
 
-"noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_3" [label="3:  Call _fun_List<item>::add_byref \n   n$1=*&l:List<item>& [line 35, column 3]\n  _=*n$1:List<item> [line 35, column 3]\n  n$3=_fun_List<item>::add_byref(n$1:List<item>&,&i:item&) [line 35, column 3]\n  NULLIFY(&l); [line 35, column 3]\n  EXIT_SCOPE(_,n$1,n$3,i,l); [line 35, column 3]\n  APPLY_ABSTRACTION; [line 35, column 3]\n " shape="box"]
+"noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_3" [label="3:  Call _fun_List<item>::add_byref \n   n$0=*&l:List<item>& [line 35, column 3]\n  _=*n$0:List<item> [line 35, column 3]\n  n$2=_fun_List<item>::add_byref(n$0:List<item>&,&i:item&) [line 35, column 3]\n  NULLIFY(&l); [line 35, column 3]\n  EXIT_SCOPE(_,n$0,n$2,i,l); [line 35, column 3]\n  APPLY_ABSTRACTION; [line 35, 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$4=*&l:List<item>& [line 34, column 3]\n  _=*n$4:List<item> [line 34, column 3]\n  n$6=_fun_List<item>::add(n$4:List<item>&,&i:item*) [line 34, column 3]\n  EXIT_SCOPE(_,n$4,n$6); [line 34, column 3]\n " shape="box"]
+"noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_4" [label="4:  Call _fun_List<item>::add \n   n$3=*&l:List<item>& [line 34, column 3]\n  _=*n$3:List<item> [line 34, column 3]\n  n$5=_fun_List<item>::add(n$3:List<item>&,&i:item*) [line 34, column 3]\n  EXIT_SCOPE(_,n$3,n$5); [line 34, column 3]\n " shape="box"]
 	
 
 	 "noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_4" -> "noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_3" ;
-"noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(i:item); [line 33, column 3]\n  n$7=_fun_item::item(&i:item*) [line 33, column 8]\n  EXIT_SCOPE(n$7); [line 33, column 8]\n " shape="box"]
+"noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(i:item); [line 33, column 3]\n  n$6=_fun_item::item(&i:item*) [line 33, column 8]\n  EXIT_SCOPE(n$6); [line 33, 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$2=*&this:List<item>* [line 14, column 42]\n  n$3=*&next_ptr:void [line 14, column 51]\n  *n$2.next_ptr:void=n$3 [line 14, column 42]\n  NULLIFY(&next_ptr); [line 14, column 42]\n  NULLIFY(&this); [line 14, column 42]\n  EXIT_SCOPE(n$2,n$3,next_ptr,this); [line 14, column 42]\n  APPLY_ABSTRACTION; [line 14, column 42]\n " shape="box"]
+"List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_3" [label="3:  Constructor Init \n   n$1=*&this:List<item>* [line 14, column 42]\n  n$2=*&next_ptr:void [line 14, column 51]\n  *n$1.next_ptr:void=n$2 [line 14, column 42]\n  NULLIFY(&next_ptr); [line 14, column 42]\n  NULLIFY(&this); [line 14, column 42]\n  EXIT_SCOPE(n$1,n$2,next_ptr,this); [line 14, column 42]\n  APPLY_ABSTRACTION; [line 14, 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$4=*&this:List<item>* [line 14, column 27]\n  *n$4.head:item*=null [line 14, column 27]\n  EXIT_SCOPE(n$4); [line 14, column 27]\n " shape="box"]
+"List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_4" [label="4:  Constructor Init \n   n$3=*&this:List<item>* [line 14, column 27]\n  *n$3.head:item*=null [line 14, column 27]\n  EXIT_SCOPE(n$3); [line 14, column 27]\n " shape="box"]
 	
 
 	 "List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_4" -> "List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_3" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/reference/reference_field.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/reference/reference_field.cpp.dot
index 89e934387..e741d5c99 100644
--- a/infer/tests/codetoanalyze/cpp/shared/reference/reference_field.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/reference/reference_field.cpp.dot
@@ -353,11 +353,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$2=*&this:reference_field::Ptr* [line 32, column 24]\n  n$3=*&this:reference_field::Ptr* [line 32, column 27]\n  n$4=*n$3.x:reference_field::X* [line 32, column 27]\n  *n$2.i:int*=n$4.f [line 32, column 24]\n  NULLIFY(&this); [line 32, column 24]\n  EXIT_SCOPE(n$2,n$3,n$4,this); [line 32, column 24]\n  APPLY_ABSTRACTION; [line 32, column 24]\n " shape="box"]
+"Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_3" [label="3:  Constructor Init \n   n$1=*&this:reference_field::Ptr* [line 32, column 24]\n  n$2=*&this:reference_field::Ptr* [line 32, column 27]\n  n$3=*n$2.x:reference_field::X* [line 32, column 27]\n  *n$1.i:int*=n$3.f [line 32, column 24]\n  NULLIFY(&this); [line 32, column 24]\n  EXIT_SCOPE(n$1,n$2,n$3,this); [line 32, column 24]\n  APPLY_ABSTRACTION; [line 32, 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$5=*&this:reference_field::Ptr* [line 32, column 16]\n  n$6=*&r_:reference_field::X& [line 32, column 19]\n  *n$5.x:reference_field::X*=n$6 [line 32, column 16]\n  NULLIFY(&r_); [line 32, column 16]\n  EXIT_SCOPE(n$5,n$6,r_); [line 32, column 16]\n " shape="box"]
+"Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_4" [label="4:  Constructor Init \n   n$4=*&this:reference_field::Ptr* [line 32, column 16]\n  n$5=*&r_:reference_field::X& [line 32, column 19]\n  *n$4.x:reference_field::X*=n$5 [line 32, column 16]\n  NULLIFY(&r_); [line 32, column 16]\n  EXIT_SCOPE(n$4,n$5,r_); [line 32, column 16]\n " shape="box"]
 	
 
 	 "Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_4" -> "Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_3" ;
@@ -390,11 +390,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$2=*&this:reference_field::Ref* [line 24, column 23]\n  n$3=*&this:reference_field::Ref* [line 24, column 25]\n  n$4=*n$3.x:reference_field::X& [line 24, column 25]\n  *n$2.i:int&=n$4.f [line 24, column 23]\n  NULLIFY(&this); [line 24, column 23]\n  EXIT_SCOPE(n$2,n$3,n$4,this); [line 24, column 23]\n  APPLY_ABSTRACTION; [line 24, column 23]\n " shape="box"]
+"Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_3" [label="3:  Constructor Init \n   n$1=*&this:reference_field::Ref* [line 24, column 23]\n  n$2=*&this:reference_field::Ref* [line 24, column 25]\n  n$3=*n$2.x:reference_field::X& [line 24, column 25]\n  *n$1.i:int&=n$3.f [line 24, column 23]\n  NULLIFY(&this); [line 24, column 23]\n  EXIT_SCOPE(n$1,n$2,n$3,this); [line 24, column 23]\n  APPLY_ABSTRACTION; [line 24, 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$5=*&this:reference_field::Ref* [line 24, column 16]\n  n$6=*&r_:reference_field::X& [line 24, column 18]\n  *n$5.x:reference_field::X&=n$6 [line 24, column 16]\n  NULLIFY(&r_); [line 24, column 16]\n  EXIT_SCOPE(n$5,n$6,r_); [line 24, column 16]\n " shape="box"]
+"Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_4" [label="4:  Constructor Init \n   n$4=*&this:reference_field::Ref* [line 24, column 16]\n  n$5=*&r_:reference_field::X& [line 24, column 18]\n  *n$4.x:reference_field::X&=n$5 [line 24, column 16]\n  NULLIFY(&r_); [line 24, column 16]\n  EXIT_SCOPE(n$4,n$5,r_); [line 24, column 16]\n " shape="box"]
 	
 
 	 "Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_4" -> "Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_3" ;
@@ -427,11 +427,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$2=*&this:reference_field::Val* [line 40, column 23]\n  n$3=*&this:reference_field::Val* [line 40, column 25]\n  n$4=*n$3.x.f:int [line 40, column 25]\n  *n$2.i:int=n$4 [line 40, column 23]\n  NULLIFY(&this); [line 40, column 23]\n  EXIT_SCOPE(n$2,n$3,n$4,this); [line 40, column 23]\n  APPLY_ABSTRACTION; [line 40, column 23]\n " shape="box"]
+"Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_3" [label="3:  Constructor Init \n   n$1=*&this:reference_field::Val* [line 40, column 23]\n  n$2=*&this:reference_field::Val* [line 40, column 25]\n  n$3=*n$2.x.f:int [line 40, column 25]\n  *n$1.i:int=n$3 [line 40, column 23]\n  NULLIFY(&this); [line 40, column 23]\n  EXIT_SCOPE(n$1,n$2,n$3,this); [line 40, column 23]\n  APPLY_ABSTRACTION; [line 40, 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$5=*&this:reference_field::Val* [line 40, column 16]\n  n$6=*&r_:reference_field::X& [line 40, column 18]\n  n$7=_fun_reference_field::X::X(n$5.x:reference_field::X*,n$6:reference_field::X&) [line 40, column 16]\n  NULLIFY(&r_); [line 40, column 16]\n  EXIT_SCOPE(n$5,n$6,n$7,r_); [line 40, column 16]\n " shape="box"]
+"Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_4" [label="4:  Constructor Init \n   n$4=*&this:reference_field::Val* [line 40, column 16]\n  n$5=*&r_:reference_field::X& [line 40, column 18]\n  n$6=_fun_reference_field::X::X(n$4.x:reference_field::X*,n$5:reference_field::X&) [line 40, column 16]\n  NULLIFY(&r_); [line 40, column 16]\n  EXIT_SCOPE(n$4,n$5,n$6,r_); [line 40, column 16]\n " shape="box"]
 	
 
 	 "Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_4" -> "Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_3" ;
@@ -442,7 +442,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$2=*&this:reference_field::X* [line 10, column 8]\n  n$3=*&__param_0:reference_field::X const & [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  NULLIFY(&this); [line 10, column 8]\n  NULLIFY(&__param_0); [line 10, column 8]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
+"X#X#reference_field#{16892162000533972663|constexpr}.d3ad2332bde2031935fecc6685296b44_3" [label="3:  Constructor Init \n   n$1=*&this:reference_field::X* [line 10, column 8]\n  n$2=*&__param_0:reference_field::X const & [line 10, column 8]\n  n$3=*n$2.f:int [line 10, column 8]\n  *n$1.f:int=n$3 [line 10, column 8]\n  NULLIFY(&this); [line 10, column 8]\n  NULLIFY(&__param_0); [line 10, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
 	
 
 	 "X#X#reference_field#{16892162000533972663|constexpr}.d3ad2332bde2031935fecc6685296b44_3" -> "X#X#reference_field#{16892162000533972663|constexpr}.d3ad2332bde2031935fecc6685296b44_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/reference/reference_struct_e2e.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/reference/reference_struct_e2e.cpp.dot
index 1d6e598c5..7d65115ec 100644
--- a/infer/tests/codetoanalyze/cpp/shared/reference/reference_struct_e2e.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/reference/reference_struct_e2e.cpp.dot
@@ -27,19 +27,19 @@ digraph cfg {
 	
 
 	 "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_4" -> "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_2" ;
-"field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_5" [label="5: Prune (true branch, if) \n   n$1=*&x:X* [line 46, column 7]\n  PRUNE(n$1, true); [line 46, column 7]\n  EXIT_SCOPE(n$1); [line 46, column 7]\n " shape="invhouse"]
+"field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_5" [label="5: Prune (true branch, if) \n   n$0=*&x:X* [line 46, column 7]\n  PRUNE(n$0, true); [line 46, column 7]\n  EXIT_SCOPE(n$0); [line 46, column 7]\n " shape="invhouse"]
 	
 
 	 "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_5" -> "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_8" ;
-"field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_6" [label="6: Prune (false branch, if) \n   n$1=*&x:X* [line 46, column 7]\n  PRUNE(!n$1, false); [line 46, column 7]\n  NULLIFY(&x); [line 46, column 7]\n  EXIT_SCOPE(n$1,x); [line 46, column 7]\n " shape="invhouse"]
+"field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_6" [label="6: Prune (false branch, if) \n   n$0=*&x:X* [line 46, column 7]\n  PRUNE(!n$0, false); [line 46, column 7]\n  NULLIFY(&x); [line 46, column 7]\n  EXIT_SCOPE(n$0,x); [line 46, column 7]\n " shape="invhouse"]
 	
 
 	 "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_6" -> "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_3" ;
-"field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_7" [label="7:  Return Stmt \n   n$2=*&x:X* [line 48, column 12]\n  _=*n$2:X [line 48, column 12]\n  n$4=_fun_X::div(n$2:X*) [line 48, column 12]\n  *&return:int=n$4 [line 48, column 5]\n  NULLIFY(&x); [line 48, column 5]\n  EXIT_SCOPE(_,n$2,n$4,x); [line 48, column 5]\n  APPLY_ABSTRACTION; [line 48, column 5]\n " shape="box"]
+"field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_7" [label="7:  Return Stmt \n   n$1=*&x:X* [line 48, column 12]\n  _=*n$1:X [line 48, column 12]\n  n$3=_fun_X::div(n$1:X*) [line 48, column 12]\n  *&return:int=n$3 [line 48, column 5]\n  NULLIFY(&x); [line 48, column 5]\n  EXIT_SCOPE(_,n$1,n$3,x); [line 48, column 5]\n  APPLY_ABSTRACTION; [line 48, column 5]\n " shape="box"]
 	
 
 	 "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_7" -> "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_2" ;
-"field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_8" [label="8:  Call _fun_set_field_ptr \n   n$6=*&x:X* [line 47, column 19]\n  n$7=_fun_set_field_ptr(n$6:X*,0:int) [line 47, column 5]\n  EXIT_SCOPE(n$6,n$7); [line 47, column 5]\n " shape="box"]
+"field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_8" [label="8:  Call _fun_set_field_ptr \n   n$4=*&x:X* [line 47, column 19]\n  n$5=_fun_set_field_ptr(n$4:X*,0:int) [line 47, column 5]\n  EXIT_SCOPE(n$4,n$5); [line 47, column 5]\n " shape="box"]
 	
 
 	 "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_8" -> "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_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$4=*&x:X& [line 94, column 17]\n  n$5=_fun_set_field_ref(n$4:X&,0:int) [line 94, column 3]\n  EXIT_SCOPE(n$4,n$5); [line 94, column 3]\n " shape="box"]
+"field_div0_ref#11723804822630548942.b7eb5245bed0a75cdc2d181e5af92008_4" [label="4:  Call _fun_set_field_ref \n   n$3=*&x:X& [line 94, column 17]\n  n$4=_fun_set_field_ref(n$3:X&,0:int) [line 94, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 94, 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(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_4" -> "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_2" ;
-"field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_5" [label="5: Prune (true branch, if) \n   n$1=*&x:X* [line 53, column 7]\n  PRUNE(n$1, true); [line 53, column 7]\n  EXIT_SCOPE(n$1); [line 53, column 7]\n " shape="invhouse"]
+"field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_5" [label="5: Prune (true branch, if) \n   n$0=*&x:X* [line 53, column 7]\n  PRUNE(n$0, true); [line 53, column 7]\n  EXIT_SCOPE(n$0); [line 53, column 7]\n " shape="invhouse"]
 	
 
 	 "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_5" -> "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_8" ;
-"field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_6" [label="6: Prune (false branch, if) \n   n$1=*&x:X* [line 53, column 7]\n  PRUNE(!n$1, false); [line 53, column 7]\n  NULLIFY(&x); [line 53, column 7]\n  EXIT_SCOPE(n$1,x); [line 53, column 7]\n " shape="invhouse"]
+"field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_6" [label="6: Prune (false branch, if) \n   n$0=*&x:X* [line 53, column 7]\n  PRUNE(!n$0, false); [line 53, column 7]\n  NULLIFY(&x); [line 53, column 7]\n  EXIT_SCOPE(n$0,x); [line 53, column 7]\n " shape="invhouse"]
 	
 
 	 "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_6" -> "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_3" ;
-"field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_7" [label="7:  Return Stmt \n   n$2=*&x:X* [line 55, column 12]\n  _=*n$2:X [line 55, column 12]\n  n$4=_fun_X::div(n$2:X*) [line 55, column 12]\n  *&return:int=n$4 [line 55, column 5]\n  NULLIFY(&x); [line 55, column 5]\n  EXIT_SCOPE(_,n$2,n$4,x); [line 55, column 5]\n  APPLY_ABSTRACTION; [line 55, column 5]\n " shape="box"]
+"field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_7" [label="7:  Return Stmt \n   n$1=*&x:X* [line 55, column 12]\n  _=*n$1:X [line 55, column 12]\n  n$3=_fun_X::div(n$1:X*) [line 55, column 12]\n  *&return:int=n$3 [line 55, column 5]\n  NULLIFY(&x); [line 55, column 5]\n  EXIT_SCOPE(_,n$1,n$3,x); [line 55, column 5]\n  APPLY_ABSTRACTION; [line 55, column 5]\n " shape="box"]
 	
 
 	 "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_7" -> "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_2" ;
-"field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_8" [label="8:  Call _fun_set_field_ptr \n   n$6=*&x:X* [line 54, column 19]\n  n$7=_fun_set_field_ptr(n$6:X*,1:int) [line 54, column 5]\n  EXIT_SCOPE(n$6,n$7); [line 54, column 5]\n " shape="box"]
+"field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_8" [label="8:  Call _fun_set_field_ptr \n   n$4=*&x:X* [line 54, column 19]\n  n$5=_fun_set_field_ptr(n$4:X*,1:int) [line 54, column 5]\n  EXIT_SCOPE(n$4,n$5); [line 54, column 5]\n " shape="box"]
 	
 
 	 "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_8" -> "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_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$4=*&x:X& [line 99, column 17]\n  n$5=_fun_set_field_ref(n$4:X&,1:int) [line 99, column 3]\n  EXIT_SCOPE(n$4,n$5); [line 99, column 3]\n " shape="box"]
+"field_div1_ref#1499715418357335887.5b6e5f87301df1903e4a04faae98d6d5_4" [label="4:  Call _fun_set_field_ref \n   n$3=*&x:X& [line 99, column 17]\n  n$4=_fun_set_field_ref(n$3:X&,1:int) [line 99, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 99, 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$1=_fun_get_global_ptr() [line 74, column 3]\n  _=*n$1:X [line 74, column 3]\n  n$3=_fun_X::div(n$1:X*) [line 74, column 3]\n  EXIT_SCOPE(_,n$1,n$3); [line 74, column 3]\n  APPLY_ABSTRACTION; [line 74, column 3]\n " shape="box"]
+"get_global_ptr_div0_field#8708891951617234281.85a5d13d32b9177abaa3c8c98323c45e_3" [label="3:  Call _fun_X::div \n   n$0=_fun_get_global_ptr() [line 74, column 3]\n  _=*n$0:X [line 74, column 3]\n  n$2=_fun_X::div(n$0:X*) [line 74, column 3]\n  EXIT_SCOPE(_,n$0,n$2); [line 74, column 3]\n  APPLY_ABSTRACTION; [line 74, 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$4=_fun_get_global_ptr() [line 73, column 3]\n  *n$4.f:int=0 [line 73, column 3]\n  EXIT_SCOPE(n$4); [line 73, column 3]\n " shape="box"]
+"get_global_ptr_div0_field#8708891951617234281.85a5d13d32b9177abaa3c8c98323c45e_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=_fun_get_global_ptr() [line 73, column 3]\n  *n$3.f:int=0 [line 73, column 3]\n  EXIT_SCOPE(n$3); [line 73, 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$5=_fun_get_global_ptr() [line 72, column 3]\n  _=*n$5:X [line 72, column 3]\n  n$7=_fun_X::nonzero(n$5:X*) [line 72, column 3]\n  EXIT_SCOPE(_,n$5,n$7); [line 72, column 3]\n " shape="box"]
+"get_global_ptr_div0_field#8708891951617234281.85a5d13d32b9177abaa3c8c98323c45e_5" [label="5:  Call _fun_X::nonzero \n   n$4=_fun_get_global_ptr() [line 72, column 3]\n  _=*n$4:X [line 72, column 3]\n  n$6=_fun_X::nonzero(n$4:X*) [line 72, column 3]\n  EXIT_SCOPE(_,n$4,n$6); [line 72, 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$1=_fun_get_global_ptr() [line 62, column 3]\n  _=*n$1:X [line 62, column 3]\n  n$3=_fun_X::div(n$1:X*) [line 62, column 3]\n  EXIT_SCOPE(_,n$1,n$3); [line 62, column 3]\n  APPLY_ABSTRACTION; [line 62, column 3]\n " shape="box"]
+"get_global_ptr_div0_method#6868600075123047675.d796dd8227b55f7d5d2ba2c1a06183dd_3" [label="3:  Call _fun_X::div \n   n$0=_fun_get_global_ptr() [line 62, column 3]\n  _=*n$0:X [line 62, column 3]\n  n$2=_fun_X::div(n$0:X*) [line 62, column 3]\n  EXIT_SCOPE(_,n$0,n$2); [line 62, column 3]\n  APPLY_ABSTRACTION; [line 62, 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$4=_fun_get_global_ptr() [line 61, column 3]\n  _=*n$4:X [line 61, column 3]\n  n$6=_fun_X::zero(n$4:X*) [line 61, column 3]\n  EXIT_SCOPE(_,n$4,n$6); [line 61, column 3]\n " shape="box"]
+"get_global_ptr_div0_method#6868600075123047675.d796dd8227b55f7d5d2ba2c1a06183dd_4" [label="4:  Call _fun_X::zero \n   n$3=_fun_get_global_ptr() [line 61, column 3]\n  _=*n$3:X [line 61, column 3]\n  n$5=_fun_X::zero(n$3:X*) [line 61, column 3]\n  EXIT_SCOPE(_,n$3,n$5); [line 61, 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$7=_fun_get_global_ptr() [line 60, column 3]\n  *n$7.f:int=1 [line 60, column 3]\n  EXIT_SCOPE(n$7); [line 60, column 3]\n " shape="box"]
+"get_global_ptr_div0_method#6868600075123047675.d796dd8227b55f7d5d2ba2c1a06183dd_5" [label="5:  BinaryOperatorStmt: Assign \n   n$6=_fun_get_global_ptr() [line 60, column 3]\n  *n$6.f:int=1 [line 60, column 3]\n  EXIT_SCOPE(n$6); [line 60, 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$1=_fun_get_global_ptr() [line 80, column 3]\n  _=*n$1:X [line 80, column 3]\n  n$3=_fun_X::div(n$1:X*) [line 80, column 3]\n  EXIT_SCOPE(_,n$1,n$3); [line 80, column 3]\n  APPLY_ABSTRACTION; [line 80, column 3]\n " shape="box"]
+"get_global_ptr_div1_field#6744083307199058304.94ebaff789d09fecbd24e3f8bfd75e70_3" [label="3:  Call _fun_X::div \n   n$0=_fun_get_global_ptr() [line 80, column 3]\n  _=*n$0:X [line 80, column 3]\n  n$2=_fun_X::div(n$0:X*) [line 80, column 3]\n  EXIT_SCOPE(_,n$0,n$2); [line 80, column 3]\n  APPLY_ABSTRACTION; [line 80, 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$4=_fun_get_global_ptr() [line 79, column 3]\n  *n$4.f:int=1 [line 79, column 3]\n  EXIT_SCOPE(n$4); [line 79, column 3]\n " shape="box"]
+"get_global_ptr_div1_field#6744083307199058304.94ebaff789d09fecbd24e3f8bfd75e70_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=_fun_get_global_ptr() [line 79, column 3]\n  *n$3.f:int=1 [line 79, column 3]\n  EXIT_SCOPE(n$3); [line 79, 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$5=_fun_get_global_ptr() [line 78, column 3]\n  _=*n$5:X [line 78, column 3]\n  n$7=_fun_X::zero(n$5:X*) [line 78, column 3]\n  EXIT_SCOPE(_,n$5,n$7); [line 78, column 3]\n " shape="box"]
+"get_global_ptr_div1_field#6744083307199058304.94ebaff789d09fecbd24e3f8bfd75e70_5" [label="5:  Call _fun_X::zero \n   n$4=_fun_get_global_ptr() [line 78, column 3]\n  _=*n$4:X [line 78, column 3]\n  n$6=_fun_X::zero(n$4:X*) [line 78, column 3]\n  EXIT_SCOPE(_,n$4,n$6); [line 78, 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$1=_fun_get_global_ptr() [line 68, column 3]\n  _=*n$1:X [line 68, column 3]\n  n$3=_fun_X::div(n$1:X*) [line 68, column 3]\n  EXIT_SCOPE(_,n$1,n$3); [line 68, column 3]\n  APPLY_ABSTRACTION; [line 68, column 3]\n " shape="box"]
+"get_global_ptr_div1_method#13320237176965265316.b7b17bcc9c036a753453d67e3683d764_3" [label="3:  Call _fun_X::div \n   n$0=_fun_get_global_ptr() [line 68, column 3]\n  _=*n$0:X [line 68, column 3]\n  n$2=_fun_X::div(n$0:X*) [line 68, column 3]\n  EXIT_SCOPE(_,n$0,n$2); [line 68, column 3]\n  APPLY_ABSTRACTION; [line 68, 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$4=_fun_get_global_ptr() [line 67, column 3]\n  _=*n$4:X [line 67, column 3]\n  n$6=_fun_X::nonzero(n$4:X*) [line 67, column 3]\n  EXIT_SCOPE(_,n$4,n$6); [line 67, column 3]\n " shape="box"]
+"get_global_ptr_div1_method#13320237176965265316.b7b17bcc9c036a753453d67e3683d764_4" [label="4:  Call _fun_X::nonzero \n   n$3=_fun_get_global_ptr() [line 67, column 3]\n  _=*n$3:X [line 67, column 3]\n  n$5=_fun_X::nonzero(n$3:X*) [line 67, column 3]\n  EXIT_SCOPE(_,n$3,n$5); [line 67, 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$7=_fun_get_global_ptr() [line 66, column 3]\n  *n$7.f:int=0 [line 66, column 3]\n  EXIT_SCOPE(n$7); [line 66, column 3]\n " shape="box"]
+"get_global_ptr_div1_method#13320237176965265316.b7b17bcc9c036a753453d67e3683d764_5" [label="5:  BinaryOperatorStmt: Assign \n   n$6=_fun_get_global_ptr() [line 66, column 3]\n  *n$6.f:int=0 [line 66, column 3]\n  EXIT_SCOPE(n$6); [line 66, 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$1=_fun_get_global_ref() [line 118, column 3]\n  _=*n$1:X [line 118, column 3]\n  n$3=_fun_X::div(n$1:X&) [line 118, column 3]\n  EXIT_SCOPE(_,n$1,n$3); [line 118, column 3]\n  APPLY_ABSTRACTION; [line 118, column 3]\n " shape="box"]
+"get_global_ref_div0_field#9894336115642083138.99dfafa929e6446e06064af81022e228_3" [label="3:  Call _fun_X::div \n   n$0=_fun_get_global_ref() [line 118, column 3]\n  _=*n$0:X [line 118, column 3]\n  n$2=_fun_X::div(n$0:X&) [line 118, column 3]\n  EXIT_SCOPE(_,n$0,n$2); [line 118, column 3]\n  APPLY_ABSTRACTION; [line 118, 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$4=_fun_get_global_ref() [line 117, column 3]\n  *n$4.f:int=0 [line 117, column 3]\n  EXIT_SCOPE(n$4); [line 117, column 3]\n " shape="box"]
+"get_global_ref_div0_field#9894336115642083138.99dfafa929e6446e06064af81022e228_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=_fun_get_global_ref() [line 117, column 3]\n  *n$3.f:int=0 [line 117, column 3]\n  EXIT_SCOPE(n$3); [line 117, 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$5=_fun_get_global_ref() [line 116, column 3]\n  _=*n$5:X [line 116, column 3]\n  n$7=_fun_X::nonzero(n$5:X&) [line 116, column 3]\n  EXIT_SCOPE(_,n$5,n$7); [line 116, column 3]\n " shape="box"]
+"get_global_ref_div0_field#9894336115642083138.99dfafa929e6446e06064af81022e228_5" [label="5:  Call _fun_X::nonzero \n   n$4=_fun_get_global_ref() [line 116, column 3]\n  _=*n$4:X [line 116, column 3]\n  n$6=_fun_X::nonzero(n$4:X&) [line 116, column 3]\n  EXIT_SCOPE(_,n$4,n$6); [line 116, 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$1=_fun_get_global_ref() [line 106, column 3]\n  _=*n$1:X [line 106, column 3]\n  n$3=_fun_X::div(n$1:X&) [line 106, column 3]\n  EXIT_SCOPE(_,n$1,n$3); [line 106, column 3]\n  APPLY_ABSTRACTION; [line 106, column 3]\n " shape="box"]
+"get_global_ref_div0_method#4500024601676141702.703eacc20d3ff2ec6f40a78b62656e3a_3" [label="3:  Call _fun_X::div \n   n$0=_fun_get_global_ref() [line 106, column 3]\n  _=*n$0:X [line 106, column 3]\n  n$2=_fun_X::div(n$0:X&) [line 106, column 3]\n  EXIT_SCOPE(_,n$0,n$2); [line 106, column 3]\n  APPLY_ABSTRACTION; [line 106, 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$4=_fun_get_global_ref() [line 105, column 3]\n  _=*n$4:X [line 105, column 3]\n  n$6=_fun_X::zero(n$4:X&) [line 105, column 3]\n  EXIT_SCOPE(_,n$4,n$6); [line 105, column 3]\n " shape="box"]
+"get_global_ref_div0_method#4500024601676141702.703eacc20d3ff2ec6f40a78b62656e3a_4" [label="4:  Call _fun_X::zero \n   n$3=_fun_get_global_ref() [line 105, column 3]\n  _=*n$3:X [line 105, column 3]\n  n$5=_fun_X::zero(n$3:X&) [line 105, column 3]\n  EXIT_SCOPE(_,n$3,n$5); [line 105, 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$7=_fun_get_global_ref() [line 104, column 3]\n  *n$7.f:int=1 [line 104, column 3]\n  EXIT_SCOPE(n$7); [line 104, column 3]\n " shape="box"]
+"get_global_ref_div0_method#4500024601676141702.703eacc20d3ff2ec6f40a78b62656e3a_5" [label="5:  BinaryOperatorStmt: Assign \n   n$6=_fun_get_global_ref() [line 104, column 3]\n  *n$6.f:int=1 [line 104, column 3]\n  EXIT_SCOPE(n$6); [line 104, 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$1=_fun_get_global_ref() [line 124, column 3]\n  _=*n$1:X [line 124, column 3]\n  n$3=_fun_X::div(n$1:X&) [line 124, column 3]\n  EXIT_SCOPE(_,n$1,n$3); [line 124, column 3]\n  APPLY_ABSTRACTION; [line 124, column 3]\n " shape="box"]
+"get_global_ref_div1_field#9400638526174087075.f2be9db8a45f6acda1c8ab83ffea2ce8_3" [label="3:  Call _fun_X::div \n   n$0=_fun_get_global_ref() [line 124, column 3]\n  _=*n$0:X [line 124, column 3]\n  n$2=_fun_X::div(n$0:X&) [line 124, column 3]\n  EXIT_SCOPE(_,n$0,n$2); [line 124, column 3]\n  APPLY_ABSTRACTION; [line 124, 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$4=_fun_get_global_ref() [line 123, column 3]\n  *n$4.f:int=1 [line 123, column 3]\n  EXIT_SCOPE(n$4); [line 123, column 3]\n " shape="box"]
+"get_global_ref_div1_field#9400638526174087075.f2be9db8a45f6acda1c8ab83ffea2ce8_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=_fun_get_global_ref() [line 123, column 3]\n  *n$3.f:int=1 [line 123, column 3]\n  EXIT_SCOPE(n$3); [line 123, 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$5=_fun_get_global_ref() [line 122, column 3]\n  _=*n$5:X [line 122, column 3]\n  n$7=_fun_X::zero(n$5:X&) [line 122, column 3]\n  EXIT_SCOPE(_,n$5,n$7); [line 122, column 3]\n " shape="box"]
+"get_global_ref_div1_field#9400638526174087075.f2be9db8a45f6acda1c8ab83ffea2ce8_5" [label="5:  Call _fun_X::zero \n   n$4=_fun_get_global_ref() [line 122, column 3]\n  _=*n$4:X [line 122, column 3]\n  n$6=_fun_X::zero(n$4:X&) [line 122, column 3]\n  EXIT_SCOPE(_,n$4,n$6); [line 122, 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$1=_fun_get_global_ref() [line 112, column 3]\n  _=*n$1:X [line 112, column 3]\n  n$3=_fun_X::div(n$1:X&) [line 112, column 3]\n  EXIT_SCOPE(_,n$1,n$3); [line 112, column 3]\n  APPLY_ABSTRACTION; [line 112, column 3]\n " shape="box"]
+"get_global_ref_div1_method#9218905628510589917.1d66d8c44e8582bb6fcdcb7df79e3215_3" [label="3:  Call _fun_X::div \n   n$0=_fun_get_global_ref() [line 112, column 3]\n  _=*n$0:X [line 112, column 3]\n  n$2=_fun_X::div(n$0:X&) [line 112, column 3]\n  EXIT_SCOPE(_,n$0,n$2); [line 112, column 3]\n  APPLY_ABSTRACTION; [line 112, 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$4=_fun_get_global_ref() [line 111, column 3]\n  _=*n$4:X [line 111, column 3]\n  n$6=_fun_X::nonzero(n$4:X&) [line 111, column 3]\n  EXIT_SCOPE(_,n$4,n$6); [line 111, column 3]\n " shape="box"]
+"get_global_ref_div1_method#9218905628510589917.1d66d8c44e8582bb6fcdcb7df79e3215_4" [label="4:  Call _fun_X::nonzero \n   n$3=_fun_get_global_ref() [line 111, column 3]\n  _=*n$3:X [line 111, column 3]\n  n$5=_fun_X::nonzero(n$3:X&) [line 111, column 3]\n  EXIT_SCOPE(_,n$3,n$5); [line 111, 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$7=_fun_get_global_ref() [line 110, column 3]\n  *n$7.f:int=0 [line 110, column 3]\n  EXIT_SCOPE(n$7); [line 110, column 3]\n " shape="box"]
+"get_global_ref_div1_method#9218905628510589917.1d66d8c44e8582bb6fcdcb7df79e3215_5" [label="5:  BinaryOperatorStmt: Assign \n   n$6=_fun_get_global_ref() [line 110, column 3]\n  *n$6.f:int=0 [line 110, column 3]\n  EXIT_SCOPE(n$6); [line 110, 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(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_4" -> "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_2" ;
-"method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_5" [label="5: Prune (true branch, if) \n   n$1=*&x:X* [line 32, column 7]\n  PRUNE(n$1, true); [line 32, column 7]\n  EXIT_SCOPE(n$1); [line 32, column 7]\n " shape="invhouse"]
+"method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_5" [label="5: Prune (true branch, if) \n   n$0=*&x:X* [line 32, column 7]\n  PRUNE(n$0, true); [line 32, column 7]\n  EXIT_SCOPE(n$0); [line 32, column 7]\n " shape="invhouse"]
 	
 
 	 "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_5" -> "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_8" ;
-"method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_6" [label="6: Prune (false branch, if) \n   n$1=*&x:X* [line 32, column 7]\n  PRUNE(!n$1, false); [line 32, column 7]\n  NULLIFY(&x); [line 32, column 7]\n  EXIT_SCOPE(n$1,x); [line 32, column 7]\n " shape="invhouse"]
+"method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_6" [label="6: Prune (false branch, if) \n   n$0=*&x:X* [line 32, column 7]\n  PRUNE(!n$0, false); [line 32, column 7]\n  NULLIFY(&x); [line 32, column 7]\n  EXIT_SCOPE(n$0,x); [line 32, column 7]\n " shape="invhouse"]
 	
 
 	 "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_6" -> "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_3" ;
-"method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_7" [label="7:  Return Stmt \n   n$2=*&x:X* [line 34, column 12]\n  _=*n$2:X [line 34, column 12]\n  n$4=_fun_X::div(n$2:X*) [line 34, column 12]\n  *&return:int=n$4 [line 34, column 5]\n  NULLIFY(&x); [line 34, column 5]\n  EXIT_SCOPE(_,n$2,n$4,x); [line 34, column 5]\n  APPLY_ABSTRACTION; [line 34, column 5]\n " shape="box"]
+"method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_7" [label="7:  Return Stmt \n   n$1=*&x:X* [line 34, column 12]\n  _=*n$1:X [line 34, column 12]\n  n$3=_fun_X::div(n$1:X*) [line 34, column 12]\n  *&return:int=n$3 [line 34, column 5]\n  NULLIFY(&x); [line 34, column 5]\n  EXIT_SCOPE(_,n$1,n$3,x); [line 34, column 5]\n  APPLY_ABSTRACTION; [line 34, column 5]\n " shape="box"]
 	
 
 	 "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_7" -> "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_2" ;
-"method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_8" [label="8:  Call _fun_zero_ptr \n   n$6=*&x:X* [line 33, column 14]\n  n$7=_fun_zero_ptr(n$6:X*) [line 33, column 5]\n  EXIT_SCOPE(n$6,n$7); [line 33, column 5]\n " shape="box"]
+"method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_8" [label="8:  Call _fun_zero_ptr \n   n$4=*&x:X* [line 33, column 14]\n  n$5=_fun_zero_ptr(n$4:X*) [line 33, column 5]\n  EXIT_SCOPE(n$4,n$5); [line 33, column 5]\n " shape="box"]
 	
 
 	 "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_8" -> "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_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$4=*&x:X& [line 84, column 12]\n  n$5=_fun_zero_ref(n$4:X&) [line 84, column 3]\n  EXIT_SCOPE(n$4,n$5); [line 84, column 3]\n " shape="box"]
+"method_div0_ref#12048348997540346822.5280d482da62ad0e098e3e6ad4e7915e_4" [label="4:  Call _fun_zero_ref \n   n$3=*&x:X& [line 84, column 12]\n  n$4=_fun_zero_ref(n$3:X&) [line 84, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 84, 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(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_4" -> "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_2" ;
-"method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_5" [label="5: Prune (true branch, if) \n   n$1=*&x:X* [line 39, column 7]\n  PRUNE(n$1, true); [line 39, column 7]\n  EXIT_SCOPE(n$1); [line 39, column 7]\n " shape="invhouse"]
+"method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_5" [label="5: Prune (true branch, if) \n   n$0=*&x:X* [line 39, column 7]\n  PRUNE(n$0, true); [line 39, column 7]\n  EXIT_SCOPE(n$0); [line 39, column 7]\n " shape="invhouse"]
 	
 
 	 "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_5" -> "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_8" ;
-"method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_6" [label="6: Prune (false branch, if) \n   n$1=*&x:X* [line 39, column 7]\n  PRUNE(!n$1, false); [line 39, column 7]\n  NULLIFY(&x); [line 39, column 7]\n  EXIT_SCOPE(n$1,x); [line 39, column 7]\n " shape="invhouse"]
+"method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_6" [label="6: Prune (false branch, if) \n   n$0=*&x:X* [line 39, column 7]\n  PRUNE(!n$0, false); [line 39, column 7]\n  NULLIFY(&x); [line 39, column 7]\n  EXIT_SCOPE(n$0,x); [line 39, column 7]\n " shape="invhouse"]
 	
 
 	 "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_6" -> "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_3" ;
-"method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_7" [label="7:  Return Stmt \n   n$2=*&x:X* [line 41, column 12]\n  _=*n$2:X [line 41, column 12]\n  n$4=_fun_X::div(n$2:X*) [line 41, column 12]\n  *&return:int=n$4 [line 41, column 5]\n  NULLIFY(&x); [line 41, column 5]\n  EXIT_SCOPE(_,n$2,n$4,x); [line 41, column 5]\n  APPLY_ABSTRACTION; [line 41, column 5]\n " shape="box"]
+"method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_7" [label="7:  Return Stmt \n   n$1=*&x:X* [line 41, column 12]\n  _=*n$1:X [line 41, column 12]\n  n$3=_fun_X::div(n$1:X*) [line 41, column 12]\n  *&return:int=n$3 [line 41, column 5]\n  NULLIFY(&x); [line 41, column 5]\n  EXIT_SCOPE(_,n$1,n$3,x); [line 41, column 5]\n  APPLY_ABSTRACTION; [line 41, column 5]\n " shape="box"]
 	
 
 	 "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_7" -> "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_2" ;
-"method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_8" [label="8:  Call _fun_nonzero_ptr \n   n$6=*&x:X* [line 40, column 17]\n  n$7=_fun_nonzero_ptr(n$6:X*) [line 40, column 5]\n  EXIT_SCOPE(n$6,n$7); [line 40, column 5]\n " shape="box"]
+"method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_8" [label="8:  Call _fun_nonzero_ptr \n   n$4=*&x:X* [line 40, column 17]\n  n$5=_fun_nonzero_ptr(n$4:X*) [line 40, column 5]\n  EXIT_SCOPE(n$4,n$5); [line 40, column 5]\n " shape="box"]
 	
 
 	 "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_8" -> "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_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$4=*&x:X& [line 89, column 15]\n  n$5=_fun_nonzero_ref(n$4:X&) [line 89, column 3]\n  EXIT_SCOPE(n$4,n$5); [line 89, column 3]\n " shape="box"]
+"method_div1_ref#18445848838166655559.1ecfa9c02aff37ba12fb556cb038f32c_4" [label="4:  Call _fun_nonzero_ref \n   n$3=*&x:X& [line 89, column 15]\n  n$4=_fun_nonzero_ref(n$3:X&) [line 89, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 89, 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(class X)#1716920554390102131.ab3e0f6dea34ce6bb6abf3732e2b1b66_2" [label="2: Exit nonzero_ptr \n  " color=yellow style=filled]
 	
 
-"nonzero_ptr(class X)#1716920554390102131.ab3e0f6dea34ce6bb6abf3732e2b1b66_3" [label="3:  Call _fun_X::nonzero \n   n$1=*&x:X* [line 17, column 26]\n  _=*n$1:X [line 17, column 26]\n  n$3=_fun_X::nonzero(n$1:X*) [line 17, column 26]\n  NULLIFY(&x); [line 17, column 26]\n  EXIT_SCOPE(_,n$1,n$3,x); [line 17, column 26]\n  APPLY_ABSTRACTION; [line 17, column 26]\n " shape="box"]
+"nonzero_ptr(class X)#1716920554390102131.ab3e0f6dea34ce6bb6abf3732e2b1b66_3" [label="3:  Call _fun_X::nonzero \n   n$0=*&x:X* [line 17, column 26]\n  _=*n$0:X [line 17, column 26]\n  n$2=_fun_X::nonzero(n$0:X*) [line 17, column 26]\n  NULLIFY(&x); [line 17, column 26]\n  EXIT_SCOPE(_,n$0,n$2,x); [line 17, column 26]\n  APPLY_ABSTRACTION; [line 17, column 26]\n " shape="box"]
 	
 
 	 "nonzero_ptr(class X)#1716920554390102131.ab3e0f6dea34ce6bb6abf3732e2b1b66_3" -> "nonzero_ptr(class X)#1716920554390102131.ab3e0f6dea34ce6bb6abf3732e2b1b66_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$1=*&x:X& [line 23, column 26]\n  _=*n$1:X [line 23, column 26]\n  n$3=_fun_X::nonzero(n$1:X&) [line 23, column 26]\n  NULLIFY(&x); [line 23, column 26]\n  EXIT_SCOPE(_,n$1,n$3,x); [line 23, column 26]\n  APPLY_ABSTRACTION; [line 23, column 26]\n " shape="box"]
+"nonzero_ref#2062801655575406720.e5794366c34a5ecd10e2fd062a659f30_3" [label="3:  Call _fun_X::nonzero \n   n$0=*&x:X& [line 23, column 26]\n  _=*n$0:X [line 23, column 26]\n  n$2=_fun_X::nonzero(n$0:X&) [line 23, column 26]\n  NULLIFY(&x); [line 23, column 26]\n  EXIT_SCOPE(_,n$0,n$2,x); [line 23, column 26]\n  APPLY_ABSTRACTION; [line 23, column 26]\n " shape="box"]
 	
 
 	 "nonzero_ref#2062801655575406720.e5794366c34a5ecd10e2fd062a659f30_3" -> "nonzero_ref#2062801655575406720.e5794366c34a5ecd10e2fd062a659f30_2" ;
@@ -402,7 +402,7 @@ digraph cfg {
 "set_field_ptr(class X)#10262801862810946974.624982a2696b528e07aa0054da333ca2_2" [label="2: Exit set_field_ptr \n  " color=yellow style=filled]
 	
 
-"set_field_ptr(class X)#10262801862810946974.624982a2696b528e07aa0054da333ca2_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&x:X* [line 19, column 37]\n  n$2=*&val:int [line 19, column 44]\n  *n$1.f:int=n$2 [line 19, column 37]\n  NULLIFY(&val); [line 19, column 37]\n  NULLIFY(&x); [line 19, column 37]\n  EXIT_SCOPE(n$1,n$2,val,x); [line 19, column 37]\n  APPLY_ABSTRACTION; [line 19, column 37]\n " shape="box"]
+"set_field_ptr(class X)#10262801862810946974.624982a2696b528e07aa0054da333ca2_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&x:X* [line 19, column 37]\n  n$1=*&val:int [line 19, column 44]\n  *n$0.f:int=n$1 [line 19, column 37]\n  NULLIFY(&val); [line 19, column 37]\n  NULLIFY(&x); [line 19, column 37]\n  EXIT_SCOPE(n$0,n$1,val,x); [line 19, column 37]\n  APPLY_ABSTRACTION; [line 19, column 37]\n " shape="box"]
 	
 
 	 "set_field_ptr(class X)#10262801862810946974.624982a2696b528e07aa0054da333ca2_3" -> "set_field_ptr(class X)#10262801862810946974.624982a2696b528e07aa0054da333ca2_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$1=*&x:X& [line 25, column 37]\n  n$2=*&val:int [line 25, column 43]\n  *n$1.f:int=n$2 [line 25, column 37]\n  NULLIFY(&val); [line 25, column 37]\n  NULLIFY(&x); [line 25, column 37]\n  EXIT_SCOPE(n$1,n$2,val,x); [line 25, column 37]\n  APPLY_ABSTRACTION; [line 25, column 37]\n " shape="box"]
+"set_field_ref#15177497547761982491.aa4620ee8933c900acc4164344e57432_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&x:X& [line 25, column 37]\n  n$1=*&val:int [line 25, column 43]\n  *n$0.f:int=n$1 [line 25, column 37]\n  NULLIFY(&val); [line 25, column 37]\n  NULLIFY(&x); [line 25, column 37]\n  EXIT_SCOPE(n$0,n$1,val,x); [line 25, column 37]\n  APPLY_ABSTRACTION; [line 25, 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(class X)#12528709853087384868.d08145759acbbf21c345f01eb7eefc7e_2" [label="2: Exit zero_ptr \n  " color=yellow style=filled]
 	
 
-"zero_ptr(class X)#12528709853087384868.d08145759acbbf21c345f01eb7eefc7e_3" [label="3:  Call _fun_X::zero \n   n$1=*&x:X* [line 15, column 23]\n  _=*n$1:X [line 15, column 23]\n  n$3=_fun_X::zero(n$1:X*) [line 15, column 23]\n  NULLIFY(&x); [line 15, column 23]\n  EXIT_SCOPE(_,n$1,n$3,x); [line 15, column 23]\n  APPLY_ABSTRACTION; [line 15, column 23]\n " shape="box"]
+"zero_ptr(class X)#12528709853087384868.d08145759acbbf21c345f01eb7eefc7e_3" [label="3:  Call _fun_X::zero \n   n$0=*&x:X* [line 15, column 23]\n  _=*n$0:X [line 15, column 23]\n  n$2=_fun_X::zero(n$0:X*) [line 15, column 23]\n  NULLIFY(&x); [line 15, column 23]\n  EXIT_SCOPE(_,n$0,n$2,x); [line 15, column 23]\n  APPLY_ABSTRACTION; [line 15, column 23]\n " shape="box"]
 	
 
 	 "zero_ptr(class X)#12528709853087384868.d08145759acbbf21c345f01eb7eefc7e_3" -> "zero_ptr(class X)#12528709853087384868.d08145759acbbf21c345f01eb7eefc7e_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$1=*&x:X& [line 21, column 23]\n  _=*n$1:X [line 21, column 23]\n  n$3=_fun_X::zero(n$1:X&) [line 21, column 23]\n  NULLIFY(&x); [line 21, column 23]\n  EXIT_SCOPE(_,n$1,n$3,x); [line 21, column 23]\n  APPLY_ABSTRACTION; [line 21, column 23]\n " shape="box"]
+"zero_ref#14077465191616488315.9f868765c76672369ef06a4d03ded4f3_3" [label="3:  Call _fun_X::zero \n   n$0=*&x:X& [line 21, column 23]\n  _=*n$0:X [line 21, column 23]\n  n$2=_fun_X::zero(n$0:X&) [line 21, column 23]\n  NULLIFY(&x); [line 21, column 23]\n  EXIT_SCOPE(_,n$0,n$2,x); [line 21, column 23]\n  APPLY_ABSTRACTION; [line 21, column 23]\n " shape="box"]
 	
 
 	 "zero_ref#14077465191616488315.9f868765c76672369ef06a4d03ded4f3_3" -> "zero_ref#14077465191616488315.9f868765c76672369ef06a4d03ded4f3_2" ;
@@ -446,7 +446,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$1=*&this:X* [line 10, column 20]\n  *n$1.f:int=1 [line 10, column 20]\n  NULLIFY(&this); [line 10, column 20]\n  EXIT_SCOPE(n$1,this); [line 10, column 20]\n  APPLY_ABSTRACTION; [line 10, column 20]\n " shape="box"]
+"nonzero#X#(11619218627491700674).1d7c44c6589f4c816f501055b35038bc_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:X* [line 10, column 20]\n  *n$0.f:int=1 [line 10, column 20]\n  NULLIFY(&this); [line 10, column 20]\n  EXIT_SCOPE(n$0,this); [line 10, column 20]\n  APPLY_ABSTRACTION; [line 10, column 20]\n " shape="box"]
 	
 
 	 "nonzero#X#(11619218627491700674).1d7c44c6589f4c816f501055b35038bc_3" -> "nonzero#X#(11619218627491700674).1d7c44c6589f4c816f501055b35038bc_2" ;
@@ -457,7 +457,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$1=*&this:X* [line 11, column 17]\n  *n$1.f:int=0 [line 11, column 17]\n  NULLIFY(&this); [line 11, column 17]\n  EXIT_SCOPE(n$1,this); [line 11, column 17]\n  APPLY_ABSTRACTION; [line 11, column 17]\n " shape="box"]
+"zero#X#(16299302305861440992).e13842f7b98f126e5d2188644c16a995_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:X* [line 11, column 17]\n  *n$0.f:int=0 [line 11, column 17]\n  NULLIFY(&this); [line 11, column 17]\n  EXIT_SCOPE(n$0,this); [line 11, column 17]\n  APPLY_ABSTRACTION; [line 11, column 17]\n " shape="box"]
 	
 
 	 "zero#X#(16299302305861440992).e13842f7b98f126e5d2188644c16a995_3" -> "zero#X#(16299302305861440992).e13842f7b98f126e5d2188644c16a995_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/reference/reference_type_e2e.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/reference/reference_type_e2e.cpp.dot
index f938a83db..349e71e3a 100644
--- a/infer/tests/codetoanalyze/cpp/shared/reference/reference_type_e2e.cpp.dot
+++ b/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$2=*&p:int* [line 14, column 4]\n  *n$2:int=0 [line 14, column 3]\n  NULLIFY(&p); [line 14, column 3]\n  EXIT_SCOPE(n$2,p); [line 14, column 3]\n " shape="box"]
+"ptr_div0#14193575060740497524.6928690623c7c21a5a52547c8cdd4310_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&p:int* [line 14, column 4]\n  *n$1:int=0 [line 14, column 3]\n  NULLIFY(&p); [line 14, column 3]\n  EXIT_SCOPE(n$1,p); [line 14, 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$2=_fun_zero_ptr(&a:int*) [line 20, column 3]\n  EXIT_SCOPE(n$2); [line 20, column 3]\n " shape="box"]
+"ptr_div0_function#15472019236267517423.0a3eb7529edaa487d598988d34f0b091_4" [label="4:  Call _fun_zero_ptr \n   n$1=_fun_zero_ptr(&a:int*) [line 20, column 3]\n  EXIT_SCOPE(n$1); [line 20, 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$2=*&r:int* [line 27, column 12]\n  n$3=_fun_zero_ptr(n$2:int*) [line 27, column 3]\n  NULLIFY(&r); [line 27, column 3]\n  EXIT_SCOPE(n$2,n$3,r); [line 27, column 3]\n " shape="box"]
+"ptr_div0_function_temp_var#5150281836928396778.6b88ca0a7e844195f8de319fd04a3139_4" [label="4:  Call _fun_zero_ptr \n   n$1=*&r:int* [line 27, column 12]\n  n$2=_fun_zero_ptr(n$1:int*) [line 27, column 3]\n  NULLIFY(&r); [line 27, column 3]\n  EXIT_SCOPE(n$1,n$2,r); [line 27, 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$2=*&r:int& [line 34, column 3]\n  *n$2:int=0 [line 34, column 3]\n  NULLIFY(&r); [line 34, column 3]\n  EXIT_SCOPE(n$2,r); [line 34, column 3]\n " shape="box"]
+"ref_div0#1043072996947162803.d8e5fefe42038c8549979f6316354144_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&r:int& [line 34, column 3]\n  *n$1:int=0 [line 34, column 3]\n  NULLIFY(&r); [line 34, column 3]\n  EXIT_SCOPE(n$1,r); [line 34, 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$2=_fun_zero_ref(&a:int&) [line 40, column 3]\n  EXIT_SCOPE(n$2); [line 40, column 3]\n " shape="box"]
+"ref_div0_function#15446684317306379342.095fd29aa2a7d2024ec0380b2c42aad4_4" [label="4:  Call _fun_zero_ref \n   n$1=_fun_zero_ref(&a:int&) [line 40, column 3]\n  EXIT_SCOPE(n$1); [line 40, 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$2=*&r:int& [line 47, column 12]\n  n$3=_fun_zero_ref(n$2:int&) [line 47, column 3]\n  NULLIFY(&r); [line 47, column 3]\n  EXIT_SCOPE(n$2,n$3,r); [line 47, column 3]\n " shape="box"]
+"ref_div0_function_temp_var#14207866842047996477.a899517f09b367d539ea5f04365fd46e_4" [label="4:  Call _fun_zero_ref \n   n$1=*&r:int& [line 47, column 12]\n  n$2=_fun_zero_ref(n$1:int&) [line 47, column 3]\n  NULLIFY(&r); [line 47, column 3]\n  EXIT_SCOPE(n$1,n$2,r); [line 47, 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$2=*&r2:int& [line 56, column 3]\n  *n$2:int=0 [line 56, column 3]\n  NULLIFY(&r2); [line 56, column 3]\n  EXIT_SCOPE(n$2,r2); [line 56, column 3]\n " shape="box"]
+"ref_div0_nested_assignment#17126972420420854569.bd6abb3056f6689fbac92af920ec6879_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&r2:int& [line 56, column 3]\n  *n$1:int=0 [line 56, column 3]\n  NULLIFY(&r2); [line 56, column 3]\n  EXIT_SCOPE(n$1,r2); [line 56, 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   VARIABLE_DECLARED(r2:int&); [line 55, column 3]\n  n$3=*&r1:int& [line 55, column 13]\n  *&b:int=1 [line 55, column 18]\n  n$4=*&b:int [line 55, column 18]\n  *n$3:int=n$4 [line 55, column 13]\n  *&r2:int&=n$3 [line 55, column 3]\n  NULLIFY(&b); [line 55, column 3]\n  NULLIFY(&r1); [line 55, column 3]\n  EXIT_SCOPE(n$3,n$4,b,r1); [line 55, column 3]\n " shape="box"]
+"ref_div0_nested_assignment#17126972420420854569.bd6abb3056f6689fbac92af920ec6879_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(r2:int&); [line 55, column 3]\n  n$2=*&r1:int& [line 55, column 13]\n  *&b:int=1 [line 55, column 18]\n  n$3=*&b:int [line 55, column 18]\n  *n$2:int=n$3 [line 55, column 13]\n  *&r2:int&=n$2 [line 55, column 3]\n  NULLIFY(&b); [line 55, column 3]\n  NULLIFY(&r1); [line 55, column 3]\n  EXIT_SCOPE(n$2,n$3,b,r1); [line 55, 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$2=*&r2:int& [line 65, column 3]\n  *n$2:int=0 [line 65, column 3]\n  NULLIFY(&r2); [line 65, column 3]\n  EXIT_SCOPE(n$2,r2); [line 65, column 3]\n " shape="box"]
+"ref_div1_nested_assignment#5121576951592231820.a9f8511d9ff791c44569fd8a8eb9d3cf_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&r2:int& [line 65, column 3]\n  *n$1:int=0 [line 65, column 3]\n  NULLIFY(&r2); [line 65, column 3]\n  EXIT_SCOPE(n$1,r2); [line 65, 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   VARIABLE_DECLARED(r2:int&); [line 64, column 3]\n  n$3=*&r1:int& [line 64, column 13]\n  *&b:int=1 [line 64, column 18]\n  n$4=*&b:int [line 64, column 18]\n  *n$3:int=n$4 [line 64, column 13]\n  *&r2:int&=n$3 [line 64, column 3]\n  NULLIFY(&r1); [line 64, column 3]\n  EXIT_SCOPE(n$3,n$4,r1); [line 64, column 3]\n " shape="box"]
+"ref_div1_nested_assignment#5121576951592231820.a9f8511d9ff791c44569fd8a8eb9d3cf_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(r2:int&); [line 64, column 3]\n  n$2=*&r1:int& [line 64, column 13]\n  *&b:int=1 [line 64, column 18]\n  n$3=*&b:int [line 64, column 18]\n  *n$2:int=n$3 [line 64, column 13]\n  *&r2:int&=n$2 [line 64, column 3]\n  NULLIFY(&r1); [line 64, column 3]\n  EXIT_SCOPE(n$2,n$3,r1); [line 64, 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$1=*&p:int* [line 8, column 26]\n  *n$1:int=0 [line 8, column 25]\n  NULLIFY(&p); [line 8, column 25]\n  EXIT_SCOPE(n$1,p); [line 8, column 25]\n  APPLY_ABSTRACTION; [line 8, column 25]\n " shape="box"]
+"zero_ptr#10962438709356261388.c1a1091e7e1d49bd9bd5d8cac96703e9_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&p:int* [line 8, column 26]\n  *n$0:int=0 [line 8, column 25]\n  NULLIFY(&p); [line 8, column 25]\n  EXIT_SCOPE(n$0,p); [line 8, column 25]\n  APPLY_ABSTRACTION; [line 8, 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$1=*&p:int& [line 9, column 25]\n  *n$1:int=0 [line 9, column 25]\n  NULLIFY(&p); [line 9, column 25]\n  EXIT_SCOPE(n$1,p); [line 9, column 25]\n  APPLY_ABSTRACTION; [line 9, column 25]\n " shape="box"]
+"zero_ref#8777441955929384761.2247f2b8d396eabba21c20ef967ac6ec_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&p:int& [line 9, column 25]\n  *n$0:int=0 [line 9, column 25]\n  NULLIFY(&p); [line 9, column 25]\n  EXIT_SCOPE(n$0,p); [line 9, column 25]\n  APPLY_ABSTRACTION; [line 9, column 25]\n " shape="box"]
 	
 
 	 "zero_ref#8777441955929384761.2247f2b8d396eabba21c20ef967ac6ec_3" -> "zero_ref#8777441955929384761.2247f2b8d396eabba21c20ef967ac6ec_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/reference/temporary_lvalue.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/reference/temporary_lvalue.cpp.dot
index 3a4f26257..bbc788b7e 100644
--- a/infer/tests/codetoanalyze/cpp/shared/reference/temporary_lvalue.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/reference/temporary_lvalue.cpp.dot
@@ -22,18 +22,18 @@ digraph cfg {
 	
 
 	 "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$3:int const  \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$2:int const  \n  " color=yellow style=filled]
 	
 
 	 "div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_1" -> "div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_4" ;
-"div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_2" [label="2: Exit div0_init_expr \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$3); [line 13, column 1]\n " color=yellow style=filled]
+"div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_2" [label="2: Exit div0_init_expr \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$2); [line 13, column 1]\n " color=yellow style=filled]
 	
 
 "div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_3" [label="3:  Return Stmt \n   n$0=*&a:int const & [line 12, column 14]\n  n$1=_fun_div(n$0:int const &) [line 12, column 10]\n  *&return:int=n$1 [line 12, column 3]\n  NULLIFY(&a); [line 12, column 3]\n  EXIT_SCOPE(n$0,n$1,a); [line 12, column 3]\n  APPLY_ABSTRACTION; [line 12, column 3]\n " shape="box"]
 	
 
 	 "div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_3" -> "div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_2" ;
-"div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(a:int const &); [line 11, column 3]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$3:int const ); [line 11, column 18]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$3:int=0 [line 11, column 18]\n  *&a:int const &=&0$?%__sil_tmpSIL_materialize_temp__n$3 [line 11, column 3]\n  EXIT_SCOPE(0$?%__sil_tmpSIL_materialize_temp__n$3); [line 11, column 3]\n " shape="box"]
+"div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(a:int const &); [line 11, column 3]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$2:int const ); [line 11, column 18]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$2:int=0 [line 11, column 18]\n  *&a:int const &=&0$?%__sil_tmpSIL_materialize_temp__n$2 [line 11, column 3]\n  EXIT_SCOPE(0$?%__sil_tmpSIL_materialize_temp__n$2); [line 11, column 3]\n " shape="box"]
 	
 
 	 "div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_4" -> "div0_init_expr#16429869714979266683.46e79db6a434bbf3e121689869095925_3" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/reference/unbox.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/reference/unbox.cpp.dot
index 4c8d051b7..cc617109b 100644
--- a/infer/tests/codetoanalyze/cpp/shared/reference/unbox.cpp.dot
+++ b/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   NULLIFY(&a); [line 32, column 1]\n " color=yellow style=filled]
 	
 
-"unbox_ptr#3550280956167916174.75d50cc2e2dfffd1cc23613b01fc878b_3" [label="3:  Call _fun_fun_r \n   n$1=*&p:int* [line 31, column 10]\n  n$2=_fun_fun_r(n$1:int&) [line 31, column 3]\n  NULLIFY(&p); [line 31, column 3]\n  EXIT_SCOPE(n$1,n$2,p); [line 31, column 3]\n  APPLY_ABSTRACTION; [line 31, column 3]\n " shape="box"]
+"unbox_ptr#3550280956167916174.75d50cc2e2dfffd1cc23613b01fc878b_3" [label="3:  Call _fun_fun_r \n   n$0=*&p:int* [line 31, column 10]\n  n$1=_fun_fun_r(n$0:int&) [line 31, column 3]\n  NULLIFY(&p); [line 31, column 3]\n  EXIT_SCOPE(n$0,n$1,p); [line 31, column 3]\n  APPLY_ABSTRACTION; [line 31, 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$3=*&p:int* [line 30, column 10]\n  n$4=*n$3:int [line 30, column 9]\n  n$5=_fun_fun_v(n$4:int) [line 30, column 3]\n  EXIT_SCOPE(n$3,n$4,n$5); [line 30, column 3]\n " shape="box"]
+"unbox_ptr#3550280956167916174.75d50cc2e2dfffd1cc23613b01fc878b_4" [label="4:  Call _fun_fun_v \n   n$2=*&p:int* [line 30, column 10]\n  n$3=*n$2:int [line 30, column 9]\n  n$4=_fun_fun_v(n$3:int) [line 30, column 3]\n  EXIT_SCOPE(n$2,n$3,n$4); [line 30, 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$6=*&p:int* [line 29, column 9]\n  n$7=_fun_fun_p(n$6:int*) [line 29, column 3]\n  EXIT_SCOPE(n$6,n$7); [line 29, column 3]\n " shape="box"]
+"unbox_ptr#3550280956167916174.75d50cc2e2dfffd1cc23613b01fc878b_5" [label="5:  Call _fun_fun_p \n   n$5=*&p:int* [line 29, column 9]\n  n$6=_fun_fun_p(n$5:int*) [line 29, column 3]\n  EXIT_SCOPE(n$5,n$6); [line 29, 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   NULLIFY(&a); [line 22, column 1]\n " color=yellow style=filled]
 	
 
-"unbox_ref#9977470601320200599.91094dce9e5b43dc4c89abcbc69b2c70_3" [label="3:  Call _fun_fun_r \n   n$1=*&r:int& [line 21, column 9]\n  n$2=_fun_fun_r(n$1:int&) [line 21, column 3]\n  NULLIFY(&r); [line 21, column 3]\n  EXIT_SCOPE(n$1,n$2,r); [line 21, column 3]\n  APPLY_ABSTRACTION; [line 21, column 3]\n " shape="box"]
+"unbox_ref#9977470601320200599.91094dce9e5b43dc4c89abcbc69b2c70_3" [label="3:  Call _fun_fun_r \n   n$0=*&r:int& [line 21, column 9]\n  n$1=_fun_fun_r(n$0:int&) [line 21, column 3]\n  NULLIFY(&r); [line 21, column 3]\n  EXIT_SCOPE(n$0,n$1,r); [line 21, column 3]\n  APPLY_ABSTRACTION; [line 21, 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$3=*&r:int& [line 20, column 9]\n  n$4=*n$3:int [line 20, column 9]\n  n$5=_fun_fun_v(n$4:int) [line 20, column 3]\n  EXIT_SCOPE(n$3,n$4,n$5); [line 20, column 3]\n " shape="box"]
+"unbox_ref#9977470601320200599.91094dce9e5b43dc4c89abcbc69b2c70_4" [label="4:  Call _fun_fun_v \n   n$2=*&r:int& [line 20, column 9]\n  n$3=*n$2:int [line 20, column 9]\n  n$4=_fun_fun_v(n$3:int) [line 20, column 3]\n  EXIT_SCOPE(n$2,n$3,n$4); [line 20, 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$6=*&r:int& [line 19, column 10]\n  n$7=_fun_fun_p(n$6:int*) [line 19, column 3]\n  EXIT_SCOPE(n$6,n$7); [line 19, column 3]\n " shape="box"]
+"unbox_ref#9977470601320200599.91094dce9e5b43dc4c89abcbc69b2c70_5" [label="5:  Call _fun_fun_p \n   n$5=*&r:int& [line 19, column 10]\n  n$6=_fun_fun_p(n$5:int*) [line 19, column 3]\n  EXIT_SCOPE(n$5,n$6); [line 19, column 3]\n " shape="box"]
 	
 
 	 "unbox_ref#9977470601320200599.91094dce9e5b43dc4c89abcbc69b2c70_5" -> "unbox_ref#9977470601320200599.91094dce9e5b43dc4c89abcbc69b2c70_4" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/templates/class_specialization.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/templates/class_specialization.cpp.dot
index d74c0c7d9..e20e34cf2 100644
--- a/infer/tests/codetoanalyze/cpp/shared/templates/class_specialization.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/templates/class_specialization.cpp.dot
@@ -7,15 +7,15 @@ digraph cfg {
 "foo_int#class_specialization#18011277194514159170.29412bbb7345cd5150bdd3239c145d19_2" [label="2: Exit class_specialization::foo_int \n   NULLIFY(&b); [line 34, column 1]\n " color=yellow style=filled]
 	
 
-"foo_int#class_specialization#18011277194514159170.29412bbb7345cd5150bdd3239c145d19_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(z:int); [line 33, column 3]\n  n$1=*&b.x:int [line 33, column 15]\n  *&z:int=(1 / n$1) [line 33, column 3]\n  NULLIFY(&z); [line 33, column 3]\n  EXIT_SCOPE(n$1,b,z); [line 33, column 3]\n  APPLY_ABSTRACTION; [line 33, column 3]\n " shape="box"]
+"foo_int#class_specialization#18011277194514159170.29412bbb7345cd5150bdd3239c145d19_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(z:int); [line 33, column 3]\n  n$0=*&b.x:int [line 33, column 15]\n  *&z:int=(1 / n$0) [line 33, column 3]\n  NULLIFY(&z); [line 33, column 3]\n  EXIT_SCOPE(n$0,b,z); [line 33, column 3]\n  APPLY_ABSTRACTION; [line 33, column 3]\n " shape="box"]
 	
 
 	 "foo_int#class_specialization#18011277194514159170.29412bbb7345cd5150bdd3239c145d19_3" -> "foo_int#class_specialization#18011277194514159170.29412bbb7345cd5150bdd3239c145d19_2" ;
-"foo_int#class_specialization#18011277194514159170.29412bbb7345cd5150bdd3239c145d19_4" [label="4:  Call _fun_class_specialization::Derived<int>::foo \n   _=*&b:class_specialization::Derived<int> [line 32, column 3]\n  n$3=_fun_class_specialization::Derived<int>::foo(&b:class_specialization::Derived<int>&,0:int) [line 32, column 3]\n  EXIT_SCOPE(_,n$3); [line 32, column 3]\n " shape="box"]
+"foo_int#class_specialization#18011277194514159170.29412bbb7345cd5150bdd3239c145d19_4" [label="4:  Call _fun_class_specialization::Derived<int>::foo \n   _=*&b:class_specialization::Derived<int> [line 32, column 3]\n  n$2=_fun_class_specialization::Derived<int>::foo(&b:class_specialization::Derived<int>&,0:int) [line 32, column 3]\n  EXIT_SCOPE(_,n$2); [line 32, column 3]\n " shape="box"]
 	
 
 	 "foo_int#class_specialization#18011277194514159170.29412bbb7345cd5150bdd3239c145d19_4" -> "foo_int#class_specialization#18011277194514159170.29412bbb7345cd5150bdd3239c145d19_3" ;
-"foo_int#class_specialization#18011277194514159170.29412bbb7345cd5150bdd3239c145d19_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(b:class_specialization::Derived<int>); [line 31, column 3]\n  n$4=_fun_class_specialization::Derived<int>::Derived(&b:class_specialization::Derived<int>*) [line 31, column 16]\n  EXIT_SCOPE(n$4); [line 31, column 16]\n " shape="box"]
+"foo_int#class_specialization#18011277194514159170.29412bbb7345cd5150bdd3239c145d19_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(b:class_specialization::Derived<int>); [line 31, column 3]\n  n$3=_fun_class_specialization::Derived<int>::Derived(&b:class_specialization::Derived<int>*) [line 31, column 16]\n  EXIT_SCOPE(n$3); [line 31, column 16]\n " shape="box"]
 	
 
 	 "foo_int#class_specialization#18011277194514159170.29412bbb7345cd5150bdd3239c145d19_5" -> "foo_int#class_specialization#18011277194514159170.29412bbb7345cd5150bdd3239c145d19_4" ;
@@ -26,15 +26,15 @@ digraph cfg {
 "foo_intptr#class_specialization#3914514069521239538.096096ddd8eb9462872f535952d6e0a5_2" [label="2: Exit class_specialization::foo_intptr \n   NULLIFY(&b); [line 28, column 1]\n " color=yellow style=filled]
 	
 
-"foo_intptr#class_specialization#3914514069521239538.096096ddd8eb9462872f535952d6e0a5_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 27, column 3]\n  n$1=*&b.x:int* [line 27, column 12]\n  n$2=*n$1:int [line 27, column 11]\n  *&x:int=n$2 [line 27, column 3]\n  NULLIFY(&x); [line 27, column 3]\n  EXIT_SCOPE(n$1,n$2,b,x); [line 27, column 3]\n  APPLY_ABSTRACTION; [line 27, column 3]\n " shape="box"]
+"foo_intptr#class_specialization#3914514069521239538.096096ddd8eb9462872f535952d6e0a5_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 27, column 3]\n  n$0=*&b.x:int* [line 27, column 12]\n  n$1=*n$0:int [line 27, column 11]\n  *&x:int=n$1 [line 27, column 3]\n  NULLIFY(&x); [line 27, column 3]\n  EXIT_SCOPE(n$0,n$1,b,x); [line 27, column 3]\n  APPLY_ABSTRACTION; [line 27, column 3]\n " shape="box"]
 	
 
 	 "foo_intptr#class_specialization#3914514069521239538.096096ddd8eb9462872f535952d6e0a5_3" -> "foo_intptr#class_specialization#3914514069521239538.096096ddd8eb9462872f535952d6e0a5_2" ;
-"foo_intptr#class_specialization#3914514069521239538.096096ddd8eb9462872f535952d6e0a5_4" [label="4:  Call _fun_class_specialization::Derived<int*>::foo2 \n   _=*&b:class_specialization::Derived<int*> [line 26, column 3]\n  n$4=_fun_class_specialization::Derived<int*>::foo2(&b:class_specialization::Derived<int*>&,null:int*) [line 26, column 3]\n  EXIT_SCOPE(_,n$4); [line 26, column 3]\n " shape="box"]
+"foo_intptr#class_specialization#3914514069521239538.096096ddd8eb9462872f535952d6e0a5_4" [label="4:  Call _fun_class_specialization::Derived<int*>::foo2 \n   _=*&b:class_specialization::Derived<int*> [line 26, column 3]\n  n$3=_fun_class_specialization::Derived<int*>::foo2(&b:class_specialization::Derived<int*>&,null:int*) [line 26, column 3]\n  EXIT_SCOPE(_,n$3); [line 26, column 3]\n " shape="box"]
 	
 
 	 "foo_intptr#class_specialization#3914514069521239538.096096ddd8eb9462872f535952d6e0a5_4" -> "foo_intptr#class_specialization#3914514069521239538.096096ddd8eb9462872f535952d6e0a5_3" ;
-"foo_intptr#class_specialization#3914514069521239538.096096ddd8eb9462872f535952d6e0a5_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(b:class_specialization::Derived<int*>); [line 25, column 3]\n  n$5=_fun_class_specialization::Derived<int*>::Derived(&b:class_specialization::Derived<int*>*) [line 25, column 17]\n  EXIT_SCOPE(n$5); [line 25, column 17]\n " shape="box"]
+"foo_intptr#class_specialization#3914514069521239538.096096ddd8eb9462872f535952d6e0a5_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(b:class_specialization::Derived<int*>); [line 25, column 3]\n  n$4=_fun_class_specialization::Derived<int*>::Derived(&b:class_specialization::Derived<int*>*) [line 25, column 17]\n  EXIT_SCOPE(n$4); [line 25, column 17]\n " shape="box"]
 	
 
 	 "foo_intptr#class_specialization#3914514069521239538.096096ddd8eb9462872f535952d6e0a5_5" -> "foo_intptr#class_specialization#3914514069521239538.096096ddd8eb9462872f535952d6e0a5_4" ;
@@ -59,7 +59,7 @@ digraph cfg {
 "foo2#Derived<int*>#class_specialization#(12167928122938213289).9c7a2e679a7d7dcf0338960c56f01bd4_2" [label="2: Exit class_specialization::Derived<int*>::foo2 \n  " color=yellow style=filled]
 	
 
-"foo2#Derived<int*>#class_specialization#(12167928122938213289).9c7a2e679a7d7dcf0338960c56f01bd4_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:class_specialization::Derived<int*>* [line 21, column 21]\n  n$2=*&t:int* [line 21, column 31]\n  *n$1.x:int*=n$2 [line 21, column 21]\n  NULLIFY(&t); [line 21, column 21]\n  NULLIFY(&this); [line 21, column 21]\n  EXIT_SCOPE(n$1,n$2,t,this); [line 21, column 21]\n  APPLY_ABSTRACTION; [line 21, column 21]\n " shape="box"]
+"foo2#Derived<int*>#class_specialization#(12167928122938213289).9c7a2e679a7d7dcf0338960c56f01bd4_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class_specialization::Derived<int*>* [line 21, column 21]\n  n$1=*&t:int* [line 21, column 31]\n  *n$0.x:int*=n$1 [line 21, column 21]\n  NULLIFY(&t); [line 21, column 21]\n  NULLIFY(&this); [line 21, column 21]\n  EXIT_SCOPE(n$0,n$1,t,this); [line 21, column 21]\n  APPLY_ABSTRACTION; [line 21, column 21]\n " shape="box"]
 	
 
 	 "foo2#Derived<int*>#class_specialization#(12167928122938213289).9c7a2e679a7d7dcf0338960c56f01bd4_3" -> "foo2#Derived<int*>#class_specialization#(12167928122938213289).9c7a2e679a7d7dcf0338960c56f01bd4_2" ;
@@ -70,7 +70,7 @@ digraph cfg {
 "Derived#Derived<int*>#class_specialization#{6947111178756325946}.2484a8b63b0d0003a390b6e57428fee2_2" [label="2: Exit class_specialization::Derived<int*>::Derived \n  " color=yellow style=filled]
 	
 
-"Derived#Derived<int*>#class_specialization#{6947111178756325946}.2484a8b63b0d0003a390b6e57428fee2_3" [label="3:  Constructor Init \n   n$2=*&this:class_specialization::Derived<int*>* [line 20, column 8]\n  n$3=_fun_class_specialization::Base<int*>::Base(n$2:class_specialization::Derived<int*>*) [line 20, column 8]\n  NULLIFY(&this); [line 20, column 8]\n  EXIT_SCOPE(n$2,n$3,this); [line 20, column 8]\n  APPLY_ABSTRACTION; [line 20, column 8]\n " shape="box"]
+"Derived#Derived<int*>#class_specialization#{6947111178756325946}.2484a8b63b0d0003a390b6e57428fee2_3" [label="3:  Constructor Init \n   n$1=*&this:class_specialization::Derived<int*>* [line 20, column 8]\n  n$2=_fun_class_specialization::Base<int*>::Base(n$1:class_specialization::Derived<int*>*) [line 20, column 8]\n  NULLIFY(&this); [line 20, column 8]\n  EXIT_SCOPE(n$1,n$2,this); [line 20, column 8]\n  APPLY_ABSTRACTION; [line 20, column 8]\n " shape="box"]
 	
 
 	 "Derived#Derived<int*>#class_specialization#{6947111178756325946}.2484a8b63b0d0003a390b6e57428fee2_3" -> "Derived#Derived<int*>#class_specialization#{6947111178756325946}.2484a8b63b0d0003a390b6e57428fee2_2" ;
@@ -81,7 +81,7 @@ digraph cfg {
 "foo#Derived<int>#class_specialization#(3691368771332090182).157c4cba925bdfdc131986d2b52af05d_2" [label="2: Exit class_specialization::Derived<int>::foo \n  " color=yellow style=filled]
 	
 
-"foo#Derived<int>#class_specialization#(3691368771332090182).157c4cba925bdfdc131986d2b52af05d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:class_specialization::Derived<int>* [line 16, column 19]\n  n$2=*&t:int [line 16, column 29]\n  *n$1.x:int=n$2 [line 16, column 19]\n  NULLIFY(&t); [line 16, column 19]\n  NULLIFY(&this); [line 16, column 19]\n  EXIT_SCOPE(n$1,n$2,t,this); [line 16, column 19]\n  APPLY_ABSTRACTION; [line 16, column 19]\n " shape="box"]
+"foo#Derived<int>#class_specialization#(3691368771332090182).157c4cba925bdfdc131986d2b52af05d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class_specialization::Derived<int>* [line 16, column 19]\n  n$1=*&t:int [line 16, column 29]\n  *n$0.x:int=n$1 [line 16, column 19]\n  NULLIFY(&t); [line 16, column 19]\n  NULLIFY(&this); [line 16, column 19]\n  EXIT_SCOPE(n$0,n$1,t,this); [line 16, column 19]\n  APPLY_ABSTRACTION; [line 16, column 19]\n " shape="box"]
 	
 
 	 "foo#Derived<int>#class_specialization#(3691368771332090182).157c4cba925bdfdc131986d2b52af05d_3" -> "foo#Derived<int>#class_specialization#(3691368771332090182).157c4cba925bdfdc131986d2b52af05d_2" ;
@@ -92,7 +92,7 @@ digraph cfg {
 "Derived#Derived<int>#class_specialization#{14157761386473130888}.40e79d469e516a33fdff720996ff80ab_2" [label="2: Exit class_specialization::Derived<int>::Derived \n  " color=yellow style=filled]
 	
 
-"Derived#Derived<int>#class_specialization#{14157761386473130888}.40e79d469e516a33fdff720996ff80ab_3" [label="3:  Constructor Init \n   n$2=*&this:class_specialization::Derived<int>* [line 15, column 8]\n  n$3=_fun_class_specialization::Base<int>::Base(n$2:class_specialization::Derived<int>*) [line 15, column 8]\n  NULLIFY(&this); [line 15, column 8]\n  EXIT_SCOPE(n$2,n$3,this); [line 15, column 8]\n  APPLY_ABSTRACTION; [line 15, column 8]\n " shape="box"]
+"Derived#Derived<int>#class_specialization#{14157761386473130888}.40e79d469e516a33fdff720996ff80ab_3" [label="3:  Constructor Init \n   n$1=*&this:class_specialization::Derived<int>* [line 15, column 8]\n  n$2=_fun_class_specialization::Base<int>::Base(n$1:class_specialization::Derived<int>*) [line 15, column 8]\n  NULLIFY(&this); [line 15, column 8]\n  EXIT_SCOPE(n$1,n$2,this); [line 15, column 8]\n  APPLY_ABSTRACTION; [line 15, column 8]\n " shape="box"]
 	
 
 	 "Derived#Derived<int>#class_specialization#{14157761386473130888}.40e79d469e516a33fdff720996ff80ab_3" -> "Derived#Derived<int>#class_specialization#{14157761386473130888}.40e79d469e516a33fdff720996ff80ab_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/templates/function.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/templates/function.cpp.dot
index 984b9c180..e4039b609 100644
--- a/infer/tests/codetoanalyze/cpp/shared/templates/function.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/templates/function.cpp.dot
@@ -33,7 +33,7 @@ digraph cfg {
 	
 
 	 "createAndGetVal<function::X1>#function#6914861794749950810.03576380bf9ba7f93eef05bd79193575_3" -> "createAndGetVal<function::X1>#function#6914861794749950810.03576380bf9ba7f93eef05bd79193575_2" ;
-"createAndGetVal<function::X1>#function#6914861794749950810.03576380bf9ba7f93eef05bd79193575_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:function::X1); [line 35, column 3]\n  n$2=_fun_function::X1::X1(&x:function::X1*) [line 35, column 5]\n  EXIT_SCOPE(n$2); [line 35, column 5]\n " shape="box"]
+"createAndGetVal<function::X1>#function#6914861794749950810.03576380bf9ba7f93eef05bd79193575_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:function::X1); [line 35, column 3]\n  n$1=_fun_function::X1::X1(&x:function::X1*) [line 35, column 5]\n  EXIT_SCOPE(n$1); [line 35, column 5]\n " shape="box"]
 	
 
 	 "createAndGetVal<function::X1>#function#6914861794749950810.03576380bf9ba7f93eef05bd79193575_4" -> "createAndGetVal<function::X1>#function#6914861794749950810.03576380bf9ba7f93eef05bd79193575_3" ;
@@ -48,7 +48,7 @@ digraph cfg {
 	
 
 	 "createAndGetVal<function::X3>#function#780814784522236088.525e889c7c5ef92e178075392a6961a4_3" -> "createAndGetVal<function::X3>#function#780814784522236088.525e889c7c5ef92e178075392a6961a4_2" ;
-"createAndGetVal<function::X3>#function#780814784522236088.525e889c7c5ef92e178075392a6961a4_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:function::X3); [line 35, column 3]\n  n$2=_fun_function::X3::X3(&x:function::X3*) [line 35, column 5]\n  EXIT_SCOPE(n$2); [line 35, column 5]\n " shape="box"]
+"createAndGetVal<function::X3>#function#780814784522236088.525e889c7c5ef92e178075392a6961a4_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:function::X3); [line 35, column 3]\n  n$1=_fun_function::X3::X3(&x:function::X3*) [line 35, column 5]\n  EXIT_SCOPE(n$1); [line 35, column 5]\n " shape="box"]
 	
 
 	 "createAndGetVal<function::X3>#function#780814784522236088.525e889c7c5ef92e178075392a6961a4_4" -> "createAndGetVal<function::X3>#function#780814784522236088.525e889c7c5ef92e178075392a6961a4_3" ;
@@ -74,11 +74,11 @@ digraph cfg {
 	
 
 	 "div0_get_val#function#10798510201986830040.b077944b4022150f57aec37a5ffc164a_3" -> "div0_get_val#function#10798510201986830040.b077944b4022150f57aec37a5ffc164a_2" ;
-"div0_get_val#function#10798510201986830040.b077944b4022150f57aec37a5ffc164a_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x3:function::X3); [line 57, column 3]\n  n$3=_fun_function::X3::X3(&x3:function::X3*) [line 57, column 6]\n  EXIT_SCOPE(n$3); [line 57, column 6]\n " shape="box"]
+"div0_get_val#function#10798510201986830040.b077944b4022150f57aec37a5ffc164a_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x3:function::X3); [line 57, column 3]\n  n$2=_fun_function::X3::X3(&x3:function::X3*) [line 57, column 6]\n  EXIT_SCOPE(n$2); [line 57, column 6]\n " shape="box"]
 	
 
 	 "div0_get_val#function#10798510201986830040.b077944b4022150f57aec37a5ffc164a_4" -> "div0_get_val#function#10798510201986830040.b077944b4022150f57aec37a5ffc164a_3" ;
-"div0_get_val#function#10798510201986830040.b077944b4022150f57aec37a5ffc164a_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x1:function::X1); [line 56, column 3]\n  n$4=_fun_function::X1::X1(&x1:function::X1*) [line 56, column 6]\n  EXIT_SCOPE(n$4); [line 56, column 6]\n " shape="box"]
+"div0_get_val#function#10798510201986830040.b077944b4022150f57aec37a5ffc164a_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x1:function::X1); [line 56, column 3]\n  n$3=_fun_function::X1::X1(&x1:function::X1*) [line 56, column 6]\n  EXIT_SCOPE(n$3); [line 56, column 6]\n " shape="box"]
 	
 
 	 "div0_get_val#function#10798510201986830040.b077944b4022150f57aec37a5ffc164a_5" -> "div0_get_val#function#10798510201986830040.b077944b4022150f57aec37a5ffc164a_4" ;
@@ -104,11 +104,11 @@ digraph cfg {
 	
 
 	 "div1_get_val#function#3554411408849091151.45cb38d8fc35a6b2cdc1f63de85d2e51_3" -> "div1_get_val#function#3554411408849091151.45cb38d8fc35a6b2cdc1f63de85d2e51_2" ;
-"div1_get_val#function#3554411408849091151.45cb38d8fc35a6b2cdc1f63de85d2e51_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x3:function::X3); [line 63, column 3]\n  n$3=_fun_function::X3::X3(&x3:function::X3*) [line 63, column 6]\n  EXIT_SCOPE(n$3); [line 63, column 6]\n " shape="box"]
+"div1_get_val#function#3554411408849091151.45cb38d8fc35a6b2cdc1f63de85d2e51_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x3:function::X3); [line 63, column 3]\n  n$2=_fun_function::X3::X3(&x3:function::X3*) [line 63, column 6]\n  EXIT_SCOPE(n$2); [line 63, column 6]\n " shape="box"]
 	
 
 	 "div1_get_val#function#3554411408849091151.45cb38d8fc35a6b2cdc1f63de85d2e51_4" -> "div1_get_val#function#3554411408849091151.45cb38d8fc35a6b2cdc1f63de85d2e51_3" ;
-"div1_get_val#function#3554411408849091151.45cb38d8fc35a6b2cdc1f63de85d2e51_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x1:function::X1); [line 62, column 3]\n  n$4=_fun_function::X1::X1(&x1:function::X1*) [line 62, column 6]\n  EXIT_SCOPE(n$4); [line 62, column 6]\n " shape="box"]
+"div1_get_val#function#3554411408849091151.45cb38d8fc35a6b2cdc1f63de85d2e51_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x1:function::X1); [line 62, column 3]\n  n$3=_fun_function::X1::X1(&x1:function::X1*) [line 62, column 6]\n  EXIT_SCOPE(n$3); [line 62, column 6]\n " shape="box"]
 	
 
 	 "div1_get_val#function#3554411408849091151.45cb38d8fc35a6b2cdc1f63de85d2e51_5" -> "div1_get_val#function#3554411408849091151.45cb38d8fc35a6b2cdc1f63de85d2e51_4" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/templates/method.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/templates/method.cpp.dot
index 80e746fcf..3abce4785 100644
--- a/infer/tests/codetoanalyze/cpp/shared/templates/method.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/templates/method.cpp.dot
@@ -11,11 +11,11 @@ digraph cfg {
 	
 
 	 "div0_getter#method#14570248362286164751.5f9f1e67fd1ac95f6c38eb7d407ea9ec_3" -> "div0_getter#method#14570248362286164751.5f9f1e67fd1ac95f6c38eb7d407ea9ec_2" ;
-"div0_getter#method#14570248362286164751.5f9f1e67fd1ac95f6c38eb7d407ea9ec_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(g:method::Getter); [line 39, column 3]\n  n$3=_fun_method::Getter::Getter(&g:method::Getter*) [line 39, column 10]\n  EXIT_SCOPE(n$3); [line 39, column 10]\n " shape="box"]
+"div0_getter#method#14570248362286164751.5f9f1e67fd1ac95f6c38eb7d407ea9ec_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(g:method::Getter); [line 39, column 3]\n  n$2=_fun_method::Getter::Getter(&g:method::Getter*) [line 39, column 10]\n  EXIT_SCOPE(n$2); [line 39, column 10]\n " shape="box"]
 	
 
 	 "div0_getter#method#14570248362286164751.5f9f1e67fd1ac95f6c38eb7d407ea9ec_4" -> "div0_getter#method#14570248362286164751.5f9f1e67fd1ac95f6c38eb7d407ea9ec_3" ;
-"div0_getter#method#14570248362286164751.5f9f1e67fd1ac95f6c38eb7d407ea9ec_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x2:method::X2); [line 38, column 3]\n  n$4=_fun_method::X2::X2(&x2:method::X2*) [line 38, column 6]\n  EXIT_SCOPE(n$4); [line 38, column 6]\n " shape="box"]
+"div0_getter#method#14570248362286164751.5f9f1e67fd1ac95f6c38eb7d407ea9ec_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x2:method::X2); [line 38, column 3]\n  n$3=_fun_method::X2::X2(&x2:method::X2*) [line 38, column 6]\n  EXIT_SCOPE(n$3); [line 38, column 6]\n " shape="box"]
 	
 
 	 "div0_getter#method#14570248362286164751.5f9f1e67fd1ac95f6c38eb7d407ea9ec_5" -> "div0_getter#method#14570248362286164751.5f9f1e67fd1ac95f6c38eb7d407ea9ec_4" ;
@@ -30,15 +30,15 @@ digraph cfg {
 	
 
 	 "div0_getter_templ#method#6375326311998023520.359f49fd177ddd10abb56481c8c0c0e0_3" -> "div0_getter_templ#method#6375326311998023520.359f49fd177ddd10abb56481c8c0c0e0_2" ;
-"div0_getter_templ#method#6375326311998023520.359f49fd177ddd10abb56481c8c0c0e0_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(g:method::GetterTempl<method::X3>); [line 52, column 3]\n  n$3=_fun_method::GetterTempl<method::X3>::GetterTempl(&g:method::GetterTempl<method::X3>*) [line 52, column 19]\n  EXIT_SCOPE(n$3); [line 52, column 19]\n " shape="box"]
+"div0_getter_templ#method#6375326311998023520.359f49fd177ddd10abb56481c8c0c0e0_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(g:method::GetterTempl<method::X3>); [line 52, column 3]\n  n$2=_fun_method::GetterTempl<method::X3>::GetterTempl(&g:method::GetterTempl<method::X3>*) [line 52, column 19]\n  EXIT_SCOPE(n$2); [line 52, column 19]\n " shape="box"]
 	
 
 	 "div0_getter_templ#method#6375326311998023520.359f49fd177ddd10abb56481c8c0c0e0_4" -> "div0_getter_templ#method#6375326311998023520.359f49fd177ddd10abb56481c8c0c0e0_3" ;
-"div0_getter_templ#method#6375326311998023520.359f49fd177ddd10abb56481c8c0c0e0_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x3:method::X3); [line 51, column 3]\n  n$4=_fun_method::X3::X3(&x3:method::X3*) [line 51, column 6]\n  EXIT_SCOPE(n$4); [line 51, column 6]\n " shape="box"]
+"div0_getter_templ#method#6375326311998023520.359f49fd177ddd10abb56481c8c0c0e0_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x3:method::X3); [line 51, column 3]\n  n$3=_fun_method::X3::X3(&x3:method::X3*) [line 51, column 6]\n  EXIT_SCOPE(n$3); [line 51, column 6]\n " shape="box"]
 	
 
 	 "div0_getter_templ#method#6375326311998023520.359f49fd177ddd10abb56481c8c0c0e0_5" -> "div0_getter_templ#method#6375326311998023520.359f49fd177ddd10abb56481c8c0c0e0_4" ;
-"div0_getter_templ#method#6375326311998023520.359f49fd177ddd10abb56481c8c0c0e0_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(x2:method::X2); [line 50, column 3]\n  n$5=_fun_method::X2::X2(&x2:method::X2*) [line 50, column 6]\n  EXIT_SCOPE(n$5); [line 50, column 6]\n " shape="box"]
+"div0_getter_templ#method#6375326311998023520.359f49fd177ddd10abb56481c8c0c0e0_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(x2:method::X2); [line 50, column 3]\n  n$4=_fun_method::X2::X2(&x2:method::X2*) [line 50, column 6]\n  EXIT_SCOPE(n$4); [line 50, column 6]\n " shape="box"]
 	
 
 	 "div0_getter_templ#method#6375326311998023520.359f49fd177ddd10abb56481c8c0c0e0_6" -> "div0_getter_templ#method#6375326311998023520.359f49fd177ddd10abb56481c8c0c0e0_5" ;
@@ -53,15 +53,15 @@ digraph cfg {
 	
 
 	 "div0_getter_templ2#method#6451937884879872417.49c23913cff8a0a59e8e2158ec845f0c_3" -> "div0_getter_templ2#method#6451937884879872417.49c23913cff8a0a59e8e2158ec845f0c_2" ;
-"div0_getter_templ2#method#6451937884879872417.49c23913cff8a0a59e8e2158ec845f0c_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(g:method::GetterTempl<method::X2>); [line 59, column 3]\n  n$3=_fun_method::GetterTempl<method::X2>::GetterTempl(&g:method::GetterTempl<method::X2>*) [line 59, column 19]\n  EXIT_SCOPE(n$3); [line 59, column 19]\n " shape="box"]
+"div0_getter_templ2#method#6451937884879872417.49c23913cff8a0a59e8e2158ec845f0c_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(g:method::GetterTempl<method::X2>); [line 59, column 3]\n  n$2=_fun_method::GetterTempl<method::X2>::GetterTempl(&g:method::GetterTempl<method::X2>*) [line 59, column 19]\n  EXIT_SCOPE(n$2); [line 59, column 19]\n " shape="box"]
 	
 
 	 "div0_getter_templ2#method#6451937884879872417.49c23913cff8a0a59e8e2158ec845f0c_4" -> "div0_getter_templ2#method#6451937884879872417.49c23913cff8a0a59e8e2158ec845f0c_3" ;
-"div0_getter_templ2#method#6451937884879872417.49c23913cff8a0a59e8e2158ec845f0c_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x2_2:method::X2); [line 58, column 3]\n  n$4=_fun_method::X2::X2(&x2_2:method::X2*) [line 58, column 6]\n  EXIT_SCOPE(n$4); [line 58, column 6]\n " shape="box"]
+"div0_getter_templ2#method#6451937884879872417.49c23913cff8a0a59e8e2158ec845f0c_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x2_2:method::X2); [line 58, column 3]\n  n$3=_fun_method::X2::X2(&x2_2:method::X2*) [line 58, column 6]\n  EXIT_SCOPE(n$3); [line 58, column 6]\n " shape="box"]
 	
 
 	 "div0_getter_templ2#method#6451937884879872417.49c23913cff8a0a59e8e2158ec845f0c_5" -> "div0_getter_templ2#method#6451937884879872417.49c23913cff8a0a59e8e2158ec845f0c_4" ;
-"div0_getter_templ2#method#6451937884879872417.49c23913cff8a0a59e8e2158ec845f0c_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(x2_1:method::X2); [line 57, column 3]\n  n$5=_fun_method::X2::X2(&x2_1:method::X2*) [line 57, column 6]\n  EXIT_SCOPE(n$5); [line 57, column 6]\n " shape="box"]
+"div0_getter_templ2#method#6451937884879872417.49c23913cff8a0a59e8e2158ec845f0c_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(x2_1:method::X2); [line 57, column 3]\n  n$4=_fun_method::X2::X2(&x2_1:method::X2*) [line 57, column 6]\n  EXIT_SCOPE(n$4); [line 57, column 6]\n " shape="box"]
 	
 
 	 "div0_getter_templ2#method#6451937884879872417.49c23913cff8a0a59e8e2158ec845f0c_6" -> "div0_getter_templ2#method#6451937884879872417.49c23913cff8a0a59e8e2158ec845f0c_5" ;
@@ -76,11 +76,11 @@ digraph cfg {
 	
 
 	 "div1_getter#method#14010655706182645930.dfb00d82a62eb9bd9507d251472215d9_3" -> "div1_getter#method#14010655706182645930.dfb00d82a62eb9bd9507d251472215d9_2" ;
-"div1_getter#method#14010655706182645930.dfb00d82a62eb9bd9507d251472215d9_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(g:method::Getter); [line 45, column 3]\n  n$3=_fun_method::Getter::Getter(&g:method::Getter*) [line 45, column 10]\n  EXIT_SCOPE(n$3); [line 45, column 10]\n " shape="box"]
+"div1_getter#method#14010655706182645930.dfb00d82a62eb9bd9507d251472215d9_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(g:method::Getter); [line 45, column 3]\n  n$2=_fun_method::Getter::Getter(&g:method::Getter*) [line 45, column 10]\n  EXIT_SCOPE(n$2); [line 45, column 10]\n " shape="box"]
 	
 
 	 "div1_getter#method#14010655706182645930.dfb00d82a62eb9bd9507d251472215d9_4" -> "div1_getter#method#14010655706182645930.dfb00d82a62eb9bd9507d251472215d9_3" ;
-"div1_getter#method#14010655706182645930.dfb00d82a62eb9bd9507d251472215d9_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x1:method::X1); [line 44, column 3]\n  n$4=_fun_method::X1::X1(&x1:method::X1*) [line 44, column 6]\n  EXIT_SCOPE(n$4); [line 44, column 6]\n " shape="box"]
+"div1_getter#method#14010655706182645930.dfb00d82a62eb9bd9507d251472215d9_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x1:method::X1); [line 44, column 3]\n  n$3=_fun_method::X1::X1(&x1:method::X1*) [line 44, column 6]\n  EXIT_SCOPE(n$3); [line 44, column 6]\n " shape="box"]
 	
 
 	 "div1_getter#method#14010655706182645930.dfb00d82a62eb9bd9507d251472215d9_5" -> "div1_getter#method#14010655706182645930.dfb00d82a62eb9bd9507d251472215d9_4" ;
@@ -95,15 +95,15 @@ digraph cfg {
 	
 
 	 "div1_getter_templ#method#11958064193628013457.8a8112afb18681951fdb43c93893e0c5_3" -> "div1_getter_templ#method#11958064193628013457.8a8112afb18681951fdb43c93893e0c5_2" ;
-"div1_getter_templ#method#11958064193628013457.8a8112afb18681951fdb43c93893e0c5_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(g:method::GetterTempl<method::X2>); [line 66, column 3]\n  n$3=_fun_method::GetterTempl<method::X2>::GetterTempl(&g:method::GetterTempl<method::X2>*) [line 66, column 19]\n  EXIT_SCOPE(n$3); [line 66, column 19]\n " shape="box"]
+"div1_getter_templ#method#11958064193628013457.8a8112afb18681951fdb43c93893e0c5_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(g:method::GetterTempl<method::X2>); [line 66, column 3]\n  n$2=_fun_method::GetterTempl<method::X2>::GetterTempl(&g:method::GetterTempl<method::X2>*) [line 66, column 19]\n  EXIT_SCOPE(n$2); [line 66, column 19]\n " shape="box"]
 	
 
 	 "div1_getter_templ#method#11958064193628013457.8a8112afb18681951fdb43c93893e0c5_4" -> "div1_getter_templ#method#11958064193628013457.8a8112afb18681951fdb43c93893e0c5_3" ;
-"div1_getter_templ#method#11958064193628013457.8a8112afb18681951fdb43c93893e0c5_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x2:method::X2); [line 65, column 3]\n  n$4=_fun_method::X2::X2(&x2:method::X2*) [line 65, column 6]\n  EXIT_SCOPE(n$4); [line 65, column 6]\n " shape="box"]
+"div1_getter_templ#method#11958064193628013457.8a8112afb18681951fdb43c93893e0c5_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x2:method::X2); [line 65, column 3]\n  n$3=_fun_method::X2::X2(&x2:method::X2*) [line 65, column 6]\n  EXIT_SCOPE(n$3); [line 65, column 6]\n " shape="box"]
 	
 
 	 "div1_getter_templ#method#11958064193628013457.8a8112afb18681951fdb43c93893e0c5_5" -> "div1_getter_templ#method#11958064193628013457.8a8112afb18681951fdb43c93893e0c5_4" ;
-"div1_getter_templ#method#11958064193628013457.8a8112afb18681951fdb43c93893e0c5_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(x1:method::X1); [line 64, column 3]\n  n$5=_fun_method::X1::X1(&x1:method::X1*) [line 64, column 6]\n  EXIT_SCOPE(n$5); [line 64, column 6]\n " shape="box"]
+"div1_getter_templ#method#11958064193628013457.8a8112afb18681951fdb43c93893e0c5_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(x1:method::X1); [line 64, column 3]\n  n$4=_fun_method::X1::X1(&x1:method::X1*) [line 64, column 6]\n  EXIT_SCOPE(n$4); [line 64, column 6]\n " shape="box"]
 	
 
 	 "div1_getter_templ#method#11958064193628013457.8a8112afb18681951fdb43c93893e0c5_6" -> "div1_getter_templ#method#11958064193628013457.8a8112afb18681951fdb43c93893e0c5_5" ;
@@ -118,15 +118,15 @@ digraph cfg {
 	
 
 	 "div1_getter_templ2#method#7327429174804405806.fe61550d5271fa95726c7580c68f9015_3" -> "div1_getter_templ2#method#7327429174804405806.fe61550d5271fa95726c7580c68f9015_2" ;
-"div1_getter_templ2#method#7327429174804405806.fe61550d5271fa95726c7580c68f9015_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(g:method::GetterTempl<method::X1>); [line 73, column 3]\n  n$3=_fun_method::GetterTempl<method::X1>::GetterTempl(&g:method::GetterTempl<method::X1>*) [line 73, column 19]\n  EXIT_SCOPE(n$3); [line 73, column 19]\n " shape="box"]
+"div1_getter_templ2#method#7327429174804405806.fe61550d5271fa95726c7580c68f9015_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(g:method::GetterTempl<method::X1>); [line 73, column 3]\n  n$2=_fun_method::GetterTempl<method::X1>::GetterTempl(&g:method::GetterTempl<method::X1>*) [line 73, column 19]\n  EXIT_SCOPE(n$2); [line 73, column 19]\n " shape="box"]
 	
 
 	 "div1_getter_templ2#method#7327429174804405806.fe61550d5271fa95726c7580c68f9015_4" -> "div1_getter_templ2#method#7327429174804405806.fe61550d5271fa95726c7580c68f9015_3" ;
-"div1_getter_templ2#method#7327429174804405806.fe61550d5271fa95726c7580c68f9015_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x1_2:method::X1); [line 72, column 3]\n  n$4=_fun_method::X1::X1(&x1_2:method::X1*) [line 72, column 6]\n  EXIT_SCOPE(n$4); [line 72, column 6]\n " shape="box"]
+"div1_getter_templ2#method#7327429174804405806.fe61550d5271fa95726c7580c68f9015_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x1_2:method::X1); [line 72, column 3]\n  n$3=_fun_method::X1::X1(&x1_2:method::X1*) [line 72, column 6]\n  EXIT_SCOPE(n$3); [line 72, column 6]\n " shape="box"]
 	
 
 	 "div1_getter_templ2#method#7327429174804405806.fe61550d5271fa95726c7580c68f9015_5" -> "div1_getter_templ2#method#7327429174804405806.fe61550d5271fa95726c7580c68f9015_4" ;
-"div1_getter_templ2#method#7327429174804405806.fe61550d5271fa95726c7580c68f9015_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(x1_1:method::X1); [line 71, column 3]\n  n$5=_fun_method::X1::X1(&x1_1:method::X1*) [line 71, column 6]\n  EXIT_SCOPE(n$5); [line 71, column 6]\n " shape="box"]
+"div1_getter_templ2#method#7327429174804405806.fe61550d5271fa95726c7580c68f9015_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(x1_1:method::X1); [line 71, column 3]\n  n$4=_fun_method::X1::X1(&x1_1:method::X1*) [line 71, column 6]\n  EXIT_SCOPE(n$4); [line 71, column 6]\n " shape="box"]
 	
 
 	 "div1_getter_templ2#method#7327429174804405806.fe61550d5271fa95726c7580c68f9015_6" -> "div1_getter_templ2#method#7327429174804405806.fe61550d5271fa95726c7580c68f9015_5" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/templates/simple.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/templates/simple.cpp.dot
index 965efec0f..8f8223345 100644
--- a/infer/tests/codetoanalyze/cpp/shared/templates/simple.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/templates/simple.cpp.dot
@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "div0_struct_field#9739930445713322699.789b28ce09db76d69bc6373aefeacf6a_3" -> "div0_struct_field#9739930445713322699.789b28ce09db76d69bc6373aefeacf6a_2" ;
-"div0_struct_field#9739930445713322699.789b28ce09db76d69bc6373aefeacf6a_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=*&v:X& [line 23, column 3]\n  *n$3.field:int=0 [line 23, column 3]\n  EXIT_SCOPE(n$3); [line 23, column 3]\n " shape="box"]
+"div0_struct_field#9739930445713322699.789b28ce09db76d69bc6373aefeacf6a_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&v:X& [line 23, column 3]\n  *n$2.field:int=0 [line 23, column 3]\n  EXIT_SCOPE(n$2); [line 23, column 3]\n " shape="box"]
 	
 
 	 "div0_struct_field#9739930445713322699.789b28ce09db76d69bc6373aefeacf6a_4" -> "div0_struct_field#9739930445713322699.789b28ce09db76d69bc6373aefeacf6a_3" ;
@@ -26,7 +26,7 @@ digraph cfg {
 	
 
 	 "div0_template_field#16893301392201012428.8e63a0ece60a1b5e4e7b3cfa5d3dddd8_3" -> "div0_template_field#16893301392201012428.8e63a0ece60a1b5e4e7b3cfa5d3dddd8_2" ;
-"div0_template_field#16893301392201012428.8e63a0ece60a1b5e4e7b3cfa5d3dddd8_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=*&v:Container<int>& [line 18, column 3]\n  *n$3.field:int=0 [line 18, column 3]\n  EXIT_SCOPE(n$3); [line 18, column 3]\n " shape="box"]
+"div0_template_field#16893301392201012428.8e63a0ece60a1b5e4e7b3cfa5d3dddd8_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&v:Container<int>& [line 18, column 3]\n  *n$2.field:int=0 [line 18, column 3]\n  EXIT_SCOPE(n$2); [line 18, column 3]\n " shape="box"]
 	
 
 	 "div0_template_field#16893301392201012428.8e63a0ece60a1b5e4e7b3cfa5d3dddd8_4" -> "div0_template_field#16893301392201012428.8e63a0ece60a1b5e4e7b3cfa5d3dddd8_3" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/templates/sizeof_pack.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/templates/sizeof_pack.cpp.dot
index bd834af0d..34eda93f2 100644
--- a/infer/tests/codetoanalyze/cpp/shared/templates/sizeof_pack.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/templates/sizeof_pack.cpp.dot
@@ -34,11 +34,11 @@ digraph cfg {
 	
 
 	 "hash_combine_generic<MyHasher,_int,_int,_int>#343026119801841589.3016efe6a900b985af0e18a37325385b_6" -> "hash_combine_generic<MyHasher,_int,_int,_int>#343026119801841589.3016efe6a900b985af0e18a37325385b_4" ;
-"hash_combine_generic<MyHasher,_int,_int,_int>#343026119801841589.3016efe6a900b985af0e18a37325385b_7" [label="7:  Return Stmt \n   n$1=*&seed:int [line 16, column 12]\n  *&return:int=n$1 [line 16, column 5]\n  NULLIFY(&seed); [line 16, column 5]\n  EXIT_SCOPE(n$1,seed); [line 16, column 5]\n  APPLY_ABSTRACTION; [line 16, column 5]\n " shape="box"]
+"hash_combine_generic<MyHasher,_int,_int,_int>#343026119801841589.3016efe6a900b985af0e18a37325385b_7" [label="7:  Return Stmt \n   n$0=*&seed:int [line 16, column 12]\n  *&return:int=n$0 [line 16, column 5]\n  NULLIFY(&seed); [line 16, column 5]\n  EXIT_SCOPE(n$0,seed); [line 16, column 5]\n  APPLY_ABSTRACTION; [line 16, column 5]\n " shape="box"]
 	
 
 	 "hash_combine_generic<MyHasher,_int,_int,_int>#343026119801841589.3016efe6a900b985af0e18a37325385b_7" -> "hash_combine_generic<MyHasher,_int,_int,_int>#343026119801841589.3016efe6a900b985af0e18a37325385b_2" ;
-"hash_combine_generic<MyHasher,_int,_int,_int>#343026119801841589.3016efe6a900b985af0e18a37325385b_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(seed:int); [line 14, column 3]\n  n$6=*&t:int const & [line 14, column 27]\n  n$7=*n$6:int [line 14, column 27]\n  n$8=_fun_MyHasher::hash(n$7:int) [line 14, column 14]\n  *&seed:int=n$8 [line 14, column 3]\n  NULLIFY(&t); [line 14, column 3]\n  EXIT_SCOPE(n$6,n$7,n$8,t); [line 14, column 3]\n " shape="box"]
+"hash_combine_generic<MyHasher,_int,_int,_int>#343026119801841589.3016efe6a900b985af0e18a37325385b_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(seed:int); [line 14, column 3]\n  n$4=*&t:int const & [line 14, column 27]\n  n$5=*n$4:int [line 14, column 27]\n  n$6=_fun_MyHasher::hash(n$5:int) [line 14, column 14]\n  *&seed:int=n$6 [line 14, column 3]\n  NULLIFY(&t); [line 14, column 3]\n  EXIT_SCOPE(n$4,n$5,n$6,t); [line 14, column 3]\n " shape="box"]
 	
 
 	 "hash_combine_generic<MyHasher,_int,_int,_int>#343026119801841589.3016efe6a900b985af0e18a37325385b_8" -> "hash_combine_generic<MyHasher,_int,_int,_int>#343026119801841589.3016efe6a900b985af0e18a37325385b_5" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/types/casts.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/types/casts.cpp.dot
index 6bf4c0871..88f48d910 100644
--- a/infer/tests/codetoanalyze/cpp/shared/types/casts.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/types/casts.cpp.dot
@@ -18,7 +18,7 @@ digraph cfg {
 "stat_cast#12446126613472042601.03b0c783caaf8ed84eb6e909b7645c57_2" [label="2: Exit stat_cast \n  " color=yellow style=filled]
 	
 
-"stat_cast#12446126613472042601.03b0c783caaf8ed84eb6e909b7645c57_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(la:long long); [line 10, column 3]\n  n$1=*&a:int [line 10, column 41]\n  *&la:long long=n$1 [line 10, column 3]\n  NULLIFY(&a); [line 10, column 3]\n  NULLIFY(&la); [line 10, column 3]\n  EXIT_SCOPE(n$1,a,la); [line 10, column 3]\n  APPLY_ABSTRACTION; [line 10, column 3]\n " shape="box"]
+"stat_cast#12446126613472042601.03b0c783caaf8ed84eb6e909b7645c57_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(la:long long); [line 10, column 3]\n  n$0=*&a:int [line 10, column 41]\n  *&la:long long=n$0 [line 10, column 3]\n  NULLIFY(&a); [line 10, column 3]\n  NULLIFY(&la); [line 10, column 3]\n  EXIT_SCOPE(n$0,a,la); [line 10, column 3]\n  APPLY_ABSTRACTION; [line 10, column 3]\n " shape="box"]
 	
 
 	 "stat_cast#12446126613472042601.03b0c783caaf8ed84eb6e909b7645c57_3" -> "stat_cast#12446126613472042601.03b0c783caaf8ed84eb6e909b7645c57_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/types/const.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/types/const.cpp.dot
index 34933ce70..1c4a07583 100644
--- a/infer/tests/codetoanalyze/cpp/shared/types/const.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/types/const.cpp.dot
@@ -7,11 +7,11 @@ digraph cfg {
 "call_const_params_with_address#9224946220162093338.ede5d9916aae78a9bdce4ac18328cdb4_2" [label="2: Exit call_const_params_with_address \n   NULLIFY(&cx); [line 20, column 1]\n  NULLIFY(&x); [line 20, column 1]\n " color=yellow style=filled]
 	
 
-"call_const_params_with_address#9224946220162093338.ede5d9916aae78a9bdce4ac18328cdb4_3" [label="3:  Call _fun_const_in_param2 \n   n$1=_fun_const_in_param2(&cx:int const *) [line 19, column 3]\n  EXIT_SCOPE(n$1,cx); [line 19, column 3]\n  APPLY_ABSTRACTION; [line 19, column 3]\n " shape="box"]
+"call_const_params_with_address#9224946220162093338.ede5d9916aae78a9bdce4ac18328cdb4_3" [label="3:  Call _fun_const_in_param2 \n   n$0=_fun_const_in_param2(&cx:int const *) [line 19, column 3]\n  EXIT_SCOPE(n$0,cx); [line 19, column 3]\n  APPLY_ABSTRACTION; [line 19, column 3]\n " shape="box"]
 	
 
 	 "call_const_params_with_address#9224946220162093338.ede5d9916aae78a9bdce4ac18328cdb4_3" -> "call_const_params_with_address#9224946220162093338.ede5d9916aae78a9bdce4ac18328cdb4_2" ;
-"call_const_params_with_address#9224946220162093338.ede5d9916aae78a9bdce4ac18328cdb4_4" [label="4:  Call _fun_const_in_param1 \n   n$2=_fun_const_in_param1(&cx:int const *) [line 18, column 3]\n  EXIT_SCOPE(n$2); [line 18, column 3]\n " shape="box"]
+"call_const_params_with_address#9224946220162093338.ede5d9916aae78a9bdce4ac18328cdb4_4" [label="4:  Call _fun_const_in_param1 \n   n$1=_fun_const_in_param1(&cx:int const *) [line 18, column 3]\n  EXIT_SCOPE(n$1); [line 18, column 3]\n " shape="box"]
 	
 
 	 "call_const_params_with_address#9224946220162093338.ede5d9916aae78a9bdce4ac18328cdb4_4" -> "call_const_params_with_address#9224946220162093338.ede5d9916aae78a9bdce4ac18328cdb4_3" ;
@@ -19,11 +19,11 @@ digraph cfg {
 	
 
 	 "call_const_params_with_address#9224946220162093338.ede5d9916aae78a9bdce4ac18328cdb4_5" -> "call_const_params_with_address#9224946220162093338.ede5d9916aae78a9bdce4ac18328cdb4_4" ;
-"call_const_params_with_address#9224946220162093338.ede5d9916aae78a9bdce4ac18328cdb4_6" [label="6:  Call _fun_const_in_param2 \n   n$3=_fun_const_in_param2(&x:int*) [line 14, column 3]\n  EXIT_SCOPE(n$3,x); [line 14, column 3]\n " shape="box"]
+"call_const_params_with_address#9224946220162093338.ede5d9916aae78a9bdce4ac18328cdb4_6" [label="6:  Call _fun_const_in_param2 \n   n$2=_fun_const_in_param2(&x:int*) [line 14, column 3]\n  EXIT_SCOPE(n$2,x); [line 14, column 3]\n " shape="box"]
 	
 
 	 "call_const_params_with_address#9224946220162093338.ede5d9916aae78a9bdce4ac18328cdb4_6" -> "call_const_params_with_address#9224946220162093338.ede5d9916aae78a9bdce4ac18328cdb4_5" ;
-"call_const_params_with_address#9224946220162093338.ede5d9916aae78a9bdce4ac18328cdb4_7" [label="7:  Call _fun_const_in_param1 \n   n$4=_fun_const_in_param1(&x:int*) [line 13, column 3]\n  EXIT_SCOPE(n$4); [line 13, column 3]\n " shape="box"]
+"call_const_params_with_address#9224946220162093338.ede5d9916aae78a9bdce4ac18328cdb4_7" [label="7:  Call _fun_const_in_param1 \n   n$3=_fun_const_in_param1(&x:int*) [line 13, column 3]\n  EXIT_SCOPE(n$3); [line 13, column 3]\n " shape="box"]
 	
 
 	 "call_const_params_with_address#9224946220162093338.ede5d9916aae78a9bdce4ac18328cdb4_7" -> "call_const_params_with_address#9224946220162093338.ede5d9916aae78a9bdce4ac18328cdb4_6" ;
@@ -38,7 +38,7 @@ digraph cfg {
 "call_const_params_with_pointer1#3193967915651281089.e26879dad7f44305c11fcc69c90dba86_2" [label="2: Exit call_const_params_with_pointer1 \n  " color=yellow style=filled]
 	
 
-"call_const_params_with_pointer1#3193967915651281089.e26879dad7f44305c11fcc69c90dba86_3" [label="3:  Call _fun_const_in_param1 \n   n$1=*&p:int* [line 24, column 19]\n  n$2=_fun_const_in_param1(n$1:int*) [line 24, column 3]\n  NULLIFY(&p); [line 24, column 3]\n  EXIT_SCOPE(n$1,n$2,p); [line 24, column 3]\n  APPLY_ABSTRACTION; [line 24, column 3]\n " shape="box"]
+"call_const_params_with_pointer1#3193967915651281089.e26879dad7f44305c11fcc69c90dba86_3" [label="3:  Call _fun_const_in_param1 \n   n$0=*&p:int* [line 24, column 19]\n  n$1=_fun_const_in_param1(n$0:int*) [line 24, column 3]\n  NULLIFY(&p); [line 24, column 3]\n  EXIT_SCOPE(n$0,n$1,p); [line 24, column 3]\n  APPLY_ABSTRACTION; [line 24, column 3]\n " shape="box"]
 	
 
 	 "call_const_params_with_pointer1#3193967915651281089.e26879dad7f44305c11fcc69c90dba86_3" -> "call_const_params_with_pointer1#3193967915651281089.e26879dad7f44305c11fcc69c90dba86_2" ;
@@ -53,7 +53,7 @@ digraph cfg {
 "call_const_params_with_pointer2#3191133374674320806.7e564aa4edfd75304391a38942d7e07f_2" [label="2: Exit call_const_params_with_pointer2 \n  " color=yellow style=filled]
 	
 
-"call_const_params_with_pointer2#3191133374674320806.7e564aa4edfd75304391a38942d7e07f_3" [label="3:  Call _fun_const_in_param2 \n   n$1=*&p:int* [line 28, column 19]\n  n$2=_fun_const_in_param2(n$1:int*) [line 28, column 3]\n  NULLIFY(&p); [line 28, column 3]\n  EXIT_SCOPE(n$1,n$2,p); [line 28, column 3]\n  APPLY_ABSTRACTION; [line 28, column 3]\n " shape="box"]
+"call_const_params_with_pointer2#3191133374674320806.7e564aa4edfd75304391a38942d7e07f_3" [label="3:  Call _fun_const_in_param2 \n   n$0=*&p:int* [line 28, column 19]\n  n$1=_fun_const_in_param2(n$0:int*) [line 28, column 3]\n  NULLIFY(&p); [line 28, column 3]\n  EXIT_SCOPE(n$0,n$1,p); [line 28, column 3]\n  APPLY_ABSTRACTION; [line 28, column 3]\n " shape="box"]
 	
 
 	 "call_const_params_with_pointer2#3191133374674320806.7e564aa4edfd75304391a38942d7e07f_3" -> "call_const_params_with_pointer2#3191133374674320806.7e564aa4edfd75304391a38942d7e07f_2" ;
@@ -68,7 +68,7 @@ digraph cfg {
 "call_const_params_with_pointer3#3191979998627854051.cb64d3f1c70e7ecb4d702fb494a6ddf9_2" [label="2: Exit call_const_params_with_pointer3 \n  " color=yellow style=filled]
 	
 
-"call_const_params_with_pointer3#3191979998627854051.cb64d3f1c70e7ecb4d702fb494a6ddf9_3" [label="3:  Call _fun_const_in_param2 \n   n$1=*&cp:int* [line 33, column 19]\n  n$2=_fun_const_in_param2(n$1:int*) [line 33, column 3]\n  NULLIFY(&cp); [line 33, column 3]\n  EXIT_SCOPE(n$1,n$2,cp); [line 33, column 3]\n  APPLY_ABSTRACTION; [line 33, column 3]\n " shape="box"]
+"call_const_params_with_pointer3#3191979998627854051.cb64d3f1c70e7ecb4d702fb494a6ddf9_3" [label="3:  Call _fun_const_in_param2 \n   n$0=*&cp:int* [line 33, column 19]\n  n$1=_fun_const_in_param2(n$0:int*) [line 33, column 3]\n  NULLIFY(&cp); [line 33, column 3]\n  EXIT_SCOPE(n$0,n$1,cp); [line 33, column 3]\n  APPLY_ABSTRACTION; [line 33, column 3]\n " shape="box"]
 	
 
 	 "call_const_params_with_pointer3#3191979998627854051.cb64d3f1c70e7ecb4d702fb494a6ddf9_3" -> "call_const_params_with_pointer3#3191979998627854051.cb64d3f1c70e7ecb4d702fb494a6ddf9_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/types/functions.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/types/functions.cpp.dot
index 2aa234963..d2074c947 100644
--- a/infer/tests/codetoanalyze/cpp/shared/types/functions.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/types/functions.cpp.dot
@@ -40,23 +40,23 @@ digraph cfg {
 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Call _fun_fun_default_decl \n   n$1=_fun_fun_default_decl(6:int,6:int) [line 22, column 3]\n  EXIT_SCOPE(n$1); [line 22, column 3]\n  APPLY_ABSTRACTION; [line 22, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Call _fun_fun_default_decl \n   n$0=_fun_fun_default_decl(6:int,6:int) [line 22, column 3]\n  EXIT_SCOPE(n$0); [line 22, column 3]\n  APPLY_ABSTRACTION; [line 22, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  Call _fun_fun_default_decl \n   n$2=_fun_fun_default_decl(6:int,5:int) [line 21, column 3]\n  EXIT_SCOPE(n$2); [line 21, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  Call _fun_fun_default_decl \n   n$1=_fun_fun_default_decl(6:int,5:int) [line 21, column 3]\n  EXIT_SCOPE(n$1); [line 21, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  Call _fun_fun_default \n   n$3=_fun_fun_default(3:int,5:int) [line 19, column 3]\n  EXIT_SCOPE(n$3); [line 19, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  Call _fun_fun_default \n   n$2=_fun_fun_default(3:int,5:int) [line 19, column 3]\n  EXIT_SCOPE(n$2); [line 19, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  Call _fun_fun_default \n   n$4=_fun_fun_default(1:int,5:int) [line 18, column 3]\n  EXIT_SCOPE(n$4); [line 18, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  Call _fun_fun_default \n   n$3=_fun_fun_default(1:int,5:int) [line 18, column 3]\n  EXIT_SCOPE(n$3); [line 18, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" [label="7:  Call _fun_fun_default \n   n$5=_fun_fun_default(1:int,2:int) [line 17, column 3]\n  EXIT_SCOPE(n$5); [line 17, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" [label="7:  Call _fun_fun_default \n   n$4=_fun_fun_default(1:int,2:int) [line 17, column 3]\n  EXIT_SCOPE(n$4); [line 17, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" ;
@@ -67,7 +67,7 @@ digraph cfg {
 "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_2" [label="2: Exit test2 \n  " color=yellow style=filled]
 	
 
-"test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_3" [label="3:  Call _fun_fun_ignore_param \n   n$1=_fun_fun_ignore_param(1:int,1:int,1:int) [line 25, column 16]\n  EXIT_SCOPE(n$1); [line 25, column 16]\n  APPLY_ABSTRACTION; [line 25, column 16]\n " shape="box"]
+"test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_3" [label="3:  Call _fun_fun_ignore_param \n   n$0=_fun_fun_ignore_param(1:int,1:int,1:int) [line 25, column 16]\n  EXIT_SCOPE(n$0); [line 25, column 16]\n  APPLY_ABSTRACTION; [line 25, column 16]\n " shape="box"]
 	
 
 	 "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_3" -> "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/types/inheritance.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/types/inheritance.cpp.dot
index 94e4463dd..218bb3ddf 100644
--- a/infer/tests/codetoanalyze/cpp/shared/types/inheritance.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/types/inheritance.cpp.dot
@@ -7,39 +7,39 @@ digraph cfg {
 "call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_2" [label="2: Exit call_static_methods \n  " color=yellow style=filled]
 	
 
-"call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_3" [label="3:  Call _fun_Sub::fun_redefine \n   n$1=*&s2:Sub* [line 30, column 3]\n  _=*n$1:Sub [line 30, column 3]\n  n$3=_fun_Sub::fun_redefine(n$1:Sub*) [line 30, column 3]\n  NULLIFY(&s2); [line 30, column 3]\n  EXIT_SCOPE(_,n$1,n$3,s2); [line 30, column 3]\n  APPLY_ABSTRACTION; [line 30, column 3]\n " shape="box"]
+"call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_3" [label="3:  Call _fun_Sub::fun_redefine \n   n$0=*&s2:Sub* [line 30, column 3]\n  _=*n$0:Sub [line 30, column 3]\n  n$2=_fun_Sub::fun_redefine(n$0:Sub*) [line 30, column 3]\n  NULLIFY(&s2); [line 30, column 3]\n  EXIT_SCOPE(_,n$0,n$2,s2); [line 30, column 3]\n  APPLY_ABSTRACTION; [line 30, column 3]\n " shape="box"]
 	
 
 	 "call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_3" -> "call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_2" ;
-"call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_4" [label="4:  Call _fun_Base::fun_redefine \n   n$4=*&s1:Base* [line 29, column 3]\n  _=*n$4:Base [line 29, column 3]\n  n$6=_fun_Base::fun_redefine(n$4:Base*) [line 29, column 3]\n  NULLIFY(&s1); [line 29, column 3]\n  EXIT_SCOPE(_,n$4,n$6,s1); [line 29, column 3]\n " shape="box"]
+"call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_4" [label="4:  Call _fun_Base::fun_redefine \n   n$3=*&s1:Base* [line 29, column 3]\n  _=*n$3:Base [line 29, column 3]\n  n$5=_fun_Base::fun_redefine(n$3:Base*) [line 29, column 3]\n  NULLIFY(&s1); [line 29, column 3]\n  EXIT_SCOPE(_,n$3,n$5,s1); [line 29, column 3]\n " shape="box"]
 	
 
 	 "call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_4" -> "call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_3" ;
-"call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_5" [label="5:  Call _fun_Base::fun_redefine \n   n$7=*&b:Base* [line 28, column 3]\n  _=*n$7:Base [line 28, column 3]\n  n$9=_fun_Base::fun_redefine(n$7:Base*) [line 28, column 3]\n  NULLIFY(&b); [line 28, column 3]\n  EXIT_SCOPE(_,n$7,n$9,b); [line 28, column 3]\n " shape="box"]
+"call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_5" [label="5:  Call _fun_Base::fun_redefine \n   n$6=*&b:Base* [line 28, column 3]\n  _=*n$6:Base [line 28, column 3]\n  n$8=_fun_Base::fun_redefine(n$6:Base*) [line 28, column 3]\n  NULLIFY(&b); [line 28, column 3]\n  EXIT_SCOPE(_,n$6,n$8,b); [line 28, column 3]\n " shape="box"]
 	
 
 	 "call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_5" -> "call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_4" ;
-"call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_6" [label="6:  Call _fun_Base::fun \n   n$10=*&s2:Sub* [line 26, column 3]\n  _=*n$10:Sub [line 26, column 3]\n  n$12=_fun_Base::fun(n$10:Sub*) [line 26, column 3]\n  EXIT_SCOPE(_,n$10,n$12); [line 26, column 3]\n " shape="box"]
+"call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_6" [label="6:  Call _fun_Base::fun \n   n$9=*&s2:Sub* [line 26, column 3]\n  _=*n$9:Sub [line 26, column 3]\n  n$11=_fun_Base::fun(n$9:Sub*) [line 26, column 3]\n  EXIT_SCOPE(_,n$9,n$11); [line 26, column 3]\n " shape="box"]
 	
 
 	 "call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_6" -> "call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_5" ;
-"call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_7" [label="7:  Call _fun_Base::fun \n   n$13=*&s1:Base* [line 25, column 3]\n  _=*n$13:Base [line 25, column 3]\n  n$15=_fun_Base::fun(n$13:Base*) [line 25, column 3]\n  EXIT_SCOPE(_,n$13,n$15); [line 25, column 3]\n " shape="box"]
+"call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_7" [label="7:  Call _fun_Base::fun \n   n$12=*&s1:Base* [line 25, column 3]\n  _=*n$12:Base [line 25, column 3]\n  n$14=_fun_Base::fun(n$12:Base*) [line 25, column 3]\n  EXIT_SCOPE(_,n$12,n$14); [line 25, column 3]\n " shape="box"]
 	
 
 	 "call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_7" -> "call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_6" ;
-"call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_8" [label="8:  Call _fun_Base::fun \n   n$16=*&b:Base* [line 24, column 3]\n  _=*n$16:Base [line 24, column 3]\n  n$18=_fun_Base::fun(n$16:Base*) [line 24, column 3]\n  EXIT_SCOPE(_,n$16,n$18); [line 24, column 3]\n " shape="box"]
+"call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_8" [label="8:  Call _fun_Base::fun \n   n$15=*&b:Base* [line 24, column 3]\n  _=*n$15:Base [line 24, column 3]\n  n$17=_fun_Base::fun(n$15:Base*) [line 24, column 3]\n  EXIT_SCOPE(_,n$15,n$17); [line 24, column 3]\n " shape="box"]
 	
 
 	 "call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_8" -> "call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_7" ;
-"call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(s2:Sub*); [line 22, column 3]\n  n$19=_fun___new(sizeof(t=Sub):unsigned long) [line 22, column 13]\n  n$20=_fun_Sub::Sub(n$19:Sub*) [line 22, column 17]\n  *&s2:Sub*=n$19 [line 22, column 3]\n  EXIT_SCOPE(n$19,n$20); [line 22, column 3]\n " shape="box"]
+"call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(s2:Sub*); [line 22, column 3]\n  n$18=_fun___new(sizeof(t=Sub):unsigned long) [line 22, column 13]\n  n$19=_fun_Sub::Sub(n$18:Sub*) [line 22, column 17]\n  *&s2:Sub*=n$18 [line 22, column 3]\n  EXIT_SCOPE(n$18,n$19); [line 22, column 3]\n " shape="box"]
 	
 
 	 "call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_9" -> "call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_8" ;
-"call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(s1:Base*); [line 21, column 3]\n  n$21=_fun___new(sizeof(t=Sub):unsigned long) [line 21, column 14]\n  n$22=_fun_Sub::Sub(n$21:Sub*) [line 21, column 18]\n  *&s1:Sub*=n$21 [line 21, column 3]\n  EXIT_SCOPE(n$21,n$22); [line 21, column 3]\n " shape="box"]
+"call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(s1:Base*); [line 21, column 3]\n  n$20=_fun___new(sizeof(t=Sub):unsigned long) [line 21, column 14]\n  n$21=_fun_Sub::Sub(n$20:Sub*) [line 21, column 18]\n  *&s1:Sub*=n$20 [line 21, column 3]\n  EXIT_SCOPE(n$20,n$21); [line 21, column 3]\n " shape="box"]
 	
 
 	 "call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_10" -> "call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_9" ;
-"call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(b:Base*); [line 20, column 3]\n  n$23=_fun___new(sizeof(t=Base):unsigned long) [line 20, column 13]\n  n$24=_fun_Base::Base(n$23:Base*) [line 20, column 17]\n  *&b:Base*=n$23 [line 20, column 3]\n  EXIT_SCOPE(n$23,n$24); [line 20, column 3]\n " shape="box"]
+"call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(b:Base*); [line 20, column 3]\n  n$22=_fun___new(sizeof(t=Base):unsigned long) [line 20, column 13]\n  n$23=_fun_Base::Base(n$22:Base*) [line 20, column 17]\n  *&b:Base*=n$22 [line 20, column 3]\n  EXIT_SCOPE(n$22,n$23); [line 20, column 3]\n " shape="box"]
 	
 
 	 "call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_11" -> "call_static_methods#2229162425019005814.6b8ed680875ca5e183f8fa3b51ea6718_10" ;
@@ -90,7 +90,7 @@ digraph cfg {
 "Sub#Sub#{11878357359117042972|constexpr}.886e3a99a94b49e456c4d39277ccc93b_2" [label="2: Exit Sub::Sub \n  " color=yellow style=filled]
 	
 
-"Sub#Sub#{11878357359117042972|constexpr}.886e3a99a94b49e456c4d39277ccc93b_3" [label="3:  Constructor Init \n   n$2=*&this:Sub* [line 14, column 7]\n  n$3=_fun_Base::Base(n$2:Sub*) [line 14, column 7]\n  NULLIFY(&this); [line 14, column 7]\n  EXIT_SCOPE(n$2,n$3,this); [line 14, column 7]\n  APPLY_ABSTRACTION; [line 14, column 7]\n " shape="box"]
+"Sub#Sub#{11878357359117042972|constexpr}.886e3a99a94b49e456c4d39277ccc93b_3" [label="3:  Constructor Init \n   n$1=*&this:Sub* [line 14, column 7]\n  n$2=_fun_Base::Base(n$1:Sub*) [line 14, column 7]\n  NULLIFY(&this); [line 14, column 7]\n  EXIT_SCOPE(n$1,n$2,this); [line 14, column 7]\n  APPLY_ABSTRACTION; [line 14, column 7]\n " shape="box"]
 	
 
 	 "Sub#Sub#{11878357359117042972|constexpr}.886e3a99a94b49e456c4d39277ccc93b_3" -> "Sub#Sub#{11878357359117042972|constexpr}.886e3a99a94b49e456c4d39277ccc93b_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/types/inheritance_casts.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/types/inheritance_casts.cpp.dot
index d9725865b..41c82a320 100644
--- a/infer/tests/codetoanalyze/cpp/shared/types/inheritance_casts.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/types/inheritance_casts.cpp.dot
@@ -100,7 +100,7 @@ digraph cfg {
 "A#A#inheritance_casts#{10902709585585133973|constexpr}.68880ef701101d56bd12eca3d63ad60a_2" [label="2: Exit inheritance_casts::A::A \n  " color=yellow style=filled]
 	
 
-"A#A#inheritance_casts#{10902709585585133973|constexpr}.68880ef701101d56bd12eca3d63ad60a_3" [label="3:  Constructor Init \n   n$2=*&this:inheritance_casts::A* [line 8, column 8]\n  n$3=*&__param_0:inheritance_casts::A& [line 8, column 8]\n  n$4=*n$3.f:int [line 8, column 8]\n  *n$2.f:int=n$4 [line 8, column 8]\n  NULLIFY(&this); [line 8, column 8]\n  NULLIFY(&__param_0); [line 8, column 8]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 8, column 8]\n  APPLY_ABSTRACTION; [line 8, column 8]\n " shape="box"]
+"A#A#inheritance_casts#{10902709585585133973|constexpr}.68880ef701101d56bd12eca3d63ad60a_3" [label="3:  Constructor Init \n   n$1=*&this:inheritance_casts::A* [line 8, column 8]\n  n$2=*&__param_0:inheritance_casts::A& [line 8, column 8]\n  n$3=*n$2.f:int [line 8, column 8]\n  *n$1.f:int=n$3 [line 8, column 8]\n  NULLIFY(&this); [line 8, column 8]\n  NULLIFY(&__param_0); [line 8, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 8, column 8]\n  APPLY_ABSTRACTION; [line 8, column 8]\n " shape="box"]
 	
 
 	 "A#A#inheritance_casts#{10902709585585133973|constexpr}.68880ef701101d56bd12eca3d63ad60a_3" -> "A#A#inheritance_casts#{10902709585585133973|constexpr}.68880ef701101d56bd12eca3d63ad60a_2" ;
@@ -118,7 +118,7 @@ digraph cfg {
 "B#B#inheritance_casts#{757591507791864682|constexpr}.5bcf15d1bf21f1370c2f899ddef4b1c9_2" [label="2: Exit inheritance_casts::B::B \n  " color=yellow style=filled]
 	
 
-"B#B#inheritance_casts#{757591507791864682|constexpr}.5bcf15d1bf21f1370c2f899ddef4b1c9_3" [label="3:  Constructor Init \n   n$2=*&this:inheritance_casts::B* [line 11, column 8]\n  n$3=*&__param_0:inheritance_casts::B& [line 11, column 8]\n  n$4=_fun_inheritance_casts::A::A(n$2:inheritance_casts::B*,n$3:inheritance_casts::B&) [line 11, column 8]\n  NULLIFY(&this); [line 11, column 8]\n  NULLIFY(&__param_0); [line 11, column 8]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 11, column 8]\n  APPLY_ABSTRACTION; [line 11, column 8]\n " shape="box"]
+"B#B#inheritance_casts#{757591507791864682|constexpr}.5bcf15d1bf21f1370c2f899ddef4b1c9_3" [label="3:  Constructor Init \n   n$1=*&this:inheritance_casts::B* [line 11, column 8]\n  n$2=*&__param_0:inheritance_casts::B& [line 11, column 8]\n  n$3=_fun_inheritance_casts::A::A(n$1:inheritance_casts::B*,n$2:inheritance_casts::B&) [line 11, column 8]\n  NULLIFY(&this); [line 11, column 8]\n  NULLIFY(&__param_0); [line 11, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 11, column 8]\n  APPLY_ABSTRACTION; [line 11, column 8]\n " shape="box"]
 	
 
 	 "B#B#inheritance_casts#{757591507791864682|constexpr}.5bcf15d1bf21f1370c2f899ddef4b1c9_3" -> "B#B#inheritance_casts#{757591507791864682|constexpr}.5bcf15d1bf21f1370c2f899ddef4b1c9_2" ;
@@ -129,7 +129,7 @@ digraph cfg {
 "B#B#inheritance_casts#{9678838365339542453}.8b569e08272bb08f8843c357c8546f65_2" [label="2: Exit inheritance_casts::B::B \n  " color=yellow style=filled]
 	
 
-"B#B#inheritance_casts#{9678838365339542453}.8b569e08272bb08f8843c357c8546f65_3" [label="3:  Constructor Init \n   n$2=*&this:inheritance_casts::B* [line 11, column 8]\n  n$3=_fun_inheritance_casts::A::A(n$2:inheritance_casts::B*) [line 11, column 8]\n  NULLIFY(&this); [line 11, column 8]\n  EXIT_SCOPE(n$2,n$3,this); [line 11, column 8]\n  APPLY_ABSTRACTION; [line 11, column 8]\n " shape="box"]
+"B#B#inheritance_casts#{9678838365339542453}.8b569e08272bb08f8843c357c8546f65_3" [label="3:  Constructor Init \n   n$1=*&this:inheritance_casts::B* [line 11, column 8]\n  n$2=_fun_inheritance_casts::A::A(n$1:inheritance_casts::B*) [line 11, column 8]\n  NULLIFY(&this); [line 11, column 8]\n  EXIT_SCOPE(n$1,n$2,this); [line 11, column 8]\n  APPLY_ABSTRACTION; [line 11, column 8]\n " shape="box"]
 	
 
 	 "B#B#inheritance_casts#{9678838365339542453}.8b569e08272bb08f8843c357c8546f65_3" -> "B#B#inheritance_casts#{9678838365339542453}.8b569e08272bb08f8843c357c8546f65_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/types/inheritance_field.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/types/inheritance_field.cpp.dot
index af5dc91ce..fda107a5b 100644
--- a/infer/tests/codetoanalyze/cpp/shared/types/inheritance_field.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/types/inheritance_field.cpp.dot
@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "div0_b1#17650173920024552929.38acfc238efbf35c1ac5da7290b49422_3" -> "div0_b1#17650173920024552929.38acfc238efbf35c1ac5da7290b49422_2" ;
-"div0_b1#17650173920024552929.38acfc238efbf35c1ac5da7290b49422_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=*&s:Sub& [line 21, column 3]\n  *n$3.b1:int=0 [line 21, column 3]\n  EXIT_SCOPE(n$3); [line 21, column 3]\n " shape="box"]
+"div0_b1#17650173920024552929.38acfc238efbf35c1ac5da7290b49422_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&s:Sub& [line 21, column 3]\n  *n$2.b1:int=0 [line 21, column 3]\n  EXIT_SCOPE(n$2); [line 21, column 3]\n " shape="box"]
 	
 
 	 "div0_b1#17650173920024552929.38acfc238efbf35c1ac5da7290b49422_4" -> "div0_b1#17650173920024552929.38acfc238efbf35c1ac5da7290b49422_3" ;
@@ -26,11 +26,11 @@ digraph cfg {
 	
 
 	 "div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_3" -> "div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_2" ;
-"div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_4" [label="4:  BinaryOperatorStmt: Assign \n   n$5=*&s:Sub* [line 49, column 3]\n  *n$5.s:int=1 [line 49, column 3]\n  EXIT_SCOPE(n$5); [line 49, column 3]\n " shape="box"]
+"div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_4" [label="4:  BinaryOperatorStmt: Assign \n   n$4=*&s:Sub* [line 49, column 3]\n  *n$4.s:int=1 [line 49, column 3]\n  EXIT_SCOPE(n$4); [line 49, column 3]\n " shape="box"]
 	
 
 	 "div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_4" -> "div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_3" ;
-"div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_5" [label="5:  BinaryOperatorStmt: Assign \n   n$6=*&s:Sub* [line 48, column 3]\n  *n$6.b1:int=1 [line 48, column 3]\n  EXIT_SCOPE(n$6); [line 48, column 3]\n " shape="box"]
+"div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_5" [label="5:  BinaryOperatorStmt: Assign \n   n$5=*&s:Sub* [line 48, column 3]\n  *n$5.b1:int=1 [line 48, column 3]\n  EXIT_SCOPE(n$5); [line 48, column 3]\n " shape="box"]
 	
 
 	 "div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_5" -> "div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_4" ;
@@ -45,7 +45,7 @@ digraph cfg {
 	
 
 	 "div0_b2#6935029956526426132.ef88e6d1eac891cdde3f345b9b55439c_3" -> "div0_b2#6935029956526426132.ef88e6d1eac891cdde3f345b9b55439c_2" ;
-"div0_b2#6935029956526426132.ef88e6d1eac891cdde3f345b9b55439c_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=*&s:Sub& [line 26, column 3]\n  *n$3.b2:int=0 [line 26, column 3]\n  EXIT_SCOPE(n$3); [line 26, column 3]\n " shape="box"]
+"div0_b2#6935029956526426132.ef88e6d1eac891cdde3f345b9b55439c_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&s:Sub& [line 26, column 3]\n  *n$2.b2:int=0 [line 26, column 3]\n  EXIT_SCOPE(n$2); [line 26, column 3]\n " shape="box"]
 	
 
 	 "div0_b2#6935029956526426132.ef88e6d1eac891cdde3f345b9b55439c_4" -> "div0_b2#6935029956526426132.ef88e6d1eac891cdde3f345b9b55439c_3" ;
@@ -60,11 +60,11 @@ digraph cfg {
 	
 
 	 "div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_3" -> "div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_2" ;
-"div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(b:Base1*); [line 37, column 3]\n  n$3=*&s:Sub* [line 37, column 14]\n  *&b:Sub*=n$3 [line 37, column 3]\n  NULLIFY(&s); [line 37, column 3]\n  EXIT_SCOPE(n$3,s); [line 37, column 3]\n " shape="box"]
+"div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(b:Base1*); [line 37, column 3]\n  n$2=*&s:Sub* [line 37, column 14]\n  *&b:Sub*=n$2 [line 37, column 3]\n  NULLIFY(&s); [line 37, column 3]\n  EXIT_SCOPE(n$2,s); [line 37, column 3]\n " shape="box"]
 	
 
 	 "div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_4" -> "div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_3" ;
-"div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_5" [label="5:  BinaryOperatorStmt: Assign \n   n$4=*&s:Sub* [line 36, column 3]\n  *n$4.b1:int=0 [line 36, column 3]\n  EXIT_SCOPE(n$4); [line 36, column 3]\n " shape="box"]
+"div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_5" [label="5:  BinaryOperatorStmt: Assign \n   n$3=*&s:Sub* [line 36, column 3]\n  *n$3.b1:int=0 [line 36, column 3]\n  EXIT_SCOPE(n$3); [line 36, column 3]\n " shape="box"]
 	
 
 	 "div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_5" -> "div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_4" ;
@@ -79,11 +79,11 @@ digraph cfg {
 	
 
 	 "div0_cast_ref#11427648331886451822.4f535c7752ac1b6e5f35ab1a83dc2bd8_3" -> "div0_cast_ref#11427648331886451822.4f535c7752ac1b6e5f35ab1a83dc2bd8_2" ;
-"div0_cast_ref#11427648331886451822.4f535c7752ac1b6e5f35ab1a83dc2bd8_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(b:Base1&); [line 43, column 3]\n  n$3=*&s:Sub& [line 43, column 14]\n  *&b:Sub&=n$3 [line 43, column 3]\n  NULLIFY(&s); [line 43, column 3]\n  EXIT_SCOPE(n$3,s); [line 43, column 3]\n " shape="box"]
+"div0_cast_ref#11427648331886451822.4f535c7752ac1b6e5f35ab1a83dc2bd8_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(b:Base1&); [line 43, column 3]\n  n$2=*&s:Sub& [line 43, column 14]\n  *&b:Sub&=n$2 [line 43, column 3]\n  NULLIFY(&s); [line 43, column 3]\n  EXIT_SCOPE(n$2,s); [line 43, column 3]\n " shape="box"]
 	
 
 	 "div0_cast_ref#11427648331886451822.4f535c7752ac1b6e5f35ab1a83dc2bd8_4" -> "div0_cast_ref#11427648331886451822.4f535c7752ac1b6e5f35ab1a83dc2bd8_3" ;
-"div0_cast_ref#11427648331886451822.4f535c7752ac1b6e5f35ab1a83dc2bd8_5" [label="5:  BinaryOperatorStmt: Assign \n   n$4=*&s:Sub& [line 42, column 3]\n  *n$4.b1:int=0 [line 42, column 3]\n  EXIT_SCOPE(n$4); [line 42, column 3]\n " shape="box"]
+"div0_cast_ref#11427648331886451822.4f535c7752ac1b6e5f35ab1a83dc2bd8_5" [label="5:  BinaryOperatorStmt: Assign \n   n$3=*&s:Sub& [line 42, column 3]\n  *n$3.b1:int=0 [line 42, column 3]\n  EXIT_SCOPE(n$3); [line 42, column 3]\n " shape="box"]
 	
 
 	 "div0_cast_ref#11427648331886451822.4f535c7752ac1b6e5f35ab1a83dc2bd8_5" -> "div0_cast_ref#11427648331886451822.4f535c7752ac1b6e5f35ab1a83dc2bd8_4" ;
@@ -98,7 +98,7 @@ digraph cfg {
 	
 
 	 "div0_s#16566672704220882536.127f1e4fb94cf0b77844a4e153e0f991_3" -> "div0_s#16566672704220882536.127f1e4fb94cf0b77844a4e153e0f991_2" ;
-"div0_s#16566672704220882536.127f1e4fb94cf0b77844a4e153e0f991_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=*&s:Sub& [line 31, column 3]\n  *n$3.s:int=0 [line 31, column 3]\n  EXIT_SCOPE(n$3); [line 31, column 3]\n " shape="box"]
+"div0_s#16566672704220882536.127f1e4fb94cf0b77844a4e153e0f991_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&s:Sub& [line 31, column 3]\n  *n$2.s:int=0 [line 31, column 3]\n  EXIT_SCOPE(n$2); [line 31, column 3]\n " shape="box"]
 	
 
 	 "div0_s#16566672704220882536.127f1e4fb94cf0b77844a4e153e0f991_4" -> "div0_s#16566672704220882536.127f1e4fb94cf0b77844a4e153e0f991_3" ;
@@ -113,11 +113,11 @@ digraph cfg {
 	
 
 	 "div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_3" -> "div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_2" ;
-"div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_4" [label="4:  BinaryOperatorStmt: Assign \n   n$5=*&s:Sub* [line 55, column 3]\n  *n$5.s:int=1 [line 55, column 3]\n  EXIT_SCOPE(n$5); [line 55, column 3]\n " shape="box"]
+"div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_4" [label="4:  BinaryOperatorStmt: Assign \n   n$4=*&s:Sub* [line 55, column 3]\n  *n$4.s:int=1 [line 55, column 3]\n  EXIT_SCOPE(n$4); [line 55, column 3]\n " shape="box"]
 	
 
 	 "div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_4" -> "div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_3" ;
-"div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_5" [label="5:  BinaryOperatorStmt: Assign \n   n$6=*&s:Sub* [line 54, column 3]\n  *n$6.b1:int=1 [line 54, column 3]\n  EXIT_SCOPE(n$6); [line 54, column 3]\n " shape="box"]
+"div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_5" [label="5:  BinaryOperatorStmt: Assign \n   n$5=*&s:Sub* [line 54, column 3]\n  *n$5.b1:int=1 [line 54, column 3]\n  EXIT_SCOPE(n$5); [line 54, column 3]\n " shape="box"]
 	
 
 	 "div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_5" -> "div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_4" ;
@@ -132,7 +132,7 @@ digraph cfg {
 	
 
 	 "div1_b1#14974413951234929464.2d37fbc87faf449081172c1e2711163f_3" -> "div1_b1#14974413951234929464.2d37fbc87faf449081172c1e2711163f_2" ;
-"div1_b1#14974413951234929464.2d37fbc87faf449081172c1e2711163f_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=*&s:Sub& [line 60, column 3]\n  *n$3.b1:int=1 [line 60, column 3]\n  EXIT_SCOPE(n$3); [line 60, column 3]\n " shape="box"]
+"div1_b1#14974413951234929464.2d37fbc87faf449081172c1e2711163f_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&s:Sub& [line 60, column 3]\n  *n$2.b1:int=1 [line 60, column 3]\n  EXIT_SCOPE(n$2); [line 60, column 3]\n " shape="box"]
 	
 
 	 "div1_b1#14974413951234929464.2d37fbc87faf449081172c1e2711163f_4" -> "div1_b1#14974413951234929464.2d37fbc87faf449081172c1e2711163f_3" ;
@@ -147,11 +147,11 @@ digraph cfg {
 	
 
 	 "div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_3" -> "div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_2" ;
-"div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(b:Base1*); [line 66, column 3]\n  n$3=*&s:Sub* [line 66, column 14]\n  *&b:Sub*=n$3 [line 66, column 3]\n  NULLIFY(&s); [line 66, column 3]\n  EXIT_SCOPE(n$3,s); [line 66, column 3]\n " shape="box"]
+"div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(b:Base1*); [line 66, column 3]\n  n$2=*&s:Sub* [line 66, column 14]\n  *&b:Sub*=n$2 [line 66, column 3]\n  NULLIFY(&s); [line 66, column 3]\n  EXIT_SCOPE(n$2,s); [line 66, column 3]\n " shape="box"]
 	
 
 	 "div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_4" -> "div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_3" ;
-"div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_5" [label="5:  BinaryOperatorStmt: Assign \n   n$4=*&s:Sub* [line 65, column 3]\n  *n$4.b1:int=1 [line 65, column 3]\n  EXIT_SCOPE(n$4); [line 65, column 3]\n " shape="box"]
+"div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_5" [label="5:  BinaryOperatorStmt: Assign \n   n$3=*&s:Sub* [line 65, column 3]\n  *n$3.b1:int=1 [line 65, column 3]\n  EXIT_SCOPE(n$3); [line 65, column 3]\n " shape="box"]
 	
 
 	 "div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_5" -> "div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_4" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/types/operator_overload.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/types/operator_overload.cpp.dot
index aeaf2ac1a..0be570cc1 100644
--- a/infer/tests/codetoanalyze/cpp/shared/types/operator_overload.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/types/operator_overload.cpp.dot
@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "div0_function_op#6873855268879531342.84fad54736dded19eef101141599a76d_3" -> "div0_function_op#6873855268879531342.84fad54736dded19eef101141599a76d_2" ;
-"div0_function_op#6873855268879531342.84fad54736dded19eef101141599a76d_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(v:int); [line 28, column 3]\n  n$2=*&x:X& [line 28, column 11]\n  n$3=_fun_operator*(n$2:X&,0:int) [line 28, column 11]\n  *&v:int=n$3 [line 28, column 3]\n  NULLIFY(&x); [line 28, column 3]\n  EXIT_SCOPE(n$2,n$3,x); [line 28, column 3]\n " shape="box"]
+"div0_function_op#6873855268879531342.84fad54736dded19eef101141599a76d_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(v:int); [line 28, column 3]\n  n$1=*&x:X& [line 28, column 11]\n  n$2=_fun_operator*(n$1:X&,0:int) [line 28, column 11]\n  *&v:int=n$2 [line 28, column 3]\n  NULLIFY(&x); [line 28, column 3]\n  EXIT_SCOPE(n$1,n$2,x); [line 28, column 3]\n " shape="box"]
 	
 
 	 "div0_function_op#6873855268879531342.84fad54736dded19eef101141599a76d_4" -> "div0_function_op#6873855268879531342.84fad54736dded19eef101141599a76d_3" ;
@@ -37,7 +37,7 @@ digraph cfg {
 	
 
 	 "div0_method#3394285867487200768.d62d68147390fdf119b5094668c7a05c_3" -> "div0_method#3394285867487200768.d62d68147390fdf119b5094668c7a05c_2" ;
-"div0_method#3394285867487200768.d62d68147390fdf119b5094668c7a05c_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(v:int); [line 34, column 3]\n  n$2=*&x:X& [line 34, column 11]\n  _=*n$2:X [line 34, column 11]\n  n$4=_fun_X::operator[](n$2:X&,0:int) [line 34, column 11]\n  *&v:int=n$4 [line 34, column 3]\n  NULLIFY(&x); [line 34, column 3]\n  EXIT_SCOPE(_,n$2,n$4,x); [line 34, column 3]\n " shape="box"]
+"div0_method#3394285867487200768.d62d68147390fdf119b5094668c7a05c_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(v:int); [line 34, column 3]\n  n$1=*&x:X& [line 34, column 11]\n  _=*n$1:X [line 34, column 11]\n  n$3=_fun_X::operator[](n$1:X&,0:int) [line 34, column 11]\n  *&v:int=n$3 [line 34, column 3]\n  NULLIFY(&x); [line 34, column 3]\n  EXIT_SCOPE(_,n$1,n$3,x); [line 34, column 3]\n " shape="box"]
 	
 
 	 "div0_method#3394285867487200768.d62d68147390fdf119b5094668c7a05c_4" -> "div0_method#3394285867487200768.d62d68147390fdf119b5094668c7a05c_3" ;
@@ -52,7 +52,7 @@ digraph cfg {
 	
 
 	 "div0_method_op#16458634010327501325.9f8c8af0fef3459b668ce9bd6f32558b_3" -> "div0_method_op#16458634010327501325.9f8c8af0fef3459b668ce9bd6f32558b_2" ;
-"div0_method_op#16458634010327501325.9f8c8af0fef3459b668ce9bd6f32558b_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(v:int); [line 20, column 3]\n  n$3=*&x:X& [line 20, column 11]\n  n$4=_fun_X::operator[](n$3:X&,0:int) [line 20, column 11]\n  *&v:int=n$4 [line 20, column 3]\n  NULLIFY(&x); [line 20, column 3]\n  EXIT_SCOPE(n$3,n$4,x); [line 20, column 3]\n " shape="box"]
+"div0_method_op#16458634010327501325.9f8c8af0fef3459b668ce9bd6f32558b_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(v:int); [line 20, column 3]\n  n$2=*&x:X& [line 20, column 11]\n  n$3=_fun_X::operator[](n$2:X&,0:int) [line 20, column 11]\n  *&v:int=n$3 [line 20, column 3]\n  NULLIFY(&x); [line 20, column 3]\n  EXIT_SCOPE(n$2,n$3,x); [line 20, column 3]\n " shape="box"]
 	
 
 	 "div0_method_op#16458634010327501325.9f8c8af0fef3459b668ce9bd6f32558b_4" -> "div0_method_op#16458634010327501325.9f8c8af0fef3459b668ce9bd6f32558b_3" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/types/return_struct.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/types/return_struct.cpp.dot
index 50d7f57bc..4a7cf7388 100644
--- a/infer/tests/codetoanalyze/cpp/shared/types/return_struct.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/types/return_struct.cpp.dot
@@ -49,18 +49,18 @@ digraph cfg {
 	
 
 	 "get_div1#return_struct#4287655186293816212.dabfacf04a7d838f8bdc3ef21786303d_4" -> "get_div1#return_struct#4287655186293816212.dabfacf04a7d838f8bdc3ef21786303d_3" ;
-"get_field_div0#return_struct#5765383981880135147.23dc82d8c29aaec22d9b9a68808820c3_1" [label="1: Start return_struct::get_field_div0\nFormals: \nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$0:return_struct::X 0$?%__sil_tmpSIL_materialize_temp__n$5:return_struct::X \n  " color=yellow style=filled]
+"get_field_div0#return_struct#5765383981880135147.23dc82d8c29aaec22d9b9a68808820c3_1" [label="1: Start return_struct::get_field_div0\nFormals: \nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$0:return_struct::X 0$?%__sil_tmpSIL_materialize_temp__n$4:return_struct::X \n  " color=yellow style=filled]
 	
 
 	 "get_field_div0#return_struct#5765383981880135147.23dc82d8c29aaec22d9b9a68808820c3_1" -> "get_field_div0#return_struct#5765383981880135147.23dc82d8c29aaec22d9b9a68808820c3_4" ;
-"get_field_div0#return_struct#5765383981880135147.23dc82d8c29aaec22d9b9a68808820c3_2" [label="2: Exit return_struct::get_field_div0 \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 33, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$5); [line 33, column 1]\n " color=yellow style=filled]
+"get_field_div0#return_struct#5765383981880135147.23dc82d8c29aaec22d9b9a68808820c3_2" [label="2: Exit return_struct::get_field_div0 \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 33, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$4); [line 33, column 1]\n " color=yellow style=filled]
 	
 
 "get_field_div0#return_struct#5765383981880135147.23dc82d8c29aaec22d9b9a68808820c3_3" [label="3:  Return Stmt \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$0:return_struct::X); [line 32, column 14]\n  n$2=_fun_return_struct::get(0:int,&0$?%__sil_tmpSIL_materialize_temp__n$0:return_struct::X*) assign_last [line 32, column 14]\n  n$3=*&0$?%__sil_tmpSIL_materialize_temp__n$0.f:int [line 32, column 14]\n  *&return:int=(1 / n$3) [line 32, column 3]\n  EXIT_SCOPE(n$2,n$3,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 32, column 3]\n  APPLY_ABSTRACTION; [line 32, column 3]\n " shape="box"]
 	
 
 	 "get_field_div0#return_struct#5765383981880135147.23dc82d8c29aaec22d9b9a68808820c3_3" -> "get_field_div0#return_struct#5765383981880135147.23dc82d8c29aaec22d9b9a68808820c3_2" ;
-"get_field_div0#return_struct#5765383981880135147.23dc82d8c29aaec22d9b9a68808820c3_4" [label="4:  Call _fun_return_struct::X::skip \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$5:return_struct::X); [line 31, column 3]\n  n$7=_fun_return_struct::get(0:int,&0$?%__sil_tmpSIL_materialize_temp__n$5:return_struct::X*) assign_last [line 31, column 3]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$5:return_struct::X [line 31, column 3]\n  n$9=_fun_return_struct::X::skip(&0$?%__sil_tmpSIL_materialize_temp__n$5:return_struct::X&) [line 31, column 3]\n  EXIT_SCOPE(_,n$7,n$9,0$?%__sil_tmpSIL_materialize_temp__n$5); [line 31, column 3]\n " shape="box"]
+"get_field_div0#return_struct#5765383981880135147.23dc82d8c29aaec22d9b9a68808820c3_4" [label="4:  Call _fun_return_struct::X::skip \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$4:return_struct::X); [line 31, column 3]\n  n$6=_fun_return_struct::get(0:int,&0$?%__sil_tmpSIL_materialize_temp__n$4:return_struct::X*) assign_last [line 31, column 3]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$4:return_struct::X [line 31, column 3]\n  n$8=_fun_return_struct::X::skip(&0$?%__sil_tmpSIL_materialize_temp__n$4:return_struct::X&) [line 31, column 3]\n  EXIT_SCOPE(_,n$6,n$8,0$?%__sil_tmpSIL_materialize_temp__n$4); [line 31, column 3]\n " shape="box"]
 	
 
 	 "get_field_div0#return_struct#5765383981880135147.23dc82d8c29aaec22d9b9a68808820c3_4" -> "get_field_div0#return_struct#5765383981880135147.23dc82d8c29aaec22d9b9a68808820c3_3" ;
@@ -115,7 +115,7 @@ digraph cfg {
 "X#X#return_struct#{16980707005325791470}.5cc7c757bfe221e617030d485a90aa08_2" [label="2: Exit return_struct::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#return_struct#{16980707005325791470}.5cc7c757bfe221e617030d485a90aa08_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:return_struct::X* [line 14, column 9]\n  *n$1.f:int=1 [line 14, column 9]\n  NULLIFY(&this); [line 14, column 9]\n  EXIT_SCOPE(n$1,this); [line 14, column 9]\n  APPLY_ABSTRACTION; [line 14, column 9]\n " shape="box"]
+"X#X#return_struct#{16980707005325791470}.5cc7c757bfe221e617030d485a90aa08_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:return_struct::X* [line 14, column 9]\n  *n$0.f:int=1 [line 14, column 9]\n  NULLIFY(&this); [line 14, column 9]\n  EXIT_SCOPE(n$0,this); [line 14, column 9]\n  APPLY_ABSTRACTION; [line 14, column 9]\n " shape="box"]
 	
 
 	 "X#X#return_struct#{16980707005325791470}.5cc7c757bfe221e617030d485a90aa08_3" -> "X#X#return_struct#{16980707005325791470}.5cc7c757bfe221e617030d485a90aa08_2" ;
@@ -126,7 +126,7 @@ digraph cfg {
 "X#X#return_struct#{2874542973664462157}.c7820661c77babcd49c610d7742e613f_2" [label="2: Exit return_struct::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#return_struct#{2874542973664462157}.c7820661c77babcd49c610d7742e613f_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&this:return_struct::X* [line 13, column 19]\n  n$2=*&x:return_struct::X const & [line 13, column 23]\n  n$3=*n$2.f:int [line 13, column 23]\n  *n$1.f:int=n$3 [line 13, column 19]\n  NULLIFY(&x); [line 13, column 19]\n  NULLIFY(&this); [line 13, column 19]\n  EXIT_SCOPE(n$1,n$2,n$3,x,this); [line 13, column 19]\n  APPLY_ABSTRACTION; [line 13, column 19]\n " shape="box"]
+"X#X#return_struct#{2874542973664462157}.c7820661c77babcd49c610d7742e613f_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:return_struct::X* [line 13, column 19]\n  n$1=*&x:return_struct::X const & [line 13, column 23]\n  n$2=*n$1.f:int [line 13, column 23]\n  *n$0.f:int=n$2 [line 13, column 19]\n  NULLIFY(&x); [line 13, column 19]\n  NULLIFY(&this); [line 13, column 19]\n  EXIT_SCOPE(n$0,n$1,n$2,x,this); [line 13, column 19]\n  APPLY_ABSTRACTION; [line 13, column 19]\n " shape="box"]
 	
 
 	 "X#X#return_struct#{2874542973664462157}.c7820661c77babcd49c610d7742e613f_3" -> "X#X#return_struct#{2874542973664462157}.c7820661c77babcd49c610d7742e613f_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/types/struct.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/types/struct.cpp.dot
index 1e151ec36..4add2f10d 100644
--- a/infer/tests/codetoanalyze/cpp/shared/types/struct.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/types/struct.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:  BinaryOperatorStmt: Assign \n   n$1=*&xc:X_class* [line 27, column 3]\n  *n$1.b:int=20 [line 27, column 3]\n  NULLIFY(&xc); [line 27, column 3]\n  EXIT_SCOPE(n$1,xc); [line 27, column 3]\n  APPLY_ABSTRACTION; [line 27, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&xc:X_class* [line 27, column 3]\n  *n$0.b:int=20 [line 27, column 3]\n  NULLIFY(&xc); [line 27, column 3]\n  EXIT_SCOPE(n$0,xc); [line 27, column 3]\n  APPLY_ABSTRACTION; [line 27, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&xc:X_class* [line 26, column 3]\n  *n$2.a:int=10 [line 26, column 3]\n  EXIT_SCOPE(n$2); [line 26, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&xc:X_class* [line 26, column 3]\n  *n$1.a:int=10 [line 26, column 3]\n  EXIT_SCOPE(n$1); [line 26, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  BinaryOperatorStmt: Assign \n   n$3=*&xs:X_struct* [line 23, column 3]\n  *n$3.b:int=20 [line 23, column 3]\n  NULLIFY(&xs); [line 23, column 3]\n  EXIT_SCOPE(n$3,xs); [line 23, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=*&xs:X_struct* [line 23, column 3]\n  *n$2.b:int=20 [line 23, column 3]\n  NULLIFY(&xs); [line 23, column 3]\n  EXIT_SCOPE(n$2,xs); [line 23, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  BinaryOperatorStmt: Assign \n   n$4=*&xs:X_struct* [line 22, column 3]\n  *n$4.a:int=10 [line 22, column 3]\n  EXIT_SCOPE(n$4); [line 22, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  BinaryOperatorStmt: Assign \n   n$3=*&xs:X_struct* [line 22, column 3]\n  *n$3.a:int=10 [line 22, column 3]\n  EXIT_SCOPE(n$3); [line 22, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/types/struct_forward_declare.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/types/struct_forward_declare.cpp.dot
index 60d0c52d6..d475dda34 100644
--- a/infer/tests/codetoanalyze/cpp/shared/types/struct_forward_declare.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/types/struct_forward_declare.cpp.dot
@@ -15,11 +15,11 @@ digraph cfg {
 	
 
 	 "X_Y_div0#struct_forward_declare#18042232259689408087.5a34dbeba09cf8550874dbfc508af917_4" -> "X_Y_div0#struct_forward_declare#18042232259689408087.5a34dbeba09cf8550874dbfc508af917_3" ;
-"X_Y_div0#struct_forward_declare#18042232259689408087.5a34dbeba09cf8550874dbfc508af917_5" [label="5: Prune (true branch, if) \n   n$3=*&x.y:struct_forward_declare::Y* [line 49, column 7]\n  PRUNE(n$3, true); [line 49, column 7]\n  EXIT_SCOPE(n$3,x); [line 49, column 7]\n " shape="invhouse"]
+"X_Y_div0#struct_forward_declare#18042232259689408087.5a34dbeba09cf8550874dbfc508af917_5" [label="5: Prune (true branch, if) \n   n$2=*&x.y:struct_forward_declare::Y* [line 49, column 7]\n  PRUNE(n$2, true); [line 49, column 7]\n  EXIT_SCOPE(n$2,x); [line 49, column 7]\n " shape="invhouse"]
 	
 
 	 "X_Y_div0#struct_forward_declare#18042232259689408087.5a34dbeba09cf8550874dbfc508af917_5" -> "X_Y_div0#struct_forward_declare#18042232259689408087.5a34dbeba09cf8550874dbfc508af917_7" ;
-"X_Y_div0#struct_forward_declare#18042232259689408087.5a34dbeba09cf8550874dbfc508af917_6" [label="6: Prune (false branch, if) \n   n$3=*&x.y:struct_forward_declare::Y* [line 49, column 7]\n  PRUNE(!n$3, false); [line 49, column 7]\n  EXIT_SCOPE(n$3); [line 49, column 7]\n " shape="invhouse"]
+"X_Y_div0#struct_forward_declare#18042232259689408087.5a34dbeba09cf8550874dbfc508af917_6" [label="6: Prune (false branch, if) \n   n$2=*&x.y:struct_forward_declare::Y* [line 49, column 7]\n  PRUNE(!n$2, false); [line 49, column 7]\n  EXIT_SCOPE(n$2); [line 49, column 7]\n " shape="invhouse"]
 	
 
 	 "X_Y_div0#struct_forward_declare#18042232259689408087.5a34dbeba09cf8550874dbfc508af917_6" -> "X_Y_div0#struct_forward_declare#18042232259689408087.5a34dbeba09cf8550874dbfc508af917_4" ;
@@ -36,7 +36,7 @@ digraph cfg {
 	
 
 	 "X_Y_div0#struct_forward_declare#18042232259689408087.5a34dbeba09cf8550874dbfc508af917_9" -> "X_Y_div0#struct_forward_declare#18042232259689408087.5a34dbeba09cf8550874dbfc508af917_8" ;
-"X_Y_div0#struct_forward_declare#18042232259689408087.5a34dbeba09cf8550874dbfc508af917_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(x:struct_forward_declare::X); [line 46, column 3]\n  n$7=_fun_struct_forward_declare::X::X(&x:struct_forward_declare::X*) [line 46, column 5]\n  EXIT_SCOPE(n$7); [line 46, column 5]\n " shape="box"]
+"X_Y_div0#struct_forward_declare#18042232259689408087.5a34dbeba09cf8550874dbfc508af917_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(x:struct_forward_declare::X); [line 46, column 3]\n  n$5=_fun_struct_forward_declare::X::X(&x:struct_forward_declare::X*) [line 46, column 5]\n  EXIT_SCOPE(n$5); [line 46, column 5]\n " shape="box"]
 	
 
 	 "X_Y_div0#struct_forward_declare#18042232259689408087.5a34dbeba09cf8550874dbfc508af917_10" -> "X_Y_div0#struct_forward_declare#18042232259689408087.5a34dbeba09cf8550874dbfc508af917_9" ;
@@ -55,7 +55,7 @@ digraph cfg {
 	
 
 	 "X_div0#struct_forward_declare#14943490796844086809.e860fd7462df24ba7720802867a02ac2_4" -> "X_div0#struct_forward_declare#14943490796844086809.e860fd7462df24ba7720802867a02ac2_3" ;
-"X_div0#struct_forward_declare#14943490796844086809.e860fd7462df24ba7720802867a02ac2_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x:struct_forward_declare::X); [line 35, column 3]\n  n$3=_fun_struct_forward_declare::X::X(&x:struct_forward_declare::X*) [line 35, column 5]\n  EXIT_SCOPE(n$3); [line 35, column 5]\n " shape="box"]
+"X_div0#struct_forward_declare#14943490796844086809.e860fd7462df24ba7720802867a02ac2_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x:struct_forward_declare::X); [line 35, column 3]\n  n$2=_fun_struct_forward_declare::X::X(&x:struct_forward_declare::X*) [line 35, column 5]\n  EXIT_SCOPE(n$2); [line 35, column 5]\n " shape="box"]
 	
 
 	 "X_div0#struct_forward_declare#14943490796844086809.e860fd7462df24ba7720802867a02ac2_5" -> "X_div0#struct_forward_declare#14943490796844086809.e860fd7462df24ba7720802867a02ac2_4" ;
@@ -70,7 +70,7 @@ digraph cfg {
 	
 
 	 "X_ptr_div0#struct_forward_declare(class struct_forward_declare::X)#16748991602723853091.a5c80332fff139355cc770fc0a47092e_3" -> "X_ptr_div0#struct_forward_declare(class struct_forward_declare::X)#16748991602723853091.a5c80332fff139355cc770fc0a47092e_2" ;
-"X_ptr_div0#struct_forward_declare(class struct_forward_declare::X)#16748991602723853091.a5c80332fff139355cc770fc0a47092e_4" [label="4:  BinaryOperatorStmt: Assign \n   n$4=*&x:struct_forward_declare::X* [line 41, column 3]\n  *n$4.f:int=0 [line 41, column 3]\n  EXIT_SCOPE(n$4); [line 41, column 3]\n " shape="box"]
+"X_ptr_div0#struct_forward_declare(class struct_forward_declare::X)#16748991602723853091.a5c80332fff139355cc770fc0a47092e_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=*&x:struct_forward_declare::X* [line 41, column 3]\n  *n$3.f:int=0 [line 41, column 3]\n  EXIT_SCOPE(n$3); [line 41, column 3]\n " shape="box"]
 	
 
 	 "X_ptr_div0#struct_forward_declare(class struct_forward_declare::X)#16748991602723853091.a5c80332fff139355cc770fc0a47092e_4" -> "X_ptr_div0#struct_forward_declare(class struct_forward_declare::X)#16748991602723853091.a5c80332fff139355cc770fc0a47092e_3" ;
@@ -89,7 +89,7 @@ digraph cfg {
 	
 
 	 "Z_div0#struct_forward_declare#1627203008264837059.744970cb2a0863ceafbc26504cb09faf_4" -> "Z_div0#struct_forward_declare#1627203008264837059.744970cb2a0863ceafbc26504cb09faf_3" ;
-"Z_div0#struct_forward_declare#1627203008264837059.744970cb2a0863ceafbc26504cb09faf_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(z:struct_forward_declare::Z); [line 56, column 3]\n  n$3=_fun_struct_forward_declare::Z::Z(&z:struct_forward_declare::Z*) [line 56, column 5]\n  EXIT_SCOPE(n$3); [line 56, column 5]\n " shape="box"]
+"Z_div0#struct_forward_declare#1627203008264837059.744970cb2a0863ceafbc26504cb09faf_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(z:struct_forward_declare::Z); [line 56, column 3]\n  n$2=_fun_struct_forward_declare::Z::Z(&z:struct_forward_declare::Z*) [line 56, column 5]\n  EXIT_SCOPE(n$2); [line 56, column 5]\n " shape="box"]
 	
 
 	 "Z_div0#struct_forward_declare#1627203008264837059.744970cb2a0863ceafbc26504cb09faf_5" -> "Z_div0#struct_forward_declare#1627203008264837059.744970cb2a0863ceafbc26504cb09faf_4" ;
@@ -104,7 +104,7 @@ digraph cfg {
 	
 
 	 "Z_ptr_div0#struct_forward_declare(class struct_forward_declare::Z)#18058661690516691263.ce600c6da403f28f2c501df577604772_3" -> "Z_ptr_div0#struct_forward_declare(class struct_forward_declare::Z)#18058661690516691263.ce600c6da403f28f2c501df577604772_2" ;
-"Z_ptr_div0#struct_forward_declare(class struct_forward_declare::Z)#18058661690516691263.ce600c6da403f28f2c501df577604772_4" [label="4:  BinaryOperatorStmt: Assign \n   n$4=*&z:struct_forward_declare::Z* [line 65, column 3]\n  *n$4.f:int=0 [line 65, column 3]\n  EXIT_SCOPE(n$4); [line 65, column 3]\n " shape="box"]
+"Z_ptr_div0#struct_forward_declare(class struct_forward_declare::Z)#18058661690516691263.ce600c6da403f28f2c501df577604772_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=*&z:struct_forward_declare::Z* [line 65, column 3]\n  *n$3.f:int=0 [line 65, column 3]\n  EXIT_SCOPE(n$3); [line 65, column 3]\n " shape="box"]
 	
 
 	 "Z_ptr_div0#struct_forward_declare(class struct_forward_declare::Z)#18058661690516691263.ce600c6da403f28f2c501df577604772_4" -> "Z_ptr_div0#struct_forward_declare(class struct_forward_declare::Z)#18058661690516691263.ce600c6da403f28f2c501df577604772_3" ;
@@ -115,7 +115,7 @@ digraph cfg {
 "fun_with_Z#struct_forward_declare(class struct_forward_declare::Z)#10740368644462176169.d708d356d0748993ed722a0113d84853_2" [label="2: Exit struct_forward_declare::fun_with_Z \n  " color=yellow style=filled]
 	
 
-"fun_with_Z#struct_forward_declare(class struct_forward_declare::Z)#10740368644462176169.d708d356d0748993ed722a0113d84853_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(z2:struct_forward_declare::Z*); [line 24, column 26]\n  n$1=*&z1:struct_forward_declare::Z* [line 24, column 34]\n  *&z2:struct_forward_declare::Z*=n$1 [line 24, column 26]\n  NULLIFY(&z2); [line 24, column 26]\n  NULLIFY(&z1); [line 24, column 26]\n  EXIT_SCOPE(n$1,z2,z1); [line 24, column 26]\n  APPLY_ABSTRACTION; [line 24, column 26]\n " shape="box"]
+"fun_with_Z#struct_forward_declare(class struct_forward_declare::Z)#10740368644462176169.d708d356d0748993ed722a0113d84853_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(z2:struct_forward_declare::Z*); [line 24, column 26]\n  n$0=*&z1:struct_forward_declare::Z* [line 24, column 34]\n  *&z2:struct_forward_declare::Z*=n$0 [line 24, column 26]\n  NULLIFY(&z2); [line 24, column 26]\n  NULLIFY(&z1); [line 24, column 26]\n  EXIT_SCOPE(n$0,z2,z1); [line 24, column 26]\n  APPLY_ABSTRACTION; [line 24, column 26]\n " shape="box"]
 	
 
 	 "fun_with_Z#struct_forward_declare(class struct_forward_declare::Z)#10740368644462176169.d708d356d0748993ed722a0113d84853_3" -> "fun_with_Z#struct_forward_declare(class struct_forward_declare::Z)#10740368644462176169.d708d356d0748993ed722a0113d84853_2" ;
diff --git a/infer/tests/codetoanalyze/cpp/shared/types/struct_pass_by_value.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/types/struct_pass_by_value.cpp.dot
index 611f93991..3e02c19f1 100644
--- a/infer/tests/codetoanalyze/cpp/shared/types/struct_pass_by_value.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/types/struct_pass_by_value.cpp.dot
@@ -75,7 +75,7 @@ digraph cfg {
 "set_f#struct_pass_by_value#449985082730240817.3244dc0de9a72d4ec2d03e236d94d06e_2" [label="2: Exit struct_pass_by_value::set_f \n  " color=yellow style=filled]
 	
 
-"set_f#struct_pass_by_value#449985082730240817.3244dc0de9a72d4ec2d03e236d94d06e_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&val:struct_pass_by_value::X& [line 23, column 28]\n  n$2=*&f:int [line 23, column 36]\n  *n$1.f:int=n$2 [line 23, column 28]\n  NULLIFY(&f); [line 23, column 28]\n  NULLIFY(&val); [line 23, column 28]\n  EXIT_SCOPE(n$1,n$2,f,val); [line 23, column 28]\n  APPLY_ABSTRACTION; [line 23, column 28]\n " shape="box"]
+"set_f#struct_pass_by_value#449985082730240817.3244dc0de9a72d4ec2d03e236d94d06e_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&val:struct_pass_by_value::X& [line 23, column 28]\n  n$1=*&f:int [line 23, column 36]\n  *n$0.f:int=n$1 [line 23, column 28]\n  NULLIFY(&f); [line 23, column 28]\n  NULLIFY(&val); [line 23, column 28]\n  EXIT_SCOPE(n$0,n$1,f,val); [line 23, column 28]\n  APPLY_ABSTRACTION; [line 23, column 28]\n " shape="box"]
 	
 
 	 "set_f#struct_pass_by_value#449985082730240817.3244dc0de9a72d4ec2d03e236d94d06e_3" -> "set_f#struct_pass_by_value#449985082730240817.3244dc0de9a72d4ec2d03e236d94d06e_2" ;
@@ -138,7 +138,7 @@ digraph cfg {
 "X#X#struct_pass_by_value#{11203369373673859396}.cf8c3ea98f014a538f7f90e4593e75eb_2" [label="2: Exit struct_pass_by_value::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#struct_pass_by_value#{11203369373673859396}.cf8c3ea98f014a538f7f90e4593e75eb_3" [label="3:  Constructor Init \n   n$2=*&this:struct_pass_by_value::X* [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  NULLIFY(&f); [line 12, column 14]\n  NULLIFY(&this); [line 12, column 14]\n  EXIT_SCOPE(n$2,n$3,f,this); [line 12, column 14]\n  APPLY_ABSTRACTION; [line 12, column 14]\n " shape="box"]
+"X#X#struct_pass_by_value#{11203369373673859396}.cf8c3ea98f014a538f7f90e4593e75eb_3" [label="3:  Constructor Init \n   n$1=*&this:struct_pass_by_value::X* [line 12, column 14]\n  n$2=*&f:int [line 12, column 16]\n  *n$1.f:int=n$2 [line 12, column 14]\n  NULLIFY(&f); [line 12, column 14]\n  NULLIFY(&this); [line 12, column 14]\n  EXIT_SCOPE(n$1,n$2,f,this); [line 12, column 14]\n  APPLY_ABSTRACTION; [line 12, column 14]\n " shape="box"]
 	
 
 	 "X#X#struct_pass_by_value#{11203369373673859396}.cf8c3ea98f014a538f7f90e4593e75eb_3" -> "X#X#struct_pass_by_value#{11203369373673859396}.cf8c3ea98f014a538f7f90e4593e75eb_2" ;
@@ -149,7 +149,7 @@ digraph cfg {
 "X#X#struct_pass_by_value#{8495470270182220238|constexpr}.ea3fe0be489de1d7a9283f9ea7d8899f_2" [label="2: Exit struct_pass_by_value::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#struct_pass_by_value#{8495470270182220238|constexpr}.ea3fe0be489de1d7a9283f9ea7d8899f_3" [label="3:  Constructor Init \n   n$2=*&this:struct_pass_by_value::X* [line 10, column 8]\n  n$3=*&__param_0:struct_pass_by_value::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  NULLIFY(&this); [line 10, column 8]\n  NULLIFY(&__param_0); [line 10, column 8]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
+"X#X#struct_pass_by_value#{8495470270182220238|constexpr}.ea3fe0be489de1d7a9283f9ea7d8899f_3" [label="3:  Constructor Init \n   n$1=*&this:struct_pass_by_value::X* [line 10, column 8]\n  n$2=*&__param_0:struct_pass_by_value::X& [line 10, column 8]\n  n$3=*n$2.f:int [line 10, column 8]\n  *n$1.f:int=n$3 [line 10, column 8]\n  NULLIFY(&this); [line 10, column 8]\n  NULLIFY(&__param_0); [line 10, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
 	
 
 	 "X#X#struct_pass_by_value#{8495470270182220238|constexpr}.ea3fe0be489de1d7a9283f9ea7d8899f_3" -> "X#X#struct_pass_by_value#{8495470270182220238|constexpr}.ea3fe0be489de1d7a9283f9ea7d8899f_2" ;
@@ -160,7 +160,7 @@ digraph cfg {
 "X#X#struct_pass_by_value#{9755652315089766298|constexpr}.81acc1c263466d84e0cc912cd1d47b28_2" [label="2: Exit struct_pass_by_value::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#struct_pass_by_value#{9755652315089766298|constexpr}.81acc1c263466d84e0cc912cd1d47b28_3" [label="3:  Constructor Init \n   n$2=*&this:struct_pass_by_value::X* [line 10, column 8]\n  n$3=*&__param_0:struct_pass_by_value::X const & [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  NULLIFY(&this); [line 10, column 8]\n  NULLIFY(&__param_0); [line 10, column 8]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
+"X#X#struct_pass_by_value#{9755652315089766298|constexpr}.81acc1c263466d84e0cc912cd1d47b28_3" [label="3:  Constructor Init \n   n$1=*&this:struct_pass_by_value::X* [line 10, column 8]\n  n$2=*&__param_0:struct_pass_by_value::X const & [line 10, column 8]\n  n$3=*n$2.f:int [line 10, column 8]\n  *n$1.f:int=n$3 [line 10, column 8]\n  NULLIFY(&this); [line 10, column 8]\n  NULLIFY(&__param_0); [line 10, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
 	
 
 	 "X#X#struct_pass_by_value#{9755652315089766298|constexpr}.81acc1c263466d84e0cc912cd1d47b28_3" -> "X#X#struct_pass_by_value#{9755652315089766298|constexpr}.81acc1c263466d84e0cc912cd1d47b28_2" ;
@@ -171,7 +171,7 @@ digraph cfg {
 "Y#Y#struct_pass_by_value#{2591422873810003675}.4cc6400ed3a8bedc19c95b6ea1876631_2" [label="2: Exit struct_pass_by_value::Y::Y \n  " color=yellow style=filled]
 	
 
-"Y#Y#struct_pass_by_value#{2591422873810003675}.4cc6400ed3a8bedc19c95b6ea1876631_3" [label="3:  Constructor Init \n   n$2=*&this:struct_pass_by_value::Y* [line 16, column 19]\n  n$3=*&x:struct_pass_by_value::X const & [line 16, column 21]\n  n$4=_fun_struct_pass_by_value::X::X(n$2.x:struct_pass_by_value::X*,n$3:struct_pass_by_value::X const &) [line 16, column 19]\n  NULLIFY(&x); [line 16, column 19]\n  NULLIFY(&this); [line 16, column 19]\n  EXIT_SCOPE(n$2,n$3,n$4,x,this); [line 16, column 19]\n  APPLY_ABSTRACTION; [line 16, column 19]\n " shape="box"]
+"Y#Y#struct_pass_by_value#{2591422873810003675}.4cc6400ed3a8bedc19c95b6ea1876631_3" [label="3:  Constructor Init \n   n$1=*&this:struct_pass_by_value::Y* [line 16, column 19]\n  n$2=*&x:struct_pass_by_value::X const & [line 16, column 21]\n  n$3=_fun_struct_pass_by_value::X::X(n$1.x:struct_pass_by_value::X*,n$2:struct_pass_by_value::X const &) [line 16, column 19]\n  NULLIFY(&x); [line 16, column 19]\n  NULLIFY(&this); [line 16, column 19]\n  EXIT_SCOPE(n$1,n$2,n$3,x,this); [line 16, column 19]\n  APPLY_ABSTRACTION; [line 16, column 19]\n " shape="box"]
 	
 
 	 "Y#Y#struct_pass_by_value#{2591422873810003675}.4cc6400ed3a8bedc19c95b6ea1876631_3" -> "Y#Y#struct_pass_by_value#{2591422873810003675}.4cc6400ed3a8bedc19c95b6ea1876631_2" ;
diff --git a/infer/tests/codetoanalyze/objcpp/frontend/global_const/global_const.mm.dot b/infer/tests/codetoanalyze/objcpp/frontend/global_const/global_const.mm.dot
index 1a69bec97..3208f6786 100644
--- a/infer/tests/codetoanalyze/objcpp/frontend/global_const/global_const.mm.dot
+++ b/infer/tests/codetoanalyze/objcpp/frontend/global_const/global_const.mm.dot
@@ -29,15 +29,15 @@ digraph cfg {
 "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_2" [label="2: Exit Fields:: \n  " color=yellow style=filled]
 	
 
-"#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_3" [label="3:  Constructor Init \n   n$2=*&this:Fields* [line 8, column 9]\n  n$3=*&__param_0:Fields const & [line 8, column 9]\n  n$4=*n$3.field3:float [line 8, column 9]\n  *n$2.field3:float=n$4 [line 8, column 9]\n  NULLIFY(&this); [line 8, column 9]\n  NULLIFY(&__param_0); [line 8, column 9]\n  EXIT_SCOPE(n$2,n$3,n$4,this,__param_0); [line 8, column 9]\n  APPLY_ABSTRACTION; [line 8, column 9]\n " shape="box"]
+"#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_3" [label="3:  Constructor Init \n   n$1=*&this:Fields* [line 8, column 9]\n  n$2=*&__param_0:Fields const & [line 8, column 9]\n  n$3=*n$2.field3:float [line 8, column 9]\n  *n$1.field3:float=n$3 [line 8, column 9]\n  NULLIFY(&this); [line 8, column 9]\n  NULLIFY(&__param_0); [line 8, column 9]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 8, column 9]\n  APPLY_ABSTRACTION; [line 8, column 9]\n " shape="box"]
 	
 
 	 "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_3" -> "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_2" ;
-"#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_4" [label="4:  Constructor Init \n   n$5=*&this:Fields* [line 8, column 9]\n  n$6=*&__param_0:Fields const & [line 8, column 9]\n  n$7=*n$6.field2:float [line 8, column 9]\n  *n$5.field2:float=n$7 [line 8, column 9]\n  EXIT_SCOPE(n$5,n$6,n$7); [line 8, column 9]\n " shape="box"]
+"#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_4" [label="4:  Constructor Init \n   n$4=*&this:Fields* [line 8, column 9]\n  n$5=*&__param_0:Fields const & [line 8, column 9]\n  n$6=*n$5.field2:float [line 8, column 9]\n  *n$4.field2:float=n$6 [line 8, column 9]\n  EXIT_SCOPE(n$4,n$5,n$6); [line 8, column 9]\n " shape="box"]
 	
 
 	 "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_4" -> "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_3" ;
-"#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_5" [label="5:  Constructor Init \n   n$8=*&this:Fields* [line 8, column 9]\n  n$9=*&__param_0:Fields const & [line 8, column 9]\n  n$10=*n$9.field1:float [line 8, column 9]\n  *n$8.field1:float=n$10 [line 8, column 9]\n  EXIT_SCOPE(n$8,n$9,n$10); [line 8, column 9]\n " shape="box"]
+"#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_5" [label="5:  Constructor Init \n   n$7=*&this:Fields* [line 8, column 9]\n  n$8=*&__param_0:Fields const & [line 8, column 9]\n  n$9=*n$8.field1:float [line 8, column 9]\n  *n$7.field1:float=n$9 [line 8, column 9]\n  EXIT_SCOPE(n$7,n$8,n$9); [line 8, column 9]\n " shape="box"]
 	
 
 	 "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_5" -> "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_4" ;