[SIL][preanalysis] add call flag for functions treating first formal as return

Summary: This helps some checkers and the liveness preanalysis.

Reviewed By: da319

Differential Revision: D13102954

fbshipit-source-id: b8d3c5fe2

infer/src/IR/CallFlags.ml

@@ -15,6 +15,7 @@ module F = Format
 type t =
   { cf_virtual: bool
   ; cf_interface: bool
+  ; cf_assign_last_arg: bool
   ; cf_noreturn: bool
   ; cf_is_objc_block: bool
   ; cf_targets: Typ.Procname.t list
@@ -23,6 +24,7 @@ type t =
 
 let pp f cf =
   if cf.cf_virtual then F.pp_print_string f " virtual" ;
+  if cf.cf_assign_last_arg then F.pp_print_string f " assign_last" ;
   if cf.cf_noreturn then F.pp_print_string f " noreturn" ;
   if cf.cf_with_block_parameters then F.pp_print_string f " block_params"
 
@@ -30,6 +32,7 @@ let pp f cf =
 let default =
   { cf_virtual= false
   ; cf_interface= false
+  ; cf_assign_last_arg= false
   ; cf_noreturn= false
   ; cf_is_objc_block= false
   ; cf_with_block_parameters= false

infer/src/IR/CallFlags.mli

@@ -15,6 +15,7 @@ module F = Format
 type t =
   { cf_virtual: bool
   ; cf_interface: bool
+  ; cf_assign_last_arg: bool
   ; cf_noreturn: bool
   ; cf_is_objc_block: bool
   ; cf_targets: Typ.Procname.t list

infer/src/backend/preanal.ml

@@ -92,9 +92,18 @@ module NullifyTransferFunctions = struct
       match instr with
       | Sil.Load (lhs_id, _, _, _) ->
           (VarDomain.add (Var.of_id lhs_id) active_defs, to_nullify)
-      | Sil.Call ((id, _), _, _, _, _) ->
+      | Sil.Call ((id, _), _, actuals, _, {CallFlags.cf_assign_last_arg}) ->
-          let active_defs' = VarDomain.add (Var.of_id id) active_defs in
+          let active_defs = VarDomain.add (Var.of_id id) active_defs in
-          (active_defs', to_nullify)
+          let active_defs =
+            if cf_assign_last_arg then
+              match IList.split_last_rev actuals with
+              | Some ((Exp.Lvar pvar, _), _) ->
+                  VarDomain.add (Var.of_pvar pvar) active_defs
+              | _ ->
+                  active_defs
+            else active_defs
+          in
+          (active_defs, to_nullify)
       | Sil.Store (Exp.Lvar lhs_pvar, _, _, _) ->
           (VarDomain.add (Var.of_pvar lhs_pvar) active_defs, to_nullify)
       | Sil.Store _ | Prune _ | ExitScope _ | Abstract _ ->

infer/src/checkers/liveness.ml

@@ -13,6 +13,9 @@ module F = Format
 module VarSet = AbstractDomain.FiniteSet (Var)
 module Domain = VarSet
 
+(* only kill pvars that are local; don't kill those that can escape *)
+let is_always_in_scope pvar = Pvar.is_return pvar || Pvar.is_global pvar
+
 (* compilers 101-style backward transfer functions for liveness analysis. gen a variable when it is
    read, kill the variable when it is assigned *)
 module TransferFunctions (CFG : ProcCfg.S) = struct
@@ -57,7 +60,7 @@ module TransferFunctions (CFG : ProcCfg.S) = struct
         Domain.remove (Var.of_id lhs_id) astate |> exp_add_live rhs_exp
     | Sil.Store (Lvar lhs_pvar, _, rhs_exp, _) ->
         let astate' =
-          if Pvar.is_global lhs_pvar then astate (* never kill globals *)
+          if is_always_in_scope lhs_pvar then astate (* never kill globals *)
           else Domain.remove (Var.of_pvar lhs_pvar) astate
         in
         exp_add_live rhs_exp astate'
@@ -65,9 +68,19 @@ module TransferFunctions (CFG : ProcCfg.S) = struct
         exp_add_live lhs_exp astate |> exp_add_live rhs_exp
     | Sil.Prune (exp, _, _, _) ->
         exp_add_live exp astate
-    | Sil.Call ((ret_id, _), call_exp, actuals, _, _) ->
+    | Sil.Call ((ret_id, _), call_exp, actuals, _, {CallFlags.cf_assign_last_arg}) ->
+        let actuals_to_read, astate =
+          if cf_assign_last_arg then
+            match IList.split_last_rev actuals with
+            | Some ((Exp.Lvar pvar, _), actuals') when not (is_always_in_scope pvar) ->
+                (actuals', Domain.remove (Var.of_pvar pvar) astate)
+            | _ ->
+                (actuals, astate)
+          else (actuals, astate)
+        in
         Domain.remove (Var.of_id ret_id) astate
-        |> exp_add_live call_exp |> add_live_actuals actuals call_exp
+        |> exp_add_live call_exp
+        |> add_live_actuals actuals_to_read call_exp
     | Sil.ExitScope _ | Abstract _ | Nullify _ ->
         astate
 

infer/src/clang/cTrans.ml

@@ -236,7 +236,7 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s
   let create_call_instr trans_state (return_type : Typ.t) function_sil params_sil sil_loc
       call_flags ~is_objc_method ~is_inherited_ctor =
     let ret_id_typ = (Ident.create_fresh Ident.knormal, return_type) in
-    let ret_id', params, initd_exps, ret_exps =
+    let ret_id', params, initd_exps, ret_exps, call_flags =
       (* Assumption: should_add_return_param will return true only for struct types *)
       if CType_decl.should_add_return_param return_type ~is_objc_method then
         let param_type = Typ.mk (Typ.Tptr (return_type, Typ.Pk_pointer)) in
@@ -272,13 +272,18 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s
         (*                   value doesn't work good anyway. This may need to be revisited later*)
         let ret_param = (var_exp, param_type) in
         let ret_exp = (var_exp, return_type) in
-        (mk_fresh_void_id_typ (), params_sil @ [ret_param], [var_exp], ret_exp)
+        ( mk_fresh_void_id_typ ()
+        , params_sil @ [ret_param]
+        , [var_exp]
+        , ret_exp
+        , {call_flags with CallFlags.cf_assign_last_arg= true} )
       else
         ( ret_id_typ
         , params_sil
         , []
-        , let i, t = ret_id_typ in
+        , (let i, t = ret_id_typ in
-          (Exp.Var i, t) )
+           (Exp.Var i, t))
+        , call_flags )
     in
     let forwarded_params, forwarded_init_instrs =
       if is_inherited_ctor then get_forwarded_params trans_state sil_loc else ([], [])
@@ -2265,8 +2270,11 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s
                 { empty_control with
                   instrs=
                     [ Sil.Call
-                        ((ret_id, Typ.void), sil_fun, [var_exp_typ], sil_loc, CallFlags.default) ]
+                        ( (ret_id, Typ.void)
-                }
+                        , sil_fun
+                        , [var_exp_typ]
+                        , sil_loc
+                        , {CallFlags.default with cf_assign_last_arg= true} ) ] }
           | _ ->
               None
         in

infer/src/istd/IList.ml

@@ -117,6 +117,15 @@ let rec fold_last l ~init ~f ~f_last =
       fold_last tl ~init:(f init hd) ~f ~f_last
 
 
+let split_last_rev l =
+  let result, _rev_prefix =
+    fold_last l ~init:(None, [])
+      ~f:(fun (_, rev_prefix) x -> (None, x :: rev_prefix))
+      ~f_last:(fun (_, rev_prefix) last -> (Some (last, rev_prefix), rev_prefix))
+  in
+  result
+
+
 let append_no_duplicates (type a) ~(cmp : a -> a -> int) =
   (* roughly based on [Core.List.stable_dedup_staged] but also takes care of the append and takes
      into account the invariant that [list1] and [list2] do not contain duplicates individually *)

infer/src/istd/IList.mli

@@ -27,6 +27,10 @@ val inter : cmp:('a -> 'a -> int) -> 'a list -> 'a list -> 'a list
 val fold_last : 'a list -> init:'b -> f:('b -> 'a -> 'b) -> f_last:('b -> 'a -> 'b) -> 'b
 (** like fold, but apply f_last to the last element *)
 
+val split_last_rev : 'a list -> ('a * 'a list) option
+(** [split_last_rev l] is [Some (last, rev_prefix)] where [last :: (List.rev rev_prefix) == l],
+    [None] if [l] is empty *)
+
 val append_no_duplicates : cmp:('a -> 'a -> int) -> ('a list -> 'a list -> 'a list) Staged.t
 (** [append_no_duplicates list1 list2], assuming that list1 and list2 have no duplicates on their
     own, it computes list1 @ (filtered list2), so it keeps the order of both lists and has no

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

@@ -124,11 +124,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>) [line 20, column 3]\n  n$5=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>_basic_string<nullptr_t>(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 20, column 15]\n  EXIT_SCOPE(n$5,n$6); [line 20, column 15]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>) assign_last [line 20, column 3]\n  n$5=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>_basic_string<nullptr_t>(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 20, column 15]\n  EXIT_SCOPE(n$5,n$6); [line 20, column 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$9=_fun___variable_initialization(&x:int*) [line 19, column 3]\n  n$8=_fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 19, column 24]\n  n$7=*&x:int* [line 19, column 24]\n  EXIT_SCOPE(n$7,n$8,n$9); [line 19, column 24]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$9=_fun___variable_initialization(&x:int*) assign_last [line 19, column 3]\n  n$8=_fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 19, column 24]\n  n$7=*&x:int* [line 19, column 24]\n  EXIT_SCOPE(n$7,n$8,n$9); [line 19, column 24]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -155,7 +155,7 @@ digraph cfg {
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_2" ;
-"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&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,n$4,x); [line 15, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&x:int) assign_last [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,n$4,x); [line 15, column 3]\n " shape="box"]
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" ;
@@ -669,7 +669,7 @@ digraph cfg {
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_3" ;
-"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&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,n$5); [line 933, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&ret:_Bool) assign_last [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,n$5); [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" ;
@@ -688,7 +688,7 @@ digraph cfg {
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_3" ;
-"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&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,n$5); [line 938, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&ret:_Bool) assign_last [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,n$5); [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" ;

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

@@ -124,11 +124,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>) [line 20, column 3]\n  n$5=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>_basic_string<nullptr_t>(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 20, column 15]\n  EXIT_SCOPE(n$5,n$6); [line 20, column 15]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>) assign_last [line 20, column 3]\n  n$5=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>_basic_string<nullptr_t>(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 20, column 15]\n  EXIT_SCOPE(n$5,n$6); [line 20, column 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$9=_fun___variable_initialization(&x:int*) [line 19, column 3]\n  n$8=_fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 19, column 24]\n  n$7=*&x:int* [line 19, column 24]\n  EXIT_SCOPE(n$7,n$8,n$9); [line 19, column 24]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$9=_fun___variable_initialization(&x:int*) assign_last [line 19, column 3]\n  n$8=_fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 19, column 24]\n  n$7=*&x:int* [line 19, column 24]\n  EXIT_SCOPE(n$7,n$8,n$9); [line 19, column 24]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -155,7 +155,7 @@ digraph cfg {
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_2" ;
-"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&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,n$4,x); [line 15, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&x:int) assign_last [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,n$4,x); [line 15, column 3]\n " shape="box"]
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" ;
@@ -669,7 +669,7 @@ digraph cfg {
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_3" ;
-"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&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,n$5); [line 933, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&ret:_Bool) assign_last [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,n$5); [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" ;
@@ -688,7 +688,7 @@ digraph cfg {
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_3" ;
-"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&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,n$5); [line 938, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&ret:_Bool) assign_last [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,n$5); [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" ;

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

@@ -124,11 +124,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>) [line 20, column 3]\n  n$5=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>_basic_string<nullptr_t>(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 20, column 15]\n  EXIT_SCOPE(n$5,n$6); [line 20, column 15]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>) assign_last [line 20, column 3]\n  n$5=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>_basic_string<nullptr_t>(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 20, column 15]\n  EXIT_SCOPE(n$5,n$6); [line 20, column 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$9=_fun___variable_initialization(&x:int*) [line 19, column 3]\n  n$8=_fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 19, column 24]\n  n$7=*&x:int* [line 19, column 24]\n  EXIT_SCOPE(n$7,n$8,n$9); [line 19, column 24]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$9=_fun___variable_initialization(&x:int*) assign_last [line 19, column 3]\n  n$8=_fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 19, column 24]\n  n$7=*&x:int* [line 19, column 24]\n  EXIT_SCOPE(n$7,n$8,n$9); [line 19, column 24]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -155,7 +155,7 @@ digraph cfg {
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_2" ;
-"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&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,n$4,x); [line 15, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&x:int) assign_last [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,n$4,x); [line 15, column 3]\n " shape="box"]
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" ;
@@ -669,7 +669,7 @@ digraph cfg {
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_3" ;
-"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&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,n$5); [line 933, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&ret:_Bool) assign_last [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,n$5); [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" ;
@@ -688,7 +688,7 @@ digraph cfg {
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_3" ;
-"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&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,n$5); [line 938, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&ret:_Bool) assign_last [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,n$5); [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" ;

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

@@ -124,11 +124,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>) [line 20, column 3]\n  n$5=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>_basic_string<nullptr_t>(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 20, column 15]\n  EXIT_SCOPE(n$5,n$6); [line 20, column 15]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>) assign_last [line 20, column 3]\n  n$5=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>_basic_string<nullptr_t>(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 20, column 15]\n  EXIT_SCOPE(n$5,n$6); [line 20, column 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$9=_fun___variable_initialization(&x:int*) [line 19, column 3]\n  n$8=_fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 19, column 24]\n  n$7=*&x:int* [line 19, column 24]\n  EXIT_SCOPE(n$7,n$8,n$9); [line 19, column 24]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$9=_fun___variable_initialization(&x:int*) assign_last [line 19, column 3]\n  n$8=_fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 19, column 24]\n  n$7=*&x:int* [line 19, column 24]\n  EXIT_SCOPE(n$7,n$8,n$9); [line 19, column 24]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -155,7 +155,7 @@ digraph cfg {
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_2" ;
-"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&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,n$4,x); [line 15, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&x:int) assign_last [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,n$4,x); [line 15, column 3]\n " shape="box"]
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" ;
@@ -669,7 +669,7 @@ digraph cfg {
 	
 
 	 "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_4" -> "test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_3" ;
-"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&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,n$5); [line 933, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6342589292624928640).e1a95571862fb026e9cf3fed47e15f71_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&ret:_Bool) assign_last [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,n$5); [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" ;
@@ -688,7 +688,7 @@ digraph cfg {
 	
 
 	 "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_4" -> "test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_3" ;
-"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&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,n$5); [line 938, column 5]\n " shape="box"]
+"test_and_set#atomic_flag#std#(6471561702066990866).1f32ee5584df8a2cd5807312ee98cdb7_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&ret:_Bool) assign_last [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,n$5); [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" ;

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

@@ -35,7 +35,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   n$6=_fun___variable_initialization(&b:int) [line 14, column 3]\n  *&b:int=1 [line 14, column 3]\n  EXIT_SCOPE(n$6); [line 14, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   n$6=_fun___variable_initialization(&b:int) assign_last [line 14, column 3]\n  *&b:int=1 [line 14, column 3]\n  EXIT_SCOPE(n$6); [line 14, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
@@ -55,7 +55,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   n$11=_fun___variable_initialization(&x:double) [line 9, column 3]\n  *&x:double=1. [line 9, column 3]\n  EXIT_SCOPE(n$11); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   n$11=_fun___variable_initialization(&x:double) assign_last [line 9, column 3]\n  *&x:double=1. [line 9, column 3]\n  EXIT_SCOPE(n$11); [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;

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

@@ -11,15 +11,15 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$0=_fun___variable_initialization(&overflow_int:int) [line 18, column 3]\n  *&overflow_int:int=9223372036854775808 [line 18, column 3]\n  NULLIFY(&overflow_int); [line 18, column 3]\n  EXIT_SCOPE(n$0,overflow_int); [line 18, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$0=_fun___variable_initialization(&overflow_int:int) assign_last [line 18, column 3]\n  *&overflow_int:int=9223372036854775808 [line 18, column 3]\n  NULLIFY(&overflow_int); [line 18, column 3]\n  EXIT_SCOPE(n$0,overflow_int); [line 18, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$1=_fun___variable_initialization(&large_int:int) [line 17, column 3]\n  *&large_int:int=9223372036854775807 [line 17, column 3]\n  NULLIFY(&large_int); [line 17, column 3]\n  EXIT_SCOPE(n$1,large_int); [line 17, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$1=_fun___variable_initialization(&large_int:int) assign_last [line 17, column 3]\n  *&large_int:int=9223372036854775807 [line 17, column 3]\n  NULLIFY(&large_int); [line 17, column 3]\n  EXIT_SCOPE(n$1,large_int); [line 17, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  DeclStmt \n   n$2=_fun___variable_initialization(&#GB<codetoanalyze/c/frontend/arithmetic/int_const.c>$main.kDuration:int const ) [line 15, column 3]\n  *&#GB<codetoanalyze/c/frontend/arithmetic/int_const.c>$main.kDuration:int=3 [line 15, column 3]\n  EXIT_SCOPE(n$2); [line 15, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  DeclStmt \n   n$2=_fun___variable_initialization(&#GB<codetoanalyze/c/frontend/arithmetic/int_const.c>$main.kDuration:int const ) assign_last [line 15, column 3]\n  *&#GB<codetoanalyze/c/frontend/arithmetic/int_const.c>$main.kDuration:int=3 [line 15, column 3]\n  EXIT_SCOPE(n$2); [line 15, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;

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

@@ -11,11 +11,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&z:int) [line 10, column 3]\n  *&z:int=3 [line 10, column 3]\n  EXIT_SCOPE(n$2); [line 10, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&z:int) assign_last [line 10, column 3]\n  *&z:int=3 [line 10, column 3]\n  EXIT_SCOPE(n$2); [line 10, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$3=_fun___variable_initialization(&x:int) [line 9, column 3]\n  *&x:int=2 [line 9, column 3]\n  EXIT_SCOPE(n$3); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$3=_fun___variable_initialization(&x:int) assign_last [line 9, column 3]\n  *&x:int=2 [line 9, column 3]\n  EXIT_SCOPE(n$3); [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;

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

@@ -55,7 +55,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   n$13=_fun___variable_initialization(&x:int) [line 9, column 3]\n  *&x:int=1 [line 9, column 3]\n  EXIT_SCOPE(n$13); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   n$13=_fun___variable_initialization(&x:int) assign_last [line 9, column 3]\n  *&x:int=1 [line 9, column 3]\n  EXIT_SCOPE(n$13); [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;

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

@@ -43,7 +43,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   n$4=_fun___variable_initialization(&x:int) [line 11, column 3]\n  *&x:int=3 [line 11, column 3]\n  EXIT_SCOPE(n$4); [line 11, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   n$4=_fun___variable_initialization(&x:int) assign_last [line 11, column 3]\n  *&x:int=3 [line 11, column 3]\n  EXIT_SCOPE(n$4); [line 11, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;

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

@@ -11,15 +11,15 @@ digraph cfg {
 	
 
 	 "comma_1.bafaed8336991f5a2e612ee2580c1506_3" -> "comma_1.bafaed8336991f5a2e612ee2580c1506_2" ;
-"comma_1.bafaed8336991f5a2e612ee2580c1506_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&d:int) [line 10, column 3]\n  n$1=*&a:int [line 10, column 16]\n  *&a:int=(n$1 * 2) [line 10, column 12]\n  n$2=*&a:int [line 10, column 12]\n  n$3=*&a:int [line 10, column 31]\n  *&a:int=(n$3 + 1) [line 10, column 31]\n  *&b:int=(7 * n$3) [line 10, column 23]\n  n$4=*&b:int [line 10, column 23]\n  *&d:int=n$4 [line 10, column 3]\n  NULLIFY(&a); [line 10, column 3]\n  NULLIFY(&b); [line 10, column 3]\n  EXIT_SCOPE(n$1,n$2,n$3,n$4,n$5,a,b); [line 10, column 3]\n " shape="box"]
+"comma_1.bafaed8336991f5a2e612ee2580c1506_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&d:int) assign_last [line 10, column 3]\n  n$1=*&a:int [line 10, column 16]\n  *&a:int=(n$1 * 2) [line 10, column 12]\n  n$2=*&a:int [line 10, column 12]\n  n$3=*&a:int [line 10, column 31]\n  *&a:int=(n$3 + 1) [line 10, column 31]\n  *&b:int=(7 * n$3) [line 10, column 23]\n  n$4=*&b:int [line 10, column 23]\n  *&d:int=n$4 [line 10, column 3]\n  NULLIFY(&a); [line 10, column 3]\n  NULLIFY(&b); [line 10, column 3]\n  EXIT_SCOPE(n$1,n$2,n$3,n$4,n$5,a,b); [line 10, column 3]\n " shape="box"]
 	
 
 	 "comma_1.bafaed8336991f5a2e612ee2580c1506_4" -> "comma_1.bafaed8336991f5a2e612ee2580c1506_3" ;
-"comma_1.bafaed8336991f5a2e612ee2580c1506_5" [label="5:  DeclStmt \n   n$6=_fun___variable_initialization(&b:int) [line 9, column 3]\n  *&b:int=7 [line 9, column 3]\n  NULLIFY(&b); [line 9, column 3]\n  EXIT_SCOPE(n$6,b); [line 9, column 3]\n " shape="box"]
+"comma_1.bafaed8336991f5a2e612ee2580c1506_5" [label="5:  DeclStmt \n   n$6=_fun___variable_initialization(&b:int) assign_last [line 9, column 3]\n  *&b:int=7 [line 9, column 3]\n  NULLIFY(&b); [line 9, column 3]\n  EXIT_SCOPE(n$6,b); [line 9, column 3]\n " shape="box"]
 	
 
 	 "comma_1.bafaed8336991f5a2e612ee2580c1506_5" -> "comma_1.bafaed8336991f5a2e612ee2580c1506_4" ;
-"comma_1.bafaed8336991f5a2e612ee2580c1506_6" [label="6:  DeclStmt \n   n$7=_fun___variable_initialization(&a:int) [line 9, column 3]\n  *&a:int=9 [line 9, column 3]\n  EXIT_SCOPE(n$7); [line 9, column 3]\n " shape="box"]
+"comma_1.bafaed8336991f5a2e612ee2580c1506_6" [label="6:  DeclStmt \n   n$7=_fun___variable_initialization(&a:int) assign_last [line 9, column 3]\n  *&a:int=9 [line 9, column 3]\n  EXIT_SCOPE(n$7); [line 9, column 3]\n " shape="box"]
 	
 
 	 "comma_1.bafaed8336991f5a2e612ee2580c1506_6" -> "comma_1.bafaed8336991f5a2e612ee2580c1506_5" ;
@@ -34,15 +34,15 @@ digraph cfg {
 	
 
 	 "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_3" -> "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_2" ;
-"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_4" [label="4:  DeclStmt \n   n$7=_fun___variable_initialization(&d:int) [line 16, column 3]\n  n$1=*&a:int [line 16, column 16]\n  *&a:int=(n$1 * 2) [line 16, column 12]\n  n$2=*&a:int [line 16, column 12]\n  n$3=*&a:int [line 16, column 31]\n  *&a:int=(n$3 + 1) [line 16, column 31]\n  *&b:int=(7 * n$3) [line 16, column 23]\n  n$4=*&b:int [line 16, column 23]\n  n$5=*&a:int [line 16, column 36]\n  n$6=*&b:int [line 16, column 40]\n  *&d:int=((n$5 + n$6) + 9) [line 16, column 3]\n  NULLIFY(&b); [line 16, column 3]\n  NULLIFY(&a); [line 16, column 3]\n  EXIT_SCOPE(n$1,n$2,n$3,n$4,n$5,n$6,n$7,b,a); [line 16, column 3]\n " shape="box"]
+"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_4" [label="4:  DeclStmt \n   n$7=_fun___variable_initialization(&d:int) assign_last [line 16, column 3]\n  n$1=*&a:int [line 16, column 16]\n  *&a:int=(n$1 * 2) [line 16, column 12]\n  n$2=*&a:int [line 16, column 12]\n  n$3=*&a:int [line 16, column 31]\n  *&a:int=(n$3 + 1) [line 16, column 31]\n  *&b:int=(7 * n$3) [line 16, column 23]\n  n$4=*&b:int [line 16, column 23]\n  n$5=*&a:int [line 16, column 36]\n  n$6=*&b:int [line 16, column 40]\n  *&d:int=((n$5 + n$6) + 9) [line 16, column 3]\n  NULLIFY(&b); [line 16, column 3]\n  NULLIFY(&a); [line 16, column 3]\n  EXIT_SCOPE(n$1,n$2,n$3,n$4,n$5,n$6,n$7,b,a); [line 16, column 3]\n " shape="box"]
 	
 
 	 "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_4" -> "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_3" ;
-"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&b:int) [line 15, column 3]\n  *&b:int=7 [line 15, column 3]\n  NULLIFY(&b); [line 15, column 3]\n  EXIT_SCOPE(n$8,b); [line 15, column 3]\n " shape="box"]
+"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&b:int) assign_last [line 15, column 3]\n  *&b:int=7 [line 15, column 3]\n  NULLIFY(&b); [line 15, column 3]\n  EXIT_SCOPE(n$8,b); [line 15, column 3]\n " shape="box"]
 	
 
 	 "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_5" -> "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_4" ;
-"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_6" [label="6:  DeclStmt \n   n$9=_fun___variable_initialization(&a:int) [line 15, column 3]\n  *&a:int=9 [line 15, column 3]\n  EXIT_SCOPE(n$9); [line 15, column 3]\n " shape="box"]
+"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_6" [label="6:  DeclStmt \n   n$9=_fun___variable_initialization(&a:int) assign_last [line 15, column 3]\n  *&a:int=9 [line 15, column 3]\n  EXIT_SCOPE(n$9); [line 15, column 3]\n " shape="box"]
 	
 
 	 "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_6" -> "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_5" ;
@@ -57,19 +57,19 @@ digraph cfg {
 	
 
 	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_3" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_2" ;
-"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_4" [label="4:  DeclStmt \n   n$9=_fun___variable_initialization(&d:int) [line 22, column 3]\n  n$1=*&a:int [line 22, column 16]\n  *&a:int=(n$1 * 2) [line 22, column 12]\n  n$2=*&a:int [line 22, column 12]\n  n$3=*&a:int [line 22, column 31]\n  *&a:int=(n$3 + 1) [line 22, column 31]\n  *&b:int=(7 * n$3) [line 22, column 23]\n  n$4=*&b:int [line 22, column 23]\n  n$5=*&a:int [line 22, column 40]\n  n$6=*&b:int [line 22, column 44]\n  *&c:int=((n$5 + n$6) + 9) [line 22, column 36]\n  n$7=*&c:int [line 22, column 36]\n  n$8=*&c:int [line 22, column 51]\n  *&d:int=n$8 [line 22, column 3]\n  NULLIFY(&c); [line 22, column 3]\n  NULLIFY(&b); [line 22, column 3]\n  NULLIFY(&a); [line 22, column 3]\n  EXIT_SCOPE(n$1,n$2,n$3,n$4,n$5,n$6,n$7,n$8,n$9,c,b,a); [line 22, column 3]\n " shape="box"]
+"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_4" [label="4:  DeclStmt \n   n$9=_fun___variable_initialization(&d:int) assign_last [line 22, column 3]\n  n$1=*&a:int [line 22, column 16]\n  *&a:int=(n$1 * 2) [line 22, column 12]\n  n$2=*&a:int [line 22, column 12]\n  n$3=*&a:int [line 22, column 31]\n  *&a:int=(n$3 + 1) [line 22, column 31]\n  *&b:int=(7 * n$3) [line 22, column 23]\n  n$4=*&b:int [line 22, column 23]\n  n$5=*&a:int [line 22, column 40]\n  n$6=*&b:int [line 22, column 44]\n  *&c:int=((n$5 + n$6) + 9) [line 22, column 36]\n  n$7=*&c:int [line 22, column 36]\n  n$8=*&c:int [line 22, column 51]\n  *&d:int=n$8 [line 22, column 3]\n  NULLIFY(&c); [line 22, column 3]\n  NULLIFY(&b); [line 22, column 3]\n  NULLIFY(&a); [line 22, column 3]\n  EXIT_SCOPE(n$1,n$2,n$3,n$4,n$5,n$6,n$7,n$8,n$9,c,b,a); [line 22, column 3]\n " shape="box"]
 	
 
 	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_4" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_3" ;
-"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_5" [label="5:  DeclStmt \n   n$10=_fun___variable_initialization(&c:int) [line 21, column 3]\n  *&c:int=3 [line 21, column 3]\n  NULLIFY(&c); [line 21, column 3]\n  EXIT_SCOPE(n$10,c); [line 21, column 3]\n " shape="box"]
+"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_5" [label="5:  DeclStmt \n   n$10=_fun___variable_initialization(&c:int) assign_last [line 21, column 3]\n  *&c:int=3 [line 21, column 3]\n  NULLIFY(&c); [line 21, column 3]\n  EXIT_SCOPE(n$10,c); [line 21, column 3]\n " shape="box"]
 	
 
 	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_5" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_4" ;
-"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_6" [label="6:  DeclStmt \n   n$11=_fun___variable_initialization(&b:int) [line 21, column 3]\n  *&b:int=7 [line 21, column 3]\n  NULLIFY(&b); [line 21, column 3]\n  EXIT_SCOPE(n$11,b); [line 21, column 3]\n " shape="box"]
+"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_6" [label="6:  DeclStmt \n   n$11=_fun___variable_initialization(&b:int) assign_last [line 21, column 3]\n  *&b:int=7 [line 21, column 3]\n  NULLIFY(&b); [line 21, column 3]\n  EXIT_SCOPE(n$11,b); [line 21, column 3]\n " shape="box"]
 	
 
 	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_6" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_5" ;
-"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_7" [label="7:  DeclStmt \n   n$12=_fun___variable_initialization(&a:int) [line 21, column 3]\n  *&a:int=9 [line 21, column 3]\n  EXIT_SCOPE(n$12); [line 21, column 3]\n " shape="box"]
+"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_7" [label="7:  DeclStmt \n   n$12=_fun___variable_initialization(&a:int) assign_last [line 21, column 3]\n  *&a:int=9 [line 21, column 3]\n  EXIT_SCOPE(n$12); [line 21, column 3]\n " shape="box"]
 	
 
 	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_7" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_6" ;

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

@@ -49,7 +49,7 @@ digraph cfg {
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_12" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_8" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_13" [label="13:  DeclStmt \n   n$8=_fun___variable_initialization(&y3:int) [line 24, column 3]\n  n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 24, column 13]\n  n$7=*&0$?%__sil_tmpSIL_temp_conditional___n$4:int [line 24, column 27]\n  *&y3:int=(n$3 + n$7) [line 24, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 24, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$4); [line 24, column 3]\n  NULLIFY(&y3); [line 24, column 3]\n  EXIT_SCOPE(n$3,n$7,n$8,0$?%__sil_tmpSIL_temp_conditional___n$0,0$?%__sil_tmpSIL_temp_conditional___n$4,y3); [line 24, column 3]\n  APPLY_ABSTRACTION; [line 24, column 3]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_13" [label="13:  DeclStmt \n   n$8=_fun___variable_initialization(&y3:int) assign_last [line 24, column 3]\n  n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 24, column 13]\n  n$7=*&0$?%__sil_tmpSIL_temp_conditional___n$4:int [line 24, column 27]\n  *&y3:int=(n$3 + n$7) [line 24, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 24, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$4); [line 24, column 3]\n  NULLIFY(&y3); [line 24, column 3]\n  EXIT_SCOPE(n$3,n$7,n$8,0$?%__sil_tmpSIL_temp_conditional___n$0,0$?%__sil_tmpSIL_temp_conditional___n$4,y3); [line 24, column 3]\n  APPLY_ABSTRACTION; [line 24, column 3]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_13" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_2" ;
@@ -73,7 +73,7 @@ digraph cfg {
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_18" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_14" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_19" [label="19:  DeclStmt \n   n$13=_fun___variable_initialization(&y2:int) [line 22, column 3]\n  n$12=*&0$?%__sil_tmpSIL_temp_conditional___n$9:int [line 22, column 18]\n  *&y2:int=(77 + n$12) [line 22, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$9); [line 22, column 3]\n  NULLIFY(&y2); [line 22, column 3]\n  EXIT_SCOPE(n$12,n$13,0$?%__sil_tmpSIL_temp_conditional___n$9,y2); [line 22, column 3]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_19" [label="19:  DeclStmt \n   n$13=_fun___variable_initialization(&y2:int) assign_last [line 22, column 3]\n  n$12=*&0$?%__sil_tmpSIL_temp_conditional___n$9:int [line 22, column 18]\n  *&y2:int=(77 + n$12) [line 22, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$9); [line 22, column 3]\n  NULLIFY(&y2); [line 22, column 3]\n  EXIT_SCOPE(n$12,n$13,0$?%__sil_tmpSIL_temp_conditional___n$9,y2); [line 22, column 3]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_19" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_4" ;
@@ -98,7 +98,7 @@ digraph cfg {
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_24" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_20" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_25" [label="25:  DeclStmt \n   n$18=_fun___variable_initialization(&y1:int) [line 20, column 3]\n  n$17=*&0$?%__sil_tmpSIL_temp_conditional___n$14:int [line 20, column 13]\n  *&y1:int=(n$17 + 77) [line 20, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$14); [line 20, column 3]\n  NULLIFY(&y1); [line 20, column 3]\n  EXIT_SCOPE(n$17,n$18,0$?%__sil_tmpSIL_temp_conditional___n$14,y1); [line 20, column 3]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_25" [label="25:  DeclStmt \n   n$18=_fun___variable_initialization(&y1:int) assign_last [line 20, column 3]\n  n$17=*&0$?%__sil_tmpSIL_temp_conditional___n$14:int [line 20, column 13]\n  *&y1:int=(n$17 + 77) [line 20, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$14); [line 20, column 3]\n  NULLIFY(&y1); [line 20, column 3]\n  EXIT_SCOPE(n$17,n$18,0$?%__sil_tmpSIL_temp_conditional___n$14,y1); [line 20, column 3]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_25" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_15" ;

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

@@ -196,12 +196,12 @@ digraph cfg {
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_27" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_20" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_28" [label="28:  DeclStmt \n   n$10=_fun___variable_initialization(&n:int) [line 14, column 3]\n  n$9=*&0$?%__sil_tmpSIL_temp_conditional___n$6:int [line 14, column 12]\n  *&n:int=n$9 [line 14, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$6); [line 14, column 3]\n  NULLIFY(&n); [line 14, column 3]\n  EXIT_SCOPE(n$9,n$10,0$?%__sil_tmpSIL_temp_conditional___n$6,n); [line 14, column 3]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_28" [label="28:  DeclStmt \n   n$10=_fun___variable_initialization(&n:int) assign_last [line 14, column 3]\n  n$9=*&0$?%__sil_tmpSIL_temp_conditional___n$6:int [line 14, column 12]\n  *&n:int=n$9 [line 14, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$6); [line 14, column 3]\n  NULLIFY(&n); [line 14, column 3]\n  EXIT_SCOPE(n$9,n$10,0$?%__sil_tmpSIL_temp_conditional___n$6,n); [line 14, column 3]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_28" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_10" ;
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_28" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_11" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_29" [label="29:  DeclStmt \n   n$11=_fun___variable_initialization(&y:int) [line 13, column 3]\n  *&y:int=19 [line 13, column 3]\n  EXIT_SCOPE(n$11); [line 13, column 3]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_29" [label="29:  DeclStmt \n   n$11=_fun___variable_initialization(&y:int) assign_last [line 13, column 3]\n  *&y:int=19 [line 13, column 3]\n  EXIT_SCOPE(n$11); [line 13, column 3]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_29" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_21" ;
@@ -235,7 +235,7 @@ digraph cfg {
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_36" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_30" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_37" [label="37:  DeclStmt \n   n$16=_fun___variable_initialization(&x:int) [line 9, column 3]\n  *&x:int=5 [line 9, column 3]\n  EXIT_SCOPE(n$16); [line 9, column 3]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_37" [label="37:  DeclStmt \n   n$16=_fun___variable_initialization(&x:int) assign_last [line 9, column 3]\n  *&x:int=5 [line 9, column 3]\n  EXIT_SCOPE(n$16); [line 9, column 3]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_37" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_31" ;

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

@@ -64,7 +64,7 @@ digraph cfg {
 	
 
 	 "test1.5a105e8b9d40e1329780d62ea2265d8a_8" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_4" ;
-"test1.5a105e8b9d40e1329780d62ea2265d8a_9" [label="9:  DeclStmt \n   n$5=_fun___variable_initialization(&x:int) [line 15, column 3]\n  n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 15, column 11]\n  *&x:int=n$4 [line 15, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 15, column 3]\n  EXIT_SCOPE(n$4,n$5,0$?%__sil_tmpSIL_temp_conditional___n$1); [line 15, column 3]\n " shape="box"]
+"test1.5a105e8b9d40e1329780d62ea2265d8a_9" [label="9:  DeclStmt \n   n$5=_fun___variable_initialization(&x:int) assign_last [line 15, column 3]\n  n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 15, column 11]\n  *&x:int=n$4 [line 15, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 15, column 3]\n  EXIT_SCOPE(n$4,n$5,0$?%__sil_tmpSIL_temp_conditional___n$1); [line 15, column 3]\n " shape="box"]
 	
 
 	 "test1.5a105e8b9d40e1329780d62ea2265d8a_9" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_3" ;
@@ -115,7 +115,7 @@ digraph cfg {
 
 	 "test3.8ad8757baa8564dc136c1e07507f4a98_9" -> "test3.8ad8757baa8564dc136c1e07507f4a98_5" ;
 	 "test3.8ad8757baa8564dc136c1e07507f4a98_9" -> "test3.8ad8757baa8564dc136c1e07507f4a98_6" ;
-"test3.8ad8757baa8564dc136c1e07507f4a98_10" [label="10:  DeclStmt \n   n$4=_fun___variable_initialization(&x:int) [line 20, column 3]\n  n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 20, column 11]\n  *&x:int=n$3 [line 20, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$2); [line 20, column 3]\n  EXIT_SCOPE(n$3,n$4,0$?%__sil_tmpSIL_temp_conditional___n$2); [line 20, column 3]\n " shape="box"]
+"test3.8ad8757baa8564dc136c1e07507f4a98_10" [label="10:  DeclStmt \n   n$4=_fun___variable_initialization(&x:int) assign_last [line 20, column 3]\n  n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 20, column 11]\n  *&x:int=n$3 [line 20, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$2); [line 20, column 3]\n  EXIT_SCOPE(n$3,n$4,0$?%__sil_tmpSIL_temp_conditional___n$2); [line 20, column 3]\n " shape="box"]
 	
 
 	 "test3.8ad8757baa8564dc136c1e07507f4a98_10" -> "test3.8ad8757baa8564dc136c1e07507f4a98_3" ;
@@ -223,7 +223,7 @@ digraph cfg {
 	
 
 	 "test6.4cfad7076129962ee70c36839a1e3e15_8" -> "test6.4cfad7076129962ee70c36839a1e3e15_4" ;
-"test6.4cfad7076129962ee70c36839a1e3e15_9" [label="9:  DeclStmt \n   n$5=_fun___variable_initialization(&z:int) [line 29, column 3]\n  n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 29, column 11]\n  *&z:int=n$4 [line 29, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 29, column 3]\n  EXIT_SCOPE(n$4,n$5,0$?%__sil_tmpSIL_temp_conditional___n$1); [line 29, column 3]\n " shape="box"]
+"test6.4cfad7076129962ee70c36839a1e3e15_9" [label="9:  DeclStmt \n   n$5=_fun___variable_initialization(&z:int) assign_last [line 29, column 3]\n  n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 29, column 11]\n  *&z:int=n$4 [line 29, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 29, column 3]\n  EXIT_SCOPE(n$4,n$5,0$?%__sil_tmpSIL_temp_conditional___n$1); [line 29, column 3]\n " shape="box"]
 	
 
 	 "test6.4cfad7076129962ee70c36839a1e3e15_9" -> "test6.4cfad7076129962ee70c36839a1e3e15_3" ;

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

@@ -28,7 +28,7 @@ digraph cfg {
 	
 
 	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_7" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_3" ;
-"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_8" [label="8:  DeclStmt \n   n$4=_fun___variable_initialization(&z:int) [line 20, column 37]\n  n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 20, column 45]\n  *&z:int=n$3 [line 20, column 37]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 20, column 37]\n  NULLIFY(&z); [line 20, column 37]\n  EXIT_SCOPE(n$3,n$4,0$?%__sil_tmpSIL_temp_conditional___n$0,z); [line 20, column 37]\n  APPLY_ABSTRACTION; [line 20, column 37]\n " shape="box"]
+"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_8" [label="8:  DeclStmt \n   n$4=_fun___variable_initialization(&z:int) assign_last [line 20, column 37]\n  n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 20, column 45]\n  *&z:int=n$3 [line 20, column 37]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 20, column 37]\n  NULLIFY(&z); [line 20, column 37]\n  EXIT_SCOPE(n$3,n$4,0$?%__sil_tmpSIL_temp_conditional___n$0,z); [line 20, column 37]\n  APPLY_ABSTRACTION; [line 20, column 37]\n " shape="box"]
 	
 
 	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_8" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_2" ;
@@ -60,7 +60,7 @@ digraph cfg {
 	
 
 	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_7" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_3" ;
-"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_8" [label="8:  DeclStmt \n   n$4=_fun___variable_initialization(&z:int) [line 18, column 37]\n  n$1=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 18, column 54]\n  n$2=_fun_ret_ptr(n$1:int) [line 18, column 46]\n  n$3=*n$2.field:int [line 18, column 45]\n  *&z:int=n$3 [line 18, column 37]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 18, column 37]\n  NULLIFY(&z); [line 18, column 37]\n  EXIT_SCOPE(n$1,n$2,n$3,n$4,0$?%__sil_tmpSIL_temp_conditional___n$0,z); [line 18, column 37]\n  APPLY_ABSTRACTION; [line 18, column 37]\n " shape="box"]
+"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_8" [label="8:  DeclStmt \n   n$4=_fun___variable_initialization(&z:int) assign_last [line 18, column 37]\n  n$1=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 18, column 54]\n  n$2=_fun_ret_ptr(n$1:int) [line 18, column 46]\n  n$3=*n$2.field:int [line 18, column 45]\n  *&z:int=n$3 [line 18, column 37]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 18, column 37]\n  NULLIFY(&z); [line 18, column 37]\n  EXIT_SCOPE(n$1,n$2,n$3,n$4,0$?%__sil_tmpSIL_temp_conditional___n$0,z); [line 18, column 37]\n  APPLY_ABSTRACTION; [line 18, column 37]\n " shape="box"]
 	
 
 	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_8" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_2" ;
@@ -92,7 +92,7 @@ digraph cfg {
 	
 
 	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_7" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_3" ;
-"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_8" [label="8:  DeclStmt \n   n$5=_fun___variable_initialization(&z:int) [line 15, column 3]\n  n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:s* [line 15, column 12]\n  n$4=*n$3.field:int [line 15, column 11]\n  *&z:int=n$4 [line 15, column 3]\n  NULLIFY(&z); [line 15, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 15, column 3]\n  EXIT_SCOPE(n$3,n$4,n$5,z,0$?%__sil_tmpSIL_temp_conditional___n$0); [line 15, column 3]\n  APPLY_ABSTRACTION; [line 15, column 3]\n " shape="box"]
+"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_8" [label="8:  DeclStmt \n   n$5=_fun___variable_initialization(&z:int) assign_last [line 15, column 3]\n  n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:s* [line 15, column 12]\n  n$4=*n$3.field:int [line 15, column 11]\n  *&z:int=n$4 [line 15, column 3]\n  NULLIFY(&z); [line 15, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 15, column 3]\n  EXIT_SCOPE(n$3,n$4,n$5,z,0$?%__sil_tmpSIL_temp_conditional___n$0); [line 15, column 3]\n  APPLY_ABSTRACTION; [line 15, column 3]\n " shape="box"]
 	
 
 	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_8" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_2" ;

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

@@ -56,7 +56,7 @@ digraph cfg {
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_14" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_10" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_15" [label="15:  DeclStmt \n   n$10=_fun___variable_initialization(&y:int) [line 12, column 3]\n  n$8=*&0$?%__sil_tmpSIL_temp_conditional___n$5:int* [line 12, column 13]\n  n$9=*n$8:int [line 12, column 11]\n  *&y:int=n$9 [line 12, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$5); [line 12, column 3]\n  NULLIFY(&y); [line 12, column 3]\n  EXIT_SCOPE(n$8,n$9,n$10,0$?%__sil_tmpSIL_temp_conditional___n$5,y); [line 12, column 3]\n " shape="box"]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_15" [label="15:  DeclStmt \n   n$10=_fun___variable_initialization(&y:int) assign_last [line 12, column 3]\n  n$8=*&0$?%__sil_tmpSIL_temp_conditional___n$5:int* [line 12, column 13]\n  n$9=*n$8:int [line 12, column 11]\n  *&y:int=n$9 [line 12, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$5); [line 12, column 3]\n  NULLIFY(&y); [line 12, column 3]\n  EXIT_SCOPE(n$8,n$9,n$10,0$?%__sil_tmpSIL_temp_conditional___n$5,y); [line 12, column 3]\n " shape="box"]
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_15" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_4" ;

infer/tests/codetoanalyze/c/frontend/enumeration/enum.c.dot

@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$0=_fun___variable_initialization(&i:int) [line 24, column 3]\n  *&i:int=(2 + (2 - 0)) [line 24, column 3]\n  NULLIFY(&i); [line 24, column 3]\n  EXIT_SCOPE(n$0,i); [line 24, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$0=_fun___variable_initialization(&i:int) assign_last [line 24, column 3]\n  *&i:int=(2 + (2 - 0)) [line 24, column 3]\n  NULLIFY(&i); [line 24, column 3]\n  EXIT_SCOPE(n$0,i); [line 24, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;

infer/tests/codetoanalyze/c/frontend/enumeration/enum_bitmask.c.dot

@@ -7,11 +7,11 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   n$0=_fun___variable_initialization(&option2:int) [line 15, column 3]\n  *&option2:int=(1 << 1) [line 15, column 3]\n  NULLIFY(&option2); [line 15, column 3]\n  EXIT_SCOPE(n$0,option2); [line 15, column 3]\n  APPLY_ABSTRACTION; [line 15, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   n$0=_fun___variable_initialization(&option2:int) assign_last [line 15, column 3]\n  *&option2:int=(1 << 1) [line 15, column 3]\n  NULLIFY(&option2); [line 15, column 3]\n  EXIT_SCOPE(n$0,option2); [line 15, column 3]\n  APPLY_ABSTRACTION; [line 15, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$1=_fun___variable_initialization(&option1:int) [line 14, column 3]\n  *&option1:int=(1 << 0) [line 14, column 3]\n  NULLIFY(&option1); [line 14, column 3]\n  EXIT_SCOPE(n$1,option1); [line 14, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   n$1=_fun___variable_initialization(&option1:int) assign_last [line 14, column 3]\n  *&option1:int=(1 << 0) [line 14, column 3]\n  NULLIFY(&option1); [line 14, column 3]\n  EXIT_SCOPE(n$1,option1); [line 14, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;

infer/tests/codetoanalyze/c/frontend/enumeration/other_enum.c.dot

@@ -7,31 +7,31 @@ digraph cfg {
 "other_enum_main.572f04969b0ade4902dd1faf86fac461_2" [label="2: Exit other_enum_main \n  " color=yellow style=filled]
 	
 
-"other_enum_main.572f04969b0ade4902dd1faf86fac461_3" [label="3:  DeclStmt \n   n$0=_fun___variable_initialization(&foo_g:int) [line 17, column 3]\n  *&foo_g:int=(2 + 10) [line 17, column 3]\n  NULLIFY(&foo_g); [line 17, column 3]\n  EXIT_SCOPE(n$0,foo_g); [line 17, column 3]\n  APPLY_ABSTRACTION; [line 17, column 3]\n " shape="box"]
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_3" [label="3:  DeclStmt \n   n$0=_fun___variable_initialization(&foo_g:int) assign_last [line 17, column 3]\n  *&foo_g:int=(2 + 10) [line 17, column 3]\n  NULLIFY(&foo_g); [line 17, column 3]\n  EXIT_SCOPE(n$0,foo_g); [line 17, column 3]\n  APPLY_ABSTRACTION; [line 17, column 3]\n " shape="box"]
 	
 
 	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_3" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_2" ;
-"other_enum_main.572f04969b0ade4902dd1faf86fac461_4" [label="4:  DeclStmt \n   n$1=_fun___variable_initialization(&foo_f:int) [line 16, column 3]\n  *&foo_f:int=2 [line 16, column 3]\n  NULLIFY(&foo_f); [line 16, column 3]\n  EXIT_SCOPE(n$1,foo_f); [line 16, column 3]\n " shape="box"]
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_4" [label="4:  DeclStmt \n   n$1=_fun___variable_initialization(&foo_f:int) assign_last [line 16, column 3]\n  *&foo_f:int=2 [line 16, column 3]\n  NULLIFY(&foo_f); [line 16, column 3]\n  EXIT_SCOPE(n$1,foo_f); [line 16, column 3]\n " shape="box"]
 	
 
 	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_4" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_3" ;
-"other_enum_main.572f04969b0ade4902dd1faf86fac461_5" [label="5:  DeclStmt \n   n$2=_fun___variable_initialization(&foo_e:int) [line 15, column 3]\n  *&foo_e:int=1 [line 15, column 3]\n  NULLIFY(&foo_e); [line 15, column 3]\n  EXIT_SCOPE(n$2,foo_e); [line 15, column 3]\n " shape="box"]
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_5" [label="5:  DeclStmt \n   n$2=_fun___variable_initialization(&foo_e:int) assign_last [line 15, column 3]\n  *&foo_e:int=1 [line 15, column 3]\n  NULLIFY(&foo_e); [line 15, column 3]\n  EXIT_SCOPE(n$2,foo_e); [line 15, column 3]\n " shape="box"]
 	
 
 	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_5" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_4" ;
-"other_enum_main.572f04969b0ade4902dd1faf86fac461_6" [label="6:  DeclStmt \n   n$3=_fun___variable_initialization(&foo_d:int) [line 14, column 3]\n  *&foo_d:int=11 [line 14, column 3]\n  NULLIFY(&foo_d); [line 14, column 3]\n  EXIT_SCOPE(n$3,foo_d); [line 14, column 3]\n " shape="box"]
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_6" [label="6:  DeclStmt \n   n$3=_fun___variable_initialization(&foo_d:int) assign_last [line 14, column 3]\n  *&foo_d:int=11 [line 14, column 3]\n  NULLIFY(&foo_d); [line 14, column 3]\n  EXIT_SCOPE(n$3,foo_d); [line 14, column 3]\n " shape="box"]
 	
 
 	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_6" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_5" ;
-"other_enum_main.572f04969b0ade4902dd1faf86fac461_7" [label="7:  DeclStmt \n   n$4=_fun___variable_initialization(&foo_c:int) [line 13, column 3]\n  *&foo_c:int=10 [line 13, column 3]\n  NULLIFY(&foo_c); [line 13, column 3]\n  EXIT_SCOPE(n$4,foo_c); [line 13, column 3]\n " shape="box"]
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_7" [label="7:  DeclStmt \n   n$4=_fun___variable_initialization(&foo_c:int) assign_last [line 13, column 3]\n  *&foo_c:int=10 [line 13, column 3]\n  NULLIFY(&foo_c); [line 13, column 3]\n  EXIT_SCOPE(n$4,foo_c); [line 13, column 3]\n " shape="box"]
 	
 
 	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_7" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_6" ;
-"other_enum_main.572f04969b0ade4902dd1faf86fac461_8" [label="8:  DeclStmt \n   n$5=_fun___variable_initialization(&foo_b:int) [line 12, column 3]\n  *&foo_b:int=1 [line 12, column 3]\n  NULLIFY(&foo_b); [line 12, column 3]\n  EXIT_SCOPE(n$5,foo_b); [line 12, column 3]\n " shape="box"]
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_8" [label="8:  DeclStmt \n   n$5=_fun___variable_initialization(&foo_b:int) assign_last [line 12, column 3]\n  *&foo_b:int=1 [line 12, column 3]\n  NULLIFY(&foo_b); [line 12, column 3]\n  EXIT_SCOPE(n$5,foo_b); [line 12, column 3]\n " shape="box"]
 	
 
 	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_8" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_7" ;
-"other_enum_main.572f04969b0ade4902dd1faf86fac461_9" [label="9:  DeclStmt \n   n$6=_fun___variable_initialization(&foo_a:int) [line 11, column 3]\n  *&foo_a:int=0 [line 11, column 3]\n  NULLIFY(&foo_a); [line 11, column 3]\n  EXIT_SCOPE(n$6,foo_a); [line 11, column 3]\n " shape="box"]
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_9" [label="9:  DeclStmt \n   n$6=_fun___variable_initialization(&foo_a:int) assign_last [line 11, column 3]\n  *&foo_a:int=0 [line 11, column 3]\n  NULLIFY(&foo_a); [line 11, column 3]\n  EXIT_SCOPE(n$6,foo_a); [line 11, column 3]\n " shape="box"]
 	
 
 	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_9" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_8" ;
@@ -71,11 +71,11 @@ digraph cfg {
 	
 
 	 "other_enum_test.100f3583adf0259001be6c944828c44a_9" -> "other_enum_test.100f3583adf0259001be6c944828c44a_2" ;
-"other_enum_test.100f3583adf0259001be6c944828c44a_10" [label="10:  DeclStmt \n   n$4=_fun___variable_initialization(&foo_a:int) [line 22, column 3]\n  *&foo_a:int=0 [line 22, column 3]\n  EXIT_SCOPE(n$4); [line 22, column 3]\n " shape="box"]
+"other_enum_test.100f3583adf0259001be6c944828c44a_10" [label="10:  DeclStmt \n   n$4=_fun___variable_initialization(&foo_a:int) assign_last [line 22, column 3]\n  *&foo_a:int=0 [line 22, column 3]\n  EXIT_SCOPE(n$4); [line 22, column 3]\n " shape="box"]
 	
 
 	 "other_enum_test.100f3583adf0259001be6c944828c44a_10" -> "other_enum_test.100f3583adf0259001be6c944828c44a_5" ;
-"other_enum_test.100f3583adf0259001be6c944828c44a_11" [label="11:  DeclStmt \n   n$5=_fun___variable_initialization(&foo_g:int) [line 21, column 3]\n  *&foo_g:int=(2 + 10) [line 21, column 3]\n  EXIT_SCOPE(n$5); [line 21, column 3]\n " shape="box"]
+"other_enum_test.100f3583adf0259001be6c944828c44a_11" [label="11:  DeclStmt \n   n$5=_fun___variable_initialization(&foo_g:int) assign_last [line 21, column 3]\n  *&foo_g:int=(2 + 10) [line 21, column 3]\n  EXIT_SCOPE(n$5); [line 21, column 3]\n " shape="box"]
 	
 
 	 "other_enum_test.100f3583adf0259001be6c944828c44a_11" -> "other_enum_test.100f3583adf0259001be6c944828c44a_10" ;

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

@@ -44,7 +44,7 @@ digraph cfg {
 	
 
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_11" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_8" ;
-"g0.8ac829e3bb8338d74cfb45ebe834d8e1_12" [label="12:  DeclStmt \n   n$7=_fun___variable_initialization(&a:int) [line 13, column 3]\n  *&a:int=0 [line 13, column 3]\n  NULLIFY(&a); [line 13, column 3]\n  EXIT_SCOPE(n$7,a); [line 13, column 3]\n " shape="box"]
+"g0.8ac829e3bb8338d74cfb45ebe834d8e1_12" [label="12:  DeclStmt \n   n$7=_fun___variable_initialization(&a:int) assign_last [line 13, column 3]\n  *&a:int=0 [line 13, column 3]\n  NULLIFY(&a); [line 13, column 3]\n  EXIT_SCOPE(n$7,a); [line 13, column 3]\n " shape="box"]
 	
 
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_12" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_9" ;
@@ -88,7 +88,7 @@ digraph cfg {
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_10" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_7" ;
-"g1.0120a4f9196a5f9eb9f523f31f914da7_11" [label="11:  DeclStmt \n   n$5=_fun___variable_initialization(&a:int) [line 25, column 3]\n  *&a:int=0 [line 25, column 3]\n  NULLIFY(&a); [line 25, column 3]\n  EXIT_SCOPE(n$5,a); [line 25, column 3]\n " shape="box"]
+"g1.0120a4f9196a5f9eb9f523f31f914da7_11" [label="11:  DeclStmt \n   n$5=_fun___variable_initialization(&a:int) assign_last [line 25, column 3]\n  *&a:int=0 [line 25, column 3]\n  NULLIFY(&a); [line 25, column 3]\n  EXIT_SCOPE(n$5,a); [line 25, column 3]\n " shape="box"]
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_11" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_8" ;
@@ -186,7 +186,7 @@ digraph cfg {
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_23" -> "g2.e1c80488853d86ab9d6decfe30d8930f_20" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_24" [label="24:  DeclStmt \n   n$15=_fun___variable_initialization(&a:int) [line 36, column 3]\n  *&a:int=0 [line 36, column 3]\n  NULLIFY(&a); [line 36, column 3]\n  EXIT_SCOPE(n$15,a); [line 36, column 3]\n  APPLY_ABSTRACTION; [line 36, column 3]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_24" [label="24:  DeclStmt \n   n$15=_fun___variable_initialization(&a:int) assign_last [line 36, column 3]\n  *&a:int=0 [line 36, column 3]\n  NULLIFY(&a); [line 36, column 3]\n  EXIT_SCOPE(n$15,a); [line 36, column 3]\n  APPLY_ABSTRACTION; [line 36, column 3]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_24" -> "g2.e1c80488853d86ab9d6decfe30d8930f_14" ;
@@ -213,7 +213,7 @@ digraph cfg {
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_6" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_5" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_7" [label="7:  DeclStmt \n   n$3=_fun___variable_initialization(&a:int) [line 71, column 3]\n  *&a:int=2 [line 71, column 3]\n  NULLIFY(&a); [line 71, column 3]\n  EXIT_SCOPE(n$3,a); [line 71, column 3]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_7" [label="7:  DeclStmt \n   n$3=_fun___variable_initialization(&a:int) assign_last [line 71, column 3]\n  *&a:int=2 [line 71, column 3]\n  NULLIFY(&a); [line 71, column 3]\n  EXIT_SCOPE(n$3,a); [line 71, column 3]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_7" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_6" ;
@@ -311,7 +311,7 @@ digraph cfg {
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_6" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_5" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_7" [label="7:  DeclStmt \n   n$3=_fun___variable_initialization(&a:int) [line 92, column 3]\n  *&a:int=2 [line 92, column 3]\n  NULLIFY(&a); [line 92, column 3]\n  EXIT_SCOPE(n$3,a); [line 92, column 3]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_7" [label="7:  DeclStmt \n   n$3=_fun___variable_initialization(&a:int) assign_last [line 92, column 3]\n  *&a:int=2 [line 92, column 3]\n  NULLIFY(&a); [line 92, column 3]\n  EXIT_SCOPE(n$3,a); [line 92, column 3]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_7" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_6" ;
@@ -409,7 +409,7 @@ digraph cfg {
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_7" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_6" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_8" [label="8:  DeclStmt \n   n$4=_fun___variable_initialization(&a:int) [line 113, column 3]\n  *&a:int=2 [line 113, column 3]\n  NULLIFY(&a); [line 113, column 3]\n  EXIT_SCOPE(n$4,a); [line 113, column 3]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_8" [label="8:  DeclStmt \n   n$4=_fun___variable_initialization(&a:int) assign_last [line 113, column 3]\n  *&a:int=2 [line 113, column 3]\n  NULLIFY(&a); [line 113, column 3]\n  EXIT_SCOPE(n$4,a); [line 113, column 3]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_8" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_7" ;
@@ -499,7 +499,7 @@ digraph cfg {
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_7" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_6" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_8" [label="8:  DeclStmt \n   n$4=_fun___variable_initialization(&a:int) [line 135, column 3]\n  *&a:int=2 [line 135, column 3]\n  NULLIFY(&a); [line 135, column 3]\n  EXIT_SCOPE(n$4,a); [line 135, column 3]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_8" [label="8:  DeclStmt \n   n$4=_fun___variable_initialization(&a:int) assign_last [line 135, column 3]\n  *&a:int=2 [line 135, column 3]\n  NULLIFY(&a); [line 135, column 3]\n  EXIT_SCOPE(n$4,a); [line 135, column 3]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_8" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_7" ;
@@ -606,7 +606,7 @@ digraph cfg {
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_11" -> "g7.727bb92f57c3951d11695a52c92c2b0c_13" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_12" [label="12: Prune (false branch, while) \n   PRUNE(!(n$5 < 10), false); [line 146, column 10]\n  NULLIFY(&j); [line 146, column 10]\n  NULLIFY(&k); [line 146, column 10]\n  NULLIFY(&i); [line 146, column 10]\n  NULLIFY(&v); [line 146, column 10]\n  EXIT_SCOPE(n$5,j,k,i,v); [line 146, column 10]\n  APPLY_ABSTRACTION; [line 146, column 10]\n " shape="invhouse"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_12" [label="12: Prune (false branch, while) \n   PRUNE(!(n$5 < 10), false); [line 146, column 10]\n  NULLIFY(&j); [line 146, column 10]\n  NULLIFY(&k); [line 146, column 10]\n  NULLIFY(&i); [line 146, column 10]\n  EXIT_SCOPE(n$5,j,k,i); [line 146, column 10]\n  APPLY_ABSTRACTION; [line 146, column 10]\n " shape="invhouse"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_12" -> "g7.727bb92f57c3951d11695a52c92c2b0c_8" ;
@@ -648,12 +648,12 @@ digraph cfg {
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_21" -> "g7.727bb92f57c3951d11695a52c92c2b0c_17" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_22" [label="22:  BinaryOperatorStmt: GE \n   n$8=*&v:int [line 150, column 13]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_22" [label="22:  BinaryOperatorStmt: GE \n   n$8=*&v:int [line 150, column 13]\n  NULLIFY(&v); [line 150, column 13]\n  EXIT_SCOPE(v); [line 150, column 13]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_22" -> "g7.727bb92f57c3951d11695a52c92c2b0c_23" ;
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_22" -> "g7.727bb92f57c3951d11695a52c92c2b0c_24" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_23" [label="23: Prune (true branch, if) \n   PRUNE((n$8 >= 15), true); [line 150, column 13]\n  NULLIFY(&j); [line 150, column 13]\n  NULLIFY(&k); [line 150, column 13]\n  NULLIFY(&i); [line 150, column 13]\n  NULLIFY(&v); [line 150, column 13]\n  EXIT_SCOPE(n$8,j,k,i,v); [line 150, column 13]\n  APPLY_ABSTRACTION; [line 150, column 13]\n " shape="invhouse"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_23" [label="23: Prune (true branch, if) \n   PRUNE((n$8 >= 15), true); [line 150, column 13]\n  NULLIFY(&j); [line 150, column 13]\n  NULLIFY(&k); [line 150, column 13]\n  NULLIFY(&i); [line 150, column 13]\n  EXIT_SCOPE(n$8,j,k,i); [line 150, column 13]\n  APPLY_ABSTRACTION; [line 150, column 13]\n " shape="invhouse"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_23" -> "g7.727bb92f57c3951d11695a52c92c2b0c_8" ;
@@ -665,19 +665,19 @@ digraph cfg {
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_25" -> "g7.727bb92f57c3951d11695a52c92c2b0c_5" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_26" [label="26:  DeclStmt \n   n$18=_fun___variable_initialization(&v:int) [line 149, column 9]\n  n$15=*&i:int [line 149, column 17]\n  n$16=*&j:int [line 149, column 21]\n  n$17=*&k:int [line 149, column 25]\n  *&v:int=((n$15 + n$16) + n$17) [line 149, column 9]\n  EXIT_SCOPE(n$15,n$16,n$17,n$18); [line 149, column 9]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_26" [label="26:  DeclStmt \n   n$18=_fun___variable_initialization(&v:int) assign_last [line 149, column 9]\n  n$15=*&i:int [line 149, column 17]\n  n$16=*&j:int [line 149, column 21]\n  n$17=*&k:int [line 149, column 25]\n  *&v:int=((n$15 + n$16) + n$17) [line 149, column 9]\n  EXIT_SCOPE(n$15,n$16,n$17,n$18); [line 149, column 9]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_26" -> "g7.727bb92f57c3951d11695a52c92c2b0c_22" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_27" [label="27:  DeclStmt \n   n$22=_fun___variable_initialization(&k:int) [line 145, column 3]\n  *&k:int=0 [line 145, column 3]\n  EXIT_SCOPE(n$22); [line 145, column 3]\n  APPLY_ABSTRACTION; [line 145, column 3]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_27" [label="27:  DeclStmt \n   n$22=_fun___variable_initialization(&k:int) assign_last [line 145, column 3]\n  *&k:int=0 [line 145, column 3]\n  EXIT_SCOPE(n$22); [line 145, column 3]\n  APPLY_ABSTRACTION; [line 145, column 3]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_27" -> "g7.727bb92f57c3951d11695a52c92c2b0c_9" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_28" [label="28:  DeclStmt \n   n$23=_fun___variable_initialization(&j:int) [line 145, column 3]\n  *&j:int=0 [line 145, column 3]\n  EXIT_SCOPE(n$23); [line 145, column 3]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_28" [label="28:  DeclStmt \n   n$23=_fun___variable_initialization(&j:int) assign_last [line 145, column 3]\n  *&j:int=0 [line 145, column 3]\n  EXIT_SCOPE(n$23); [line 145, column 3]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_28" -> "g7.727bb92f57c3951d11695a52c92c2b0c_27" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_29" [label="29:  DeclStmt \n   n$24=_fun___variable_initialization(&i:int) [line 145, column 3]\n  *&i:int=0 [line 145, column 3]\n  EXIT_SCOPE(n$24); [line 145, column 3]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_29" [label="29:  DeclStmt \n   n$24=_fun___variable_initialization(&i:int) assign_last [line 145, column 3]\n  *&i:int=0 [line 145, column 3]\n  EXIT_SCOPE(n$24); [line 145, column 3]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_29" -> "g7.727bb92f57c3951d11695a52c92c2b0c_28" ;
@@ -721,7 +721,7 @@ digraph cfg {
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_10" -> "g8.c98b82371573afc08575815d90f5eac4_12" ;
-"g8.c98b82371573afc08575815d90f5eac4_11" [label="11: Prune (false branch, while) \n   PRUNE(!(n$4 < 10), false); [line 171, column 10]\n  NULLIFY(&i); [line 171, column 10]\n  NULLIFY(&j); [line 171, column 10]\n  NULLIFY(&k); [line 171, column 10]\n  NULLIFY(&v); [line 171, column 10]\n  EXIT_SCOPE(n$4,i,j,k,v); [line 171, column 10]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_11" [label="11: Prune (false branch, while) \n   PRUNE(!(n$4 < 10), false); [line 171, column 10]\n  NULLIFY(&i); [line 171, column 10]\n  NULLIFY(&j); [line 171, column 10]\n  NULLIFY(&k); [line 171, column 10]\n  EXIT_SCOPE(n$4,i,j,k); [line 171, column 10]\n " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_11" -> "g8.c98b82371573afc08575815d90f5eac4_7" ;
@@ -763,7 +763,7 @@ digraph cfg {
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_20" -> "g8.c98b82371573afc08575815d90f5eac4_16" ;
-"g8.c98b82371573afc08575815d90f5eac4_21" [label="21:  BinaryOperatorStmt: GE \n   n$7=*&v:int [line 175, column 13]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_21" [label="21:  BinaryOperatorStmt: GE \n   n$7=*&v:int [line 175, column 13]\n  NULLIFY(&v); [line 175, column 13]\n  EXIT_SCOPE(v); [line 175, column 13]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_21" -> "g8.c98b82371573afc08575815d90f5eac4_22" ;
@@ -784,7 +784,7 @@ digraph cfg {
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_25" -> "g8.c98b82371573afc08575815d90f5eac4_24" ;
-"g8.c98b82371573afc08575815d90f5eac4_26" [label="26:  DeclStmt \n   n$15=_fun___variable_initialization(&v:int) [line 174, column 9]\n  n$12=*&i:int [line 174, column 17]\n  n$13=*&j:int [line 174, column 21]\n  n$14=*&k:int [line 174, column 25]\n  *&v:int=((n$12 + n$13) + n$14) [line 174, column 9]\n  EXIT_SCOPE(n$12,n$13,n$14,n$15); [line 174, column 9]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_26" [label="26:  DeclStmt \n   n$15=_fun___variable_initialization(&v:int) assign_last [line 174, column 9]\n  n$12=*&i:int [line 174, column 17]\n  n$13=*&j:int [line 174, column 21]\n  n$14=*&k:int [line 174, column 25]\n  *&v:int=((n$12 + n$13) + n$14) [line 174, column 9]\n  EXIT_SCOPE(n$12,n$13,n$14,n$15); [line 174, column 9]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_26" -> "g8.c98b82371573afc08575815d90f5eac4_21" ;
@@ -800,16 +800,16 @@ digraph cfg {
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_29" -> "g8.c98b82371573afc08575815d90f5eac4_27" ;
-"g8.c98b82371573afc08575815d90f5eac4_30" [label="30:  DeclStmt \n   n$23=_fun___variable_initialization(&k:int) [line 168, column 3]\n  *&k:int=0 [line 168, column 3]\n  EXIT_SCOPE(n$23); [line 168, column 3]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_30" [label="30:  DeclStmt \n   n$23=_fun___variable_initialization(&k:int) assign_last [line 168, column 3]\n  *&k:int=0 [line 168, column 3]\n  EXIT_SCOPE(n$23); [line 168, column 3]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_30" -> "g8.c98b82371573afc08575815d90f5eac4_28" ;
 	 "g8.c98b82371573afc08575815d90f5eac4_30" -> "g8.c98b82371573afc08575815d90f5eac4_29" ;
-"g8.c98b82371573afc08575815d90f5eac4_31" [label="31:  DeclStmt \n   n$24=_fun___variable_initialization(&j:int) [line 168, column 3]\n  *&j:int=0 [line 168, column 3]\n  EXIT_SCOPE(n$24); [line 168, column 3]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_31" [label="31:  DeclStmt \n   n$24=_fun___variable_initialization(&j:int) assign_last [line 168, column 3]\n  *&j:int=0 [line 168, column 3]\n  EXIT_SCOPE(n$24); [line 168, column 3]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_31" -> "g8.c98b82371573afc08575815d90f5eac4_30" ;
-"g8.c98b82371573afc08575815d90f5eac4_32" [label="32:  DeclStmt \n   n$25=_fun___variable_initialization(&i:int) [line 168, column 3]\n  *&i:int=0 [line 168, column 3]\n  EXIT_SCOPE(n$25); [line 168, column 3]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_32" [label="32:  DeclStmt \n   n$25=_fun___variable_initialization(&i:int) assign_last [line 168, column 3]\n  *&i:int=0 [line 168, column 3]\n  EXIT_SCOPE(n$25); [line 168, column 3]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_32" -> "g8.c98b82371573afc08575815d90f5eac4_31" ;

infer/tests/codetoanalyze/c/frontend/initialization/array_initlistexpr.c.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "init_const_array.b1cf412cdbd1beaf15a9f6a3789043b9_2" [label="2: Exit init_const_array \n  " color=yellow style=filled]
 	
 
-"init_const_array.b1cf412cdbd1beaf15a9f6a3789043b9_3" [label="3:  DeclStmt \n   n$1=_fun___variable_initialization(&a:int[3*4][2*12]) [line 10, column 3]\n  n$0=*&z:int [line 10, column 19]\n  *&a[0][0]:int=(n$0 + 1) [line 10, column 18]\n  *&a[0][1]:int=2 [line 10, column 18]\n  *&a[0][2]:int=3 [line 10, column 18]\n  *&a[1][0]:int=5 [line 10, column 33]\n  *&a[1][1]:int=6 [line 10, column 33]\n  *&a[1][2]:int=7 [line 10, column 33]\n  NULLIFY(&z); [line 10, column 33]\n  NULLIFY(&a); [line 10, column 33]\n  EXIT_SCOPE(n$0,n$1,z,a); [line 10, column 33]\n  APPLY_ABSTRACTION; [line 10, column 33]\n " shape="box"]
+"init_const_array.b1cf412cdbd1beaf15a9f6a3789043b9_3" [label="3:  DeclStmt \n   n$1=_fun___variable_initialization(&a:int[3*4][2*12]) assign_last [line 10, column 3]\n  n$0=*&z:int [line 10, column 19]\n  *&a[0][0]:int=(n$0 + 1) [line 10, column 18]\n  *&a[0][1]:int=2 [line 10, column 18]\n  *&a[0][2]:int=3 [line 10, column 18]\n  *&a[1][0]:int=5 [line 10, column 33]\n  *&a[1][1]:int=6 [line 10, column 33]\n  *&a[1][2]:int=7 [line 10, column 33]\n  NULLIFY(&z); [line 10, column 33]\n  NULLIFY(&a); [line 10, column 33]\n  EXIT_SCOPE(n$0,n$1,z,a); [line 10, column 33]\n  APPLY_ABSTRACTION; [line 10, column 33]\n " shape="box"]
 	
 
 	 "init_const_array.b1cf412cdbd1beaf15a9f6a3789043b9_3" -> "init_const_array.b1cf412cdbd1beaf15a9f6a3789043b9_2" ;
@@ -22,7 +22,7 @@ digraph cfg {
 	
 
 	 "init_variable_array.8cdc6857adcb1fd04fb6555d8ce3e4c1_3" -> "init_variable_array.8cdc6857adcb1fd04fb6555d8ce3e4c1_2" ;
-"init_variable_array.8cdc6857adcb1fd04fb6555d8ce3e4c1_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&x:int) [line 14, column 3]\n  n$3=*&len:int [line 14, column 15]\n  *&x:int=(2 * n$3) [line 14, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 14, column 3]\n " shape="box"]
+"init_variable_array.8cdc6857adcb1fd04fb6555d8ce3e4c1_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&x:int) assign_last [line 14, column 3]\n  n$3=*&len:int [line 14, column 15]\n  *&x:int=(2 * n$3) [line 14, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 14, column 3]\n " shape="box"]
 	
 
 	 "init_variable_array.8cdc6857adcb1fd04fb6555d8ce3e4c1_4" -> "init_variable_array.8cdc6857adcb1fd04fb6555d8ce3e4c1_3" ;

infer/tests/codetoanalyze/c/frontend/initialization/compound_literal.c.dot

@@ -22,7 +22,7 @@ digraph cfg {
 	
 
 	 "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_3" -> "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_2" ;
-"init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&p:point) [line 16, column 3]\n  *&p.x:int=32 [line 16, column 34]\n  *&p.y:int=52 [line 16, column 34]\n  n$1=*&p:point [line 16, column 20]\n  EXIT_SCOPE(n$1,n$2); [line 16, column 20]\n " shape="box"]
+"init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&p:point) assign_last [line 16, column 3]\n  *&p.x:int=32 [line 16, column 34]\n  *&p.y:int=52 [line 16, column 34]\n  n$1=*&p:point [line 16, column 20]\n  EXIT_SCOPE(n$1,n$2); [line 16, column 20]\n " shape="box"]
 	
 
 	 "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_4" -> "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_3" ;

infer/tests/codetoanalyze/c/frontend/initialization/enum_initlistexpr.c.dot

@@ -7,15 +7,15 @@ digraph cfg {
 "union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_2" [label="2: Exit union_initialize_FIXME \n  " color=yellow style=filled]
 	
 
-"union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_3" [label="3:  DeclStmt \n   n$0=_fun___variable_initialization(&set_f1_implicit:U) [line 15, column 3]\n  NULLIFY(&set_f1_implicit); [line 15, column 3]\n  EXIT_SCOPE(n$0,set_f1_implicit); [line 15, column 3]\n  APPLY_ABSTRACTION; [line 15, column 3]\n " shape="box"]
+"union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_3" [label="3:  DeclStmt \n   n$0=_fun___variable_initialization(&set_f1_implicit:U) assign_last [line 15, column 3]\n  NULLIFY(&set_f1_implicit); [line 15, column 3]\n  EXIT_SCOPE(n$0,set_f1_implicit); [line 15, column 3]\n  APPLY_ABSTRACTION; [line 15, column 3]\n " shape="box"]
 	
 
 	 "union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_3" -> "union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_2" ;
-"union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_4" [label="4:  DeclStmt \n   n$1=_fun___variable_initialization(&set_f2:U) [line 14, column 3]\n  NULLIFY(&set_f2); [line 14, column 3]\n  EXIT_SCOPE(n$1,set_f2); [line 14, column 3]\n " shape="box"]
+"union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_4" [label="4:  DeclStmt \n   n$1=_fun___variable_initialization(&set_f2:U) assign_last [line 14, column 3]\n  NULLIFY(&set_f2); [line 14, column 3]\n  EXIT_SCOPE(n$1,set_f2); [line 14, column 3]\n " shape="box"]
 	
 
 	 "union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_4" -> "union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_3" ;
-"union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_5" [label="5:  DeclStmt \n   n$2=_fun___variable_initialization(&set_f1:U) [line 13, column 3]\n  NULLIFY(&set_f1); [line 13, column 3]\n  EXIT_SCOPE(n$2,set_f1); [line 13, column 3]\n " shape="box"]
+"union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_5" [label="5:  DeclStmt \n   n$2=_fun___variable_initialization(&set_f1:U) assign_last [line 13, column 3]\n  NULLIFY(&set_f1); [line 13, column 3]\n  EXIT_SCOPE(n$2,set_f1); [line 13, column 3]\n " shape="box"]
 	
 
 	 "union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_5" -> "union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_4" ;

infer/tests/codetoanalyze/c/frontend/initialization/struct_initlistexpr.c.dot

@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "field_set_correctly.b8d9a4294a85d24818c312a099420dce_3" -> "field_set_correctly.b8d9a4294a85d24818c312a099420dce_2" ;
-"field_set_correctly.b8d9a4294a85d24818c312a099420dce_4" [label="4:  DeclStmt \n   n$1=_fun___variable_initialization(&e:Employee) [line 33, column 3]\n  *&e.ssn:int=12 [line 33, column 23]\n  *&e.salary:float=3000.5 [line 33, column 23]\n  *&e.doj.date:int=12 [line 33, column 37]\n  *&e.doj.month:int=12 [line 33, column 37]\n  *&e.doj.year:int=2010 [line 33, column 37]\n  EXIT_SCOPE(n$1); [line 33, column 37]\n " shape="box"]
+"field_set_correctly.b8d9a4294a85d24818c312a099420dce_4" [label="4:  DeclStmt \n   n$1=_fun___variable_initialization(&e:Employee) assign_last [line 33, column 3]\n  *&e.ssn:int=12 [line 33, column 23]\n  *&e.salary:float=3000.5 [line 33, column 23]\n  *&e.doj.date:int=12 [line 33, column 37]\n  *&e.doj.month:int=12 [line 33, column 37]\n  *&e.doj.year:int=2010 [line 33, column 37]\n  EXIT_SCOPE(n$1); [line 33, column 37]\n " shape="box"]
 	
 
 	 "field_set_correctly.b8d9a4294a85d24818c312a099420dce_4" -> "field_set_correctly.b8d9a4294a85d24818c312a099420dce_3" ;
@@ -48,7 +48,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   n$1=_fun___variable_initialization(&p:Point) [line 15, column 14]\n  *&p.x:int=1 [line 15, column 31]\n  n$0=_fun_foo() [line 15, column 35]\n  *&p.y:int=(n$0 + 3) [line 15, column 31]\n  NULLIFY(&p); [line 15, column 31]\n  EXIT_SCOPE(n$0,n$1,p); [line 15, column 31]\n  APPLY_ABSTRACTION; [line 15, column 31]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   n$1=_fun___variable_initialization(&p:Point) assign_last [line 15, column 14]\n  *&p.x:int=1 [line 15, column 31]\n  n$0=_fun_foo() [line 15, column 35]\n  *&p.y:int=(n$0 + 3) [line 15, column 31]\n  NULLIFY(&p); [line 15, column 31]\n  EXIT_SCOPE(n$0,n$1,p); [line 15, column 31]\n  APPLY_ABSTRACTION; [line 15, column 31]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -32,11 +32,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   n$2=_fun___variable_initialization(&b:int) [line 10, column 3]\n  *&b:int=0 [line 10, column 3]\n  EXIT_SCOPE(n$2); [line 10, column 3]\n  APPLY_ABSTRACTION; [line 10, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   n$2=_fun___variable_initialization(&b:int) assign_last [line 10, column 3]\n  *&b:int=0 [line 10, column 3]\n  EXIT_SCOPE(n$2); [line 10, column 3]\n  APPLY_ABSTRACTION; [line 10, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   n$3=_fun___variable_initialization(&a:int) [line 9, column 3]\n  *&a:int=10 [line 9, column 3]\n  NULLIFY(&a); [line 9, column 3]\n  EXIT_SCOPE(n$3,a); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   n$3=_fun___variable_initialization(&a:int) assign_last [line 9, column 3]\n  *&a:int=10 [line 9, column 3]\n  NULLIFY(&a); [line 9, column 3]\n  EXIT_SCOPE(n$3,a); [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;

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

@@ -32,11 +32,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   n$2=_fun___variable_initialization(&b:int) [line 10, column 3]\n  *&b:int=0 [line 10, column 3]\n  NULLIFY(&b); [line 10, column 3]\n  EXIT_SCOPE(n$2,b); [line 10, column 3]\n  APPLY_ABSTRACTION; [line 10, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   n$2=_fun___variable_initialization(&b:int) assign_last [line 10, column 3]\n  *&b:int=0 [line 10, column 3]\n  NULLIFY(&b); [line 10, column 3]\n  EXIT_SCOPE(n$2,b); [line 10, column 3]\n  APPLY_ABSTRACTION; [line 10, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   n$3=_fun___variable_initialization(&a:int) [line 9, column 3]\n  *&a:int=10 [line 9, column 3]\n  NULLIFY(&a); [line 9, column 3]\n  EXIT_SCOPE(n$3,a); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   n$3=_fun___variable_initialization(&a:int) assign_last [line 9, column 3]\n  *&a:int=10 [line 9, column 3]\n  NULLIFY(&a); [line 9, column 3]\n  EXIT_SCOPE(n$3,a); [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;

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

@@ -53,11 +53,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  DeclStmt \n   n$4=_fun___variable_initialization(&b:int) [line 10, column 3]\n  *&b:int=0 [line 10, column 3]\n  EXIT_SCOPE(n$4); [line 10, column 3]\n  APPLY_ABSTRACTION; [line 10, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  DeclStmt \n   n$4=_fun___variable_initialization(&b:int) assign_last [line 10, column 3]\n  *&b:int=0 [line 10, column 3]\n  EXIT_SCOPE(n$4); [line 10, column 3]\n  APPLY_ABSTRACTION; [line 10, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   n$5=_fun___variable_initialization(&a:int) [line 9, column 3]\n  *&a:int=10 [line 9, column 3]\n  NULLIFY(&a); [line 9, column 3]\n  EXIT_SCOPE(n$5,a); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   n$5=_fun___variable_initialization(&a:int) assign_last [line 9, column 3]\n  *&a:int=10 [line 9, column 3]\n  NULLIFY(&a); [line 9, column 3]\n  EXIT_SCOPE(n$5,a); [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;

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

@@ -15,7 +15,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$0=_fun___variable_initialization(&b:int) [line 11, column 8]\n  *&b:int=3 [line 11, column 8]\n  NULLIFY(&b); [line 11, column 8]\n  EXIT_SCOPE(n$0,b); [line 11, column 8]\n  APPLY_ABSTRACTION; [line 11, column 8]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$0=_fun___variable_initialization(&b:int) assign_last [line 11, column 8]\n  *&b:int=3 [line 11, column 8]\n  NULLIFY(&b); [line 11, column 8]\n  EXIT_SCOPE(n$0,b); [line 11, column 8]\n  APPLY_ABSTRACTION; [line 11, column 8]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -40,11 +40,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   n$6=_fun___variable_initialization(&i:int) [line 10, column 3]\n  *&i:int=0 [line 10, column 3]\n  EXIT_SCOPE(n$6); [line 10, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   n$6=_fun___variable_initialization(&i:int) assign_last [line 10, column 3]\n  *&i:int=0 [line 10, column 3]\n  EXIT_SCOPE(n$6); [line 10, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  DeclStmt \n   n$7=_fun___variable_initialization(&j:int) [line 9, column 3]\n  *&j:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$7); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  DeclStmt \n   n$7=_fun___variable_initialization(&j:int) assign_last [line 9, column 3]\n  *&j:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$7); [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;

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

@@ -15,7 +15,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$1=_fun___variable_initialization(&i:int) [line 10, column 8]\n  *&i:int=0 [line 10, column 8]\n  EXIT_SCOPE(n$1); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$1=_fun___variable_initialization(&i:int) assign_last [line 10, column 8]\n  *&i:int=0 [line 10, column 8]\n  EXIT_SCOPE(n$1); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -32,7 +32,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (false branch, for loop) \n   PRUNE(!(n$3 < 10), false); [line 10, column 19]\n  NULLIFY(&i); [line 10, column 19]\n  NULLIFY(&j); [line 10, column 19]\n  EXIT_SCOPE(n$3,i,j); [line 10, column 19]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (false branch, for loop) \n   PRUNE(!(n$3 < 10), false); [line 10, column 19]\n  NULLIFY(&i); [line 10, column 19]\n  EXIT_SCOPE(n$3,i); [line 10, column 19]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
@@ -40,7 +40,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   n$4=_fun___variable_initialization(&j:int) [line 11, column 10]\n  *&j:int=0 [line 11, column 10]\n  EXIT_SCOPE(n$4); [line 11, column 10]\n  APPLY_ABSTRACTION; [line 11, column 10]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   n$4=_fun___variable_initialization(&j:int) assign_last [line 11, column 10]\n  *&j:int=0 [line 11, column 10]\n  EXIT_SCOPE(n$4); [line 11, column 10]\n  APPLY_ABSTRACTION; [line 11, column 10]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
@@ -57,7 +57,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_16" ;
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15: Prune (false branch, for loop) \n   PRUNE(!(n$6 < 10), false); [line 11, column 21]\n  EXIT_SCOPE(n$6); [line 11, column 21]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15: Prune (false branch, for loop) \n   PRUNE(!(n$6 < 10), false); [line 11, column 21]\n  NULLIFY(&j); [line 11, column 21]\n  EXIT_SCOPE(n$6,j); [line 11, column 21]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
@@ -65,7 +65,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_16" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
-"main.fad58de7366495db4650cfefac2fcd61_17" [label="17:  DeclStmt \n   n$11=_fun___variable_initialization(&k:int) [line 9, column 3]\n  *&k:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$11); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_17" [label="17:  DeclStmt \n   n$11=_fun___variable_initialization(&k:int) assign_last [line 9, column 3]\n  *&k:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$11); [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_17" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;

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

@@ -16,7 +16,7 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$0=_fun___variable_initialization(&b:int) [line 10, column 8]\n  *&b:int=0 [line 10, column 8]\n  EXIT_SCOPE(n$0); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$0=_fun___variable_initialization(&b:int) assign_last [line 10, column 8]\n  *&b:int=0 [line 10, column 8]\n  EXIT_SCOPE(n$0); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -36,7 +36,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   n$5=_fun___variable_initialization(&j:int) [line 9, column 3]\n  *&j:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$5); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   n$5=_fun___variable_initialization(&j:int) assign_last [line 9, column 3]\n  *&j:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$5); [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;

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

@@ -16,7 +16,7 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$0=_fun___variable_initialization(&b:int) [line 10, column 8]\n  *&b:int=0 [line 10, column 8]\n  NULLIFY(&b); [line 10, column 8]\n  EXIT_SCOPE(n$0,b); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$0=_fun___variable_initialization(&b:int) assign_last [line 10, column 8]\n  *&b:int=0 [line 10, column 8]\n  NULLIFY(&b); [line 10, column 8]\n  EXIT_SCOPE(n$0,b); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -32,7 +32,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   n$5=_fun___variable_initialization(&j:int) [line 9, column 3]\n  *&j:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$5); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   n$5=_fun___variable_initialization(&j:int) assign_last [line 9, column 3]\n  *&j:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$5); [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;

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

@@ -28,7 +28,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  DeclStmt \n   n$3=_fun___variable_initialization(&d:int) [line 9, column 3]\n  *&d:int=0 [line 9, column 3]\n  NULLIFY(&d); [line 9, column 3]\n  EXIT_SCOPE(n$3,d); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  DeclStmt \n   n$3=_fun___variable_initialization(&d:int) assign_last [line 9, column 3]\n  *&d:int=0 [line 9, column 3]\n  NULLIFY(&d); [line 9, column 3]\n  EXIT_SCOPE(n$3,d); [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;

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

@@ -28,7 +28,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  DeclStmt \n   n$4=_fun___variable_initialization(&i:int) [line 9, column 3]\n  *&i:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$4); [line 9, column 3]\n  APPLY_ABSTRACTION; [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  DeclStmt \n   n$4=_fun___variable_initialization(&i:int) assign_last [line 9, column 3]\n  *&i:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$4); [line 9, column 3]\n  APPLY_ABSTRACTION; [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;

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

@@ -15,7 +15,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$0=_fun___variable_initialization(&i:int) [line 10, column 8]\n  *&i:int=0 [line 10, column 8]\n  EXIT_SCOPE(n$0); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$0=_fun___variable_initialization(&i:int) assign_last [line 10, column 8]\n  *&i:int=0 [line 10, column 8]\n  EXIT_SCOPE(n$0); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -40,7 +40,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   n$6=_fun___variable_initialization(&j:int) [line 9, column 3]\n  *&j:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$6); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   n$6=_fun___variable_initialization(&j:int) assign_last [line 9, column 3]\n  *&j:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$6); [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;

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

@@ -15,7 +15,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$1=_fun___variable_initialization(&i:int) [line 10, column 8]\n  *&i:int=0 [line 10, column 8]\n  EXIT_SCOPE(n$1); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$1=_fun___variable_initialization(&i:int) assign_last [line 10, column 8]\n  *&i:int=0 [line 10, column 8]\n  EXIT_SCOPE(n$1); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -57,7 +57,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   n$8=_fun___variable_initialization(&k:int) [line 9, column 3]\n  *&k:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$8); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   n$8=_fun___variable_initialization(&k:int) assign_last [line 9, column 3]\n  *&k:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$8); [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;

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

@@ -32,7 +32,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   n$3=_fun___variable_initialization(&i:int) [line 9, column 3]\n  *&i:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$3); [line 9, column 3]\n  APPLY_ABSTRACTION; [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   n$3=_fun___variable_initialization(&i:int) assign_last [line 9, column 3]\n  *&i:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$3); [line 9, column 3]\n  APPLY_ABSTRACTION; [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;

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

@@ -32,7 +32,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   n$3=_fun___variable_initialization(&i:int) [line 9, column 3]\n  *&i:int=0 [line 9, column 3]\n  NULLIFY(&i); [line 9, column 3]\n  EXIT_SCOPE(n$3,i); [line 9, column 3]\n  APPLY_ABSTRACTION; [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   n$3=_fun___variable_initialization(&i:int) assign_last [line 9, column 3]\n  *&i:int=0 [line 9, column 3]\n  NULLIFY(&i); [line 9, column 3]\n  EXIT_SCOPE(n$3,i); [line 9, column 3]\n  APPLY_ABSTRACTION; [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;

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

@@ -53,11 +53,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  DeclStmt \n   n$6=_fun___variable_initialization(&k:int) [line 10, column 3]\n  *&k:int=0 [line 10, column 3]\n  EXIT_SCOPE(n$6); [line 10, column 3]\n  APPLY_ABSTRACTION; [line 10, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  DeclStmt \n   n$6=_fun___variable_initialization(&k:int) assign_last [line 10, column 3]\n  *&k:int=0 [line 10, column 3]\n  EXIT_SCOPE(n$6); [line 10, column 3]\n  APPLY_ABSTRACTION; [line 10, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   n$7=_fun___variable_initialization(&i:int) [line 9, column 3]\n  *&i:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$7); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   n$7=_fun___variable_initialization(&i:int) assign_last [line 9, column 3]\n  *&i:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$7); [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;

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

@@ -75,7 +75,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_18" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
-"main.fad58de7366495db4650cfefac2fcd61_19" [label="19:  DeclStmt \n   n$11=_fun___variable_initialization(&x:int) [line 9, column 3]\n  *&x:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$11); [line 9, column 3]\n  APPLY_ABSTRACTION; [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_19" [label="19:  DeclStmt \n   n$11=_fun___variable_initialization(&x:int) assign_last [line 9, column 3]\n  *&x:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$11); [line 9, column 3]\n  APPLY_ABSTRACTION; [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_19" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;

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

@@ -7,23 +7,23 @@ digraph cfg {
 "test.098f6bcd4621d373cade4e832627b4f6_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test.098f6bcd4621d373cade4e832627b4f6_3" [label="3:  DeclStmt \n   n$1=_fun___variable_initialization(&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,n$1,a,e); [line 13, column 3]\n  APPLY_ABSTRACTION; [line 13, column 3]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_3" [label="3:  DeclStmt \n   n$1=_fun___variable_initialization(&e:int) assign_last [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,n$1,a,e); [line 13, column 3]\n  APPLY_ABSTRACTION; [line 13, column 3]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_3" -> "test.098f6bcd4621d373cade4e832627b4f6_2" ;
-"test.098f6bcd4621d373cade4e832627b4f6_4" [label="4:  DeclStmt \n   n$3=_fun___variable_initialization(&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  *&d:int=(n$2 - 1) [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.098f6bcd4621d373cade4e832627b4f6_4" [label="4:  DeclStmt \n   n$3=_fun___variable_initialization(&d:int) assign_last [line 12, column 3]\n  n$2=*&a:int [line 12, column 11]\n  *&a:int=(n$2 - 1) [line 12, column 11]\n  *&d:int=(n$2 - 1) [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.098f6bcd4621d373cade4e832627b4f6_4" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;
-"test.098f6bcd4621d373cade4e832627b4f6_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&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,n$5,c); [line 11, column 3]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&c:int) assign_last [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,n$5,c); [line 11, column 3]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_5" -> "test.098f6bcd4621d373cade4e832627b4f6_4" ;
-"test.098f6bcd4621d373cade4e832627b4f6_6" [label="6:  DeclStmt \n   n$7=_fun___variable_initialization(&b:int) [line 10, column 3]\n  n$6=*&a:int [line 10, column 11]\n  *&a:int=(n$6 + 1) [line 10, column 11]\n  *&b:int=(n$6 + 1) [line 10, column 3]\n  NULLIFY(&b); [line 10, column 3]\n  EXIT_SCOPE(n$6,n$7,b); [line 10, column 3]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_6" [label="6:  DeclStmt \n   n$7=_fun___variable_initialization(&b:int) assign_last [line 10, column 3]\n  n$6=*&a:int [line 10, column 11]\n  *&a:int=(n$6 + 1) [line 10, column 11]\n  *&b:int=(n$6 + 1) [line 10, column 3]\n  NULLIFY(&b); [line 10, column 3]\n  EXIT_SCOPE(n$6,n$7,b); [line 10, column 3]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_6" -> "test.098f6bcd4621d373cade4e832627b4f6_5" ;
-"test.098f6bcd4621d373cade4e832627b4f6_7" [label="7:  DeclStmt \n   n$8=_fun___variable_initialization(&a:int) [line 9, column 3]\n  *&a:int=3 [line 9, column 3]\n  EXIT_SCOPE(n$8); [line 9, column 3]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_7" [label="7:  DeclStmt \n   n$8=_fun___variable_initialization(&a:int) assign_last [line 9, column 3]\n  *&a:int=3 [line 9, column 3]\n  EXIT_SCOPE(n$8); [line 9, column 3]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_7" -> "test.098f6bcd4621d373cade4e832627b4f6_6" ;

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

@@ -15,7 +15,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$1=_fun___variable_initialization(&X:int) [line 12, column 5]\n  *&X:int=4 [line 12, column 5]\n  EXIT_SCOPE(n$1); [line 12, column 5]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$1=_fun___variable_initialization(&X:int) assign_last [line 12, column 5]\n  *&X:int=4 [line 12, column 5]\n  EXIT_SCOPE(n$1); [line 12, column 5]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -23,7 +23,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  DeclStmt \n   n$2=_fun___variable_initialization(&y:int) [line 9, column 3]\n  *&y:int=3 [line 9, column 3]\n  NULLIFY(&y); [line 9, column 3]\n  EXIT_SCOPE(n$2,y); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  DeclStmt \n   n$2=_fun___variable_initialization(&y:int) assign_last [line 9, column 3]\n  *&y:int=3 [line 9, column 3]\n  NULLIFY(&y); [line 9, column 3]\n  EXIT_SCOPE(n$2,y); [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
@@ -38,11 +38,11 @@ digraph cfg {
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_3" -> "test.098f6bcd4621d373cade4e832627b4f6_6" ;
-"test.098f6bcd4621d373cade4e832627b4f6_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&y:int) [line 21, column 5]\n  *&y:int=1 [line 21, column 5]\n  EXIT_SCOPE(n$2); [line 21, column 5]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&y:int) assign_last [line 21, column 5]\n  *&y:int=1 [line 21, column 5]\n  EXIT_SCOPE(n$2); [line 21, column 5]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_4" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;
-"test.098f6bcd4621d373cade4e832627b4f6_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&x:int) [line 20, column 5]\n  n$3=*&p:int* [line 20, column 14]\n  n$4=*n$3:int [line 20, column 13]\n  *&x:int=n$4 [line 20, column 5]\n  NULLIFY(&p); [line 20, column 5]\n  EXIT_SCOPE(n$3,n$4,n$5,p); [line 20, column 5]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&x:int) assign_last [line 20, column 5]\n  n$3=*&p:int* [line 20, column 14]\n  n$4=*n$3:int [line 20, column 13]\n  *&x:int=n$4 [line 20, column 5]\n  NULLIFY(&p); [line 20, column 5]\n  EXIT_SCOPE(n$3,n$4,n$5,p); [line 20, column 5]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_5" -> "test.098f6bcd4621d373cade4e832627b4f6_4" ;
@@ -81,7 +81,7 @@ digraph cfg {
 	
 
 	 "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_8" -> "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_10" ;
-"with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_9" [label="9:  DeclStmt \n   n$7=_fun___variable_initialization(&x:int) [line 28, column 5]\n  *&x:int=1 [line 28, column 5]\n  EXIT_SCOPE(n$7); [line 28, column 5]\n " shape="box"]
+"with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_9" [label="9:  DeclStmt \n   n$7=_fun___variable_initialization(&x:int) assign_last [line 28, column 5]\n  *&x:int=1 [line 28, column 5]\n  EXIT_SCOPE(n$7); [line 28, column 5]\n " shape="box"]
 	
 
 	 "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_9" -> "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_4" ;

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

@@ -31,7 +31,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   n$12=_fun___variable_initialization(&x:double) [line 9, column 3]\n  *&x:double=1. [line 9, column 3]\n  NULLIFY(&x); [line 9, column 3]\n  EXIT_SCOPE(n$12,x); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   n$12=_fun___variable_initialization(&x:double) assign_last [line 9, column 3]\n  *&x:double=1. [line 9, column 3]\n  NULLIFY(&x); [line 9, column 3]\n  EXIT_SCOPE(n$12,x); [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;

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

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

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

@@ -68,7 +68,7 @@ digraph cfg {
 	
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_14" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_13" ;
-"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_15" [label="15:  DeclStmt \n   n$11=_fun___variable_initialization(&x:int) [line 17, column 7]\n  *&x:int=1 [line 17, column 7]\n " shape="box"]
+"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_15" [label="15:  DeclStmt \n   n$11=_fun___variable_initialization(&x:int) assign_last [line 17, column 7]\n  *&x:int=1 [line 17, column 7]\n " shape="box"]
 	
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_15" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_14" ;
@@ -98,7 +98,7 @@ digraph cfg {
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_21" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_18" ;
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_21" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_19" ;
-"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_22" [label="22:  DeclStmt \n   n$14=_fun___variable_initialization(&value:int) [line 11, column 3]\n  *&value:int=0 [line 11, column 3]\n  EXIT_SCOPE(n$14); [line 11, column 3]\n  APPLY_ABSTRACTION; [line 11, column 3]\n " shape="box"]
+"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_22" [label="22:  DeclStmt \n   n$14=_fun___variable_initialization(&value:int) assign_last [line 11, column 3]\n  *&value:int=0 [line 11, column 3]\n  EXIT_SCOPE(n$14); [line 11, column 3]\n  APPLY_ABSTRACTION; [line 11, column 3]\n " shape="box"]
 	
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_22" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_4" ;
@@ -117,7 +117,7 @@ digraph cfg {
 	
 
 	 "test_switch10.8a4170d3888102a2491712a5ad55ad8d_4" -> "test_switch10.8a4170d3888102a2491712a5ad55ad8d_3" ;
-"test_switch10.8a4170d3888102a2491712a5ad55ad8d_5" [label="5:  DeclStmt \n   n$3=_fun___variable_initialization(&value:int) [line 183, column 3]\n  *&value:int=0 [line 183, column 3]\n  NULLIFY(&value); [line 183, column 3]\n  EXIT_SCOPE(n$3,value); [line 183, column 3]\n " shape="box"]
+"test_switch10.8a4170d3888102a2491712a5ad55ad8d_5" [label="5:  DeclStmt \n   n$3=_fun___variable_initialization(&value:int) assign_last [line 183, column 3]\n  *&value:int=0 [line 183, column 3]\n  NULLIFY(&value); [line 183, column 3]\n  EXIT_SCOPE(n$3,value); [line 183, column 3]\n " shape="box"]
 	
 
 	 "test_switch10.8a4170d3888102a2491712a5ad55ad8d_5" -> "test_switch10.8a4170d3888102a2491712a5ad55ad8d_4" ;
@@ -174,7 +174,7 @@ digraph cfg {
 	
 
 	 "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_13" -> "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_3" ;
-"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_14" [label="14:  DeclStmt \n   n$6=_fun___variable_initialization(&value:int) [line 189, column 3]\n  *&value:int=0 [line 189, column 3]\n  EXIT_SCOPE(n$6); [line 189, column 3]\n " shape="box"]
+"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_14" [label="14:  DeclStmt \n   n$6=_fun___variable_initialization(&value:int) assign_last [line 189, column 3]\n  *&value:int=0 [line 189, column 3]\n  EXIT_SCOPE(n$6); [line 189, column 3]\n " shape="box"]
 	
 
 	 "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_14" -> "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_5" ;
@@ -202,11 +202,11 @@ digraph cfg {
 	
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_6" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_5" ;
-"test_switch2.0717c55583f10f472ddb2d73d867e556_7" [label="7:  DeclStmt \n   n$4=_fun___variable_initialization(&something:int) [line 47, column 7]\n  *&something:int=1 [line 47, column 7]\n  EXIT_SCOPE(n$4); [line 47, column 7]\n " shape="box"]
+"test_switch2.0717c55583f10f472ddb2d73d867e556_7" [label="7:  DeclStmt \n   n$4=_fun___variable_initialization(&something:int) assign_last [line 47, column 7]\n  *&something:int=1 [line 47, column 7]\n  EXIT_SCOPE(n$4); [line 47, column 7]\n " shape="box"]
 	
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_7" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_6" ;
-"test_switch2.0717c55583f10f472ddb2d73d867e556_8" [label="8:  DeclStmt \n   n$5=_fun___variable_initialization(&z:int) [line 43, column 7]\n  *&z:int=9 [line 43, column 7]\n  APPLY_ABSTRACTION; [line 43, column 7]\n " shape="box"]
+"test_switch2.0717c55583f10f472ddb2d73d867e556_8" [label="8:  DeclStmt \n   n$5=_fun___variable_initialization(&z:int) assign_last [line 43, column 7]\n  *&z:int=9 [line 43, column 7]\n  APPLY_ABSTRACTION; [line 43, column 7]\n " shape="box"]
 	
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_8" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_7" ;
@@ -248,7 +248,7 @@ digraph cfg {
 	
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_17" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_7" ;
-"test_switch2.0717c55583f10f472ddb2d73d867e556_18" [label="18:  DeclStmt \n   n$9=_fun___variable_initialization(&value:int) [line 37, column 3]\n  *&value:int=0 [line 37, column 3]\n  EXIT_SCOPE(n$9); [line 37, column 3]\n " shape="box"]
+"test_switch2.0717c55583f10f472ddb2d73d867e556_18" [label="18:  DeclStmt \n   n$9=_fun___variable_initialization(&value:int) assign_last [line 37, column 3]\n  *&value:int=0 [line 37, column 3]\n  EXIT_SCOPE(n$9); [line 37, column 3]\n " shape="box"]
 	
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_18" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_4" ;
@@ -268,7 +268,7 @@ digraph cfg {
 
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_4" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_15" ;
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_4" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_16" ;
-"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_5" [label="5:  DeclStmt \n   n$2=_fun___variable_initialization(&z:int) [line 69, column 7]\n  *&z:int=9 [line 69, column 7]\n  APPLY_ABSTRACTION; [line 69, column 7]\n " shape="box"]
+"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_5" [label="5:  DeclStmt \n   n$2=_fun___variable_initialization(&z:int) assign_last [line 69, column 7]\n  *&z:int=9 [line 69, column 7]\n  APPLY_ABSTRACTION; [line 69, column 7]\n " shape="box"]
 	
 
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_5" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_3" ;
@@ -276,7 +276,7 @@ digraph cfg {
 	
 
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_6" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_3" ;
-"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_7" [label="7:  DeclStmt \n   n$5=_fun___variable_initialization(&something:int) [line 66, column 7]\n  *&something:int=1 [line 66, column 7]\n  EXIT_SCOPE(n$5); [line 66, column 7]\n " shape="box"]
+"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_7" [label="7:  DeclStmt \n   n$5=_fun___variable_initialization(&something:int) assign_last [line 66, column 7]\n  *&something:int=1 [line 66, column 7]\n  EXIT_SCOPE(n$5); [line 66, column 7]\n " shape="box"]
 	
 
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_7" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_6" ;
@@ -319,7 +319,7 @@ digraph cfg {
 
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_16" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_13" ;
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_16" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_14" ;
-"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_17" [label="17:  DeclStmt \n   n$9=_fun___variable_initialization(&value:int) [line 60, column 3]\n  *&value:int=0 [line 60, column 3]\n  EXIT_SCOPE(n$9); [line 60, column 3]\n " shape="box"]
+"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_17" [label="17:  DeclStmt \n   n$9=_fun___variable_initialization(&value:int) assign_last [line 60, column 3]\n  *&value:int=0 [line 60, column 3]\n  EXIT_SCOPE(n$9); [line 60, column 3]\n " shape="box"]
 	
 
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_17" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_4" ;
@@ -347,11 +347,11 @@ digraph cfg {
 	
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_6" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_5" ;
-"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_7" [label="7:  DeclStmt \n   n$4=_fun___variable_initialization(&something:int) [line 88, column 7]\n  *&something:int=1 [line 88, column 7]\n  EXIT_SCOPE(n$4); [line 88, column 7]\n " shape="box"]
+"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_7" [label="7:  DeclStmt \n   n$4=_fun___variable_initialization(&something:int) assign_last [line 88, column 7]\n  *&something:int=1 [line 88, column 7]\n  EXIT_SCOPE(n$4); [line 88, column 7]\n " shape="box"]
 	
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_7" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_6" ;
-"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_8" [label="8:  DeclStmt \n   n$5=_fun___variable_initialization(&z:int) [line 84, column 7]\n  *&z:int=9 [line 84, column 7]\n  APPLY_ABSTRACTION; [line 84, column 7]\n " shape="box"]
+"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_8" [label="8:  DeclStmt \n   n$5=_fun___variable_initialization(&z:int) assign_last [line 84, column 7]\n  *&z:int=9 [line 84, column 7]\n  APPLY_ABSTRACTION; [line 84, column 7]\n " shape="box"]
 	
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_8" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_7" ;
@@ -393,7 +393,7 @@ digraph cfg {
 	
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_17" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_7" ;
-"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_18" [label="18:  DeclStmt \n   n$9=_fun___variable_initialization(&value:int) [line 78, column 3]\n  *&value:int=0 [line 78, column 3]\n  EXIT_SCOPE(n$9); [line 78, column 3]\n " shape="box"]
+"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_18" [label="18:  DeclStmt \n   n$9=_fun___variable_initialization(&value:int) assign_last [line 78, column 3]\n  *&value:int=0 [line 78, column 3]\n  EXIT_SCOPE(n$9); [line 78, column 3]\n " shape="box"]
 	
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_18" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_4" ;
@@ -450,7 +450,7 @@ digraph cfg {
 	
 
 	 "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_13" -> "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_4" ;
-"test_switch5.1d93fcc376cd01517eabe22cb325bcfd_14" [label="14:  DeclStmt \n   n$9=_fun___variable_initialization(&value:int) [line 101, column 3]\n  *&value:int=0 [line 101, column 3]\n  EXIT_SCOPE(n$9); [line 101, column 3]\n  APPLY_ABSTRACTION; [line 101, column 3]\n " shape="box"]
+"test_switch5.1d93fcc376cd01517eabe22cb325bcfd_14" [label="14:  DeclStmt \n   n$9=_fun___variable_initialization(&value:int) assign_last [line 101, column 3]\n  *&value:int=0 [line 101, column 3]\n  EXIT_SCOPE(n$9); [line 101, column 3]\n  APPLY_ABSTRACTION; [line 101, column 3]\n " shape="box"]
 	
 
 	 "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_14" -> "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_4" ;
@@ -495,7 +495,7 @@ digraph cfg {
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_10" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_21" ;
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_10" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_22" ;
-"test_switch6.a23e54b3840073f4ece330ef3c560915_11" [label="11:  DeclStmt \n   n$4=_fun___variable_initialization(&z:int) [line 126, column 7]\n  *&z:int=9 [line 126, column 7]\n  APPLY_ABSTRACTION; [line 126, column 7]\n " shape="box"]
+"test_switch6.a23e54b3840073f4ece330ef3c560915_11" [label="11:  DeclStmt \n   n$4=_fun___variable_initialization(&z:int) assign_last [line 126, column 7]\n  *&z:int=9 [line 126, column 7]\n  APPLY_ABSTRACTION; [line 126, column 7]\n " shape="box"]
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_11" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_3" ;
@@ -503,7 +503,7 @@ digraph cfg {
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_12" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_3" ;
-"test_switch6.a23e54b3840073f4ece330ef3c560915_13" [label="13:  DeclStmt \n   n$7=_fun___variable_initialization(&something:int) [line 123, column 7]\n  *&something:int=1 [line 123, column 7]\n  EXIT_SCOPE(n$7); [line 123, column 7]\n " shape="box"]
+"test_switch6.a23e54b3840073f4ece330ef3c560915_13" [label="13:  DeclStmt \n   n$7=_fun___variable_initialization(&something:int) assign_last [line 123, column 7]\n  *&something:int=1 [line 123, column 7]\n  EXIT_SCOPE(n$7); [line 123, column 7]\n " shape="box"]
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_13" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_12" ;
@@ -546,7 +546,7 @@ digraph cfg {
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_22" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_19" ;
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_22" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_20" ;
-"test_switch6.a23e54b3840073f4ece330ef3c560915_23" [label="23:  DeclStmt \n   n$11=_fun___variable_initialization(&value:int) [line 117, column 3]\n  *&value:int=0 [line 117, column 3]\n  EXIT_SCOPE(n$11); [line 117, column 3]\n " shape="box"]
+"test_switch6.a23e54b3840073f4ece330ef3c560915_23" [label="23:  DeclStmt \n   n$11=_fun___variable_initialization(&value:int) assign_last [line 117, column 3]\n  *&value:int=0 [line 117, column 3]\n  EXIT_SCOPE(n$11); [line 117, column 3]\n " shape="box"]
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_23" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_5" ;
@@ -566,7 +566,7 @@ digraph cfg {
 
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_4" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_15" ;
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_4" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_16" ;
-"test_switch7.8298274f5578f21bdddf71ffa79afcb8_5" [label="5:  DeclStmt \n   n$2=_fun___variable_initialization(&z:int) [line 146, column 7]\n  *&z:int=9 [line 146, column 7]\n  APPLY_ABSTRACTION; [line 146, column 7]\n " shape="box"]
+"test_switch7.8298274f5578f21bdddf71ffa79afcb8_5" [label="5:  DeclStmt \n   n$2=_fun___variable_initialization(&z:int) assign_last [line 146, column 7]\n  *&z:int=9 [line 146, column 7]\n  APPLY_ABSTRACTION; [line 146, column 7]\n " shape="box"]
 	
 
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_5" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_3" ;
@@ -574,7 +574,7 @@ digraph cfg {
 	
 
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_6" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_3" ;
-"test_switch7.8298274f5578f21bdddf71ffa79afcb8_7" [label="7:  DeclStmt \n   n$5=_fun___variable_initialization(&something:int) [line 143, column 7]\n  *&something:int=1 [line 143, column 7]\n  EXIT_SCOPE(n$5); [line 143, column 7]\n " shape="box"]
+"test_switch7.8298274f5578f21bdddf71ffa79afcb8_7" [label="7:  DeclStmt \n   n$5=_fun___variable_initialization(&something:int) assign_last [line 143, column 7]\n  *&something:int=1 [line 143, column 7]\n  EXIT_SCOPE(n$5); [line 143, column 7]\n " shape="box"]
 	
 
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_7" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_6" ;
@@ -617,7 +617,7 @@ digraph cfg {
 
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_16" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_13" ;
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_16" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_14" ;
-"test_switch7.8298274f5578f21bdddf71ffa79afcb8_17" [label="17:  DeclStmt \n   n$9=_fun___variable_initialization(&value:int) [line 137, column 3]\n  *&value:int=0 [line 137, column 3]\n  NULLIFY(&value); [line 137, column 3]\n  EXIT_SCOPE(n$9,value); [line 137, column 3]\n " shape="box"]
+"test_switch7.8298274f5578f21bdddf71ffa79afcb8_17" [label="17:  DeclStmt \n   n$9=_fun___variable_initialization(&value:int) assign_last [line 137, column 3]\n  *&value:int=0 [line 137, column 3]\n  NULLIFY(&value); [line 137, column 3]\n  EXIT_SCOPE(n$9,value); [line 137, column 3]\n " shape="box"]
 	
 
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_17" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_4" ;
@@ -645,11 +645,11 @@ digraph cfg {
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_6" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_10" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_7" [label="7: Prune (false branch, while) \n   PRUNE(!(n$0 < 10), false); [line 156, column 10]\n  NULLIFY(&value); [line 156, column 10]\n  NULLIFY(&a); [line 156, column 10]\n  NULLIFY(&something); [line 156, column 10]\n  EXIT_SCOPE(n$0,value,a,something); [line 156, column 10]\n " shape="invhouse"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_7" [label="7: Prune (false branch, while) \n   PRUNE(!(n$0 < 10), false); [line 156, column 10]\n  NULLIFY(&value); [line 156, column 10]\n  EXIT_SCOPE(n$0,value); [line 156, column 10]\n " shape="invhouse"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_7" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_3" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_8" [label="8:  DeclStmt \n   n$1=_fun___variable_initialization(&a:int) [line 171, column 5]\n  *&a:int=0 [line 171, column 5]\n  EXIT_SCOPE(n$1); [line 171, column 5]\n  APPLY_ABSTRACTION; [line 171, column 5]\n " shape="box"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_8" [label="8:  DeclStmt \n   n$1=_fun___variable_initialization(&a:int) assign_last [line 171, column 5]\n  *&a:int=0 [line 171, column 5]\n  NULLIFY(&a); [line 171, column 5]\n  EXIT_SCOPE(n$1,a); [line 171, column 5]\n  APPLY_ABSTRACTION; [line 171, column 5]\n " shape="box"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_8" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_4" ;
@@ -683,15 +683,15 @@ digraph cfg {
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_15" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_27" ;
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_15" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_28" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_16" [label="16:  DeclStmt \n   n$6=_fun___variable_initialization(&z:int) [line 166, column 9]\n  *&z:int=9 [line 166, column 9]\n  APPLY_ABSTRACTION; [line 166, column 9]\n " shape="box"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_16" [label="16:  DeclStmt \n   n$6=_fun___variable_initialization(&z:int) assign_last [line 166, column 9]\n  *&z:int=9 [line 166, column 9]\n  APPLY_ABSTRACTION; [line 166, column 9]\n " shape="box"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_16" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_8" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_17" [label="17:  UnaryOperator \n   n$9=*&something:int [line 163, column 9]\n  *&something:int=(n$9 + 1) [line 163, column 9]\n  EXIT_SCOPE(n$9); [line 163, column 9]\n  APPLY_ABSTRACTION; [line 163, column 9]\n " shape="box"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_17" [label="17:  UnaryOperator \n   n$9=*&something:int [line 163, column 9]\n  *&something:int=(n$9 + 1) [line 163, column 9]\n  NULLIFY(&something); [line 163, column 9]\n  EXIT_SCOPE(n$9,something); [line 163, column 9]\n  APPLY_ABSTRACTION; [line 163, column 9]\n " shape="box"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_17" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_4" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_18" [label="18:  DeclStmt \n   n$10=_fun___variable_initialization(&something:int) [line 162, column 9]\n  *&something:int=1 [line 162, column 9]\n  EXIT_SCOPE(n$10); [line 162, column 9]\n " shape="box"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_18" [label="18:  DeclStmt \n   n$10=_fun___variable_initialization(&something:int) assign_last [line 162, column 9]\n  *&something:int=1 [line 162, column 9]\n  EXIT_SCOPE(n$10); [line 162, column 9]\n " shape="box"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_18" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_17" ;
@@ -729,7 +729,7 @@ digraph cfg {
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_26" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_23" ;
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_26" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_24" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_27" [label="27: Prune (true branch, switch) \n   PRUNE((n$4 == 0), true); [line 158, column 7]\n  NULLIFY(&value); [line 158, column 7]\n  NULLIFY(&a); [line 158, column 7]\n  NULLIFY(&something); [line 158, column 7]\n  EXIT_SCOPE(n$4,value,a,something); [line 158, column 7]\n " shape="invhouse"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_27" [label="27: Prune (true branch, switch) \n   PRUNE((n$4 == 0), true); [line 158, column 7]\n  NULLIFY(&value); [line 158, column 7]\n  EXIT_SCOPE(n$4,value); [line 158, column 7]\n " shape="invhouse"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_27" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_20" ;
@@ -738,7 +738,7 @@ digraph cfg {
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_28" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_25" ;
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_28" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_26" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_29" [label="29:  DeclStmt \n   n$14=_fun___variable_initialization(&value:int) [line 155, column 3]\n  *&value:int=0 [line 155, column 3]\n  EXIT_SCOPE(n$14); [line 155, column 3]\n  APPLY_ABSTRACTION; [line 155, column 3]\n " shape="box"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_29" [label="29:  DeclStmt \n   n$14=_fun___variable_initialization(&value:int) assign_last [line 155, column 3]\n  *&value:int=0 [line 155, column 3]\n  EXIT_SCOPE(n$14); [line 155, column 3]\n  APPLY_ABSTRACTION; [line 155, column 3]\n " shape="box"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_29" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_4" ;
@@ -757,7 +757,7 @@ digraph cfg {
 	
 
 	 "test_switch9.f4a96f02ca05cf92a483f69cdfe717b1_4" -> "test_switch9.f4a96f02ca05cf92a483f69cdfe717b1_3" ;
-"test_switch9.f4a96f02ca05cf92a483f69cdfe717b1_5" [label="5:  DeclStmt \n   n$3=_fun___variable_initialization(&value:int) [line 177, column 3]\n  *&value:int=0 [line 177, column 3]\n  EXIT_SCOPE(n$3); [line 177, column 3]\n " shape="box"]
+"test_switch9.f4a96f02ca05cf92a483f69cdfe717b1_5" [label="5:  DeclStmt \n   n$3=_fun___variable_initialization(&value:int) assign_last [line 177, column 3]\n  *&value:int=0 [line 177, column 3]\n  EXIT_SCOPE(n$3); [line 177, column 3]\n " shape="box"]
 	
 
 	 "test_switch9.f4a96f02ca05cf92a483f69cdfe717b1_5" -> "test_switch9.f4a96f02ca05cf92a483f69cdfe717b1_4" ;

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

@@ -97,11 +97,11 @@ digraph cfg {
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_23" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_20" ;
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_23" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_21" ;
-"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_24" [label="24:  DeclStmt \n   n$12=_fun___variable_initialization(&loop:int) [line 9, column 3]\n  n$11=*&n:int [line 9, column 14]\n  *&loop:int=(n$11 + (3 / 4)) [line 9, column 3]\n  EXIT_SCOPE(n$11,n$12); [line 9, column 3]\n " shape="box"]
+"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_24" [label="24:  DeclStmt \n   n$12=_fun___variable_initialization(&loop:int) assign_last [line 9, column 3]\n  n$11=*&n:int [line 9, column 14]\n  *&loop:int=(n$11 + (3 / 4)) [line 9, column 3]\n  EXIT_SCOPE(n$11,n$12); [line 9, column 3]\n " shape="box"]
 	
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_24" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_4" ;
-"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_25" [label="25:  DeclStmt \n   n$13=_fun___variable_initialization(&ret:int) [line 8, column 3]\n  *&ret:int=0 [line 8, column 3]\n  EXIT_SCOPE(n$13); [line 8, column 3]\n " shape="box"]
+"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_25" [label="25:  DeclStmt \n   n$13=_fun___variable_initialization(&ret:int) assign_last [line 8, column 3]\n  *&ret:int=0 [line 8, column 3]\n  EXIT_SCOPE(n$13); [line 8, column 3]\n " shape="box"]
 	
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_25" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_24" ;

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

@@ -54,7 +54,7 @@ digraph cfg {
 
 	 "label_case.83d07a314df100648248d9156212096b_13" -> "label_case.83d07a314df100648248d9156212096b_10" ;
 	 "label_case.83d07a314df100648248d9156212096b_13" -> "label_case.83d07a314df100648248d9156212096b_11" ;
-"label_case.83d07a314df100648248d9156212096b_14" [label="14:  DeclStmt \n   n$8=_fun___variable_initialization(&ret:int) [line 25, column 3]\n  *&ret:int=0 [line 25, column 3]\n  EXIT_SCOPE(n$8); [line 25, column 3]\n " shape="box"]
+"label_case.83d07a314df100648248d9156212096b_14" [label="14:  DeclStmt \n   n$8=_fun___variable_initialization(&ret:int) assign_last [line 25, column 3]\n  *&ret:int=0 [line 25, column 3]\n  EXIT_SCOPE(n$8); [line 25, column 3]\n " shape="box"]
 	
 
 	 "label_case.83d07a314df100648248d9156212096b_14" -> "label_case.83d07a314df100648248d9156212096b_4" ;
@@ -107,7 +107,7 @@ digraph cfg {
 
 	 "label_default.f30729864b0243c0a794ef0254fe7d23_12" -> "label_default.f30729864b0243c0a794ef0254fe7d23_9" ;
 	 "label_default.f30729864b0243c0a794ef0254fe7d23_12" -> "label_default.f30729864b0243c0a794ef0254fe7d23_10" ;
-"label_default.f30729864b0243c0a794ef0254fe7d23_13" [label="13:  DeclStmt \n   n$8=_fun___variable_initialization(&ret:int) [line 9, column 3]\n  *&ret:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$8); [line 9, column 3]\n " shape="box"]
+"label_default.f30729864b0243c0a794ef0254fe7d23_13" [label="13:  DeclStmt \n   n$8=_fun___variable_initialization(&ret:int) assign_last [line 9, column 3]\n  *&ret:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$8); [line 9, column 3]\n " shape="box"]
 	
 
 	 "label_default.f30729864b0243c0a794ef0254fe7d23_13" -> "label_default.f30729864b0243c0a794ef0254fe7d23_4" ;

infer/tests/codetoanalyze/c/frontend/unusual_exps/generic_exp.c.dot

@@ -7,11 +7,11 @@ digraph cfg {
 "test_typename.b2359812ef4a83b4e2638a11e6c522b3_2" [label="2: Exit test_typename \n  " color=yellow style=filled]
 	
 
-"test_typename.b2359812ef4a83b4e2638a11e6c522b3_3" [label="3:  DeclStmt \n   n$0=_fun___variable_initialization(&z:int) [line 14, column 3]\n  *&z:int=3 [line 14, column 3]\n  NULLIFY(&z); [line 14, column 3]\n  EXIT_SCOPE(n$0,z); [line 14, column 3]\n  APPLY_ABSTRACTION; [line 14, column 3]\n " shape="box"]
+"test_typename.b2359812ef4a83b4e2638a11e6c522b3_3" [label="3:  DeclStmt \n   n$0=_fun___variable_initialization(&z:int) assign_last [line 14, column 3]\n  *&z:int=3 [line 14, column 3]\n  NULLIFY(&z); [line 14, column 3]\n  EXIT_SCOPE(n$0,z); [line 14, column 3]\n  APPLY_ABSTRACTION; [line 14, column 3]\n " shape="box"]
 	
 
 	 "test_typename.b2359812ef4a83b4e2638a11e6c522b3_3" -> "test_typename.b2359812ef4a83b4e2638a11e6c522b3_2" ;
-"test_typename.b2359812ef4a83b4e2638a11e6c522b3_4" [label="4:  DeclStmt \n   n$1=_fun___variable_initialization(&x:int) [line 13, column 3]\n  *&x:int=2 [line 13, column 3]\n  NULLIFY(&x); [line 13, column 3]\n  EXIT_SCOPE(n$1,x); [line 13, column 3]\n " shape="box"]
+"test_typename.b2359812ef4a83b4e2638a11e6c522b3_4" [label="4:  DeclStmt \n   n$1=_fun___variable_initialization(&x:int) assign_last [line 13, column 3]\n  *&x:int=2 [line 13, column 3]\n  NULLIFY(&x); [line 13, column 3]\n  EXIT_SCOPE(n$1,x); [line 13, column 3]\n " shape="box"]
 	
 
 	 "test_typename.b2359812ef4a83b4e2638a11e6c522b3_4" -> "test_typename.b2359812ef4a83b4e2638a11e6c522b3_3" ;

infer/tests/codetoanalyze/c/frontend/unusual_stmts/asm.c.dot

@@ -15,7 +15,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$2=_fun___variable_initialization(&src:int) [line 18, column 3]\n  *&src:int=1 [line 18, column 3]\n  EXIT_SCOPE(n$2); [line 18, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   n$2=_fun___variable_initialization(&src:int) assign_last [line 18, column 3]\n  *&src:int=1 [line 18, column 3]\n  EXIT_SCOPE(n$2); [line 18, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;

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

@@ -40,7 +40,7 @@ digraph cfg {
 	
 
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_10" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_5" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_11" [label="11:  DeclStmt \n   n$5=_fun___variable_initialization(&i:int) [line 13, column 3]\n  *&i:int=n$4 [line 13, column 3]\n  EXIT_SCOPE(n$4,n$5); [line 13, column 3]\n " shape="box"]
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_11" [label="11:  DeclStmt \n   n$5=_fun___variable_initialization(&i:int) assign_last [line 13, column 3]\n  *&i:int=n$4 [line 13, column 3]\n  EXIT_SCOPE(n$4,n$5); [line 13, column 3]\n " shape="box"]
 	
 
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_11" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_6" ;

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

@@ -66,7 +66,7 @@ digraph cfg {
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_13" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_10" ;
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_13" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_11" ;
-"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_14" [label="14:  DeclStmt \n   n$10=_fun___variable_initialization(&res:int) [line 11, column 3]\n  *&res:int=5 [line 11, column 3]\n  EXIT_SCOPE(n$10); [line 11, column 3]\n " shape="box"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_14" [label="14:  DeclStmt \n   n$10=_fun___variable_initialization(&res:int) assign_last [line 11, column 3]\n  *&res:int=5 [line 11, column 3]\n  EXIT_SCOPE(n$10); [line 11, column 3]\n " shape="box"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_14" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_4" ;

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

@@ -26,11 +26,11 @@ digraph cfg {
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&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,n$5); [line 10, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&i:int*) assign_last [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,n$5); [line 10, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   n$6=_fun___variable_initialization(&x:int) [line 9, column 3]\n  *&x:int=2 [line 9, column 3]\n  NULLIFY(&x); [line 9, column 3]\n  EXIT_SCOPE(n$6,x); [line 9, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   n$6=_fun___variable_initialization(&x:int) assign_last [line 9, column 3]\n  *&x:int=2 [line 9, column 3]\n  NULLIFY(&x); [line 9, column 3]\n  EXIT_SCOPE(n$6,x); [line 9, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" ;
@@ -41,7 +41,7 @@ digraph cfg {
 "test_placement#7589029240520377616.7f92d4e10c030674dddd1682731c0ba3_2" [label="2: Exit test_placement \n   NULLIFY(&p); [line 24, column 78]\n " color=yellow style=filled]
 	
 
-"test_placement#7589029240520377616.7f92d4e10c030674dddd1682731c0ba3_3" [label="3:  DeclStmt \n   n$6=_fun___variable_initialization(&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  EXIT_SCOPE(n$1,n$2,n$3,n$4,n$5,n$6,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   n$6=_fun___variable_initialization(&p:A*) assign_last [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  EXIT_SCOPE(n$1,n$2,n$3,n$4,n$5,n$6,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" ;

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

@@ -23,7 +23,7 @@ digraph cfg {
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_6" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_3" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_7" [label="7:  Destruction \n   _=*&x2:break_scope::X [line 88, column 3]\n  n$5=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 88, column 3]\n  EXIT_SCOPE(_,n$5); [line 88, column 3]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_7" [label="7:  Destruction \n   _=*&x2:break_scope::X [line 88, column 3]\n  n$5=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 88, column 3]\n  EXIT_SCOPE(_,n$5,x2); [line 88, column 3]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_7" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_5" ;
@@ -48,24 +48,24 @@ digraph cfg {
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_12" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_3" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_13" [label="13:  DeclStmt \n   n$17=_fun___variable_initialization(&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,n$17); [line 83, column 9]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_13" [label="13:  DeclStmt \n   n$17=_fun___variable_initialization(&x3:break_scope::X) assign_last [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,n$17); [line 83, column 9]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_13" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_12" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_14" [label="14:  Destruction \n   _=*&x4:break_scope::X [line 87, column 5]\n  n$19=_fun_break_scope::X_~X(&x4:break_scope::X*) [line 87, column 5]\n  EXIT_SCOPE(_,n$19); [line 87, column 5]\n  APPLY_ABSTRACTION; [line 87, column 5]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_14" [label="14:  Destruction \n   _=*&x4:break_scope::X [line 87, column 5]\n  n$19=_fun_break_scope::X_~X(&x4:break_scope::X*) [line 87, column 5]\n  EXIT_SCOPE(_,n$19,x4); [line 87, column 5]\n  APPLY_ABSTRACTION; [line 87, column 5]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_14" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_8" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_15" [label="15:  DeclStmt \n   n$22=_fun___variable_initialization(&x4:break_scope::X) [line 86, column 7]\n  n$21=_fun_break_scope::X_X(&x4:break_scope::X*) [line 86, column 9]\n  EXIT_SCOPE(n$21,n$22); [line 86, column 9]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_15" [label="15:  DeclStmt \n   n$22=_fun___variable_initialization(&x4:break_scope::X) assign_last [line 86, column 7]\n  n$21=_fun_break_scope::X_X(&x4:break_scope::X*) [line 86, column 9]\n  EXIT_SCOPE(n$21,n$22); [line 86, column 9]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_15" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_14" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_16" [label="16:  DeclStmt \n   n$25=_fun___variable_initialization(&x2:break_scope::X) [line 81, column 5]\n  n$24=_fun_break_scope::X_X(&x2:break_scope::X*) [line 81, column 7]\n  EXIT_SCOPE(n$24,n$25); [line 81, column 7]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_16" [label="16:  DeclStmt \n   n$25=_fun___variable_initialization(&x2:break_scope::X) assign_last [line 81, column 5]\n  n$24=_fun_break_scope::X_X(&x2:break_scope::X*) [line 81, column 7]\n  EXIT_SCOPE(n$24,n$25); [line 81, column 7]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_16" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_9" ;
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_16" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_10" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_17" [label="17:  DeclStmt \n   n$28=_fun___variable_initialization(&x1:break_scope::X) [line 79, column 3]\n  n$27=_fun_break_scope::X_X(&x1:break_scope::X*) [line 79, column 5]\n  EXIT_SCOPE(n$27,n$28); [line 79, column 5]\n  APPLY_ABSTRACTION; [line 79, column 5]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_17" [label="17:  DeclStmt \n   n$28=_fun___variable_initialization(&x1:break_scope::X) assign_last [line 79, column 3]\n  n$27=_fun_break_scope::X_X(&x1:break_scope::X*) [line 79, column 5]\n  EXIT_SCOPE(n$27,n$28); [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" ;
@@ -80,7 +80,7 @@ digraph cfg {
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_3" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_2" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&x2:break_scope::X) [line 63, column 3]\n  n$5=_fun_break_scope::X_X(&x2:break_scope::X*) [line 63, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 63, column 5]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&x2:break_scope::X) assign_last [line 63, column 3]\n  n$5=_fun_break_scope::X_X(&x2:break_scope::X*) [line 63, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 63, column 5]\n " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_4" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_3" ;
@@ -88,15 +88,15 @@ digraph cfg {
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_5" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_8" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_6" [label="6:  DeclStmt \n   n$13=_fun___variable_initialization(&it:break_scope::iterator) [line 57, column 8]\n  n$11=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$7:break_scope::iterator) [line 57, column 22]\n  _=*&vector:break_scope::vec [line 57, column 22]\n  n$10=_fun_break_scope::vec_begin(&vector:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$7:break_scope::iterator*) [line 57, column 22]\n  n$12=_fun_break_scope::iterator_iterator(&it:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$7:break_scope::iterator&) [line 57, column 22]\n  EXIT_SCOPE(_,n$10,n$11,n$12,n$13,0$?%__sil_tmpSIL_materialize_temp__n$7); [line 57, column 22]\n  APPLY_ABSTRACTION; [line 57, column 22]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_6" [label="6:  DeclStmt \n   n$13=_fun___variable_initialization(&it:break_scope::iterator) assign_last [line 57, column 8]\n  n$11=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$7:break_scope::iterator) assign_last [line 57, column 22]\n  _=*&vector:break_scope::vec [line 57, column 22]\n  n$10=_fun_break_scope::vec_begin(&vector:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$7:break_scope::iterator*) assign_last [line 57, column 22]\n  n$12=_fun_break_scope::iterator_iterator(&it:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$7:break_scope::iterator&) [line 57, column 22]\n  EXIT_SCOPE(_,n$10,n$11,n$12,n$13,0$?%__sil_tmpSIL_materialize_temp__n$7); [line 57, column 22]\n  APPLY_ABSTRACTION; [line 57, column 22]\n " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_6" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_5" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_7" [label="7:  Call _fun_break_scope::iterator_operator++ \n   n$17=_fun_break_scope::iterator_operator++(&it:break_scope::iterator&,&0$?%__sil_tmp__temp_return_n$16:break_scope::iterator*) [line 57, column 58]\n  EXIT_SCOPE(n$17); [line 57, column 58]\n  APPLY_ABSTRACTION; [line 57, column 58]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_7" [label="7:  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_7" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_5" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_8" [label="8:  Call _fun_break_scope::iterator_operator!= \n   n$23=_fun___variable_initialization(&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*) [line 57, column 44]\n  n$24=_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,n$23); [line 57, column 38]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_8" [label="8:  Call _fun_break_scope::iterator_operator!= \n   n$23=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$19:break_scope::iterator const ) assign_last [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$24=_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,n$23,0$?%__sil_tmpSIL_materialize_temp__n$19); [line 57, column 38]\n " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_8" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_9" ;
@@ -106,7 +106,7 @@ digraph cfg {
 
 	 "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$24, false); [line 57, column 38]\n  EXIT_SCOPE(n$24); [line 57, column 38]\n  APPLY_ABSTRACTION; [line 57, column 38]\n " shape="invhouse"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_10" [label="10: Prune (false branch, for loop) \n   PRUNE(!n$24, false); [line 57, column 38]\n  EXIT_SCOPE(n$24,it); [line 57, column 38]\n  APPLY_ABSTRACTION; [line 57, column 38]\n " shape="invhouse"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_10" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_4" ;
@@ -114,7 +114,7 @@ digraph cfg {
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_11" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_7" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_12" [label="12: Prune (true branch, if) \n   n$26=*&b:_Bool [line 58, column 9]\n  PRUNE(n$26, true); [line 58, column 9]\n  NULLIFY(&b); [line 58, column 9]\n  EXIT_SCOPE(n$26,b); [line 58, column 9]\n " shape="invhouse"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_12" [label="12: Prune (true branch, if) \n   n$26=*&b:_Bool [line 58, column 9]\n  PRUNE(n$26, true); [line 58, column 9]\n  NULLIFY(&b); [line 58, column 9]\n  EXIT_SCOPE(n$26,it,b); [line 58, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_12" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_16" ;
@@ -130,11 +130,11 @@ digraph cfg {
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_15" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_4" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_16" [label="16:  DeclStmt \n   n$34=_fun___variable_initialization(&x1:break_scope::X) [line 59, column 7]\n  n$33=_fun_break_scope::X_X(&x1:break_scope::X*) [line 59, column 9]\n  EXIT_SCOPE(n$33,n$34); [line 59, column 9]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_16" [label="16:  DeclStmt \n   n$34=_fun___variable_initialization(&x1:break_scope::X) assign_last [line 59, column 7]\n  n$33=_fun_break_scope::X_X(&x1:break_scope::X*) [line 59, column 9]\n  EXIT_SCOPE(n$33,n$34); [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   n$39=_fun___variable_initialization(&vector:break_scope::vec) [line 56, column 3]\n  n$38=_fun_break_scope::vec_vec(&vector:break_scope::vec*) [line 56, column 7]\n  EXIT_SCOPE(n$38,n$39); [line 56, column 7]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_17" [label="17:  DeclStmt \n   n$39=_fun___variable_initialization(&vector:break_scope::vec) assign_last [line 56, column 3]\n  n$38=_fun_break_scope::vec_vec(&vector:break_scope::vec*) [line 56, column 7]\n  EXIT_SCOPE(n$38,n$39); [line 56, column 7]\n " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_17" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_6" ;
@@ -153,15 +153,15 @@ digraph cfg {
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_4" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_8" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_5" [label="5:  DeclStmt \n   n$14=_fun___variable_initialization(&__end1:break_scope::iterator) [line 47, column 12]\n  n$12=_fun___variable_initialization(&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*) [line 47, column 12]\n  n$13=_fun_break_scope::iterator_iterator(&__end1:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$7:break_scope::iterator&) [line 47, column 12]\n  EXIT_SCOPE(_,n$8,n$11,n$12,n$13,n$14,__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_5" [label="5:  DeclStmt \n   n$14=_fun___variable_initialization(&__end1:break_scope::iterator) assign_last [line 47, column 12]\n  n$12=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$7:break_scope::iterator) assign_last [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$13=_fun_break_scope::iterator_iterator(&__end1:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$7:break_scope::iterator&) [line 47, column 12]\n  EXIT_SCOPE(_,n$8,n$11,n$12,n$13,n$14,__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_5" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_4" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_6" [label="6:  DeclStmt \n   n$22=_fun___variable_initialization(&__begin1:break_scope::iterator) [line 47, column 12]\n  n$20=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$15:break_scope::iterator) [line 47, column 12]\n  n$16=*&__range1:break_scope::vec& [line 47, column 12]\n  _=*n$16:break_scope::vec [line 47, column 12]\n  n$19=_fun_break_scope::vec_begin(n$16:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$15:break_scope::iterator*) [line 47, column 12]\n  n$21=_fun_break_scope::iterator_iterator(&__begin1:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$15:break_scope::iterator&) [line 47, column 12]\n  EXIT_SCOPE(_,n$16,n$19,n$20,n$21,n$22,0$?%__sil_tmpSIL_materialize_temp__n$15); [line 47, column 12]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_6" [label="6:  DeclStmt \n   n$22=_fun___variable_initialization(&__begin1:break_scope::iterator) assign_last [line 47, column 12]\n  n$20=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$15:break_scope::iterator) assign_last [line 47, column 12]\n  n$16=*&__range1:break_scope::vec& [line 47, column 12]\n  _=*n$16:break_scope::vec [line 47, column 12]\n  n$19=_fun_break_scope::vec_begin(n$16:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$15: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$15:break_scope::iterator&) [line 47, column 12]\n  EXIT_SCOPE(_,n$16,n$19,n$20,n$21,n$22,0$?%__sil_tmpSIL_materialize_temp__n$15); [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$26=_fun_break_scope::iterator_operator++(&__begin1:break_scope::iterator&,&0$?%__sil_tmp__temp_return_n$25:break_scope::iterator*) [line 47, column 12]\n  EXIT_SCOPE(n$26); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, column 12]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_7" [label="7:  Call _fun_break_scope::iterator_operator++ \n   n$26=_fun_break_scope::iterator_operator++(&__begin1:break_scope::iterator&,&0$?%__sil_tmp__temp_return_n$25:break_scope::iterator*) assign_last [line 47, column 12]\n  EXIT_SCOPE(n$26,0$?%__sil_tmp__temp_return_n$25); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, column 12]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_7" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_4" ;
@@ -174,7 +174,7 @@ digraph cfg {
 	
 
 	 "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$28, false); [line 47, column 12]\n  EXIT_SCOPE(n$28); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, column 12]\n " shape="invhouse"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_10" [label="10: Prune (false branch, for loop) \n   PRUNE(!n$28, false); [line 47, column 12]\n  EXIT_SCOPE(n$28,__end1,__begin1); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, column 12]\n " shape="invhouse"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_10" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_3" ;
@@ -182,11 +182,11 @@ digraph cfg {
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_11" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_7" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_12" [label="12: Prune (true branch, if) \n   n$31=*&b:_Bool [line 48, column 9]\n  PRUNE(n$31, true); [line 48, column 9]\n  NULLIFY(&b); [line 48, column 9]\n  EXIT_SCOPE(n$31,b); [line 48, column 9]\n " shape="invhouse"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_12" [label="12: Prune (true branch, if) \n   n$31=*&b:_Bool [line 48, column 9]\n  PRUNE(n$31, true); [line 48, column 9]\n  NULLIFY(&b); [line 48, column 9]\n  EXIT_SCOPE(n$31,b,__end1,__begin1); [line 48, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_12" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_16" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_13" [label="13: Prune (false branch, if) \n   n$31=*&b:_Bool [line 48, column 9]\n  PRUNE(!n$31, false); [line 48, column 9]\n  EXIT_SCOPE(n$31); [line 48, column 9]\n  APPLY_ABSTRACTION; [line 48, column 9]\n " shape="invhouse"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_13" [label="13: Prune (false branch, if) \n   n$31=*&b:_Bool [line 48, column 9]\n  PRUNE(!n$31, false); [line 48, column 9]\n  EXIT_SCOPE(n$31,x); [line 48, column 9]\n  APPLY_ABSTRACTION; [line 48, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_13" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_11" ;
@@ -198,24 +198,24 @@ digraph cfg {
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_15" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_3" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_16" [label="16:  DeclStmt \n   n$39=_fun___variable_initialization(&x2:break_scope::X) [line 49, column 7]\n  n$38=_fun_break_scope::X_X(&x2:break_scope::X*,&x:break_scope::X&) [line 49, column 14]\n  EXIT_SCOPE(n$38,n$39,x); [line 49, column 14]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_16" [label="16:  DeclStmt \n   n$39=_fun___variable_initialization(&x2:break_scope::X) assign_last [line 49, column 7]\n  n$38=_fun_break_scope::X_X(&x2:break_scope::X*,&x:break_scope::X&) [line 49, column 14]\n  EXIT_SCOPE(n$38,n$39,x); [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   n$48=_fun___variable_initialization(&x:break_scope::X) [line 47, column 8]\n  n$46=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$42:break_scope::X const ) [line 47, column 12]\n  n$45=_fun_break_scope::iterator_operator*(&__begin1:break_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$42:break_scope::X*) [line 47, column 12]\n  n$47=_fun_break_scope::X_X(&x:break_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$42:break_scope::X const &) [line 47, column 12]\n  EXIT_SCOPE(n$45,n$46,n$47,n$48); [line 47, column 12]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_17" [label="17:  DeclStmt \n   n$48=_fun___variable_initialization(&x:break_scope::X) assign_last [line 47, column 8]\n  n$46=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$42:break_scope::X const ) assign_last [line 47, column 12]\n  n$45=_fun_break_scope::iterator_operator*(&__begin1:break_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$42:break_scope::X*) assign_last [line 47, column 12]\n  n$47=_fun_break_scope::X_X(&x:break_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$42:break_scope::X const &) [line 47, column 12]\n  EXIT_SCOPE(n$45,n$46,n$47,n$48,0$?%__sil_tmpSIL_materialize_temp__n$42); [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_18" [label="18:  DeclStmt \n   n$50=_fun___variable_initialization(&__range1:break_scope::vec&) [line 47, column 14]\n  *&__range1:break_scope::vec&=&vector [line 47, column 14]\n  EXIT_SCOPE(n$50); [line 47, column 14]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_18" [label="18:  DeclStmt \n   n$50=_fun___variable_initialization(&__range1:break_scope::vec&) assign_last [line 47, column 14]\n  *&__range1:break_scope::vec&=&vector [line 47, column 14]\n  EXIT_SCOPE(n$50); [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_19" [label="19:  DeclStmt \n   n$52=_fun___variable_initialization(&x1:break_scope::X) [line 46, column 3]\n  n$51=_fun_break_scope::X_X(&x1:break_scope::X*) [line 46, column 5]\n  EXIT_SCOPE(n$51,n$52); [line 46, column 5]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_19" [label="19:  DeclStmt \n   n$52=_fun___variable_initialization(&x1:break_scope::X) assign_last [line 46, column 3]\n  n$51=_fun_break_scope::X_X(&x1:break_scope::X*) [line 46, column 5]\n  EXIT_SCOPE(n$51,n$52); [line 46, column 5]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_19" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_18" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_20" [label="20:  DeclStmt \n   n$54=_fun___variable_initialization(&vector:break_scope::vec) [line 45, column 3]\n  n$53=_fun_break_scope::vec_vec(&vector:break_scope::vec*) [line 45, column 7]\n  EXIT_SCOPE(n$53,n$54); [line 45, column 7]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_20" [label="20:  DeclStmt \n   n$54=_fun___variable_initialization(&vector:break_scope::vec) assign_last [line 45, column 3]\n  n$53=_fun_break_scope::vec_vec(&vector:break_scope::vec*) [line 45, column 7]\n  EXIT_SCOPE(n$53,n$54); [line 45, column 7]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_20" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_19" ;
@@ -230,7 +230,7 @@ digraph cfg {
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_3" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_2" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&x5:break_scope::X) [line 127, column 3]\n  n$5=_fun_break_scope::X_X(&x5:break_scope::X*) [line 127, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 127, column 5]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&x5:break_scope::X) assign_last [line 127, column 3]\n  n$5=_fun_break_scope::X_X(&x5:break_scope::X*) [line 127, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 127, column 5]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_4" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_3" ;
@@ -243,7 +243,7 @@ digraph cfg {
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_6" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_4" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_7" [label="7:  DeclStmt \n   n$13=_fun___variable_initialization(&x4:break_scope::X) [line 124, column 7]\n  n$12=_fun_break_scope::X_X(&x4:break_scope::X*) [line 124, column 9]\n  EXIT_SCOPE(n$12,n$13); [line 124, column 9]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_7" [label="7:  DeclStmt \n   n$13=_fun___variable_initialization(&x4:break_scope::X) assign_last [line 124, column 7]\n  n$12=_fun_break_scope::X_X(&x4:break_scope::X*) [line 124, column 9]\n  EXIT_SCOPE(n$12,n$13); [line 124, column 9]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_7" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_6" ;
@@ -255,7 +255,7 @@ digraph cfg {
 	
 
 	 "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   n$21=_fun___variable_initialization(&x3:break_scope::X) [line 120, column 7]\n  n$20=_fun_break_scope::X_X(&x3:break_scope::X*) [line 120, column 9]\n  EXIT_SCOPE(n$20,n$21); [line 120, column 9]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_10" [label="10:  DeclStmt \n   n$21=_fun___variable_initialization(&x3:break_scope::X) assign_last [line 120, column 7]\n  n$20=_fun_break_scope::X_X(&x3:break_scope::X*) [line 120, column 9]\n  EXIT_SCOPE(n$20,n$21); [line 120, column 9]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_10" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_9" ;
@@ -263,7 +263,7 @@ digraph cfg {
 	
 
 	 "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   n$26=_fun___variable_initialization(&x2:break_scope::X) [line 117, column 7]\n  n$25=_fun_break_scope::X_X(&x2:break_scope::X*) [line 117, column 9]\n  EXIT_SCOPE(n$25,n$26); [line 117, column 9]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_12" [label="12:  DeclStmt \n   n$26=_fun___variable_initialization(&x2:break_scope::X) assign_last [line 117, column 7]\n  n$25=_fun_break_scope::X_X(&x2:break_scope::X*) [line 117, column 9]\n  EXIT_SCOPE(n$25,n$26); [line 117, column 9]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_12" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_11" ;
@@ -293,7 +293,7 @@ digraph cfg {
 
 	 "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   n$29=_fun___variable_initialization(&x1:break_scope::X) [line 114, column 3]\n  n$28=_fun_break_scope::X_X(&x1:break_scope::X*) [line 114, column 5]\n  EXIT_SCOPE(n$28,n$29); [line 114, column 5]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_19" [label="19:  DeclStmt \n   n$29=_fun___variable_initialization(&x1:break_scope::X) assign_last [line 114, column 3]\n  n$28=_fun_break_scope::X_X(&x1:break_scope::X*) [line 114, column 5]\n  EXIT_SCOPE(n$28,n$29); [line 114, column 5]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_19" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_5" ;
@@ -342,19 +342,19 @@ digraph cfg {
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_11" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_3" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_12" [label="12:  DeclStmt \n   n$13=_fun___variable_initialization(&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,n$13); [line 70, column 9]\n " shape="box"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_12" [label="12:  DeclStmt \n   n$13=_fun___variable_initialization(&x2:break_scope::X) assign_last [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,n$13); [line 70, column 9]\n " shape="box"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_12" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_11" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_13" [label="13:  Destruction \n   _=*&x4:break_scope::X [line 74, column 5]\n  n$15=_fun_break_scope::X_~X(&x4:break_scope::X*) [line 74, column 5]\n  EXIT_SCOPE(_,n$15); [line 74, column 5]\n  APPLY_ABSTRACTION; [line 74, column 5]\n " shape="box"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_13" [label="13:  Destruction \n   _=*&x4:break_scope::X [line 74, column 5]\n  n$15=_fun_break_scope::X_~X(&x4:break_scope::X*) [line 74, column 5]\n  EXIT_SCOPE(_,n$15,x4); [line 74, column 5]\n  APPLY_ABSTRACTION; [line 74, column 5]\n " shape="box"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_13" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_7" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_14" [label="14:  DeclStmt \n   n$18=_fun___variable_initialization(&x4:break_scope::X) [line 73, column 7]\n  n$17=_fun_break_scope::X_X(&x4:break_scope::X*) [line 73, column 9]\n  EXIT_SCOPE(n$17,n$18); [line 73, column 9]\n " shape="box"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_14" [label="14:  DeclStmt \n   n$18=_fun___variable_initialization(&x4:break_scope::X) assign_last [line 73, column 7]\n  n$17=_fun_break_scope::X_X(&x4:break_scope::X*) [line 73, column 9]\n  EXIT_SCOPE(n$17,n$18); [line 73, column 9]\n " shape="box"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_14" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_13" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_15" [label="15:  DeclStmt \n   n$22=_fun___variable_initialization(&x1:break_scope::X) [line 67, column 3]\n  n$21=_fun_break_scope::X_X(&x1:break_scope::X*) [line 67, column 5]\n  EXIT_SCOPE(n$21,n$22); [line 67, column 5]\n  APPLY_ABSTRACTION; [line 67, column 5]\n " shape="box"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_15" [label="15:  DeclStmt \n   n$22=_fun___variable_initialization(&x1:break_scope::X) assign_last [line 67, column 3]\n  n$21=_fun_break_scope::X_X(&x1:break_scope::X*) [line 67, column 5]\n  EXIT_SCOPE(n$21,n$22); [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" ;
@@ -382,7 +382,7 @@ digraph cfg {
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_6" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_3" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_7" [label="7:  Destruction \n   _=*&x2:break_scope::X [line 99, column 3]\n  n$5=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 99, column 3]\n  EXIT_SCOPE(_,n$5); [line 99, column 3]\n  APPLY_ABSTRACTION; [line 99, column 3]\n " shape="box"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_7" [label="7:  Destruction \n   _=*&x2:break_scope::X [line 99, column 3]\n  n$5=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 99, column 3]\n  EXIT_SCOPE(_,n$5,x2); [line 99, column 3]\n  APPLY_ABSTRACTION; [line 99, column 3]\n " shape="box"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_7" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_4" ;
@@ -403,19 +403,19 @@ digraph cfg {
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_11" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_8" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_12" [label="12:  Destruction \n   _=*&x3:break_scope::X [line 97, column 7]\n  n$12=_fun_break_scope::X_~X(&x3:break_scope::X*) [line 97, column 7]\n  EXIT_SCOPE(_,n$12); [line 97, column 7]\n  APPLY_ABSTRACTION; [line 97, column 7]\n " shape="box"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_12" [label="12:  Destruction \n   _=*&x3:break_scope::X [line 97, column 7]\n  n$12=_fun_break_scope::X_~X(&x3:break_scope::X*) [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_12" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_7" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_13" [label="13:  DeclStmt \n   n$15=_fun___variable_initialization(&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,n$15); [line 96, column 9]\n " shape="box"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_13" [label="13:  DeclStmt \n   n$15=_fun___variable_initialization(&x3:break_scope::X) assign_last [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,n$15); [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   n$18=_fun___variable_initialization(&x2:break_scope::X) [line 94, column 5]\n  n$17=_fun_break_scope::X_X(&x2:break_scope::X*) [line 94, column 7]\n  EXIT_SCOPE(n$17,n$18); [line 94, column 7]\n  APPLY_ABSTRACTION; [line 94, column 7]\n " shape="box"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_14" [label="14:  DeclStmt \n   n$18=_fun___variable_initialization(&x2:break_scope::X) assign_last [line 94, column 5]\n  n$17=_fun_break_scope::X_X(&x2:break_scope::X*) [line 94, column 7]\n  EXIT_SCOPE(n$17,n$18); [line 94, column 7]\n  APPLY_ABSTRACTION; [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   n$21=_fun___variable_initialization(&x1:break_scope::X) [line 92, column 3]\n  n$20=_fun_break_scope::X_X(&x1:break_scope::X*) [line 92, column 5]\n  EXIT_SCOPE(n$20,n$21); [line 92, column 5]\n  APPLY_ABSTRACTION; [line 92, column 5]\n " shape="box"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_15" [label="15:  DeclStmt \n   n$21=_fun___variable_initialization(&x1:break_scope::X) assign_last [line 92, column 3]\n  n$20=_fun_break_scope::X_X(&x1:break_scope::X*) [line 92, column 5]\n  EXIT_SCOPE(n$20,n$21); [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" ;
@@ -430,7 +430,7 @@ digraph cfg {
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_3" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_2" ;
-"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&x3:break_scope::X) [line 110, column 3]\n  n$5=_fun_break_scope::X_X(&x3:break_scope::X*) [line 110, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 110, column 5]\n " shape="box"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&x3:break_scope::X) assign_last [line 110, column 3]\n  n$5=_fun_break_scope::X_X(&x3:break_scope::X*) [line 110, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 110, column 5]\n " shape="box"]
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_4" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_3" ;
@@ -447,7 +447,7 @@ digraph cfg {
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_7" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_4" ;
-"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_8" [label="8:  Destruction \n   _=*&x2:break_scope::X [line 109, column 3]\n  n$9=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 109, column 3]\n  EXIT_SCOPE(_,n$9); [line 109, column 3]\n  APPLY_ABSTRACTION; [line 109, column 3]\n " shape="box"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_8" [label="8:  Destruction \n   _=*&x2:break_scope::X [line 109, column 3]\n  n$9=_fun_break_scope::X_~X(&x2:break_scope::X*) [line 109, column 3]\n  EXIT_SCOPE(_,n$9,x2); [line 109, column 3]\n  APPLY_ABSTRACTION; [line 109, column 3]\n " shape="box"]
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_8" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_5" ;
@@ -464,11 +464,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   n$17=_fun___variable_initialization(&x2:break_scope::X) [line 105, column 5]\n  n$16=_fun_break_scope::X_X(&x2:break_scope::X*) [line 105, column 7]\n  EXIT_SCOPE(n$16,n$17); [line 105, column 7]\n " shape="box"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_12" [label="12:  DeclStmt \n   n$17=_fun___variable_initialization(&x2:break_scope::X) assign_last [line 105, column 5]\n  n$16=_fun_break_scope::X_X(&x2:break_scope::X*) [line 105, column 7]\n  EXIT_SCOPE(n$16,n$17); [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   n$20=_fun___variable_initialization(&x1:break_scope::X) [line 103, column 3]\n  n$19=_fun_break_scope::X_X(&x1:break_scope::X*) [line 103, column 5]\n  EXIT_SCOPE(n$19,n$20); [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   n$20=_fun___variable_initialization(&x1:break_scope::X) assign_last [line 103, column 3]\n  n$19=_fun_break_scope::X_X(&x1:break_scope::X*) [line 103, column 5]\n  EXIT_SCOPE(n$19,n$20); [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" ;
@@ -562,7 +562,7 @@ digraph cfg {
 "operator*#iterator#break_scope(class break_scope::X)#(4328339407583570703).89adb890a0c29514eda31053987e2050_2" [label="2: Exit break_scope::iterator_operator* \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 42, column 63]\n " color=yellow style=filled]
 	
 
-"operator*#iterator#break_scope(class break_scope::X)#(4328339407583570703).89adb890a0c29514eda31053987e2050_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::X* [line 42, column 33]\n  n$9=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X const ) [line 42, column 40]\n  n$2=*&this:break_scope::iterator const * [line 42, column 40]\n  n$3=*n$2.vector:break_scope::vec const * [line 42, column 40]\n  _=*n$3:break_scope::vec const  [line 42, column 40]\n  n$5=*&this:break_scope::iterator const * [line 42, column 52]\n  n$6=*n$5.position:int [line 42, column 52]\n  n$8=_fun_break_scope::vec_get(n$3:break_scope::vec const *,n$6:int,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X*) [line 42, column 40]\n  n$10=_fun_break_scope::X_X(n$0:break_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X const &) [line 42, column 40]\n  NULLIFY(&__return_param); [line 42, column 40]\n  NULLIFY(&this); [line 42, column 40]\n  EXIT_SCOPE(_,n$0,n$2,n$3,n$5,n$6,n$8,n$9,n$10,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 42, column 40]\n  APPLY_ABSTRACTION; [line 42, column 40]\n " shape="box"]
+"operator*#iterator#break_scope(class break_scope::X)#(4328339407583570703).89adb890a0c29514eda31053987e2050_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::X* [line 42, column 33]\n  n$9=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X const ) assign_last [line 42, column 40]\n  n$2=*&this:break_scope::iterator const * [line 42, column 40]\n  n$3=*n$2.vector:break_scope::vec const * [line 42, column 40]\n  _=*n$3:break_scope::vec const  [line 42, column 40]\n  n$5=*&this:break_scope::iterator const * [line 42, column 52]\n  n$6=*n$5.position:int [line 42, column 52]\n  n$8=_fun_break_scope::vec_get(n$3:break_scope::vec const *,n$6:int,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X*) assign_last [line 42, column 40]\n  n$10=_fun_break_scope::X_X(n$0:break_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X const &) [line 42, column 40]\n  NULLIFY(&__return_param); [line 42, column 40]\n  NULLIFY(&this); [line 42, column 40]\n  EXIT_SCOPE(_,n$0,n$2,n$3,n$5,n$6,n$8,n$9,n$10,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 42, column 40]\n  APPLY_ABSTRACTION; [line 42, column 40]\n " shape="box"]
 	
 
 	 "operator*#iterator#break_scope(class break_scope::X)#(4328339407583570703).89adb890a0c29514eda31053987e2050_3" -> "operator*#iterator#break_scope(class break_scope::X)#(4328339407583570703).89adb890a0c29514eda31053987e2050_2" ;
@@ -629,7 +629,7 @@ digraph cfg {
 "end#vec#break_scope(class break_scope::iterator)#(4427317924121915380).28b4ffbb5a64aa367cc424acb2a0de9b_2" [label="2: Exit break_scope::vec_end \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 35, column 47]\n " color=yellow style=filled]
 	
 
-"end#vec#break_scope(class break_scope::iterator)#(4427317924121915380).28b4ffbb5a64aa367cc424acb2a0de9b_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::iterator* [line 35, column 20]\n  n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator) [line 35, column 27]\n  n$2=*&this:break_scope::vec* [line 35, column 36]\n  n$3=_fun_break_scope::iterator_iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator*,n$2:break_scope::vec*,10:int) [line 35, column 27]\n  n$5=_fun_break_scope::iterator_iterator(n$0:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator&) [line 35, column 27]\n  NULLIFY(&__return_param); [line 35, column 27]\n  NULLIFY(&this); [line 35, column 27]\n  EXIT_SCOPE(n$0,n$2,n$3,n$4,n$5,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 35, column 27]\n  APPLY_ABSTRACTION; [line 35, column 27]\n " shape="box"]
+"end#vec#break_scope(class break_scope::iterator)#(4427317924121915380).28b4ffbb5a64aa367cc424acb2a0de9b_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::iterator* [line 35, column 20]\n  n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator) assign_last [line 35, column 27]\n  n$2=*&this:break_scope::vec* [line 35, column 36]\n  n$3=_fun_break_scope::iterator_iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator*,n$2:break_scope::vec*,10:int) [line 35, column 27]\n  n$5=_fun_break_scope::iterator_iterator(n$0:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator&) [line 35, column 27]\n  NULLIFY(&__return_param); [line 35, column 27]\n  NULLIFY(&this); [line 35, column 27]\n  EXIT_SCOPE(n$0,n$2,n$3,n$4,n$5,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 35, column 27]\n  APPLY_ABSTRACTION; [line 35, column 27]\n " shape="box"]
 	
 
 	 "end#vec#break_scope(class break_scope::iterator)#(4427317924121915380).28b4ffbb5a64aa367cc424acb2a0de9b_3" -> "end#vec#break_scope(class break_scope::iterator)#(4427317924121915380).28b4ffbb5a64aa367cc424acb2a0de9b_2" ;
@@ -640,7 +640,7 @@ digraph cfg {
 "begin#vec#break_scope(class break_scope::iterator)#(5557509884489875894).5dac1fcfbf012c7c4e9ccd6f67cbd1ce_2" [label="2: Exit break_scope::vec_begin \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 34, column 48]\n " color=yellow style=filled]
 	
 
-"begin#vec#break_scope(class break_scope::iterator)#(5557509884489875894).5dac1fcfbf012c7c4e9ccd6f67cbd1ce_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::iterator* [line 34, column 22]\n  n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator) [line 34, column 29]\n  n$2=*&this:break_scope::vec* [line 34, column 38]\n  n$3=_fun_break_scope::iterator_iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator*,n$2:break_scope::vec*,0:int) [line 34, column 29]\n  n$5=_fun_break_scope::iterator_iterator(n$0:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator&) [line 34, column 29]\n  NULLIFY(&__return_param); [line 34, column 29]\n  NULLIFY(&this); [line 34, column 29]\n  EXIT_SCOPE(n$0,n$2,n$3,n$4,n$5,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 34, column 29]\n  APPLY_ABSTRACTION; [line 34, column 29]\n " shape="box"]
+"begin#vec#break_scope(class break_scope::iterator)#(5557509884489875894).5dac1fcfbf012c7c4e9ccd6f67cbd1ce_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::iterator* [line 34, column 22]\n  n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator) assign_last [line 34, column 29]\n  n$2=*&this:break_scope::vec* [line 34, column 38]\n  n$3=_fun_break_scope::iterator_iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator*,n$2:break_scope::vec*,0:int) [line 34, column 29]\n  n$5=_fun_break_scope::iterator_iterator(n$0:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator&) [line 34, column 29]\n  NULLIFY(&__return_param); [line 34, column 29]\n  NULLIFY(&this); [line 34, column 29]\n  EXIT_SCOPE(n$0,n$2,n$3,n$4,n$5,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 34, column 29]\n  APPLY_ABSTRACTION; [line 34, column 29]\n " shape="box"]
 	
 
 	 "begin#vec#break_scope(class break_scope::iterator)#(5557509884489875894).5dac1fcfbf012c7c4e9ccd6f67cbd1ce_3" -> "begin#vec#break_scope(class break_scope::iterator)#(5557509884489875894).5dac1fcfbf012c7c4e9ccd6f67cbd1ce_2" ;

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

@@ -23,7 +23,7 @@ digraph cfg {
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_6" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_3" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_7" [label="7:  Destruction \n   _=*&x2:continue_scope::X [line 88, column 3]\n  n$5=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 88, column 3]\n  EXIT_SCOPE(_,n$5); [line 88, column 3]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_7" [label="7:  Destruction \n   _=*&x2:continue_scope::X [line 88, column 3]\n  n$5=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 88, column 3]\n  EXIT_SCOPE(_,n$5,x2); [line 88, column 3]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_7" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_5" ;
@@ -44,29 +44,29 @@ digraph cfg {
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_11" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_8" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_12" [label="12:  Destruction \n   _=*&x3:continue_scope::X [line 84, column 7]\n  n$12=_fun_continue_scope::X_~X(&x3:continue_scope::X*) [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*) [line 84, column 7]\n  EXIT_SCOPE(_,_,n$12,n$14); [line 84, column 7]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_12" [label="12:  Destruction \n   _=*&x3:continue_scope::X [line 84, column 7]\n  n$12=_fun_continue_scope::X_~X(&x3:continue_scope::X*) [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*) [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_12" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_5" ;
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_12" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_6" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_13" [label="13:  DeclStmt \n   n$17=_fun___variable_initialization(&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,n$17); [line 83, column 9]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_13" [label="13:  DeclStmt \n   n$17=_fun___variable_initialization(&x3:continue_scope::X) assign_last [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,n$17); [line 83, column 9]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_13" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_12" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_14" [label="14:  Destruction \n   _=*&x4:continue_scope::X [line 87, column 5]\n  n$19=_fun_continue_scope::X_~X(&x4:continue_scope::X*) [line 87, column 5]\n  EXIT_SCOPE(_,n$19); [line 87, column 5]\n  APPLY_ABSTRACTION; [line 87, column 5]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_14" [label="14:  Destruction \n   _=*&x4:continue_scope::X [line 87, column 5]\n  n$19=_fun_continue_scope::X_~X(&x4:continue_scope::X*) [line 87, column 5]\n  EXIT_SCOPE(_,n$19,x4); [line 87, column 5]\n  APPLY_ABSTRACTION; [line 87, column 5]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_14" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_8" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_15" [label="15:  DeclStmt \n   n$22=_fun___variable_initialization(&x4:continue_scope::X) [line 86, column 7]\n  n$21=_fun_continue_scope::X_X(&x4:continue_scope::X*) [line 86, column 9]\n  EXIT_SCOPE(n$21,n$22); [line 86, column 9]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_15" [label="15:  DeclStmt \n   n$22=_fun___variable_initialization(&x4:continue_scope::X) assign_last [line 86, column 7]\n  n$21=_fun_continue_scope::X_X(&x4:continue_scope::X*) [line 86, column 9]\n  EXIT_SCOPE(n$21,n$22); [line 86, column 9]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_15" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_14" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_16" [label="16:  DeclStmt \n   n$25=_fun___variable_initialization(&x2:continue_scope::X) [line 81, column 5]\n  n$24=_fun_continue_scope::X_X(&x2:continue_scope::X*) [line 81, column 7]\n  EXIT_SCOPE(n$24,n$25); [line 81, column 7]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_16" [label="16:  DeclStmt \n   n$25=_fun___variable_initialization(&x2:continue_scope::X) assign_last [line 81, column 5]\n  n$24=_fun_continue_scope::X_X(&x2:continue_scope::X*) [line 81, column 7]\n  EXIT_SCOPE(n$24,n$25); [line 81, column 7]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_16" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_9" ;
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_16" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_10" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_17" [label="17:  DeclStmt \n   n$28=_fun___variable_initialization(&x1:continue_scope::X) [line 79, column 3]\n  n$27=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 79, column 5]\n  EXIT_SCOPE(n$27,n$28); [line 79, column 5]\n  APPLY_ABSTRACTION; [line 79, column 5]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_17" [label="17:  DeclStmt \n   n$28=_fun___variable_initialization(&x1:continue_scope::X) assign_last [line 79, column 3]\n  n$27=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 79, column 5]\n  EXIT_SCOPE(n$27,n$28); [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" ;
@@ -81,7 +81,7 @@ digraph cfg {
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_3" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_2" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&x2:continue_scope::X) [line 63, column 3]\n  n$5=_fun_continue_scope::X_X(&x2:continue_scope::X*) [line 63, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 63, column 5]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&x2:continue_scope::X) assign_last [line 63, column 3]\n  n$5=_fun_continue_scope::X_X(&x2:continue_scope::X*) [line 63, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 63, column 5]\n " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_4" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_3" ;
@@ -89,15 +89,15 @@ digraph cfg {
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_5" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_8" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_6" [label="6:  DeclStmt \n   n$13=_fun___variable_initialization(&it:continue_scope::iterator) [line 57, column 8]\n  n$11=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$7:continue_scope::iterator) [line 57, column 22]\n  _=*&vector:continue_scope::vec [line 57, column 22]\n  n$10=_fun_continue_scope::vec_begin(&vector:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$7:continue_scope::iterator*) [line 57, column 22]\n  n$12=_fun_continue_scope::iterator_iterator(&it:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$7:continue_scope::iterator&) [line 57, column 22]\n  EXIT_SCOPE(_,n$10,n$11,n$12,n$13,0$?%__sil_tmpSIL_materialize_temp__n$7); [line 57, column 22]\n  APPLY_ABSTRACTION; [line 57, column 22]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_6" [label="6:  DeclStmt \n   n$13=_fun___variable_initialization(&it:continue_scope::iterator) assign_last [line 57, column 8]\n  n$11=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$7:continue_scope::iterator) assign_last [line 57, column 22]\n  _=*&vector:continue_scope::vec [line 57, column 22]\n  n$10=_fun_continue_scope::vec_begin(&vector:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$7:continue_scope::iterator*) assign_last [line 57, column 22]\n  n$12=_fun_continue_scope::iterator_iterator(&it:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$7:continue_scope::iterator&) [line 57, column 22]\n  EXIT_SCOPE(_,n$10,n$11,n$12,n$13,0$?%__sil_tmpSIL_materialize_temp__n$7); [line 57, column 22]\n  APPLY_ABSTRACTION; [line 57, column 22]\n " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_6" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_5" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_7" [label="7:  Call _fun_continue_scope::iterator_operator++ \n   n$17=_fun_continue_scope::iterator_operator++(&it:continue_scope::iterator&,&0$?%__sil_tmp__temp_return_n$16:continue_scope::iterator*) [line 57, column 58]\n  EXIT_SCOPE(n$17); [line 57, column 58]\n  APPLY_ABSTRACTION; [line 57, column 58]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_7" [label="7:  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_7" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_5" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_8" [label="8:  Call _fun_continue_scope::iterator_operator!= \n   n$23=_fun___variable_initialization(&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*) [line 57, column 44]\n  n$24=_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,n$23); [line 57, column 38]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_8" [label="8:  Call _fun_continue_scope::iterator_operator!= \n   n$23=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$19:continue_scope::iterator const ) assign_last [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$24=_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,n$23,0$?%__sil_tmpSIL_materialize_temp__n$19); [line 57, column 38]\n " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_8" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_9" ;
@@ -107,7 +107,7 @@ digraph cfg {
 
 	 "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$24, false); [line 57, column 38]\n  EXIT_SCOPE(n$24); [line 57, column 38]\n " shape="invhouse"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_10" [label="10: Prune (false branch, for loop) \n   PRUNE(!n$24, false); [line 57, column 38]\n  EXIT_SCOPE(n$24,it); [line 57, column 38]\n " shape="invhouse"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_10" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_4" ;
@@ -127,15 +127,15 @@ digraph cfg {
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_14" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_11" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_15" [label="15:  Destruction \n   _=*&x1:continue_scope::X [line 60, column 7]\n  n$31=_fun_continue_scope::X_~X(&x1:continue_scope::X*) [line 60, column 7]\n  EXIT_SCOPE(_,n$31); [line 60, column 7]\n  APPLY_ABSTRACTION; [line 60, column 7]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_15" [label="15:  Destruction \n   _=*&x1:continue_scope::X [line 60, column 7]\n  n$31=_fun_continue_scope::X_~X(&x1:continue_scope::X*) [line 60, column 7]\n  EXIT_SCOPE(_,n$31,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   n$34=_fun___variable_initialization(&x1:continue_scope::X) [line 59, column 7]\n  n$33=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 59, column 9]\n  EXIT_SCOPE(n$33,n$34); [line 59, column 9]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_16" [label="16:  DeclStmt \n   n$34=_fun___variable_initialization(&x1:continue_scope::X) assign_last [line 59, column 7]\n  n$33=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 59, column 9]\n  EXIT_SCOPE(n$33,n$34); [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   n$39=_fun___variable_initialization(&vector:continue_scope::vec) [line 56, column 3]\n  n$38=_fun_continue_scope::vec_vec(&vector:continue_scope::vec*) [line 56, column 7]\n  EXIT_SCOPE(n$38,n$39); [line 56, column 7]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_17" [label="17:  DeclStmt \n   n$39=_fun___variable_initialization(&vector:continue_scope::vec) assign_last [line 56, column 3]\n  n$38=_fun_continue_scope::vec_vec(&vector:continue_scope::vec*) [line 56, column 7]\n  EXIT_SCOPE(n$38,n$39); [line 56, column 7]\n " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_17" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_6" ;
@@ -154,15 +154,15 @@ digraph cfg {
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_4" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_8" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_5" [label="5:  DeclStmt \n   n$14=_fun___variable_initialization(&__end1:continue_scope::iterator) [line 47, column 12]\n  n$12=_fun___variable_initialization(&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*) [line 47, column 12]\n  n$13=_fun_continue_scope::iterator_iterator(&__end1:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$7:continue_scope::iterator&) [line 47, column 12]\n  EXIT_SCOPE(_,n$8,n$11,n$12,n$13,n$14,__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_5" [label="5:  DeclStmt \n   n$14=_fun___variable_initialization(&__end1:continue_scope::iterator) assign_last [line 47, column 12]\n  n$12=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$7:continue_scope::iterator) assign_last [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$13=_fun_continue_scope::iterator_iterator(&__end1:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$7:continue_scope::iterator&) [line 47, column 12]\n  EXIT_SCOPE(_,n$8,n$11,n$12,n$13,n$14,__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_5" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_4" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_6" [label="6:  DeclStmt \n   n$22=_fun___variable_initialization(&__begin1:continue_scope::iterator) [line 47, column 12]\n  n$20=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$15:continue_scope::iterator) [line 47, column 12]\n  n$16=*&__range1:continue_scope::vec& [line 47, column 12]\n  _=*n$16:continue_scope::vec [line 47, column 12]\n  n$19=_fun_continue_scope::vec_begin(n$16:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$15:continue_scope::iterator*) [line 47, column 12]\n  n$21=_fun_continue_scope::iterator_iterator(&__begin1:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$15:continue_scope::iterator&) [line 47, column 12]\n  EXIT_SCOPE(_,n$16,n$19,n$20,n$21,n$22,0$?%__sil_tmpSIL_materialize_temp__n$15); [line 47, column 12]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_6" [label="6:  DeclStmt \n   n$22=_fun___variable_initialization(&__begin1:continue_scope::iterator) assign_last [line 47, column 12]\n  n$20=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$15:continue_scope::iterator) assign_last [line 47, column 12]\n  n$16=*&__range1:continue_scope::vec& [line 47, column 12]\n  _=*n$16:continue_scope::vec [line 47, column 12]\n  n$19=_fun_continue_scope::vec_begin(n$16:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$15: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$15:continue_scope::iterator&) [line 47, column 12]\n  EXIT_SCOPE(_,n$16,n$19,n$20,n$21,n$22,0$?%__sil_tmpSIL_materialize_temp__n$15); [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$26=_fun_continue_scope::iterator_operator++(&__begin1:continue_scope::iterator&,&0$?%__sil_tmp__temp_return_n$25:continue_scope::iterator*) [line 47, column 12]\n  EXIT_SCOPE(n$26); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, column 12]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_7" [label="7:  Call _fun_continue_scope::iterator_operator++ \n   n$26=_fun_continue_scope::iterator_operator++(&__begin1:continue_scope::iterator&,&0$?%__sil_tmp__temp_return_n$25:continue_scope::iterator*) assign_last [line 47, column 12]\n  EXIT_SCOPE(n$26,0$?%__sil_tmp__temp_return_n$25); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, column 12]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_7" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_4" ;
@@ -175,7 +175,7 @@ digraph cfg {
 	
 
 	 "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$28, false); [line 47, column 12]\n  EXIT_SCOPE(n$28); [line 47, column 12]\n " shape="invhouse"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_10" [label="10: Prune (false branch, for loop) \n   PRUNE(!n$28, false); [line 47, column 12]\n  EXIT_SCOPE(n$28,__end1,__begin1); [line 47, column 12]\n " shape="invhouse"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_10" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_3" ;
@@ -187,7 +187,7 @@ digraph cfg {
 	
 
 	 "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$31=*&b:_Bool [line 48, column 9]\n  PRUNE(!n$31, false); [line 48, column 9]\n  EXIT_SCOPE(n$31); [line 48, column 9]\n  APPLY_ABSTRACTION; [line 48, column 9]\n " shape="invhouse"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_13" [label="13: Prune (false branch, if) \n   n$31=*&b:_Bool [line 48, column 9]\n  PRUNE(!n$31, false); [line 48, column 9]\n  EXIT_SCOPE(n$31,x); [line 48, column 9]\n  APPLY_ABSTRACTION; [line 48, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_13" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_11" ;
@@ -195,28 +195,28 @@ digraph cfg {
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_14" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_11" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_15" [label="15:  Destruction \n   _=*&x2:continue_scope::X [line 50, column 7]\n  n$36=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 50, column 7]\n  EXIT_SCOPE(_,n$36); [line 50, column 7]\n  APPLY_ABSTRACTION; [line 50, column 7]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_15" [label="15:  Destruction \n   _=*&x2:continue_scope::X [line 50, column 7]\n  n$36=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 50, column 7]\n  EXIT_SCOPE(_,n$36,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   n$39=_fun___variable_initialization(&x2:continue_scope::X) [line 49, column 7]\n  n$38=_fun_continue_scope::X_X(&x2:continue_scope::X*,&x:continue_scope::X&) [line 49, column 14]\n  EXIT_SCOPE(n$38,n$39); [line 49, column 14]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_16" [label="16:  DeclStmt \n   n$39=_fun___variable_initialization(&x2:continue_scope::X) assign_last [line 49, column 7]\n  n$38=_fun_continue_scope::X_X(&x2:continue_scope::X*,&x:continue_scope::X&) [line 49, column 14]\n  EXIT_SCOPE(n$38,n$39,x); [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   n$48=_fun___variable_initialization(&x:continue_scope::X) [line 47, column 8]\n  n$46=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$42:continue_scope::X const ) [line 47, column 12]\n  n$45=_fun_continue_scope::iterator_operator*(&__begin1:continue_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$42:continue_scope::X*) [line 47, column 12]\n  n$47=_fun_continue_scope::X_X(&x:continue_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$42:continue_scope::X const &) [line 47, column 12]\n  EXIT_SCOPE(n$45,n$46,n$47,n$48); [line 47, column 12]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_17" [label="17:  DeclStmt \n   n$48=_fun___variable_initialization(&x:continue_scope::X) assign_last [line 47, column 8]\n  n$46=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$42:continue_scope::X const ) assign_last [line 47, column 12]\n  n$45=_fun_continue_scope::iterator_operator*(&__begin1:continue_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$42:continue_scope::X*) assign_last [line 47, column 12]\n  n$47=_fun_continue_scope::X_X(&x:continue_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$42:continue_scope::X const &) [line 47, column 12]\n  EXIT_SCOPE(n$45,n$46,n$47,n$48,0$?%__sil_tmpSIL_materialize_temp__n$42); [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_18" [label="18:  DeclStmt \n   n$50=_fun___variable_initialization(&__range1:continue_scope::vec&) [line 47, column 14]\n  *&__range1:continue_scope::vec&=&vector [line 47, column 14]\n  EXIT_SCOPE(n$50); [line 47, column 14]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_18" [label="18:  DeclStmt \n   n$50=_fun___variable_initialization(&__range1:continue_scope::vec&) assign_last [line 47, column 14]\n  *&__range1:continue_scope::vec&=&vector [line 47, column 14]\n  EXIT_SCOPE(n$50); [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_19" [label="19:  DeclStmt \n   n$52=_fun___variable_initialization(&x1:continue_scope::X) [line 46, column 3]\n  n$51=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 46, column 5]\n  EXIT_SCOPE(n$51,n$52); [line 46, column 5]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_19" [label="19:  DeclStmt \n   n$52=_fun___variable_initialization(&x1:continue_scope::X) assign_last [line 46, column 3]\n  n$51=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 46, column 5]\n  EXIT_SCOPE(n$51,n$52); [line 46, column 5]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_19" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_18" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_20" [label="20:  DeclStmt \n   n$54=_fun___variable_initialization(&vector:continue_scope::vec) [line 45, column 3]\n  n$53=_fun_continue_scope::vec_vec(&vector:continue_scope::vec*) [line 45, column 7]\n  EXIT_SCOPE(n$53,n$54); [line 45, column 7]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_20" [label="20:  DeclStmt \n   n$54=_fun___variable_initialization(&vector:continue_scope::vec) assign_last [line 45, column 3]\n  n$53=_fun_continue_scope::vec_vec(&vector:continue_scope::vec*) [line 45, column 7]\n  EXIT_SCOPE(n$53,n$54); [line 45, column 7]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_20" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_19" ;
@@ -261,23 +261,23 @@ digraph cfg {
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_10" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_7" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_11" [label="11:  Destruction \n   _=*&x2:continue_scope::X [line 71, column 7]\n  n$10=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 71, column 7]\n  EXIT_SCOPE(_,n$10); [line 71, column 7]\n  APPLY_ABSTRACTION; [line 71, column 7]\n " shape="box"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_11" [label="11:  Destruction \n   _=*&x2:continue_scope::X [line 71, column 7]\n  n$10=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [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_11" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_4" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_12" [label="12:  DeclStmt \n   n$13=_fun___variable_initialization(&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,n$13); [line 70, column 9]\n " shape="box"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_12" [label="12:  DeclStmt \n   n$13=_fun___variable_initialization(&x2:continue_scope::X) assign_last [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,n$13); [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 \n   _=*&x4:continue_scope::X [line 74, column 5]\n  n$15=_fun_continue_scope::X_~X(&x4:continue_scope::X*) [line 74, column 5]\n  EXIT_SCOPE(_,n$15); [line 74, column 5]\n  APPLY_ABSTRACTION; [line 74, column 5]\n " shape="box"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_13" [label="13:  Destruction \n   _=*&x4:continue_scope::X [line 74, column 5]\n  n$15=_fun_continue_scope::X_~X(&x4:continue_scope::X*) [line 74, column 5]\n  EXIT_SCOPE(_,n$15,x4); [line 74, column 5]\n  APPLY_ABSTRACTION; [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   n$18=_fun___variable_initialization(&x4:continue_scope::X) [line 73, column 7]\n  n$17=_fun_continue_scope::X_X(&x4:continue_scope::X*) [line 73, column 9]\n  EXIT_SCOPE(n$17,n$18); [line 73, column 9]\n " shape="box"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_14" [label="14:  DeclStmt \n   n$18=_fun___variable_initialization(&x4:continue_scope::X) assign_last [line 73, column 7]\n  n$17=_fun_continue_scope::X_X(&x4:continue_scope::X*) [line 73, column 9]\n  EXIT_SCOPE(n$17,n$18); [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   n$22=_fun___variable_initialization(&x1:continue_scope::X) [line 67, column 3]\n  n$21=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 67, column 5]\n  EXIT_SCOPE(n$21,n$22); [line 67, column 5]\n  APPLY_ABSTRACTION; [line 67, column 5]\n " shape="box"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_15" [label="15:  DeclStmt \n   n$22=_fun___variable_initialization(&x1:continue_scope::X) assign_last [line 67, column 3]\n  n$21=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 67, column 5]\n  EXIT_SCOPE(n$21,n$22); [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" ;
@@ -305,7 +305,7 @@ digraph cfg {
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_6" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_3" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_7" [label="7:  Destruction \n   _=*&x2:continue_scope::X [line 99, column 3]\n  n$5=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 99, column 3]\n  EXIT_SCOPE(_,n$5); [line 99, column 3]\n  APPLY_ABSTRACTION; [line 99, column 3]\n " shape="box"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_7" [label="7:  Destruction \n   _=*&x2:continue_scope::X [line 99, column 3]\n  n$5=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 99, column 3]\n  EXIT_SCOPE(_,n$5,x2); [line 99, column 3]\n  APPLY_ABSTRACTION; [line 99, column 3]\n " shape="box"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_7" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_4" ;
@@ -326,19 +326,19 @@ digraph cfg {
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_11" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_8" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_12" [label="12:  Destruction \n   _=*&x3:continue_scope::X [line 97, column 7]\n  n$12=_fun_continue_scope::X_~X(&x3:continue_scope::X*) [line 97, column 7]\n  EXIT_SCOPE(_,n$12); [line 97, column 7]\n  APPLY_ABSTRACTION; [line 97, column 7]\n " shape="box"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_12" [label="12:  Destruction \n   _=*&x3:continue_scope::X [line 97, column 7]\n  n$12=_fun_continue_scope::X_~X(&x3:continue_scope::X*) [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   n$15=_fun___variable_initialization(&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,n$15); [line 96, column 9]\n " shape="box"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_13" [label="13:  DeclStmt \n   n$15=_fun___variable_initialization(&x3:continue_scope::X) assign_last [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,n$15); [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   n$18=_fun___variable_initialization(&x2:continue_scope::X) [line 94, column 5]\n  n$17=_fun_continue_scope::X_X(&x2:continue_scope::X*) [line 94, column 7]\n  EXIT_SCOPE(n$17,n$18); [line 94, column 7]\n  APPLY_ABSTRACTION; [line 94, column 7]\n " shape="box"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_14" [label="14:  DeclStmt \n   n$18=_fun___variable_initialization(&x2:continue_scope::X) assign_last [line 94, column 5]\n  n$17=_fun_continue_scope::X_X(&x2:continue_scope::X*) [line 94, column 7]\n  EXIT_SCOPE(n$17,n$18); [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   n$21=_fun___variable_initialization(&x1:continue_scope::X) [line 92, column 3]\n  n$20=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 92, column 5]\n  EXIT_SCOPE(n$20,n$21); [line 92, column 5]\n  APPLY_ABSTRACTION; [line 92, column 5]\n " shape="box"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_15" [label="15:  DeclStmt \n   n$21=_fun___variable_initialization(&x1:continue_scope::X) assign_last [line 92, column 3]\n  n$20=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 92, column 5]\n  EXIT_SCOPE(n$20,n$21); [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" ;
@@ -353,7 +353,7 @@ digraph cfg {
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_3" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_2" ;
-"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&x3:continue_scope::X) [line 110, column 3]\n  n$5=_fun_continue_scope::X_X(&x3:continue_scope::X*) [line 110, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 110, column 5]\n " shape="box"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&x3:continue_scope::X) assign_last [line 110, column 3]\n  n$5=_fun_continue_scope::X_X(&x3:continue_scope::X*) [line 110, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 110, column 5]\n " shape="box"]
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_4" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_3" ;
@@ -370,7 +370,7 @@ digraph cfg {
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_7" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_4" ;
-"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_8" [label="8:  Destruction \n   _=*&x2:continue_scope::X [line 109, column 3]\n  n$9=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 109, column 3]\n  EXIT_SCOPE(_,n$9); [line 109, column 3]\n  APPLY_ABSTRACTION; [line 109, column 3]\n " shape="box"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_8" [label="8:  Destruction \n   _=*&x2:continue_scope::X [line 109, column 3]\n  n$9=_fun_continue_scope::X_~X(&x2:continue_scope::X*) [line 109, column 3]\n  EXIT_SCOPE(_,n$9,x2); [line 109, column 3]\n  APPLY_ABSTRACTION; [line 109, column 3]\n " shape="box"]
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_8" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_5" ;
@@ -387,11 +387,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   n$17=_fun___variable_initialization(&x2:continue_scope::X) [line 105, column 5]\n  n$16=_fun_continue_scope::X_X(&x2:continue_scope::X*) [line 105, column 7]\n  EXIT_SCOPE(n$16,n$17); [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   n$17=_fun___variable_initialization(&x2:continue_scope::X) assign_last [line 105, column 5]\n  n$16=_fun_continue_scope::X_X(&x2:continue_scope::X*) [line 105, column 7]\n  EXIT_SCOPE(n$16,n$17); [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   n$20=_fun___variable_initialization(&x1:continue_scope::X) [line 103, column 3]\n  n$19=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 103, column 5]\n  EXIT_SCOPE(n$19,n$20); [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   n$20=_fun___variable_initialization(&x1:continue_scope::X) assign_last [line 103, column 3]\n  n$19=_fun_continue_scope::X_X(&x1:continue_scope::X*) [line 103, column 5]\n  EXIT_SCOPE(n$19,n$20); [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" ;
@@ -434,7 +434,7 @@ digraph cfg {
 "operator*#iterator#continue_scope(class continue_scope::X)#(10976315504449545146).6f0a140275409bbf42ae1dbc8842f6af_2" [label="2: Exit continue_scope::iterator_operator* \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 42, column 63]\n " color=yellow style=filled]
 	
 
-"operator*#iterator#continue_scope(class continue_scope::X)#(10976315504449545146).6f0a140275409bbf42ae1dbc8842f6af_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::X* [line 42, column 33]\n  n$9=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X const ) [line 42, column 40]\n  n$2=*&this:continue_scope::iterator const * [line 42, column 40]\n  n$3=*n$2.vector:continue_scope::vec const * [line 42, column 40]\n  _=*n$3:continue_scope::vec const  [line 42, column 40]\n  n$5=*&this:continue_scope::iterator const * [line 42, column 52]\n  n$6=*n$5.position:int [line 42, column 52]\n  n$8=_fun_continue_scope::vec_get(n$3:continue_scope::vec const *,n$6:int,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X*) [line 42, column 40]\n  n$10=_fun_continue_scope::X_X(n$0:continue_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X const &) [line 42, column 40]\n  NULLIFY(&__return_param); [line 42, column 40]\n  NULLIFY(&this); [line 42, column 40]\n  EXIT_SCOPE(_,n$0,n$2,n$3,n$5,n$6,n$8,n$9,n$10,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 42, column 40]\n  APPLY_ABSTRACTION; [line 42, column 40]\n " shape="box"]
+"operator*#iterator#continue_scope(class continue_scope::X)#(10976315504449545146).6f0a140275409bbf42ae1dbc8842f6af_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::X* [line 42, column 33]\n  n$9=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X const ) assign_last [line 42, column 40]\n  n$2=*&this:continue_scope::iterator const * [line 42, column 40]\n  n$3=*n$2.vector:continue_scope::vec const * [line 42, column 40]\n  _=*n$3:continue_scope::vec const  [line 42, column 40]\n  n$5=*&this:continue_scope::iterator const * [line 42, column 52]\n  n$6=*n$5.position:int [line 42, column 52]\n  n$8=_fun_continue_scope::vec_get(n$3:continue_scope::vec const *,n$6:int,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X*) assign_last [line 42, column 40]\n  n$10=_fun_continue_scope::X_X(n$0:continue_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X const &) [line 42, column 40]\n  NULLIFY(&__return_param); [line 42, column 40]\n  NULLIFY(&this); [line 42, column 40]\n  EXIT_SCOPE(_,n$0,n$2,n$3,n$5,n$6,n$8,n$9,n$10,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 42, column 40]\n  APPLY_ABSTRACTION; [line 42, column 40]\n " shape="box"]
 	
 
 	 "operator*#iterator#continue_scope(class continue_scope::X)#(10976315504449545146).6f0a140275409bbf42ae1dbc8842f6af_3" -> "operator*#iterator#continue_scope(class continue_scope::X)#(10976315504449545146).6f0a140275409bbf42ae1dbc8842f6af_2" ;
@@ -541,7 +541,7 @@ digraph cfg {
 "begin#vec#continue_scope(class continue_scope::iterator)#(10867355481694456603).8c0551e386b9f2c25bf3629672b303c4_2" [label="2: Exit continue_scope::vec_begin \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 34, column 48]\n " color=yellow style=filled]
 	
 
-"begin#vec#continue_scope(class continue_scope::iterator)#(10867355481694456603).8c0551e386b9f2c25bf3629672b303c4_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::iterator* [line 34, column 22]\n  n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator) [line 34, column 29]\n  n$2=*&this:continue_scope::vec* [line 34, column 38]\n  n$3=_fun_continue_scope::iterator_iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator*,n$2:continue_scope::vec*,0:int) [line 34, column 29]\n  n$5=_fun_continue_scope::iterator_iterator(n$0:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator&) [line 34, column 29]\n  NULLIFY(&__return_param); [line 34, column 29]\n  NULLIFY(&this); [line 34, column 29]\n  EXIT_SCOPE(n$0,n$2,n$3,n$4,n$5,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 34, column 29]\n  APPLY_ABSTRACTION; [line 34, column 29]\n " shape="box"]
+"begin#vec#continue_scope(class continue_scope::iterator)#(10867355481694456603).8c0551e386b9f2c25bf3629672b303c4_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::iterator* [line 34, column 22]\n  n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator) assign_last [line 34, column 29]\n  n$2=*&this:continue_scope::vec* [line 34, column 38]\n  n$3=_fun_continue_scope::iterator_iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator*,n$2:continue_scope::vec*,0:int) [line 34, column 29]\n  n$5=_fun_continue_scope::iterator_iterator(n$0:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator&) [line 34, column 29]\n  NULLIFY(&__return_param); [line 34, column 29]\n  NULLIFY(&this); [line 34, column 29]\n  EXIT_SCOPE(n$0,n$2,n$3,n$4,n$5,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 34, column 29]\n  APPLY_ABSTRACTION; [line 34, column 29]\n " shape="box"]
 	
 
 	 "begin#vec#continue_scope(class continue_scope::iterator)#(10867355481694456603).8c0551e386b9f2c25bf3629672b303c4_3" -> "begin#vec#continue_scope(class continue_scope::iterator)#(10867355481694456603).8c0551e386b9f2c25bf3629672b303c4_2" ;
@@ -563,7 +563,7 @@ digraph cfg {
 "end#vec#continue_scope(class continue_scope::iterator)#(4225103001970544933).15b63d21cc3cccf91200fcac42652775_2" [label="2: Exit continue_scope::vec_end \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 35, column 47]\n " color=yellow style=filled]
 	
 
-"end#vec#continue_scope(class continue_scope::iterator)#(4225103001970544933).15b63d21cc3cccf91200fcac42652775_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::iterator* [line 35, column 20]\n  n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator) [line 35, column 27]\n  n$2=*&this:continue_scope::vec* [line 35, column 36]\n  n$3=_fun_continue_scope::iterator_iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator*,n$2:continue_scope::vec*,10:int) [line 35, column 27]\n  n$5=_fun_continue_scope::iterator_iterator(n$0:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator&) [line 35, column 27]\n  NULLIFY(&__return_param); [line 35, column 27]\n  NULLIFY(&this); [line 35, column 27]\n  EXIT_SCOPE(n$0,n$2,n$3,n$4,n$5,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 35, column 27]\n  APPLY_ABSTRACTION; [line 35, column 27]\n " shape="box"]
+"end#vec#continue_scope(class continue_scope::iterator)#(4225103001970544933).15b63d21cc3cccf91200fcac42652775_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::iterator* [line 35, column 20]\n  n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator) assign_last [line 35, column 27]\n  n$2=*&this:continue_scope::vec* [line 35, column 36]\n  n$3=_fun_continue_scope::iterator_iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator*,n$2:continue_scope::vec*,10:int) [line 35, column 27]\n  n$5=_fun_continue_scope::iterator_iterator(n$0:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator&) [line 35, column 27]\n  NULLIFY(&__return_param); [line 35, column 27]\n  NULLIFY(&this); [line 35, column 27]\n  EXIT_SCOPE(n$0,n$2,n$3,n$4,n$5,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 35, column 27]\n  APPLY_ABSTRACTION; [line 35, column 27]\n " shape="box"]
 	
 
 	 "end#vec#continue_scope(class continue_scope::iterator)#(4225103001970544933).15b63d21cc3cccf91200fcac42652775_3" -> "end#vec#continue_scope(class continue_scope::iterator)#(4225103001970544933).15b63d21cc3cccf91200fcac42652775_2" ;

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

@@ -125,7 +125,7 @@ digraph cfg {
 	
 
 	 "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_4" -> "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_3" ;
-"__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_5" [label="5:  DeclStmt \n   n$12=_fun___variable_initialization(&a:A) [line 31, column 10]\n  n$11=_fun_A_A(&a:A*) [line 31, column 12]\n  EXIT_SCOPE(n$11,n$12); [line 31, column 12]\n " shape="box"]
+"__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_5" [label="5:  DeclStmt \n   n$12=_fun___variable_initialization(&a:A) assign_last [line 31, column 10]\n  n$11=_fun_A_A(&a:A*) [line 31, column 12]\n  EXIT_SCOPE(n$11,n$12); [line 31, column 12]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_5" -> "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_4" ;

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

@@ -30,7 +30,7 @@ digraph cfg {
 	
 
 	 "f#10188173399311638112.8cffce40f5525757e791edeba0985326_4" -> "f#10188173399311638112.8cffce40f5525757e791edeba0985326_3" ;
-"f#10188173399311638112.8cffce40f5525757e791edeba0985326_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&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,n$5,p); [line 10, column 3]\n " shape="box"]
+"f#10188173399311638112.8cffce40f5525757e791edeba0985326_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&x:int) assign_last [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,n$5,p); [line 10, column 3]\n " shape="box"]
 	
 
 	 "f#10188173399311638112.8cffce40f5525757e791edeba0985326_5" -> "f#10188173399311638112.8cffce40f5525757e791edeba0985326_4" ;
@@ -45,7 +45,7 @@ digraph cfg {
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&t:int*) [line 22, column 3]\n  *&t:int*=null [line 22, column 3]\n  EXIT_SCOPE(n$2); [line 22, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&t:int*) assign_last [line 22, column 3]\n  *&t:int*=null [line 22, column 3]\n  EXIT_SCOPE(n$2); [line 22, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "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_3" [label="3:  Call _fun_destructor_scope::getZ \n   n$3=_fun_destructor_scope::getZ(&0$?%__sil_tmp__temp_return_n$2:destructor_scope::Z*) [line 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$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" -> "callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_2" ;
@@ -22,7 +22,7 @@ digraph cfg {
 	
 
 	 "getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_3" -> "getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_2" ;
-"getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&x:destructor_scope::X) [line 69, column 3]\n  n$5=_fun_destructor_scope::X_X(&x:destructor_scope::X*) [line 69, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 69, column 5]\n " shape="box"]
+"getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&x:destructor_scope::X) assign_last [line 69, column 3]\n  n$5=_fun_destructor_scope::X_X(&x:destructor_scope::X*) [line 69, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 69, column 5]\n " shape="box"]
 	
 
 	 "getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_4" -> "getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_3" ;
@@ -37,7 +37,7 @@ digraph cfg {
 	
 
 	 "getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_3" -> "getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_2" ;
-"getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&z:destructor_scope::Z) [line 74, column 3]\n  n$5=_fun_destructor_scope::Z_Z(&z:destructor_scope::Z*) [line 74, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 74, column 5]\n " shape="box"]
+"getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&z:destructor_scope::Z) assign_last [line 74, column 3]\n  n$5=_fun_destructor_scope::Z_Z(&z:destructor_scope::Z*) [line 74, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 74, column 5]\n " shape="box"]
 	
 
 	 "getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_4" -> "getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_3" ;
@@ -56,11 +56,11 @@ digraph cfg {
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_4" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_3" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_5" [label="5:  DeclStmt \n   n$11=_fun___variable_initialization(&y3:destructor_scope::Y) [line 54, column 5]\n  n$10=_fun_destructor_scope::Y_Y(&y3:destructor_scope::Y*) [line 54, column 7]\n  EXIT_SCOPE(n$10,n$11); [line 54, column 7]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_5" [label="5:  DeclStmt \n   n$11=_fun___variable_initialization(&y3:destructor_scope::Y) assign_last [line 54, column 5]\n  n$10=_fun_destructor_scope::Y_Y(&y3:destructor_scope::Y*) [line 54, column 7]\n  EXIT_SCOPE(n$10,n$11); [line 54, column 7]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_5" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_4" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_6" [label="6:  DeclStmt \n   n$13=_fun___variable_initialization(&y1:destructor_scope::Y) [line 53, column 3]\n  n$12=_fun_destructor_scope::Y_Y(&y1:destructor_scope::Y*) [line 53, column 5]\n  EXIT_SCOPE(n$12,n$13); [line 53, column 5]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_6" [label="6:  DeclStmt \n   n$13=_fun___variable_initialization(&y1:destructor_scope::Y) assign_last [line 53, column 3]\n  n$12=_fun_destructor_scope::Y_Y(&y1:destructor_scope::Y*) [line 53, column 5]\n  EXIT_SCOPE(n$12,n$13); [line 53, column 5]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_6" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_5" ;
@@ -88,7 +88,7 @@ digraph cfg {
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_12" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_2" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_13" [label="13:  DeclStmt \n   n$38=_fun___variable_initialization(&x3:destructor_scope::X) [line 47, column 7]\n  n$37=_fun_destructor_scope::X_X(&x3:destructor_scope::X*) [line 47, column 9]\n  EXIT_SCOPE(n$37,n$38); [line 47, column 9]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_13" [label="13:  DeclStmt \n   n$38=_fun___variable_initialization(&x3:destructor_scope::X) assign_last [line 47, column 7]\n  n$37=_fun_destructor_scope::X_X(&x3:destructor_scope::X*) [line 47, column 9]\n  EXIT_SCOPE(n$37,n$38); [line 47, column 9]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_13" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_10" ;
@@ -109,20 +109,20 @@ digraph cfg {
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_17" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_2" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_18" [label="18:  DeclStmt \n   n$53=_fun___variable_initialization(&y2:destructor_scope::Y) [line 42, column 5]\n  n$52=_fun_destructor_scope::Y_Y(&y2:destructor_scope::Y*) [line 42, column 7]\n  EXIT_SCOPE(n$52,n$53); [line 42, column 7]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_18" [label="18:  DeclStmt \n   n$53=_fun___variable_initialization(&y2:destructor_scope::Y) assign_last [line 42, column 5]\n  n$52=_fun_destructor_scope::Y_Y(&y2:destructor_scope::Y*) [line 42, column 7]\n  EXIT_SCOPE(n$52,n$53); [line 42, column 7]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_18" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_15" ;
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_18" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_16" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_19" [label="19:  DeclStmt \n   n$55=_fun___variable_initialization(&x2:destructor_scope::X) [line 41, column 5]\n  n$54=_fun_destructor_scope::X_X(&x2:destructor_scope::X*) [line 41, column 7]\n  EXIT_SCOPE(n$54,n$55); [line 41, column 7]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_19" [label="19:  DeclStmt \n   n$55=_fun___variable_initialization(&x2:destructor_scope::X) assign_last [line 41, column 5]\n  n$54=_fun_destructor_scope::X_X(&x2:destructor_scope::X*) [line 41, column 7]\n  EXIT_SCOPE(n$54,n$55); [line 41, column 7]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_19" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_18" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_20" [label="20:  DeclStmt \n   n$57=_fun___variable_initialization(&s:destructor_scope::S) [line 39, column 3]\n  n$56=_fun_destructor_scope::S_S(&s:destructor_scope::S*) [line 39, column 5]\n  EXIT_SCOPE(n$56,n$57); [line 39, column 5]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_20" [label="20:  DeclStmt \n   n$57=_fun___variable_initialization(&s:destructor_scope::S) assign_last [line 39, column 3]\n  n$56=_fun_destructor_scope::S_S(&s:destructor_scope::S*) [line 39, column 5]\n  EXIT_SCOPE(n$56,n$57); [line 39, column 5]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_20" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_19" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_21" [label="21:  DeclStmt \n   n$59=_fun___variable_initialization(&x1:destructor_scope::X) [line 38, column 3]\n  n$58=_fun_destructor_scope::X_X(&x1:destructor_scope::X*) [line 38, column 5]\n  EXIT_SCOPE(n$58,n$59); [line 38, column 5]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_21" [label="21:  DeclStmt \n   n$59=_fun___variable_initialization(&x1:destructor_scope::X) assign_last [line 38, column 3]\n  n$58=_fun_destructor_scope::X_X(&x1:destructor_scope::X*) [line 38, column 5]\n  EXIT_SCOPE(n$58,n$59); [line 38, column 5]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_21" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_20" ;
@@ -153,7 +153,7 @@ digraph cfg {
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_7" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_2" ;
-"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_8" [label="8:  DeclStmt \n   n$10=_fun___variable_initialization(&x2:destructor_scope::X) [line 60, column 5]\n  n$9=_fun_destructor_scope::X_X(&x2:destructor_scope::X*) [line 60, column 7]\n  EXIT_SCOPE(n$9,n$10); [line 60, column 7]\n " shape="box"]
+"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_8" [label="8:  DeclStmt \n   n$10=_fun___variable_initialization(&x2:destructor_scope::X) assign_last [line 60, column 5]\n  n$9=_fun_destructor_scope::X_X(&x2:destructor_scope::X*) [line 60, column 7]\n  EXIT_SCOPE(n$9,n$10); [line 60, column 7]\n " shape="box"]
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_8" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_7" ;
@@ -161,11 +161,11 @@ digraph cfg {
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_9" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_2" ;
-"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_10" [label="10:  DeclStmt \n   n$17=_fun___variable_initialization(&x3:destructor_scope::X) [line 63, column 5]\n  n$16=_fun_destructor_scope::X_X(&x3:destructor_scope::X*) [line 63, column 7]\n  EXIT_SCOPE(n$16,n$17); [line 63, column 7]\n " shape="box"]
+"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_10" [label="10:  DeclStmt \n   n$17=_fun___variable_initialization(&x3:destructor_scope::X) assign_last [line 63, column 5]\n  n$16=_fun_destructor_scope::X_X(&x3:destructor_scope::X*) [line 63, column 7]\n  EXIT_SCOPE(n$16,n$17); [line 63, column 7]\n " shape="box"]
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_10" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_9" ;
-"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_11" [label="11:  DeclStmt \n   n$20=_fun___variable_initialization(&x1:destructor_scope::X) [line 58, column 3]\n  n$19=_fun_destructor_scope::X_X(&x1:destructor_scope::X*) [line 58, column 5]\n  EXIT_SCOPE(n$19,n$20); [line 58, column 5]\n " shape="box"]
+"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_11" [label="11:  DeclStmt \n   n$20=_fun___variable_initialization(&x1:destructor_scope::X) assign_last [line 58, column 3]\n  n$19=_fun_destructor_scope::X_X(&x1:destructor_scope::X*) [line 58, column 5]\n  EXIT_SCOPE(n$19,n$20); [line 58, column 5]\n " shape="box"]
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_11" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_5" ;
@@ -218,7 +218,7 @@ digraph cfg {
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_4" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_3" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_5" [label="5:  DeclStmt \n   n$14=_fun___variable_initialization(&y:destructor_scope::Y) [line 33, column 5]\n  n$13=_fun_destructor_scope::Y_Y(&y:destructor_scope::Y*) [line 33, column 7]\n  EXIT_SCOPE(n$13,n$14); [line 33, column 7]\n " shape="box"]
+"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_5" [label="5:  DeclStmt \n   n$14=_fun___variable_initialization(&y:destructor_scope::Y) assign_last [line 33, column 5]\n  n$13=_fun_destructor_scope::Y_Y(&y:destructor_scope::Y*) [line 33, column 7]\n  EXIT_SCOPE(n$13,n$14); [line 33, column 7]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_5" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_4" ;
@@ -238,7 +238,7 @@ digraph cfg {
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_9" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_2" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_10" [label="10:  DeclStmt \n   n$32=_fun___variable_initialization(&x:destructor_scope::X) [line 30, column 5]\n  n$31=_fun_destructor_scope::X_X(&x:destructor_scope::X*) [line 30, column 7]\n  EXIT_SCOPE(n$31,n$32); [line 30, column 7]\n " shape="box"]
+"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_10" [label="10:  DeclStmt \n   n$32=_fun___variable_initialization(&x:destructor_scope::X) assign_last [line 30, column 5]\n  n$31=_fun_destructor_scope::X_X(&x:destructor_scope::X*) [line 30, column 7]\n  EXIT_SCOPE(n$31,n$32); [line 30, column 7]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_10" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_7" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_2" [label="2: Exit __infer_globals_initializer_global \n  " color=yellow style=filled]
 	
 
-"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" [label="3:  DeclStmt \n   n$1=_fun___variable_initialization(&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|!pod>$global:X const ) [line 11, column 1]\n  n$0=_fun_X_X(&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|!pod>$global:X const *) [line 11, column 9]\n  EXIT_SCOPE(n$0,n$1); [line 11, column 9]\n  APPLY_ABSTRACTION; [line 11, column 9]\n " shape="box"]
+"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" [label="3:  DeclStmt \n   n$1=_fun___variable_initialization(&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|!pod>$global:X const ) assign_last [line 11, column 1]\n  n$0=_fun_X_X(&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|!pod>$global:X const *) [line 11, column 9]\n  EXIT_SCOPE(n$0,n$1); [line 11, column 9]\n  APPLY_ABSTRACTION; [line 11, column 9]\n " shape="box"]
 	
 
 	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "__infer_globals_initializer_v#708fabe5dc8ff523caaa5f44184921e8.588095fa475e4a9e8c83f50f26a48ea9_2" [label="2: Exit __infer_globals_initializer_v \n  " color=yellow style=filled]
 	
 
-"__infer_globals_initializer_v#708fabe5dc8ff523caaa5f44184921e8.588095fa475e4a9e8c83f50f26a48ea9_3" [label="3:  DeclStmt \n   n$0=_fun___variable_initialization(&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|ice>$v:int const ) [line 15, column 1]\n  *&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|ice>$v:int=2 [line 15, column 1]\n  EXIT_SCOPE(n$0); [line 15, column 1]\n  APPLY_ABSTRACTION; [line 15, column 1]\n " shape="box"]
+"__infer_globals_initializer_v#708fabe5dc8ff523caaa5f44184921e8.588095fa475e4a9e8c83f50f26a48ea9_3" [label="3:  DeclStmt \n   n$0=_fun___variable_initialization(&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|ice>$v:int const ) assign_last [line 15, column 1]\n  *&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|ice>$v:int=2 [line 15, column 1]\n  EXIT_SCOPE(n$0); [line 15, column 1]\n  APPLY_ABSTRACTION; [line 15, column 1]\n " shape="box"]
 	
 
 	 "__infer_globals_initializer_v#708fabe5dc8ff523caaa5f44184921e8.588095fa475e4a9e8c83f50f26a48ea9_3" -> "__infer_globals_initializer_v#708fabe5dc8ff523caaa5f44184921e8.588095fa475e4a9e8c83f50f26a48ea9_2" ;
@@ -44,7 +44,7 @@ digraph cfg {
 	
 
 	 "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_3" -> "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_2" ;
-"test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_4" [label="4:  DeclStmt \n   n$3=_fun___variable_initialization(&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,n$3,local); [line 18, column 3]\n " shape="box"]
+"test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_4" [label="4:  DeclStmt \n   n$3=_fun___variable_initialization(&local:int) assign_last [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,n$3,local); [line 18, column 3]\n " shape="box"]
 	
 
 	 "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_4" -> "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_3" ;

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

@@ -28,7 +28,7 @@ digraph cfg {
 	
 
 	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_7" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" ;
-"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_8" [label="8:  DeclStmt \n   n$2=_fun___variable_initialization(&#GB<codetoanalyze/cpp/frontend/globals/global_const2.cpp|ice>$global:int const ) [line 8, column 1]\n  n$1=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 8, column 20]\n  *&#GB<codetoanalyze/cpp/frontend/globals/global_const2.cpp|ice>$global:int=n$1 [line 8, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 8, column 1]\n  EXIT_SCOPE(n$1,n$2,0$?%__sil_tmpSIL_temp_conditional___n$0); [line 8, column 1]\n  APPLY_ABSTRACTION; [line 8, column 1]\n " shape="box"]
+"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_8" [label="8:  DeclStmt \n   n$2=_fun___variable_initialization(&#GB<codetoanalyze/cpp/frontend/globals/global_const2.cpp|ice>$global:int const ) assign_last [line 8, column 1]\n  n$1=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 8, column 20]\n  *&#GB<codetoanalyze/cpp/frontend/globals/global_const2.cpp|ice>$global:int=n$1 [line 8, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 8, column 1]\n  EXIT_SCOPE(n$1,n$2,0$?%__sil_tmpSIL_temp_conditional___n$0); [line 8, column 1]\n  APPLY_ABSTRACTION; [line 8, column 1]\n " shape="box"]
 	
 
 	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_8" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_2" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "__infer_globals_initializer_x#346c89dda90b0be6289346ddbf0528bc.83245b9f254e67fb6f879cc1e35a1bb1_2" [label="2: Exit __infer_globals_initializer_x \n  " color=yellow style=filled]
 	
 
-"__infer_globals_initializer_x#346c89dda90b0be6289346ddbf0528bc.83245b9f254e67fb6f879cc1e35a1bb1_3" [label="3:  DeclStmt \n   n$1=_fun___variable_initialization(&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$x:int) [line 12, column 1]\n  n$0=_fun_foo() [line 12, column 16]\n  *&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$x:int=(n$0 + 5) [line 12, column 1]\n  EXIT_SCOPE(n$0,n$1); [line 12, column 1]\n  APPLY_ABSTRACTION; [line 12, column 1]\n " shape="box"]
+"__infer_globals_initializer_x#346c89dda90b0be6289346ddbf0528bc.83245b9f254e67fb6f879cc1e35a1bb1_3" [label="3:  DeclStmt \n   n$1=_fun___variable_initialization(&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$x:int) assign_last [line 12, column 1]\n  n$0=_fun_foo() [line 12, column 16]\n  *&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$x:int=(n$0 + 5) [line 12, column 1]\n  EXIT_SCOPE(n$0,n$1); [line 12, column 1]\n  APPLY_ABSTRACTION; [line 12, column 1]\n " shape="box"]
 	
 
 	 "__infer_globals_initializer_x#346c89dda90b0be6289346ddbf0528bc.83245b9f254e67fb6f879cc1e35a1bb1_3" -> "__infer_globals_initializer_x#346c89dda90b0be6289346ddbf0528bc.83245b9f254e67fb6f879cc1e35a1bb1_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "__infer_globals_initializer_y#346c89dda90b0be6289346ddbf0528bc.e7d659d11156f551397be6d5db27f31c_2" [label="2: Exit __infer_globals_initializer_y \n  " color=yellow style=filled]
 	
 
-"__infer_globals_initializer_y#346c89dda90b0be6289346ddbf0528bc.e7d659d11156f551397be6d5db27f31c_3" [label="3:  DeclStmt \n   n$2=_fun___variable_initialization(&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$y:int) [line 13, column 1]\n  n$0=*&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$x:int [line 13, column 16]\n  n$1=*&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$z:int [line 13, column 20]\n  *&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$y:int=((n$0 + n$1) + 1) [line 13, column 1]\n  EXIT_SCOPE(n$0,n$1,n$2); [line 13, column 1]\n  APPLY_ABSTRACTION; [line 13, column 1]\n " shape="box"]
+"__infer_globals_initializer_y#346c89dda90b0be6289346ddbf0528bc.e7d659d11156f551397be6d5db27f31c_3" [label="3:  DeclStmt \n   n$2=_fun___variable_initialization(&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$y:int) assign_last [line 13, column 1]\n  n$0=*&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$x:int [line 13, column 16]\n  n$1=*&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$z:int [line 13, column 20]\n  *&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$y:int=((n$0 + n$1) + 1) [line 13, column 1]\n  EXIT_SCOPE(n$0,n$1,n$2); [line 13, column 1]\n  APPLY_ABSTRACTION; [line 13, column 1]\n " shape="box"]
 	
 
 	 "__infer_globals_initializer_y#346c89dda90b0be6289346ddbf0528bc.e7d659d11156f551397be6d5db27f31c_3" -> "__infer_globals_initializer_y#346c89dda90b0be6289346ddbf0528bc.e7d659d11156f551397be6d5db27f31c_2" ;

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

@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_3" -> "div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_2" ;
-"div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&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,n$4); [line 17, column 8]\n " shape="box"]
+"div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&b:B<A>) assign_last [line 17, column 3]\n  n$3=_fun_B<A>_B(&b:B<A>*) [line 17, column 8]\n  EXIT_SCOPE(n$3,n$4); [line 17, column 8]\n " shape="box"]
 	
 
 	 "div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_4" -> "div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_3" ;
@@ -26,7 +26,7 @@ digraph cfg {
 	
 
 	 "div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_3" -> "div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_2" ;
-"div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&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,n$4); [line 12, column 10]\n " shape="box"]
+"div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&b:B<int>) assign_last [line 12, column 3]\n  n$3=_fun_B<int>_B(&b:B<int>*) [line 12, column 10]\n  EXIT_SCOPE(n$3,n$4); [line 12, column 10]\n " shape="box"]
 	
 
 	 "div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_4" -> "div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_3" ;

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   n$2=_fun___variable_initialization(&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,n$2,b); [line 16, column 16]\n  APPLY_ABSTRACTION; [line 16, column 16]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   n$2=_fun___variable_initialization(&b:B) assign_last [line 16, column 14]\n  n$1=_fun_B_A(&b:B*,5:int) [line 16, column 16]\n  EXIT_SCOPE(n$1,n$2,b); [line 16, column 16]\n  APPLY_ABSTRACTION; [line 16, column 16]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "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  n$3=_fun___variable_initialization(&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,n$3,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$1=*&x:int [line 51, column 34]\n  n$3=_fun___variable_initialization(&0$?%__sil_tmpSIL_init_list__n$2:int) assign_last [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,n$3,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" -> "init_in_binop#init_list#8348250075128359911.7adaa67964536570064366a92056cf46_2" ;
@@ -18,19 +18,19 @@ digraph cfg {
 "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_2" [label="2: Exit init_list::list_init \n   NULLIFY(&yref); [line 49, column 1]\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   n$4=_fun___variable_initialization(&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  EXIT_SCOPE(n$1,n$2,n$3,n$4,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   n$4=_fun___variable_initialization(&ty:init_list::Y[3*24]) assign_last [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  EXIT_SCOPE(n$1,n$2,n$3,n$4,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" ;
-"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&yref:init_list::Y&) [line 47, column 3]\n  *&yref:init_list::Y&=&y [line 47, column 3]\n  EXIT_SCOPE(n$5); [line 47, column 3]\n " shape="box"]
+"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&yref:init_list::Y&) assign_last [line 47, column 3]\n  *&yref:init_list::Y&=&y [line 47, column 3]\n  EXIT_SCOPE(n$5); [line 47, column 3]\n " shape="box"]
 	
 
 	 "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_4" -> "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_3" ;
-"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_5" [label="5:  DeclStmt \n   n$7=_fun___variable_initialization(&y:init_list::Y) [line 46, column 3]\n  n$6=_fun_init_list::Y_Y(&y:init_list::Y*) [line 46, column 5]\n  EXIT_SCOPE(n$6,n$7); [line 46, column 5]\n " shape="box"]
+"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_5" [label="5:  DeclStmt \n   n$7=_fun___variable_initialization(&y:init_list::Y) assign_last [line 46, column 3]\n  n$6=_fun_init_list::Y_Y(&y:init_list::Y*) [line 46, column 5]\n  EXIT_SCOPE(n$6,n$7); [line 46, column 5]\n " shape="box"]
 	
 
 	 "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_5" -> "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_4" ;
-"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_6" [label="6:  DeclStmt \n   n$8=_fun___variable_initialization(&ti:int[4*4]) [line 45, column 3]\n  *&ti[0]:int=1 [line 45, column 15]\n  *&ti[1]:int=2 [line 45, column 15]\n  NULLIFY(&ti); [line 45, column 15]\n  EXIT_SCOPE(n$8,ti); [line 45, column 15]\n " shape="box"]
+"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_6" [label="6:  DeclStmt \n   n$8=_fun___variable_initialization(&ti:int[4*4]) assign_last [line 45, column 3]\n  *&ti[0]:int=1 [line 45, column 15]\n  *&ti[1]:int=2 [line 45, column 15]\n  NULLIFY(&ti); [line 45, column 15]\n  EXIT_SCOPE(n$8,ti); [line 45, column 15]\n " shape="box"]
 	
 
 	 "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_6" -> "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_5" ;
@@ -45,19 +45,19 @@ digraph cfg {
 	
 
 	 "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_3" -> "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_2" ;
-"record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&c:init_list::C) [line 41, column 3]\n  n$5=_fun_init_list::C_C(&c:init_list::C*,1:int,2:int,&x:init_list::X&) [line 41, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 41, column 5]\n " shape="box"]
+"record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&c:init_list::C) assign_last [line 41, column 3]\n  n$5=_fun_init_list::C_C(&c:init_list::C*,1:int,2:int,&x:init_list::X&) [line 41, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 41, column 5]\n " shape="box"]
 	
 
 	 "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_4" -> "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_3" ;
-"record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_5" [label="5:  DeclStmt \n   n$7=_fun___variable_initialization(&y2:init_list::Y) [line 39, column 3]\n  *&y2.z:int=1 [line 39, column 7]\n  *&y2.x.a:int=2 [line 39, column 11]\n  *&y2.x.p:int*=null [line 39, column 11]\n  NULLIFY(&y2); [line 39, column 11]\n  EXIT_SCOPE(n$7,y2); [line 39, column 11]\n " shape="box"]
+"record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_5" [label="5:  DeclStmt \n   n$7=_fun___variable_initialization(&y2:init_list::Y) assign_last [line 39, column 3]\n  *&y2.z:int=1 [line 39, column 7]\n  *&y2.x.a:int=2 [line 39, column 11]\n  *&y2.x.p:int*=null [line 39, column 11]\n  NULLIFY(&y2); [line 39, column 11]\n  EXIT_SCOPE(n$7,y2); [line 39, column 11]\n " shape="box"]
 	
 
 	 "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_5" -> "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_4" ;
-"record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_6" [label="6:  DeclStmt \n   n$9=_fun___variable_initialization(&y1:init_list::Y) [line 38, column 3]\n  *&y1.z:int=1 [line 38, column 7]\n  n$8=_fun_init_list::X_X(&y1.x:init_list::X*,&x:init_list::X&) [line 38, column 11]\n  EXIT_SCOPE(n$8,n$9,y1); [line 38, column 11]\n " shape="box"]
+"record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_6" [label="6:  DeclStmt \n   n$9=_fun___variable_initialization(&y1:init_list::Y) assign_last [line 38, column 3]\n  *&y1.z:int=1 [line 38, column 7]\n  n$8=_fun_init_list::X_X(&y1.x:init_list::X*,&x:init_list::X&) [line 38, column 11]\n  EXIT_SCOPE(n$8,n$9,y1); [line 38, column 11]\n " shape="box"]
 	
 
 	 "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_6" -> "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_5" ;
-"record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_7" [label="7:  DeclStmt \n   n$10=_fun___variable_initialization(&x:init_list::X) [line 37, column 3]\n  *&x.a:int=1 [line 37, column 6]\n  *&x.p:int*=null [line 37, column 6]\n  EXIT_SCOPE(n$10); [line 37, column 6]\n " shape="box"]
+"record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_7" [label="7:  DeclStmt \n   n$10=_fun___variable_initialization(&x:init_list::X) assign_last [line 37, column 3]\n  *&x.a:int=1 [line 37, column 6]\n  *&x.p:int*=null [line 37, column 6]\n  EXIT_SCOPE(n$10); [line 37, column 6]\n " shape="box"]
 	
 
 	 "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_7" -> "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_6" ;
@@ -68,15 +68,15 @@ digraph cfg {
 "zero_init_primitive#init_list#3465759276925732066.1d03db1e38d38f4b345f33049176e92c_2" [label="2: Exit init_list::zero_init_primitive \n   NULLIFY(&p); [line 29, column 1]\n " color=yellow style=filled]
 	
 
-"zero_init_primitive#init_list#3465759276925732066.1d03db1e38d38f4b345f33049176e92c_3" [label="3:  DeclStmt \n   n$1=_fun___variable_initialization(&f:float) [line 28, column 3]\n  *&f:float=0. [line 28, column 3]\n  NULLIFY(&f); [line 28, column 3]\n  EXIT_SCOPE(n$1,f); [line 28, column 3]\n  APPLY_ABSTRACTION; [line 28, column 3]\n " shape="box"]
+"zero_init_primitive#init_list#3465759276925732066.1d03db1e38d38f4b345f33049176e92c_3" [label="3:  DeclStmt \n   n$1=_fun___variable_initialization(&f:float) assign_last [line 28, column 3]\n  *&f:float=0. [line 28, column 3]\n  NULLIFY(&f); [line 28, column 3]\n  EXIT_SCOPE(n$1,f); [line 28, column 3]\n  APPLY_ABSTRACTION; [line 28, column 3]\n " shape="box"]
 	
 
 	 "zero_init_primitive#init_list#3465759276925732066.1d03db1e38d38f4b345f33049176e92c_3" -> "zero_init_primitive#init_list#3465759276925732066.1d03db1e38d38f4b345f33049176e92c_2" ;
-"zero_init_primitive#init_list#3465759276925732066.1d03db1e38d38f4b345f33049176e92c_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&p:int*) [line 27, column 3]\n  *&p:int*=null [line 27, column 3]\n  EXIT_SCOPE(n$2,p); [line 27, column 3]\n " shape="box"]
+"zero_init_primitive#init_list#3465759276925732066.1d03db1e38d38f4b345f33049176e92c_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&p:int*) assign_last [line 27, column 3]\n  *&p:int*=null [line 27, column 3]\n  EXIT_SCOPE(n$2,p); [line 27, column 3]\n " shape="box"]
 	
 
 	 "zero_init_primitive#init_list#3465759276925732066.1d03db1e38d38f4b345f33049176e92c_4" -> "zero_init_primitive#init_list#3465759276925732066.1d03db1e38d38f4b345f33049176e92c_3" ;
-"zero_init_primitive#init_list#3465759276925732066.1d03db1e38d38f4b345f33049176e92c_5" [label="5:  DeclStmt \n   n$3=_fun___variable_initialization(&i:int) [line 26, column 3]\n  *&i:int=0 [line 26, column 3]\n  NULLIFY(&i); [line 26, column 3]\n  EXIT_SCOPE(n$3,i); [line 26, column 3]\n " shape="box"]
+"zero_init_primitive#init_list#3465759276925732066.1d03db1e38d38f4b345f33049176e92c_5" [label="5:  DeclStmt \n   n$3=_fun___variable_initialization(&i:int) assign_last [line 26, column 3]\n  *&i:int=0 [line 26, column 3]\n  NULLIFY(&i); [line 26, column 3]\n  EXIT_SCOPE(n$3,i); [line 26, column 3]\n " shape="box"]
 	
 
 	 "zero_init_primitive#init_list#3465759276925732066.1d03db1e38d38f4b345f33049176e92c_5" -> "zero_init_primitive#init_list#3465759276925732066.1d03db1e38d38f4b345f33049176e92c_4" ;
@@ -91,11 +91,11 @@ digraph cfg {
 	
 
 	 "zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_3" -> "zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_2" ;
-"zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&c:init_list::C) [line 33, column 3]\n  n$3=_fun_init_list::C_C(&c:init_list::C*) [line 33, column 5]\n  EXIT_SCOPE(n$3,n$4); [line 33, column 5]\n " shape="box"]
+"zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&c:init_list::C) assign_last [line 33, column 3]\n  n$3=_fun_init_list::C_C(&c:init_list::C*) [line 33, column 5]\n  EXIT_SCOPE(n$3,n$4); [line 33, column 5]\n " shape="box"]
 	
 
 	 "zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_4" -> "zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_3" ;
-"zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&y:init_list::Y) [line 32, column 3]\n  *&y.z:int=0 [line 32, column 7]\n  *&y.x.a:int=0 [line 32, column 7]\n  *&y.x.p:int*=null [line 32, column 7]\n  NULLIFY(&y); [line 32, column 7]\n  EXIT_SCOPE(n$5,y); [line 32, column 7]\n " shape="box"]
+"zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&y:init_list::Y) assign_last [line 32, column 3]\n  *&y.z:int=0 [line 32, column 7]\n  *&y.x.a:int=0 [line 32, column 7]\n  *&y.x.p:int*=null [line 32, column 7]\n  NULLIFY(&y); [line 32, column 7]\n  EXIT_SCOPE(n$5,y); [line 32, column 7]\n " shape="box"]
 	
 
 	 "zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_5" -> "zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_4" ;

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

@@ -62,11 +62,11 @@ digraph cfg {
 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n   NULLIFY(&fp); [line 22, column 1]\n " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   n$1=_fun___variable_initialization(&f2:float) [line 21, column 3]\n  *&f2:float=0. [line 21, column 3]\n  NULLIFY(&f2); [line 21, column 3]\n  EXIT_SCOPE(n$1,f2); [line 21, column 3]\n  APPLY_ABSTRACTION; [line 21, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   n$1=_fun___variable_initialization(&f2:float) assign_last [line 21, column 3]\n  *&f2:float=0. [line 21, column 3]\n  NULLIFY(&f2); [line 21, column 3]\n  EXIT_SCOPE(n$1,f2); [line 21, column 3]\n  APPLY_ABSTRACTION; [line 21, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   n$3=_fun___variable_initialization(&x:int) [line 20, column 3]\n  n$2=_fun_get<ENUM>() [line 20, column 12]\n  *&x:int=n$2 [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"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   n$3=_fun___variable_initialization(&x:int) assign_last [line 20, column 3]\n  n$2=_fun_get<ENUM>() [line 20, column 12]\n  *&x:int=n$2 [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"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
@@ -74,15 +74,15 @@ digraph cfg {
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   n$6=_fun___variable_initialization(&fp:float*) [line 18, column 3]\n  n$5=_fun_get<float_*>() [line 18, column 15]\n  *&fp:float*=n$5 [line 18, column 3]\n  EXIT_SCOPE(n$5,n$6,fp); [line 18, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   n$6=_fun___variable_initialization(&fp:float*) assign_last [line 18, column 3]\n  n$5=_fun_get<float_*>() [line 18, column 15]\n  *&fp:float*=n$5 [line 18, column 3]\n  EXIT_SCOPE(n$5,n$6,fp); [line 18, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" [label="7:  DeclStmt \n   n$8=_fun___variable_initialization(&f:float) [line 17, column 3]\n  n$7=_fun_get<float>() [line 17, column 13]\n  *&f:float=n$7 [line 17, column 3]\n  NULLIFY(&f); [line 17, column 3]\n  EXIT_SCOPE(n$7,n$8,f); [line 17, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" [label="7:  DeclStmt \n   n$8=_fun___variable_initialization(&f:float) assign_last [line 17, column 3]\n  n$7=_fun_get<float>() [line 17, column 13]\n  *&f:float=n$7 [line 17, column 3]\n  NULLIFY(&f); [line 17, column 3]\n  EXIT_SCOPE(n$7,n$8,f); [line 17, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" [label="8:  DeclStmt \n   n$10=_fun___variable_initialization(&i:int) [line 16, column 3]\n  n$9=_fun_get<int>() [line 16, column 11]\n  *&i:int=n$9 [line 16, column 3]\n  NULLIFY(&i); [line 16, column 3]\n  EXIT_SCOPE(n$9,n$10,i); [line 16, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" [label="8:  DeclStmt \n   n$10=_fun___variable_initialization(&i:int) assign_last [line 16, column 3]\n  n$9=_fun_get<int>() [line 16, column 11]\n  *&i:int=n$9 [line 16, column 3]\n  NULLIFY(&i); [line 16, column 3]\n  EXIT_SCOPE(n$9,n$10,i); [line 16, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" ;

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

@@ -54,7 +54,7 @@ digraph cfg {
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_13" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_9" ;
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_13" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_10" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_14" [label="14:  DeclStmt \n   n$15=_fun___variable_initialization(&x:int) [line 9, column 3]\n  *&x:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$15); [line 9, column 3]\n  APPLY_ABSTRACTION; [line 9, column 3]\n " shape="box"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_14" [label="14:  DeclStmt \n   n$15=_fun___variable_initialization(&x:int) assign_last [line 9, column 3]\n  *&x:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$15); [line 9, column 3]\n  APPLY_ABSTRACTION; [line 9, column 3]\n " shape="box"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_14" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_4" ;

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

@@ -47,15 +47,15 @@ digraph cfg {
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   n$10=_fun___variable_initialization(&__end1:iterator) [line 35, column 18]\n  n$8=_fun___variable_initialization(&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*) [line 35, column 18]\n  n$9=_fun_iterator_iterator(&__end1:iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$3:iterator&) [line 35, column 18]\n  EXIT_SCOPE(_,n$4,n$7,n$8,n$9,n$10,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_4" [label="4:  DeclStmt \n   n$10=_fun___variable_initialization(&__end1:iterator) assign_last [line 35, column 18]\n  n$8=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$3:iterator) assign_last [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$9=_fun_iterator_iterator(&__end1:iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$3:iterator&) [line 35, column 18]\n  EXIT_SCOPE(_,n$4,n$7,n$8,n$9,n$10,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_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   n$18=_fun___variable_initialization(&__begin1:iterator) [line 35, column 18]\n  n$16=_fun___variable_initialization(&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*) [line 35, column 18]\n  n$17=_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,n$17,n$18,0$?%__sil_tmpSIL_materialize_temp__n$11); [line 35, column 18]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   n$18=_fun___variable_initialization(&__begin1:iterator) assign_last [line 35, column 18]\n  n$16=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$11:iterator) assign_last [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$17=_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,n$17,n$18,0$?%__sil_tmpSIL_materialize_temp__n$11); [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$22=_fun_iterator_operator++(&__begin1:iterator&,&0$?%__sil_tmp__temp_return_n$21:iterator*) [line 35, column 18]\n  EXIT_SCOPE(n$22); [line 35, column 18]\n  APPLY_ABSTRACTION; [line 35, column 18]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  Call _fun_iterator_operator++ \n   n$22=_fun_iterator_operator++(&__begin1:iterator&,&0$?%__sil_tmp__temp_return_n$21:iterator*) assign_last [line 35, column 18]\n  EXIT_SCOPE(n$22,0$?%__sil_tmp__temp_return_n$21); [line 35, column 18]\n  APPLY_ABSTRACTION; [line 35, column 18]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
@@ -68,23 +68,23 @@ digraph cfg {
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_11" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_9" [label="9: Prune (false branch, for loop) \n   PRUNE(!n$27, false); [line 35, column 18]\n  NULLIFY(&value); [line 35, column 18]\n  NULLIFY(&temp); [line 35, column 18]\n  EXIT_SCOPE(n$27,value,temp); [line 35, column 18]\n  APPLY_ABSTRACTION; [line 35, column 18]\n " shape="invhouse"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_9" [label="9: Prune (false branch, for loop) \n   PRUNE(!n$27, false); [line 35, column 18]\n  EXIT_SCOPE(n$27,__begin1,__end1); [line 35, column 18]\n  APPLY_ABSTRACTION; [line 35, column 18]\n " shape="invhouse"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_9" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_10" [label="10:  DeclStmt \n   n$32=_fun___variable_initialization(&temp:int) [line 36, column 5]\n  n$30=*&value:int [line 36, column 16]\n  n$31=*&value:int [line 36, column 24]\n  *&temp:int=((n$30 * n$31) + 10) [line 36, column 5]\n  EXIT_SCOPE(n$30,n$31,n$32); [line 36, column 5]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_10" [label="10:  DeclStmt \n   n$32=_fun___variable_initialization(&temp:int) assign_last [line 36, column 5]\n  n$30=*&value:int [line 36, column 16]\n  n$31=*&value:int [line 36, column 24]\n  *&temp:int=((n$30 * n$31) + 10) [line 36, column 5]\n  NULLIFY(&value); [line 36, column 5]\n  NULLIFY(&temp); [line 36, column 5]\n  EXIT_SCOPE(n$30,n$31,n$32,value,temp); [line 36, column 5]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_10" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_11" [label="11:  DeclStmt \n   n$35=_fun___variable_initialization(&value:int) [line 35, column 8]\n  n$34=_fun_iterator_operator*(&__begin1:iterator&) [line 35, column 18]\n  *&value:int=n$34 [line 35, column 8]\n  EXIT_SCOPE(n$34,n$35); [line 35, column 8]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_11" [label="11:  DeclStmt \n   n$35=_fun___variable_initialization(&value:int) assign_last [line 35, column 8]\n  n$34=_fun_iterator_operator*(&__begin1:iterator&) [line 35, column 18]\n  *&value:int=n$34 [line 35, column 8]\n  EXIT_SCOPE(n$34,n$35); [line 35, column 8]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_11" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_10" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_12" [label="12:  DeclStmt \n   n$37=_fun___variable_initialization(&__range1:vec&) [line 35, column 20]\n  *&__range1:vec&=&vector [line 35, column 20]\n  EXIT_SCOPE(n$37,vector); [line 35, column 20]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_12" [label="12:  DeclStmt \n   n$37=_fun___variable_initialization(&__range1:vec&) assign_last [line 35, column 20]\n  *&__range1:vec&=&vector [line 35, column 20]\n  EXIT_SCOPE(n$37,vector); [line 35, column 20]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_12" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_13" [label="13:  DeclStmt \n   n$39=_fun___variable_initialization(&vector:vec) [line 34, column 3]\n  n$38=_fun_vec_vec(&vector:vec*,10:int) [line 34, column 7]\n  EXIT_SCOPE(n$38,n$39); [line 34, column 7]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_13" [label="13:  DeclStmt \n   n$39=_fun___variable_initialization(&vector:vec) assign_last [line 34, column 3]\n  n$38=_fun_vec_vec(&vector:vec*,10:int) [line 34, column 7]\n  EXIT_SCOPE(n$38,n$39); [line 34, column 7]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_13" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_12" ;

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

@@ -7,23 +7,23 @@ digraph cfg {
 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   n$2=_fun___variable_initialization(&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,n$2,a,e); [line 13, column 3]\n  APPLY_ABSTRACTION; [line 13, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   n$2=_fun___variable_initialization(&e:int) assign_last [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,n$2,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   n$5=_fun___variable_initialization(&d:int) [line 12, column 3]\n  n$3=*&a:int [line 12, column 11]\n  *&a:int=(n$3 - 1) [line 12, column 11]\n  n$4=*&a:int [line 12, column 11]\n  *&d:int=n$4 [line 12, column 3]\n  NULLIFY(&d); [line 12, column 3]\n  EXIT_SCOPE(n$3,n$4,n$5,d); [line 12, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&d:int) assign_last [line 12, column 3]\n  n$3=*&a:int [line 12, column 11]\n  *&a:int=(n$3 - 1) [line 12, column 11]\n  n$4=*&a:int [line 12, column 11]\n  *&d:int=n$4 [line 12, column 3]\n  NULLIFY(&d); [line 12, column 3]\n  EXIT_SCOPE(n$3,n$4,n$5,d); [line 12, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   n$7=_fun___variable_initialization(&c:int) [line 11, column 3]\n  n$6=*&a:int [line 11, column 11]\n  *&a:int=(n$6 + 1) [line 11, column 11]\n  *&c:int=n$6 [line 11, column 3]\n  NULLIFY(&c); [line 11, column 3]\n  EXIT_SCOPE(n$6,n$7,c); [line 11, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   n$7=_fun___variable_initialization(&c:int) assign_last [line 11, column 3]\n  n$6=*&a:int [line 11, column 11]\n  *&a:int=(n$6 + 1) [line 11, column 11]\n  *&c:int=n$6 [line 11, column 3]\n  NULLIFY(&c); [line 11, column 3]\n  EXIT_SCOPE(n$6,n$7,c); [line 11, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   n$10=_fun___variable_initialization(&b:int) [line 10, column 3]\n  n$8=*&a:int [line 10, column 11]\n  *&a:int=(n$8 + 1) [line 10, column 11]\n  n$9=*&a:int [line 10, column 11]\n  *&b:int=n$9 [line 10, column 3]\n  NULLIFY(&b); [line 10, column 3]\n  EXIT_SCOPE(n$8,n$9,n$10,b); [line 10, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   n$10=_fun___variable_initialization(&b:int) assign_last [line 10, column 3]\n  n$8=*&a:int [line 10, column 11]\n  *&a:int=(n$8 + 1) [line 10, column 11]\n  n$9=*&a:int [line 10, column 11]\n  *&b:int=n$9 [line 10, column 3]\n  NULLIFY(&b); [line 10, column 3]\n  EXIT_SCOPE(n$8,n$9,n$10,b); [line 10, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" [label="7:  DeclStmt \n   n$11=_fun___variable_initialization(&a:int) [line 9, column 3]\n  *&a:int=3 [line 9, column 3]\n  EXIT_SCOPE(n$11); [line 9, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" [label="7:  DeclStmt \n   n$11=_fun___variable_initialization(&a:int) assign_last [line 9, column 3]\n  *&a:int=3 [line 9, column 3]\n  EXIT_SCOPE(n$11); [line 9, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_2" [label="2: Exit __infer_globals_initializer_y \n  " color=yellow style=filled]
 	
 
-"__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" [label="3:  DeclStmt \n   n$1=_fun___variable_initialization(&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y:anonymous_union_nestedoperators_union.cpp:13:1) [line 13, column 1]\n  n$0=_fun_anonymous_union_nestedoperators_union.cpp:13:1_(&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y:anonymous_union_nestedoperators_union.cpp:13:1*) [line 23, column 3]\n  EXIT_SCOPE(n$0,n$1); [line 23, column 3]\n  APPLY_ABSTRACTION; [line 23, column 3]\n " shape="box"]
+"__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" [label="3:  DeclStmt \n   n$1=_fun___variable_initialization(&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y:anonymous_union_nestedoperators_union.cpp:13:1) assign_last [line 13, column 1]\n  n$0=_fun_anonymous_union_nestedoperators_union.cpp:13:1_(&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y:anonymous_union_nestedoperators_union.cpp:13:1*) [line 23, column 3]\n  EXIT_SCOPE(n$0,n$1); [line 23, column 3]\n  APPLY_ABSTRACTION; [line 23, column 3]\n " shape="box"]
 	
 
 	 "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" -> "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_2" ;

infer/tests/codetoanalyze/cpp/liveness/dead_stores.cpp

@@ -496,4 +496,13 @@ void unused_attribute_ok() {
   UNUSED(x);
 }
 
+struct ChainedCalls {
+  ChainedCalls chained(int i);
+};
+
+ChainedCalls chain_method_calls_ok() {
+  ChainedCalls x;
+  return x.chained(5).chained(6);
+}
+
 } // namespace dead_stores

infer/tests/codetoanalyze/cpp/pulse/issues.exp

@@ -1,7 +1,5 @@
 codetoanalyze/cpp/pulse/basics.cpp, multiple_invalidations_branch_bad, 6, USE_AFTER_DELETE, no_bucket, ERROR, [invalidated by call to `delete ptr` at line 58, column 5 here,accessed `*(ptr)` here]
 codetoanalyze/cpp/pulse/basics.cpp, multiple_invalidations_loop_bad, 3, USE_AFTER_DELETE, no_bucket, ERROR, [invalidated by call to `delete ptr` at line 68, column 7 here,accessed `ptr` here]
-codetoanalyze/cpp/pulse/join.cpp, FP_cond_inside_loop_ok, 7, USE_AFTER_DESTRUCTOR, no_bucket, ERROR, [invalidated by destructor call `BasicStruct_~BasicStruct(x)` at line 74, column 3 here,accessed `&(x)` here]
-codetoanalyze/cpp/pulse/join.cpp, FP_list_delete_ok, 6, USE_AFTER_FREE, no_bucket, ERROR, [invalidated by call to `free(tmp->foo)` at line 42, column 7 here,accessed `tmp->foo` here]
 codetoanalyze/cpp/pulse/join.cpp, invalidate_node_alias_bad, 12, USE_AFTER_DELETE, no_bucket, ERROR, [invalidated by call to `delete result` at line 25, column 5 here,accessed `*(result)` here]
 codetoanalyze/cpp/pulse/returns.cpp, returns::return_deleted_bad, 4, USE_AFTER_DELETE, no_bucket, ERROR, [invalidated by call to `delete x` at line 112, column 3 here,accessed `x` here]
 codetoanalyze/cpp/pulse/use_after_delete.cpp, delete_in_branch_bad, 5, USE_AFTER_DELETE, no_bucket, ERROR, [invalidated by call to `delete s` at line 57, column 5 here,accessed `s` here]

infer/tests/codetoanalyze/cpp/pulse/join.cpp

@@ -32,7 +32,7 @@ int invalidate_node_alias_bad(struct list* head, int cond) {
   return *result;
 }
 
-void FP_list_delete_ok(struct list** l) {
+void list_delete_ok(struct list** l) {
   auto head = *l;
   *l = nullptr;
   while (head) {
@@ -63,7 +63,7 @@ int nested_loops_ok() {
 extern bool some_bool();
 extern BasicStruct mk_basic_struct();
 
-void FP_cond_inside_loop_ok() {
+void cond_inside_loop_ok() {
   while (true) {
     BasicStruct x;
     if (some_bool()) {

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

@@ -29,7 +29,7 @@ digraph cfg {
 	
 
 	 "derefFirstArg2_null_deref#13631548499595216278.23fca23ff6728e4b72a2548ecb3b1ba0_3" -> "derefFirstArg2_null_deref#13631548499595216278.23fca23ff6728e4b72a2548ecb3b1ba0_2" ;
-"derefFirstArg2_null_deref#13631548499595216278.23fca23ff6728e4b72a2548ecb3b1ba0_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&a:int) [line 46, column 3]\n  *&a:int=0 [line 46, column 3]\n  NULLIFY(&a); [line 46, column 3]\n  EXIT_SCOPE(n$2,a); [line 46, column 3]\n " shape="box"]
+"derefFirstArg2_null_deref#13631548499595216278.23fca23ff6728e4b72a2548ecb3b1ba0_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&a:int) assign_last [line 46, column 3]\n  *&a:int=0 [line 46, column 3]\n  NULLIFY(&a); [line 46, column 3]\n  EXIT_SCOPE(n$2,a); [line 46, column 3]\n " shape="box"]
 	
 
 	 "derefFirstArg2_null_deref#13631548499595216278.23fca23ff6728e4b72a2548ecb3b1ba0_4" -> "derefFirstArg2_null_deref#13631548499595216278.23fca23ff6728e4b72a2548ecb3b1ba0_3" ;
@@ -44,7 +44,7 @@ digraph cfg {
 	
 
 	 "derefFirstArg2_ok_deref#6873109919028202465.d57ab0b62c0ba18894b8b08d5a8f8e8a_3" -> "derefFirstArg2_ok_deref#6873109919028202465.d57ab0b62c0ba18894b8b08d5a8f8e8a_2" ;
-"derefFirstArg2_ok_deref#6873109919028202465.d57ab0b62c0ba18894b8b08d5a8f8e8a_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&a:int) [line 51, column 3]\n  *&a:int=0 [line 51, column 3]\n  EXIT_SCOPE(n$2); [line 51, column 3]\n " shape="box"]
+"derefFirstArg2_ok_deref#6873109919028202465.d57ab0b62c0ba18894b8b08d5a8f8e8a_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&a:int) assign_last [line 51, column 3]\n  *&a:int=0 [line 51, column 3]\n  EXIT_SCOPE(n$2); [line 51, column 3]\n " shape="box"]
 	
 
 	 "derefFirstArg2_ok_deref#6873109919028202465.d57ab0b62c0ba18894b8b08d5a8f8e8a_4" -> "derefFirstArg2_ok_deref#6873109919028202465.d57ab0b62c0ba18894b8b08d5a8f8e8a_3" ;
@@ -70,7 +70,7 @@ digraph cfg {
 	
 
 	 "derefFirstArg3_null_deref#3036141491555788229.605788dbf5e3c5625520098d1b5d320e_3" -> "derefFirstArg3_null_deref#3036141491555788229.605788dbf5e3c5625520098d1b5d320e_2" ;
-"derefFirstArg3_null_deref#3036141491555788229.605788dbf5e3c5625520098d1b5d320e_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&a:int) [line 61, column 3]\n  *&a:int=0 [line 61, column 3]\n  EXIT_SCOPE(n$2); [line 61, column 3]\n " shape="box"]
+"derefFirstArg3_null_deref#3036141491555788229.605788dbf5e3c5625520098d1b5d320e_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&a:int) assign_last [line 61, column 3]\n  *&a:int=0 [line 61, column 3]\n  EXIT_SCOPE(n$2); [line 61, column 3]\n " shape="box"]
 	
 
 	 "derefFirstArg3_null_deref#3036141491555788229.605788dbf5e3c5625520098d1b5d320e_4" -> "derefFirstArg3_null_deref#3036141491555788229.605788dbf5e3c5625520098d1b5d320e_3" ;
@@ -85,7 +85,7 @@ digraph cfg {
 	
 
 	 "derefFirstArg3_ok_deref#12266654054137171150.c58c85ea4ba2ebfd89d0336e51301e7a_3" -> "derefFirstArg3_ok_deref#12266654054137171150.c58c85ea4ba2ebfd89d0336e51301e7a_2" ;
-"derefFirstArg3_ok_deref#12266654054137171150.c58c85ea4ba2ebfd89d0336e51301e7a_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&a:int) [line 56, column 3]\n  *&a:int=0 [line 56, column 3]\n  EXIT_SCOPE(n$2); [line 56, column 3]\n " shape="box"]
+"derefFirstArg3_ok_deref#12266654054137171150.c58c85ea4ba2ebfd89d0336e51301e7a_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&a:int) assign_last [line 56, column 3]\n  *&a:int=0 [line 56, column 3]\n  EXIT_SCOPE(n$2); [line 56, column 3]\n " shape="box"]
 	
 
 	 "derefFirstArg3_ok_deref#12266654054137171150.c58c85ea4ba2ebfd89d0336e51301e7a_4" -> "derefFirstArg3_ok_deref#12266654054137171150.c58c85ea4ba2ebfd89d0336e51301e7a_3" ;
@@ -100,7 +100,7 @@ digraph cfg {
 	
 
 	 "derefFirstArg_null_deref#14830687999166111591.325df3347d8f75d0292cfd33a485d28a_3" -> "derefFirstArg_null_deref#14830687999166111591.325df3347d8f75d0292cfd33a485d28a_2" ;
-"derefFirstArg_null_deref#14830687999166111591.325df3347d8f75d0292cfd33a485d28a_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&a:int) [line 36, column 3]\n  *&a:int=0 [line 36, column 3]\n  NULLIFY(&a); [line 36, column 3]\n  EXIT_SCOPE(n$2,a); [line 36, column 3]\n " shape="box"]
+"derefFirstArg_null_deref#14830687999166111591.325df3347d8f75d0292cfd33a485d28a_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&a:int) assign_last [line 36, column 3]\n  *&a:int=0 [line 36, column 3]\n  NULLIFY(&a); [line 36, column 3]\n  EXIT_SCOPE(n$2,a); [line 36, column 3]\n " shape="box"]
 	
 
 	 "derefFirstArg_null_deref#14830687999166111591.325df3347d8f75d0292cfd33a485d28a_4" -> "derefFirstArg_null_deref#14830687999166111591.325df3347d8f75d0292cfd33a485d28a_3" ;
@@ -115,7 +115,7 @@ digraph cfg {
 	
 
 	 "derefFirstArg_ok_deref#70986049112502156.78efafe2cdade07d4257a7cd671e75f5_3" -> "derefFirstArg_ok_deref#70986049112502156.78efafe2cdade07d4257a7cd671e75f5_2" ;
-"derefFirstArg_ok_deref#70986049112502156.78efafe2cdade07d4257a7cd671e75f5_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&a:int) [line 41, column 3]\n  *&a:int=0 [line 41, column 3]\n  EXIT_SCOPE(n$2); [line 41, column 3]\n " shape="box"]
+"derefFirstArg_ok_deref#70986049112502156.78efafe2cdade07d4257a7cd671e75f5_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&a:int) assign_last [line 41, column 3]\n  *&a:int=0 [line 41, column 3]\n  EXIT_SCOPE(n$2); [line 41, column 3]\n " shape="box"]
 	
 
 	 "derefFirstArg_ok_deref#70986049112502156.78efafe2cdade07d4257a7cd671e75f5_4" -> "derefFirstArg_ok_deref#70986049112502156.78efafe2cdade07d4257a7cd671e75f5_3" ;
@@ -134,7 +134,7 @@ digraph cfg {
 	
 
 	 "getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_4" -> "getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_3" ;
-"getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&t:int*) [line 88, column 3]\n  n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 88, column 23]\n  n$6=*&t:int* [line 88, column 23]\n  EXIT_SCOPE(n$6,n$7,n$8); [line 88, column 23]\n " shape="box"]
+"getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&t:int*) assign_last [line 88, column 3]\n  n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 88, column 23]\n  n$6=*&t:int* [line 88, column 23]\n  EXIT_SCOPE(n$6,n$7,n$8); [line 88, column 23]\n " shape="box"]
 	
 
 	 "getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_5" -> "getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_4" ;
@@ -153,7 +153,7 @@ digraph cfg {
 	
 
 	 "getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_4" -> "getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_3" ;
-"getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&t:int*) [line 94, column 3]\n  n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 94, column 23]\n  n$6=*&t:int* [line 94, column 23]\n  EXIT_SCOPE(n$6,n$7,n$8); [line 94, column 23]\n " shape="box"]
+"getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&t:int*) assign_last [line 94, column 3]\n  n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 94, column 23]\n  n$6=*&t:int* [line 94, column 23]\n  EXIT_SCOPE(n$6,n$7,n$8); [line 94, column 23]\n " shape="box"]
 	
 
 	 "getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_5" -> "getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_4" ;
@@ -172,11 +172,11 @@ digraph cfg {
 	
 
 	 "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_4" -> "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_3" ;
-"getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&t:int*) [line 101, column 3]\n  n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 101, column 23]\n  n$6=*&t:int* [line 101, column 23]\n  EXIT_SCOPE(n$6,n$7,n$8); [line 101, column 23]\n " shape="box"]
+"getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&t:int*) assign_last [line 101, column 3]\n  n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 101, column 23]\n  n$6=*&t:int* [line 101, column 23]\n  EXIT_SCOPE(n$6,n$7,n$8); [line 101, column 23]\n " shape="box"]
 	
 
 	 "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_5" -> "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_4" ;
-"getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_6" [label="6:  DeclStmt \n   n$9=_fun___variable_initialization(&a:int) [line 100, column 3]\n  *&a:int=0 [line 100, column 3]\n  EXIT_SCOPE(n$9); [line 100, column 3]\n " shape="box"]
+"getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_6" [label="6:  DeclStmt \n   n$9=_fun___variable_initialization(&a:int) assign_last [line 100, column 3]\n  *&a:int=0 [line 100, column 3]\n  EXIT_SCOPE(n$9); [line 100, column 3]\n " shape="box"]
 	
 
 	 "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_6" -> "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_5" ;
@@ -195,7 +195,7 @@ digraph cfg {
 	
 
 	 "getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_4" -> "getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_3" ;
-"getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&t:int*) [line 126, column 3]\n  n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 126, column 23]\n  n$6=*&t:int* [line 126, column 23]\n  EXIT_SCOPE(n$6,n$7,n$8); [line 126, column 23]\n " shape="box"]
+"getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&t:int*) assign_last [line 126, column 3]\n  n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 126, column 23]\n  n$6=*&t:int* [line 126, column 23]\n  EXIT_SCOPE(n$6,n$7,n$8); [line 126, column 23]\n " shape="box"]
 	
 
 	 "getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_5" -> "getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_4" ;
@@ -214,7 +214,7 @@ digraph cfg {
 	
 
 	 "getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_4" -> "getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_3" ;
-"getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&t:int*) [line 132, column 3]\n  n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 132, column 23]\n  n$6=*&t:int* [line 132, column 23]\n  EXIT_SCOPE(n$6,n$7,n$8); [line 132, column 23]\n " shape="box"]
+"getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&t:int*) assign_last [line 132, column 3]\n  n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 132, column 23]\n  n$6=*&t:int* [line 132, column 23]\n  EXIT_SCOPE(n$6,n$7,n$8); [line 132, column 23]\n " shape="box"]
 	
 
 	 "getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_5" -> "getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_4" ;
@@ -233,11 +233,11 @@ digraph cfg {
 	
 
 	 "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_4" -> "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_3" ;
-"getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&t:int*) [line 139, column 3]\n  n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 139, column 23]\n  n$6=*&t:int* [line 139, column 23]\n  EXIT_SCOPE(n$6,n$7,n$8); [line 139, column 23]\n " shape="box"]
+"getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&t:int*) assign_last [line 139, column 3]\n  n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 139, column 23]\n  n$6=*&t:int* [line 139, column 23]\n  EXIT_SCOPE(n$6,n$7,n$8); [line 139, column 23]\n " shape="box"]
 	
 
 	 "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_5" -> "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_4" ;
-"getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_6" [label="6:  DeclStmt \n   n$9=_fun___variable_initialization(&a:int) [line 138, column 3]\n  *&a:int=0 [line 138, column 3]\n  EXIT_SCOPE(n$9); [line 138, column 3]\n " shape="box"]
+"getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_6" [label="6:  DeclStmt \n   n$9=_fun___variable_initialization(&a:int) assign_last [line 138, column 3]\n  *&a:int=0 [line 138, column 3]\n  EXIT_SCOPE(n$9); [line 138, column 3]\n " shape="box"]
 	
 
 	 "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_6" -> "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_5" ;
@@ -256,7 +256,7 @@ digraph cfg {
 	
 
 	 "operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_4" -> "operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_3" ;
-"operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&t:int*) [line 107, column 3]\n  n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 107, column 23]\n  n$6=*&t:int* [line 107, column 23]\n  EXIT_SCOPE(n$6,n$7,n$8); [line 107, column 23]\n " shape="box"]
+"operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&t:int*) assign_last [line 107, column 3]\n  n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 107, column 23]\n  n$6=*&t:int* [line 107, column 23]\n  EXIT_SCOPE(n$6,n$7,n$8); [line 107, column 23]\n " shape="box"]
 	
 
 	 "operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_5" -> "operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_4" ;
@@ -275,7 +275,7 @@ digraph cfg {
 	
 
 	 "operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_4" -> "operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_3" ;
-"operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&t:int*) [line 113, column 3]\n  n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 113, column 23]\n  n$6=*&t:int* [line 113, column 23]\n  EXIT_SCOPE(n$6,n$7,n$8); [line 113, column 23]\n " shape="box"]
+"operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&t:int*) assign_last [line 113, column 3]\n  n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 113, column 23]\n  n$6=*&t:int* [line 113, column 23]\n  EXIT_SCOPE(n$6,n$7,n$8); [line 113, column 23]\n " shape="box"]
 	
 
 	 "operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_5" -> "operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_4" ;
@@ -294,7 +294,7 @@ digraph cfg {
 	
 
 	 "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_4" -> "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_3" ;
-"operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&t:int*) [line 120, column 3]\n  n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 120, column 23]\n  n$6=*&t:int* [line 120, column 23]\n  EXIT_SCOPE(n$6,n$7,n$8); [line 120, column 23]\n " shape="box"]
+"operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&t:int*) assign_last [line 120, column 3]\n  n$7=_fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 120, column 23]\n  n$6=*&t:int* [line 120, column 23]\n  EXIT_SCOPE(n$6,n$7,n$8); [line 120, column 23]\n " shape="box"]
 	
 
 	 "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_5" -> "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_4" ;

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

@@ -24,7 +24,7 @@ digraph cfg {
 	
 
 	 "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_6" -> "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_8" ;
-"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_7" [label="7: Prune (false branch, boolean exp) \n   PRUNE(!n$12, false); [line 22, column 9]\n  EXIT_SCOPE(n$12); [line 22, column 9]\n " shape="invhouse"]
+"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_7" [label="7: Prune (false branch, boolean exp) \n   PRUNE(!n$12, false); [line 22, column 9]\n  EXIT_SCOPE(n$12,0$?%__sil_tmpSIL_materialize_temp__n$6); [line 22, column 9]\n " shape="invhouse"]
 	
 
 	 "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_7" -> "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_9" ;
@@ -36,15 +36,15 @@ digraph cfg {
 	
 
 	 "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_9" -> "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_4" ;
-"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_10" [label="10:  BinaryConditionalStmt Init \n   n$9=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$6:binary_conditional::X) [line 22, column 9]\n  n$8=_fun_binary_conditional::getX(&0$?%__sil_tmpSIL_materialize_temp__n$6:binary_conditional::X*) [line 22, column 9]\n  EXIT_SCOPE(n$8,n$9); [line 22, column 9]\n " shape="box"]
+"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_10" [label="10:  BinaryConditionalStmt Init \n   n$9=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$6:binary_conditional::X) assign_last [line 22, column 9]\n  n$8=_fun_binary_conditional::getX(&0$?%__sil_tmpSIL_materialize_temp__n$6:binary_conditional::X*) assign_last [line 22, column 9]\n  EXIT_SCOPE(n$8,n$9); [line 22, column 9]\n " shape="box"]
 	
 
 	 "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_10" -> "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_5" ;
-"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_11" [label="11:  DeclStmt \n   n$18=_fun___variable_initialization(&x:binary_conditional::X) [line 22, column 3]\n  n$16=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X) [line 22, column 9]\n  n$15=*&0$?%__sil_tmpSIL_temp_conditional___n$10:binary_conditional::X [line 22, column 9]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X=n$15 [line 22, column 9]\n  n$17=_fun_binary_conditional::X_X(&x:binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X&) [line 22, column 9]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$10); [line 22, column 9]\n  EXIT_SCOPE(n$15,n$16,n$17,n$18,0$?%__sil_tmpSIL_materialize_temp__n$5,0$?%__sil_tmpSIL_temp_conditional___n$10); [line 22, column 9]\n " shape="box"]
+"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_11" [label="11:  DeclStmt \n   n$18=_fun___variable_initialization(&x:binary_conditional::X) assign_last [line 22, column 3]\n  n$16=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X) assign_last [line 22, column 9]\n  n$15=*&0$?%__sil_tmpSIL_temp_conditional___n$10:binary_conditional::X [line 22, column 9]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X=n$15 [line 22, column 9]\n  n$17=_fun_binary_conditional::X_X(&x:binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X&) [line 22, column 9]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$10); [line 22, column 9]\n  EXIT_SCOPE(n$15,n$16,n$17,n$18,0$?%__sil_tmpSIL_materialize_temp__n$5,0$?%__sil_tmpSIL_temp_conditional___n$10); [line 22, column 9]\n " shape="box"]
 	
 
 	 "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_11" -> "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_3" ;
-"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_12" [label="12:  DeclStmt \n   n$20=_fun___variable_initialization(&a:binary_conditional::X) [line 21, column 3]\n  n$19=_fun_binary_conditional::X_X(&a:binary_conditional::X*) [line 21, column 5]\n  EXIT_SCOPE(n$19,n$20); [line 21, column 5]\n " shape="box"]
+"binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_12" [label="12:  DeclStmt \n   n$20=_fun___variable_initialization(&a:binary_conditional::X) assign_last [line 21, column 3]\n  n$19=_fun_binary_conditional::X_X(&a:binary_conditional::X*) [line 21, column 5]\n  EXIT_SCOPE(n$19,n$20); [line 21, column 5]\n " shape="box"]
 	
 
 	 "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_12" -> "binaryConditional#binary_conditional#15641211300815748363.a0f7e256e24b7117cb94c66e5aa27a30_10" ;
@@ -63,7 +63,7 @@ digraph cfg {
 	
 
 	 "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_4" -> "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_10" ;
-"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_5" [label="5:  Call _fun_binary_conditional::X_operator_bool \n   n$10=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$7:binary_conditional::X) [line 27, column 9]\n  n$9=_fun_binary_conditional::getX(&0$?%__sil_tmpSIL_materialize_temp__n$7:binary_conditional::X*) [line 27, column 9]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$7:binary_conditional::X [line 27, column 9]\n  n$12=_fun_binary_conditional::X_operator_bool(&0$?%__sil_tmpSIL_materialize_temp__n$7:binary_conditional::X&) [line 27, column 9]\n  EXIT_SCOPE(_,n$9,n$10,0$?%__sil_tmpSIL_materialize_temp__n$7); [line 27, column 9]\n " shape="box"]
+"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_5" [label="5:  Call _fun_binary_conditional::X_operator_bool \n   n$10=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$7:binary_conditional::X) assign_last [line 27, column 9]\n  n$9=_fun_binary_conditional::getX(&0$?%__sil_tmpSIL_materialize_temp__n$7:binary_conditional::X*) assign_last [line 27, column 9]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$7:binary_conditional::X [line 27, column 9]\n  n$12=_fun_binary_conditional::X_operator_bool(&0$?%__sil_tmpSIL_materialize_temp__n$7:binary_conditional::X&) [line 27, column 9]\n  EXIT_SCOPE(_,n$9,n$10,0$?%__sil_tmpSIL_materialize_temp__n$7); [line 27, column 9]\n " shape="box"]
 	
 
 	 "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_5" -> "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_6" ;
@@ -76,7 +76,7 @@ digraph cfg {
 	
 
 	 "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_7" -> "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_9" ;
-"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_8" [label="8:  ConditionalStmt Branch \n   n$16=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$13:binary_conditional::X) [line 27, column 18]\n  n$15=_fun_binary_conditional::getX(&0$?%__sil_tmpSIL_materialize_temp__n$13:binary_conditional::X*) [line 27, column 18]\n  n$17=_fun_binary_conditional::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$13:binary_conditional::X&) [line 27, column 18]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$6:binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$5 [line 27, column 9]\n  EXIT_SCOPE(n$15,n$16,n$17,0$?%__sil_tmpSIL_materialize_temp__n$13); [line 27, column 9]\n  APPLY_ABSTRACTION; [line 27, column 9]\n " shape="box"]
+"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_8" [label="8:  ConditionalStmt Branch \n   n$16=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$13:binary_conditional::X) assign_last [line 27, column 18]\n  n$15=_fun_binary_conditional::getX(&0$?%__sil_tmpSIL_materialize_temp__n$13:binary_conditional::X*) assign_last [line 27, column 18]\n  n$17=_fun_binary_conditional::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$13:binary_conditional::X&) [line 27, column 18]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$6:binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$5 [line 27, column 9]\n  EXIT_SCOPE(n$15,n$16,n$17,0$?%__sil_tmpSIL_materialize_temp__n$13); [line 27, column 9]\n  APPLY_ABSTRACTION; [line 27, column 9]\n " shape="box"]
 	
 
 	 "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_8" -> "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_4" ;
@@ -84,11 +84,11 @@ digraph cfg {
 	
 
 	 "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_9" -> "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_4" ;
-"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_10" [label="10:  DeclStmt \n   n$22=_fun___variable_initialization(&x:binary_conditional::X) [line 27, column 3]\n  n$20=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X) [line 27, column 9]\n  n$19=*&0$?%__sil_tmpSIL_temp_conditional___n$6:binary_conditional::X [line 27, column 9]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X=n$19 [line 27, column 9]\n  n$21=_fun_binary_conditional::X_X(&x:binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X&) [line 27, column 9]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$6); [line 27, column 9]\n  EXIT_SCOPE(n$19,n$20,n$21,n$22,0$?%__sil_tmpSIL_temp_conditional___n$6,0$?%__sil_tmpSIL_materialize_temp__n$5); [line 27, column 9]\n " shape="box"]
+"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_10" [label="10:  DeclStmt \n   n$22=_fun___variable_initialization(&x:binary_conditional::X) assign_last [line 27, column 3]\n  n$20=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X) assign_last [line 27, column 9]\n  n$19=*&0$?%__sil_tmpSIL_temp_conditional___n$6:binary_conditional::X [line 27, column 9]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X=n$19 [line 27, column 9]\n  n$21=_fun_binary_conditional::X_X(&x:binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$5:binary_conditional::X&) [line 27, column 9]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$6); [line 27, column 9]\n  EXIT_SCOPE(n$19,n$20,n$21,n$22,0$?%__sil_tmpSIL_temp_conditional___n$6,0$?%__sil_tmpSIL_materialize_temp__n$5); [line 27, column 9]\n " shape="box"]
 	
 
 	 "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_10" -> "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_3" ;
-"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_11" [label="11:  DeclStmt \n   n$24=_fun___variable_initialization(&a:binary_conditional::X) [line 26, column 3]\n  n$23=_fun_binary_conditional::X_X(&a:binary_conditional::X*) [line 26, column 5]\n  EXIT_SCOPE(n$23,n$24); [line 26, column 5]\n " shape="box"]
+"conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_11" [label="11:  DeclStmt \n   n$24=_fun___variable_initialization(&a:binary_conditional::X) assign_last [line 26, column 3]\n  n$23=_fun_binary_conditional::X_X(&a:binary_conditional::X*) [line 26, column 5]\n  EXIT_SCOPE(n$23,n$24); [line 26, column 5]\n " shape="box"]
 	
 
 	 "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_11" -> "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_5" ;
@@ -103,7 +103,7 @@ digraph cfg {
 	
 
 	 "getX#binary_conditional(class binary_conditional::X)#7708042186122353096.8825a5a3afa327848f6dcf77ec0e3f60_3" -> "getX#binary_conditional(class binary_conditional::X)#7708042186122353096.8825a5a3afa327848f6dcf77ec0e3f60_2" ;
-"getX#binary_conditional(class binary_conditional::X)#7708042186122353096.8825a5a3afa327848f6dcf77ec0e3f60_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&x:binary_conditional::X) [line 15, column 3]\n  n$5=_fun_binary_conditional::X_X(&x:binary_conditional::X*) [line 15, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 15, column 5]\n " shape="box"]
+"getX#binary_conditional(class binary_conditional::X)#7708042186122353096.8825a5a3afa327848f6dcf77ec0e3f60_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&x:binary_conditional::X) assign_last [line 15, column 3]\n  n$5=_fun_binary_conditional::X_X(&x:binary_conditional::X*) [line 15, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 15, column 5]\n " shape="box"]
 	
 
 	 "getX#binary_conditional(class binary_conditional::X)#7708042186122353096.8825a5a3afa327848f6dcf77ec0e3f60_4" -> "getX#binary_conditional(class binary_conditional::X)#7708042186122353096.8825a5a3afa327848f6dcf77ec0e3f60_3" ;

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

@@ -35,12 +35,12 @@ digraph cfg {
 	
 
 	 "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_9" -> "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_3" ;
-"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_10" [label="10:  DeclStmt \n   n$5=_fun___variable_initialization(&v2:int) [line 21, column 3]\n  *&v2:int=0 [line 21, column 3]\n  EXIT_SCOPE(n$5); [line 21, column 3]\n " shape="box"]
+"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_10" [label="10:  DeclStmt \n   n$5=_fun___variable_initialization(&v2:int) assign_last [line 21, column 3]\n  *&v2:int=0 [line 21, column 3]\n  EXIT_SCOPE(n$5); [line 21, column 3]\n " shape="box"]
 	
 
 	 "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_10" -> "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_5" ;
 	 "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_10" -> "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_6" ;
-"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_11" [label="11:  DeclStmt \n   n$6=_fun___variable_initialization(&v1:int) [line 21, column 3]\n  *&v1:int=0 [line 21, column 3]\n  EXIT_SCOPE(n$6); [line 21, column 3]\n " shape="box"]
+"assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_11" [label="11:  DeclStmt \n   n$6=_fun___variable_initialization(&v1:int) assign_last [line 21, column 3]\n  *&v1:int=0 [line 21, column 3]\n  EXIT_SCOPE(n$6); [line 21, column 3]\n " shape="box"]
 	
 
 	 "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_11" -> "assign_conditional#6602154438630029026.d4adbdaf8d08f61e93de4faf3d45d8ab_10" ;
@@ -75,16 +75,16 @@ digraph cfg {
 	
 
 	 "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_8" -> "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_4" ;
-"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_9" [label="9:  DeclStmt \n   n$6=_fun___variable_initialization(&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,n$6,0$?%__sil_tmpSIL_temp_conditional___n$2); [line 10, column 3]\n " shape="box"]
+"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_9" [label="9:  DeclStmt \n   n$6=_fun___variable_initialization(&v3:int) assign_last [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,n$6,0$?%__sil_tmpSIL_temp_conditional___n$2); [line 10, column 3]\n " shape="box"]
 	
 
 	 "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_9" -> "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_3" ;
-"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_10" [label="10:  DeclStmt \n   n$7=_fun___variable_initialization(&v2:int) [line 9, column 3]\n  *&v2:int=1 [line 9, column 3]\n  EXIT_SCOPE(n$7); [line 9, column 3]\n " shape="box"]
+"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_10" [label="10:  DeclStmt \n   n$7=_fun___variable_initialization(&v2:int) assign_last [line 9, column 3]\n  *&v2:int=1 [line 9, column 3]\n  EXIT_SCOPE(n$7); [line 9, column 3]\n " shape="box"]
 	
 
 	 "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_10" -> "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_5" ;
 	 "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_10" -> "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_6" ;
-"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_11" [label="11:  DeclStmt \n   n$8=_fun___variable_initialization(&v1:int) [line 9, column 3]\n  *&v1:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$8); [line 9, column 3]\n " shape="box"]
+"choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_11" [label="11:  DeclStmt \n   n$8=_fun___variable_initialization(&v1:int) assign_last [line 9, column 3]\n  *&v1:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$8); [line 9, column 3]\n " shape="box"]
 	
 
 	 "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_11" -> "choose_lvalue#6868643882447178722.7e0e06006a6e1baaef3aab18bce2b8d2_10" ;
@@ -119,11 +119,11 @@ digraph cfg {
 	
 
 	 "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_8" -> "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_4" ;
-"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_9" [label="9:  DeclStmt \n   n$6=_fun___variable_initialization(&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,n$6,0$?%__sil_tmpSIL_temp_conditional___n$2); [line 16, column 3]\n " shape="box"]
+"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_9" [label="9:  DeclStmt \n   n$6=_fun___variable_initialization(&v3:int) assign_last [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,n$6,0$?%__sil_tmpSIL_temp_conditional___n$2); [line 16, column 3]\n " shape="box"]
 	
 
 	 "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_9" -> "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_3" ;
-"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_10" [label="10:  DeclStmt \n   n$7=_fun___variable_initialization(&v1:int) [line 15, column 3]\n  *&v1:int=0 [line 15, column 3]\n  EXIT_SCOPE(n$7); [line 15, column 3]\n " shape="box"]
+"choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_10" [label="10:  DeclStmt \n   n$7=_fun___variable_initialization(&v1:int) assign_last [line 15, column 3]\n  *&v1:int=0 [line 15, column 3]\n  EXIT_SCOPE(n$7); [line 15, column 3]\n " shape="box"]
 	
 
 	 "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_10" -> "choose_rvalue#5692558402038768020.7de6e1902b5c331a5715ba3f0f51e47e_5" ;
@@ -248,7 +248,7 @@ digraph cfg {
 	
 
 	 "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_8" -> "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_4" ;
-"div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_9" [label="9:  DeclStmt \n   n$9=_fun___variable_initialization(&r:int const &) [line 27, column 3]\n  n$8=_fun___variable_initialization(&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,n$8,n$9,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   n$9=_fun___variable_initialization(&r:int const &) assign_last [line 27, column 3]\n  n$8=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$3:int const ) assign_last [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,n$8,n$9,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" -> "div_temp_lvalue#2433393879580018854.ddda47c9e217adc2189e8c150a553f53_3" ;

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

@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_3" -> "array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_2" ;
-"array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_4" [label="4:  DeclStmt \n   n$14=_fun___variable_initialization(&arr:Person[10*4]) [line 16, column 3]\n  n$4=_fun___variable_initialization(&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$5=_fun_Person_Person(&arr[0]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$2:Person&) [line 16, column 21]\n  n$8=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$6:Person) [line 16, column 31]\n  n$7=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$6:Person*) [line 16, column 31]\n  n$9=_fun_Person_Person(&arr[1]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$6:Person&) [line 16, column 31]\n  n$12=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$10:Person) [line 16, column 41]\n  n$11=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$10:Person*) [line 16, column 41]\n  n$13=_fun_Person_Person(&arr[2]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$10:Person&) [line 16, column 41]\n  EXIT_SCOPE(n$3,n$4,n$5,n$7,n$8,n$9,n$11,n$12,n$13,n$14,0$?%__sil_tmpSIL_materialize_temp__n$10,0$?%__sil_tmpSIL_materialize_temp__n$6,0$?%__sil_tmpSIL_materialize_temp__n$2); [line 16, column 41]\n " shape="box"]
+"array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_4" [label="4:  DeclStmt \n   n$14=_fun___variable_initialization(&arr:Person[10*4]) assign_last [line 16, column 3]\n  n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$2:Person) assign_last [line 16, column 21]\n  n$3=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$2:Person*) [line 16, column 21]\n  n$5=_fun_Person_Person(&arr[0]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$2:Person&) [line 16, column 21]\n  n$8=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$6:Person) assign_last [line 16, column 31]\n  n$7=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$6:Person*) [line 16, column 31]\n  n$9=_fun_Person_Person(&arr[1]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$6:Person&) [line 16, column 31]\n  n$12=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$10:Person) assign_last [line 16, column 41]\n  n$11=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$10:Person*) [line 16, column 41]\n  n$13=_fun_Person_Person(&arr[2]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$10:Person&) [line 16, column 41]\n  EXIT_SCOPE(n$3,n$4,n$5,n$7,n$8,n$9,n$11,n$12,n$13,n$14,0$?%__sil_tmpSIL_materialize_temp__n$10,0$?%__sil_tmpSIL_materialize_temp__n$6,0$?%__sil_tmpSIL_materialize_temp__n$2); [line 16, column 41]\n " shape="box"]
 	
 
 	 "array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_4" -> "array_of_person#7945672701495610995.0fecf6778237d47d15191cac7fab514c_3" ;
@@ -22,11 +22,11 @@ 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   n$2=_fun___variable_initialization(&z2:Z) [line 32, column 3]\n  n$1=_fun_Z_Z(&z2:Z*) [line 32, column 12]\n  EXIT_SCOPE(n$1,n$2,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   n$2=_fun___variable_initialization(&z2:Z) assign_last [line 32, column 3]\n  n$1=_fun_Z_Z(&z2:Z*) [line 32, column 12]\n  EXIT_SCOPE(n$1,n$2,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" ;
-"initialization_c_style#16495589501342328206.0d90448020e72c05f693b9221dac03f8_4" [label="4:  DeclStmt \n   n$3=_fun___variable_initialization(&z:Z[2*8]) [line 31, column 3]\n  *&z[0].a:int=1 [line 31, column 20]\n  *&z[0].b:int=2 [line 31, column 20]\n  *&z[1].a:int=2 [line 31, column 28]\n  *&z[1].b:int=3 [line 31, column 28]\n  NULLIFY(&z); [line 31, column 28]\n  EXIT_SCOPE(n$3,z); [line 31, column 28]\n " shape="box"]
+"initialization_c_style#16495589501342328206.0d90448020e72c05f693b9221dac03f8_4" [label="4:  DeclStmt \n   n$3=_fun___variable_initialization(&z:Z[2*8]) assign_last [line 31, column 3]\n  *&z[0].a:int=1 [line 31, column 20]\n  *&z[0].b:int=2 [line 31, column 20]\n  *&z[1].a:int=2 [line 31, column 28]\n  *&z[1].b:int=3 [line 31, column 28]\n  NULLIFY(&z); [line 31, column 28]\n  EXIT_SCOPE(n$3,z); [line 31, column 28]\n " shape="box"]
 	
 
 	 "initialization_c_style#16495589501342328206.0d90448020e72c05f693b9221dac03f8_4" -> "initialization_c_style#16495589501342328206.0d90448020e72c05f693b9221dac03f8_3" ;
@@ -37,15 +37,15 @@ 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   n$2=_fun___variable_initialization(&z2:Z) [line 40, column 3]\n  n$1=_fun_Z_Z(&z2:Z*) [line 40, column 12]\n  EXIT_SCOPE(n$1,n$2,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   n$2=_fun___variable_initialization(&z2:Z) assign_last [line 40, column 3]\n  n$1=_fun_Z_Z(&z2:Z*) [line 40, column 12]\n  EXIT_SCOPE(n$1,n$2,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   n$4=_fun___variable_initialization(&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$3=_fun_Z_Z(&z[1]:Z*,&old:Z&) [line 39, column 28]\n  EXIT_SCOPE(n$3,n$4,z,old); [line 39, column 28]\n " shape="box"]
+"initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&z:Z[2*8]) assign_last [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$3=_fun_Z_Z(&z[1]:Z*,&old:Z&) [line 39, column 28]\n  EXIT_SCOPE(n$3,n$4,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   n$6=_fun___variable_initialization(&old:Z) [line 38, column 3]\n  n$5=_fun_Z_Z(&old:Z*) [line 38, column 12]\n  EXIT_SCOPE(n$5,n$6); [line 38, column 12]\n " shape="box"]
+"initialization_mixed_styles_not_handled_correctly#5603413470418470631.422782850043f1b48105fbbb47efe379_5" [label="5:  DeclStmt \n   n$6=_fun___variable_initialization(&old:Z) assign_last [line 38, column 3]\n  n$5=_fun_Z_Z(&old:Z*) [line 38, column 12]\n  EXIT_SCOPE(n$5,n$6); [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" ;
@@ -60,7 +60,7 @@ digraph cfg {
 	
 
 	 "matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_3" -> "matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_2" ;
-"matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_4" [label="4:  DeclStmt \n   n$18=_fun___variable_initialization(&arr:Person[2*4][2*8]) [line 21, column 3]\n  n$4=_fun___variable_initialization(&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$5=_fun_Person_Person(&arr[0][0]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$2:Person&) [line 21, column 23]\n  n$8=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$6:Person) [line 21, column 33]\n  n$7=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$6:Person*) [line 21, column 33]\n  n$9=_fun_Person_Person(&arr[0][1]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$6:Person&) [line 21, column 33]\n  n$12=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$10:Person) [line 21, column 43]\n  n$11=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$10:Person*) [line 21, column 43]\n  n$13=_fun_Person_Person(&arr[1][0]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$10:Person&) [line 21, column 43]\n  n$16=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$14:Person) [line 21, column 53]\n  n$15=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$14:Person*) [line 21, column 53]\n  n$17=_fun_Person_Person(&arr[1][1]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$14:Person&) [line 21, column 53]\n  EXIT_SCOPE(n$3,n$4,n$5,n$7,n$8,n$9,n$11,n$12,n$13,n$15,n$16,n$17,n$18,0$?%__sil_tmpSIL_materialize_temp__n$10,0$?%__sil_tmpSIL_materialize_temp__n$6,0$?%__sil_tmpSIL_materialize_temp__n$2,0$?%__sil_tmpSIL_materialize_temp__n$14); [line 21, column 53]\n " shape="box"]
+"matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_4" [label="4:  DeclStmt \n   n$18=_fun___variable_initialization(&arr:Person[2*4][2*8]) assign_last [line 21, column 3]\n  n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$2:Person) assign_last [line 21, column 23]\n  n$3=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$2:Person*) [line 21, column 23]\n  n$5=_fun_Person_Person(&arr[0][0]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$2:Person&) [line 21, column 23]\n  n$8=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$6:Person) assign_last [line 21, column 33]\n  n$7=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$6:Person*) [line 21, column 33]\n  n$9=_fun_Person_Person(&arr[0][1]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$6:Person&) [line 21, column 33]\n  n$12=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$10:Person) assign_last [line 21, column 43]\n  n$11=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$10:Person*) [line 21, column 43]\n  n$13=_fun_Person_Person(&arr[1][0]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$10:Person&) [line 21, column 43]\n  n$16=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$14:Person) assign_last [line 21, column 53]\n  n$15=_fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$14:Person*) [line 21, column 53]\n  n$17=_fun_Person_Person(&arr[1][1]:Person*,&0$?%__sil_tmpSIL_materialize_temp__n$14:Person&) [line 21, column 53]\n  EXIT_SCOPE(n$3,n$4,n$5,n$7,n$8,n$9,n$11,n$12,n$13,n$15,n$16,n$17,n$18,0$?%__sil_tmpSIL_materialize_temp__n$10,0$?%__sil_tmpSIL_materialize_temp__n$6,0$?%__sil_tmpSIL_materialize_temp__n$2,0$?%__sil_tmpSIL_materialize_temp__n$14); [line 21, column 53]\n " shape="box"]
 	
 
 	 "matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_4" -> "matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_3" ;

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

@@ -7,15 +7,15 @@ digraph cfg {
 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n   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   n$2=_fun___variable_initialization(&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,n$2,x3); [line 21, column 5]\n  APPLY_ABSTRACTION; [line 21, column 5]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   n$2=_fun___variable_initialization(&x3:X) assign_last [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,n$2,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   n$4=_fun___variable_initialization(&x2:X) [line 20, column 3]\n  n$3=_fun_X_X(&x2:X*,1:int,0:int) [line 20, column 5]\n  EXIT_SCOPE(n$3,n$4,x2); [line 20, column 5]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&x2:X) assign_last [line 20, column 3]\n  n$3=_fun_X_X(&x2:X*,1:int,0:int) [line 20, column 5]\n  EXIT_SCOPE(n$3,n$4,x2); [line 20, column 5]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   n$6=_fun___variable_initialization(&x1:X) [line 19, column 3]\n  n$5=_fun_X_X(&x1:X*,0:int,0:int) [line 19, column 5]\n  EXIT_SCOPE(n$5,n$6,x1); [line 19, column 5]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   n$6=_fun___variable_initialization(&x1:X) assign_last [line 19, column 3]\n  n$5=_fun_X_X(&x1:X*,0:int,0:int) [line 19, column 5]\n  EXIT_SCOPE(n$5,n$6,x1); [line 19, column 5]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;

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

@@ -11,11 +11,11 @@ digraph cfg {
 	
 
 	 "delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_3" -> "delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_2" ;
-"delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&v:int) [line 48, column 3]\n  n$4=*&b.f:int [line 48, column 15]\n  *&v:int=(1 / n$4) [line 48, column 3]\n  NULLIFY(&v); [line 48, column 3]\n  EXIT_SCOPE(n$4,n$5,v); [line 48, column 3]\n " shape="box"]
+"delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&v:int) assign_last [line 48, column 3]\n  n$4=*&b.f:int [line 48, column 15]\n  *&v:int=(1 / n$4) [line 48, column 3]\n  NULLIFY(&v); [line 48, column 3]\n  EXIT_SCOPE(n$4,n$5,v); [line 48, column 3]\n " shape="box"]
 	
 
 	 "delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_4" -> "delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_3" ;
-"delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_5" [label="5:  DeclStmt \n   n$7=_fun___variable_initialization(&b:B) [line 47, column 3]\n  n$6=_fun_B_B(&b:B*,-1:int,0:int) [line 47, column 5]\n  EXIT_SCOPE(n$6,n$7); [line 47, column 5]\n " shape="box"]
+"delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_5" [label="5:  DeclStmt \n   n$7=_fun___variable_initialization(&b:B) assign_last [line 47, column 3]\n  n$6=_fun_B_B(&b:B*,-1:int,0:int) [line 47, column 5]\n  EXIT_SCOPE(n$6,n$7); [line 47, column 5]\n " shape="box"]
 	
 
 	 "delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_5" -> "delegate_constr_f2_div0#13553474688240246893.0ce7e6b119d9277f847a079378cf30a1_4" ;
@@ -30,11 +30,11 @@ digraph cfg {
 	
 
 	 "delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_3" -> "delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_2" ;
-"delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&v:int) [line 42, column 3]\n  n$4=*&b.f2:int [line 42, column 15]\n  *&v:int=(1 / n$4) [line 42, column 3]\n  NULLIFY(&v); [line 42, column 3]\n  EXIT_SCOPE(n$4,n$5,v); [line 42, column 3]\n " shape="box"]
+"delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&v:int) assign_last [line 42, column 3]\n  n$4=*&b.f2:int [line 42, column 15]\n  *&v:int=(1 / n$4) [line 42, column 3]\n  NULLIFY(&v); [line 42, column 3]\n  EXIT_SCOPE(n$4,n$5,v); [line 42, column 3]\n " shape="box"]
 	
 
 	 "delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_4" -> "delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_3" ;
-"delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_5" [label="5:  DeclStmt \n   n$7=_fun___variable_initialization(&b:B) [line 41, column 3]\n  n$6=_fun_B_B(&b:B*,-1:int,1:int) [line 41, column 5]\n  EXIT_SCOPE(n$6,n$7); [line 41, column 5]\n " shape="box"]
+"delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_5" [label="5:  DeclStmt \n   n$7=_fun___variable_initialization(&b:B) assign_last [line 41, column 3]\n  n$6=_fun_B_B(&b:B*,-1:int,1:int) [line 41, column 5]\n  EXIT_SCOPE(n$6,n$7); [line 41, column 5]\n " shape="box"]
 	
 
 	 "delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_5" -> "delegate_constr_f_div0#5612932889167727636.f7eff0d7a58a3e6a6faddf562531b7f4_4" ;
@@ -49,7 +49,7 @@ digraph cfg {
 	
 
 	 "f2_div0#7534053771484990951.dd0b0233a011b5600e68aef2c840bcef_3" -> "f2_div0#7534053771484990951.dd0b0233a011b5600e68aef2c840bcef_2" ;
-"f2_div0#7534053771484990951.dd0b0233a011b5600e68aef2c840bcef_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&b:B) [line 26, column 3]\n  n$4=_fun_B_B(&b:B*,0:int) [line 26, column 5]\n  EXIT_SCOPE(n$4,n$5); [line 26, column 5]\n " shape="box"]
+"f2_div0#7534053771484990951.dd0b0233a011b5600e68aef2c840bcef_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&b:B) assign_last [line 26, column 3]\n  n$4=_fun_B_B(&b:B*,0:int) [line 26, column 5]\n  EXIT_SCOPE(n$4,n$5); [line 26, column 5]\n " shape="box"]
 	
 
 	 "f2_div0#7534053771484990951.dd0b0233a011b5600e68aef2c840bcef_4" -> "f2_div0#7534053771484990951.dd0b0233a011b5600e68aef2c840bcef_3" ;
@@ -64,7 +64,7 @@ digraph cfg {
 	
 
 	 "f_div0#425664895438337450.ac4424ba5cea731e26a9fe2fb1b0b687_3" -> "f_div0#425664895438337450.ac4424ba5cea731e26a9fe2fb1b0b687_2" ;
-"f_div0#425664895438337450.ac4424ba5cea731e26a9fe2fb1b0b687_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&b:B) [line 31, column 3]\n  n$4=_fun_B_B(&b:B*,0:int) [line 31, column 5]\n  EXIT_SCOPE(n$4,n$5); [line 31, column 5]\n " shape="box"]
+"f_div0#425664895438337450.ac4424ba5cea731e26a9fe2fb1b0b687_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&b:B) assign_last [line 31, column 3]\n  n$4=_fun_B_B(&b:B*,0:int) [line 31, column 5]\n  EXIT_SCOPE(n$4,n$5); [line 31, column 5]\n " shape="box"]
 	
 
 	 "f_div0#425664895438337450.ac4424ba5cea731e26a9fe2fb1b0b687_4" -> "f_div0#425664895438337450.ac4424ba5cea731e26a9fe2fb1b0b687_3" ;
@@ -79,19 +79,19 @@ digraph cfg {
 	
 
 	 "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_3" -> "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_2" ;
-"f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&v3:int) [line 56, column 3]\n  n$5=*&b.t.v:int [line 56, column 16]\n  *&v3:int=(1 / n$5) [line 56, column 3]\n  NULLIFY(&v3); [line 56, column 3]\n  EXIT_SCOPE(n$5,n$6,v3); [line 56, column 3]\n " shape="box"]
+"f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&v3:int) assign_last [line 56, column 3]\n  n$5=*&b.t.v:int [line 56, column 16]\n  *&v3:int=(1 / n$5) [line 56, column 3]\n  NULLIFY(&v3); [line 56, column 3]\n  EXIT_SCOPE(n$5,n$6,v3); [line 56, column 3]\n " shape="box"]
 	
 
 	 "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_4" -> "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_3" ;
-"f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&v2:int) [line 55, column 3]\n  n$7=*&b.f2:int [line 55, column 16]\n  *&v2:int=(1 / n$7) [line 55, column 3]\n  EXIT_SCOPE(n$7,n$8); [line 55, column 3]\n " shape="box"]
+"f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&v2:int) assign_last [line 55, column 3]\n  n$7=*&b.f2:int [line 55, column 16]\n  *&v2:int=(1 / n$7) [line 55, column 3]\n  EXIT_SCOPE(n$7,n$8); [line 55, column 3]\n " shape="box"]
 	
 
 	 "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_5" -> "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_4" ;
-"f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_6" [label="6:  DeclStmt \n   n$10=_fun___variable_initialization(&v:int) [line 54, column 3]\n  n$9=*&b.f:int [line 54, column 15]\n  *&v:int=(1 / n$9) [line 54, column 3]\n  EXIT_SCOPE(n$9,n$10); [line 54, column 3]\n " shape="box"]
+"f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_6" [label="6:  DeclStmt \n   n$10=_fun___variable_initialization(&v:int) assign_last [line 54, column 3]\n  n$9=*&b.f:int [line 54, column 15]\n  *&v:int=(1 / n$9) [line 54, column 3]\n  EXIT_SCOPE(n$9,n$10); [line 54, column 3]\n " shape="box"]
 	
 
 	 "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_6" -> "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_5" ;
-"f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_7" [label="7:  DeclStmt \n   n$12=_fun___variable_initialization(&b:B) [line 53, column 3]\n  n$11=_fun_B_B(&b:B*,1:int) [line 53, column 5]\n  EXIT_SCOPE(n$11,n$12); [line 53, column 5]\n " shape="box"]
+"f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_7" [label="7:  DeclStmt \n   n$12=_fun___variable_initialization(&b:B) assign_last [line 53, column 3]\n  n$11=_fun_B_B(&b:B*,1:int) [line 53, column 5]\n  EXIT_SCOPE(n$11,n$12); [line 53, column 5]\n " shape="box"]
 	
 
 	 "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_7" -> "f_f2_div1#1916649103065485619.7e2fb5eeaa415affd6bdd86573d188de_6" ;
@@ -106,7 +106,7 @@ digraph cfg {
 	
 
 	 "t_div0#3531430030893775324.a762c245df414e083e61674c93898055_3" -> "t_div0#3531430030893775324.a762c245df414e083e61674c93898055_2" ;
-"t_div0#3531430030893775324.a762c245df414e083e61674c93898055_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&b:B) [line 36, column 3]\n  n$4=_fun_B_B(&b:B*,0:int) [line 36, column 5]\n  EXIT_SCOPE(n$4,n$5); [line 36, column 5]\n " shape="box"]
+"t_div0#3531430030893775324.a762c245df414e083e61674c93898055_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&b:B) assign_last [line 36, column 3]\n  n$4=_fun_B_B(&b:B*,0:int) [line 36, column 5]\n  EXIT_SCOPE(n$4,n$5); [line 36, column 5]\n " shape="box"]
 	
 
 	 "t_div0#3531430030893775324.a762c245df414e083e61674c93898055_4" -> "t_div0#3531430030893775324.a762c245df414e083e61674c93898055_3" ;

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

@@ -32,7 +32,7 @@ digraph cfg {
 	
 
 	 "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_8" -> "array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_3" ;
-"array_of_class_with_not_constant_size#constructor_new#9810665286379016302.453a7058d5d4d9a1fa36084713fcfc7d_9" [label="9:  DeclStmt \n   n$5=_fun___variable_initialization(&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  EXIT_SCOPE(n$3,n$4,n$5,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   n$5=_fun___variable_initialization(&tarray:constructor_new::Person*) assign_last [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  EXIT_SCOPE(n$3,n$4,n$5,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" -> "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   NULLIFY(&tarray); [line 93, column 78]\n " color=yellow style=filled]
 	
 
-"array_of_person_with_constant_size#constructor_new#10198805942353567956.2cf0ba8d0780ec60bbcca4089ec2aee6_3" [label="3:  DeclStmt \n   n$12=_fun___variable_initialization(&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  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 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   n$12=_fun___variable_initialization(&tarray:constructor_new::Person*) assign_last [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  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 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   n$5=_fun___variable_initialization(&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,n$5); [line 28, column 3]\n " shape="box"]
+"constructor_1_arg_new_div0#constructor_new#798841234716809588.2c010a7c7293e961b9ed8149c3f3debe_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&p:constructor_new::Person*) assign_last [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,n$5); [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,7 +73,7 @@ digraph cfg {
 	
 
 	 "constructor_3_args_new_div0#constructor_new#13438839859480315932.2122014ebac449e6fb981ba75ba0617e_3" -> "constructor_3_args_new_div0#constructor_new#13438839859480315932.2122014ebac449e6fb981ba75ba0617e_2" ;
-"constructor_3_args_new_div0#constructor_new#13438839859480315932.2122014ebac449e6fb981ba75ba0617e_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&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,n$5); [line 33, column 3]\n " shape="box"]
+"constructor_3_args_new_div0#constructor_new#13438839859480315932.2122014ebac449e6fb981ba75ba0617e_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&p:constructor_new::Person*) assign_last [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,n$5); [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" ;
@@ -113,11 +113,11 @@ digraph cfg {
 	
 
 	 "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_9" -> "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_4" ;
-"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_10" [label="10:  DeclStmt \n   n$10=_fun___variable_initialization(&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,n$10,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   n$10=_fun___variable_initialization(&p:constructor_new::Person*) assign_last [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,n$10,0$?%__sil_tmpSIL_temp_conditional___n$4); [line 71, column 3]\n " shape="box"]
 	
 
 	 "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_10" -> "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_3" ;
-"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_11" [label="11:  DeclStmt \n   n$11=_fun___variable_initialization(&z:int) [line 70, column 3]\n  *&z:int=6 [line 70, column 3]\n  EXIT_SCOPE(n$11); [line 70, column 3]\n " shape="box"]
+"constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_11" [label="11:  DeclStmt \n   n$11=_fun___variable_initialization(&z:int) assign_last [line 70, column 3]\n  *&z:int=6 [line 70, column 3]\n  EXIT_SCOPE(n$11); [line 70, column 3]\n " shape="box"]
 	
 
 	 "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_11" -> "constructor_nodes#constructor_new#2199504594298711726.73e416487288cbd4adea79b64a17dbe2_5" ;
@@ -132,7 +132,7 @@ digraph cfg {
 	
 
 	 "float_init_number#constructor_new#3988440966025503299.b1d13528d0a983c1943c8fdd13e58be6_3" -> "float_init_number#constructor_new#3988440966025503299.b1d13528d0a983c1943c8fdd13e58be6_2" ;
-"float_init_number#constructor_new#3988440966025503299.b1d13528d0a983c1943c8fdd13e58be6_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&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,n$4); [line 43, column 3]\n " shape="box"]
+"float_init_number#constructor_new#3988440966025503299.b1d13528d0a983c1943c8fdd13e58be6_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&x1:float*) assign_last [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,n$4); [line 43, column 3]\n " shape="box"]
 	
 
 	 "float_init_number#constructor_new#3988440966025503299.b1d13528d0a983c1943c8fdd13e58be6_4" -> "float_init_number#constructor_new#3988440966025503299.b1d13528d0a983c1943c8fdd13e58be6_3" ;
@@ -191,7 +191,7 @@ digraph cfg {
 	
 
 	 "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_11" -> "int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_6" ;
-"int_array#constructor_new#17288301834361373856.f0e67f3600c928968ac2559eafa09ba2_12" [label="12:  DeclStmt \n   n$12=_fun___variable_initialization(&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,n$12,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   n$12=_fun___variable_initialization(&x2:int*) assign_last [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,n$12,0$?%__sil_tmpSIL_temp_conditional___n$7); [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   n$12=_fun___variable_initialization(&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,n$12); [line 83, column 3]\n " shape="box"]
+"int_array_init#constructor_new#14099932616230884357.69a63438c3aee293029f068d373c29c3_4" [label="4:  DeclStmt \n   n$12=_fun___variable_initialization(&arr:int*) assign_last [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,n$12); [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   n$4=_fun___variable_initialization(&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,n$4); [line 48, column 3]\n " shape="box"]
+"int_init_empty#constructor_new#15413029864213743197.d5b807871fe4ea10e898a381f0edef4d_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&x1:int*) assign_last [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,n$4); [line 48, column 3]\n " shape="box"]
 	
 
 	 "int_init_empty#constructor_new#15413029864213743197.d5b807871fe4ea10e898a381f0edef4d_4" -> "int_init_empty#constructor_new#15413029864213743197.d5b807871fe4ea10e898a381f0edef4d_3" ;
@@ -236,7 +236,7 @@ digraph cfg {
 	
 
 	 "int_init_empty_list#constructor_new#3613770932207490177.2b4662eed1a13d3237e163f39bc6397c_3" -> "int_init_empty_list#constructor_new#3613770932207490177.2b4662eed1a13d3237e163f39bc6397c_2" ;
-"int_init_empty_list#constructor_new#3613770932207490177.2b4662eed1a13d3237e163f39bc6397c_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&x1:int) [line 53, column 3]\n  *&x1:int=0 [line 53, column 3]\n  EXIT_SCOPE(n$2); [line 53, column 3]\n " shape="box"]
+"int_init_empty_list#constructor_new#3613770932207490177.2b4662eed1a13d3237e163f39bc6397c_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&x1:int) assign_last [line 53, column 3]\n  *&x1:int=0 [line 53, column 3]\n  EXIT_SCOPE(n$2); [line 53, column 3]\n " shape="box"]
 	
 
 	 "int_init_empty_list#constructor_new#3613770932207490177.2b4662eed1a13d3237e163f39bc6397c_4" -> "int_init_empty_list#constructor_new#3613770932207490177.2b4662eed1a13d3237e163f39bc6397c_3" ;
@@ -251,7 +251,7 @@ digraph cfg {
 	
 
 	 "int_init_empty_list_new#constructor_new#18093274870234850959.e77c2840901e6e789e52d55ac81db88f_3" -> "int_init_empty_list_new#constructor_new#18093274870234850959.e77c2840901e6e789e52d55ac81db88f_2" ;
-"int_init_empty_list_new#constructor_new#18093274870234850959.e77c2840901e6e789e52d55ac81db88f_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&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,n$4); [line 58, column 3]\n " shape="box"]
+"int_init_empty_list_new#constructor_new#18093274870234850959.e77c2840901e6e789e52d55ac81db88f_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&x1:int*) assign_last [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,n$4); [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" ;
@@ -291,15 +291,15 @@ digraph cfg {
 	
 
 	 "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_9" -> "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_4" ;
-"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_10" [label="10:  DeclStmt \n   n$10=_fun___variable_initialization(&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,n$10,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   n$10=_fun___variable_initialization(&x:int*) assign_last [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,n$10,0$?%__sil_tmpSIL_temp_conditional___n$4); [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   n$13=_fun___variable_initialization(&y:int*) [line 64, column 3]\n  n$11=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 64, column 12]\n  n$12=_fun_constructor_new::getValue(4:int) [line 64, column 20]\n  *n$11:int=n$12 [line 64, column 12]\n  *&y:int*=n$11 [line 64, column 3]\n  EXIT_SCOPE(n$11,n$12,n$13); [line 64, column 3]\n " shape="box"]
+"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_11" [label="11:  DeclStmt \n   n$13=_fun___variable_initialization(&y:int*) assign_last [line 64, column 3]\n  n$11=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 64, column 12]\n  n$12=_fun_constructor_new::getValue(4:int) [line 64, column 20]\n  *n$11:int=n$12 [line 64, column 12]\n  *&y:int*=n$11 [line 64, column 3]\n  EXIT_SCOPE(n$11,n$12,n$13); [line 64, column 3]\n " shape="box"]
 	
 
 	 "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_11" -> "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_5" ;
-"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_12" [label="12:  DeclStmt \n   n$14=_fun___variable_initialization(&z:int) [line 63, column 3]\n  *&z:int=6 [line 63, column 3]\n  NULLIFY(&z); [line 63, column 3]\n  EXIT_SCOPE(n$14,z); [line 63, column 3]\n " shape="box"]
+"int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_12" [label="12:  DeclStmt \n   n$14=_fun___variable_initialization(&z:int) assign_last [line 63, column 3]\n  *&z:int=6 [line 63, column 3]\n  NULLIFY(&z); [line 63, column 3]\n  EXIT_SCOPE(n$14,z); [line 63, column 3]\n " shape="box"]
 	
 
 	 "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_12" -> "int_init_nodes#constructor_new#3816193909145311065.e18f1e2417086b4c8d20246eeee5dd01_11" ;
@@ -314,7 +314,7 @@ digraph cfg {
 	
 
 	 "int_init_number#constructor_new#16564762083428359974.2a1c04c2e924068dd02b097712efe518_3" -> "int_init_number#constructor_new#16564762083428359974.2a1c04c2e924068dd02b097712efe518_2" ;
-"int_init_number#constructor_new#16564762083428359974.2a1c04c2e924068dd02b097712efe518_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&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,n$4); [line 38, column 3]\n " shape="box"]
+"int_init_number#constructor_new#16564762083428359974.2a1c04c2e924068dd02b097712efe518_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&x1:int*) assign_last [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,n$4); [line 38, column 3]\n " shape="box"]
 	
 
 	 "int_init_number#constructor_new#16564762083428359974.2a1c04c2e924068dd02b097712efe518_4" -> "int_init_number#constructor_new#16564762083428359974.2a1c04c2e924068dd02b097712efe518_3" ;
@@ -329,7 +329,7 @@ digraph cfg {
 	
 
 	 "matrix_of_person#constructor_new#930045482638918044.730172056e08027af32de0bd9a490291_3" -> "matrix_of_person#constructor_new#930045482638918044.730172056e08027af32de0bd9a490291_2" ;
-"matrix_of_person#constructor_new#930045482638918044.730172056e08027af32de0bd9a490291_4" [label="4:  DeclStmt \n   n$14=_fun___variable_initialization(&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,n$14); [line 97, column 3]\n " shape="box"]
+"matrix_of_person#constructor_new#930045482638918044.730172056e08027af32de0bd9a490291_4" [label="4:  DeclStmt \n   n$14=_fun___variable_initialization(&tarray:constructor_new::Person**) assign_last [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,n$14); [line 97, column 3]\n " shape="box"]
 	
 
 	 "matrix_of_person#constructor_new#930045482638918044.730172056e08027af32de0bd9a490291_4" -> "matrix_of_person#constructor_new#930045482638918044.730172056e08027af32de0bd9a490291_3" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "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   n$3=_fun___variable_initialization(&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,n$3,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   n$3=_fun___variable_initialization(&p:Person) assign_last [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,n$3,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" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;

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

@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "test_div0#constructor_with_body#14177342253516869661.07f5b28b5e0b5cf0bd1b639da4232d5e_3" -> "test_div0#constructor_with_body#14177342253516869661.07f5b28b5e0b5cf0bd1b639da4232d5e_2" ;
-"test_div0#constructor_with_body#14177342253516869661.07f5b28b5e0b5cf0bd1b639da4232d5e_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&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,n$4); [line 29, column 5]\n " shape="box"]
+"test_div0#constructor_with_body#14177342253516869661.07f5b28b5e0b5cf0bd1b639da4232d5e_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&x:constructor_with_body::X) assign_last [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,n$4); [line 29, column 5]\n " shape="box"]
 	
 
 	 "test_div0#constructor_with_body#14177342253516869661.07f5b28b5e0b5cf0bd1b639da4232d5e_4" -> "test_div0#constructor_with_body#14177342253516869661.07f5b28b5e0b5cf0bd1b639da4232d5e_3" ;
@@ -26,7 +26,7 @@ digraph cfg {
 	
 
 	 "test_div0_default_constructor#constructor_with_body#13388399293672727772.2d6a8a159f30a2a66b86eb8aec3b9543_3" -> "test_div0_default_constructor#constructor_with_body#13388399293672727772.2d6a8a159f30a2a66b86eb8aec3b9543_2" ;
-"test_div0_default_constructor#constructor_with_body#13388399293672727772.2d6a8a159f30a2a66b86eb8aec3b9543_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&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,n$4); [line 34, column 5]\n " shape="box"]
+"test_div0_default_constructor#constructor_with_body#13388399293672727772.2d6a8a159f30a2a66b86eb8aec3b9543_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&x:constructor_with_body::X) assign_last [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,n$4); [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" ;
@@ -41,7 +41,7 @@ digraph cfg {
 	
 
 	 "test_div1#constructor_with_body#14807027065269407206.e5673561e7edf9eb35b296211ab8d37d_3" -> "test_div1#constructor_with_body#14807027065269407206.e5673561e7edf9eb35b296211ab8d37d_2" ;
-"test_div1#constructor_with_body#14807027065269407206.e5673561e7edf9eb35b296211ab8d37d_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&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,n$4); [line 39, column 5]\n " shape="box"]
+"test_div1#constructor_with_body#14807027065269407206.e5673561e7edf9eb35b296211ab8d37d_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&x:constructor_with_body::X) assign_last [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,n$4); [line 39, column 5]\n " shape="box"]
 	
 
 	 "test_div1#constructor_with_body#14807027065269407206.e5673561e7edf9eb35b296211ab8d37d_4" -> "test_div1#constructor_with_body#14807027065269407206.e5673561e7edf9eb35b296211ab8d37d_3" ;
@@ -93,7 +93,7 @@ digraph cfg {
 	
 
 	 "X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_4" -> "X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_3" ;
-"X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&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,n$8,a,b); [line 23, column 3]\n " shape="box"]
+"X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&c:int) assign_last [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,n$8,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" ;

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

@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_3" -> "no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_2" ;
-"no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&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,n$4,x1); [line 24, column 10]\n " shape="box"]
+"no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&x2:copy_array_field::X) assign_last [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,n$4,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,11 +19,11 @@ digraph cfg {
 	
 
 	 "no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_5" -> "no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_4" ;
-"no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_6" [label="6:  DeclStmt \n   n$6=_fun___variable_initialization(&x1:copy_array_field::X) [line 22, column 3]\n  n$5=_fun_copy_array_field::X_X(&x1:copy_array_field::X*) [line 22, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 22, column 5]\n " shape="box"]
+"no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_6" [label="6:  DeclStmt \n   n$6=_fun___variable_initialization(&x1:copy_array_field::X) assign_last [line 22, column 3]\n  n$5=_fun_copy_array_field::X_X(&x1:copy_array_field::X*) [line 22, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 22, column 5]\n " shape="box"]
 	
 
 	 "no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_6" -> "no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_5" ;
-"no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_7" [label="7:  DeclStmt \n   n$7=_fun___variable_initialization(&a:int) [line 21, column 3]\n  *&a:int=0 [line 21, column 3]\n  EXIT_SCOPE(n$7); [line 21, column 3]\n " shape="box"]
+"no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_7" [label="7:  DeclStmt \n   n$7=_fun___variable_initialization(&a:int) assign_last [line 21, column 3]\n  *&a:int=0 [line 21, column 3]\n  EXIT_SCOPE(n$7); [line 21, column 3]\n " shape="box"]
 	
 
 	 "no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_7" -> "no_npe#copy_array_field#15879390968573954131.8ea76552f08038187f112d283020a67e_6" ;
@@ -38,7 +38,7 @@ digraph cfg {
 	
 
 	 "npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_3" -> "npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_2" ;
-"npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&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,n$4,x1); [line 16, column 10]\n " shape="box"]
+"npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&x2:copy_array_field::X) assign_last [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,n$4,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   n$6=_fun___variable_initialization(&x1:copy_array_field::X) [line 14, column 3]\n  n$5=_fun_copy_array_field::X_X(&x1:copy_array_field::X*) [line 14, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 14, column 5]\n " shape="box"]
+"npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_6" [label="6:  DeclStmt \n   n$6=_fun___variable_initialization(&x1:copy_array_field::X) assign_last [line 14, column 3]\n  n$5=_fun_copy_array_field::X_X(&x1:copy_array_field::X*) [line 14, column 5]\n  EXIT_SCOPE(n$5,n$6); [line 14, column 5]\n " shape="box"]
 	
 
 	 "npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_6" -> "npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_5" ;

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

@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_3" -> "copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_2" ;
-"copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_4" [label="4:  DeclStmt \n   n$7=_fun___variable_initialization(&x2:copy_move_constructor::X) [line 42, column 3]\n  n$6=_fun_copy_move_constructor::X_X(&x2:copy_move_constructor::X*,&x1:copy_move_constructor::X&) [line 42, column 10]\n  EXIT_SCOPE(n$6,n$7); [line 42, column 10]\n " shape="box"]
+"copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_4" [label="4:  DeclStmt \n   n$7=_fun___variable_initialization(&x2:copy_move_constructor::X) assign_last [line 42, column 3]\n  n$6=_fun_copy_move_constructor::X_X(&x2:copy_move_constructor::X*,&x1:copy_move_constructor::X&) [line 42, column 10]\n  EXIT_SCOPE(n$6,n$7); [line 42, column 10]\n " shape="box"]
 	
 
 	 "copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_4" -> "copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_3" ;
@@ -19,7 +19,7 @@ digraph cfg {
 	
 
 	 "copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_5" -> "copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_4" ;
-"copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_6" [label="6:  DeclStmt \n   n$9=_fun___variable_initialization(&x1:copy_move_constructor::X) [line 40, column 3]\n  n$8=_fun_copy_move_constructor::X_X(&x1:copy_move_constructor::X*) [line 40, column 5]\n  EXIT_SCOPE(n$8,n$9); [line 40, column 5]\n " shape="box"]
+"copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_6" [label="6:  DeclStmt \n   n$9=_fun___variable_initialization(&x1:copy_move_constructor::X) assign_last [line 40, column 3]\n  n$8=_fun_copy_move_constructor::X_X(&x1:copy_move_constructor::X*) [line 40, column 5]\n  EXIT_SCOPE(n$8,n$9); [line 40, column 5]\n " shape="box"]
 	
 
 	 "copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_6" -> "copyX_div0#copy_move_constructor#7555826423954612298.1fd45599e2fc3ce471d7d474aa615bcb_5" ;
@@ -34,15 +34,15 @@ digraph cfg {
 	
 
 	 "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_3" -> "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_2" ;
-"copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_4" [label="4:  DeclStmt \n   n$12=_fun___variable_initialization(&d2:int) [line 68, column 3]\n  n$10=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$7:copy_move_constructor::X) [line 68, column 16]\n  n$9=_fun_copy_move_constructor::getX(1:int,&0$?%__sil_tmpSIL_materialize_temp__n$7:copy_move_constructor::X*) [line 68, column 16]\n  n$11=*&0$?%__sil_tmpSIL_materialize_temp__n$7.f:int [line 68, column 16]\n  *&d2:int=(1 / n$11) [line 68, column 3]\n  EXIT_SCOPE(n$9,n$10,n$11,n$12,0$?%__sil_tmpSIL_materialize_temp__n$7); [line 68, column 3]\n " shape="box"]
+"copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_4" [label="4:  DeclStmt \n   n$12=_fun___variable_initialization(&d2:int) assign_last [line 68, column 3]\n  n$10=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$7:copy_move_constructor::X) assign_last [line 68, column 16]\n  n$9=_fun_copy_move_constructor::getX(1:int,&0$?%__sil_tmpSIL_materialize_temp__n$7:copy_move_constructor::X*) assign_last [line 68, column 16]\n  n$11=*&0$?%__sil_tmpSIL_materialize_temp__n$7.f:int [line 68, column 16]\n  *&d2:int=(1 / n$11) [line 68, column 3]\n  EXIT_SCOPE(n$9,n$10,n$11,n$12,0$?%__sil_tmpSIL_materialize_temp__n$7); [line 68, column 3]\n " shape="box"]
 	
 
 	 "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_4" -> "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_3" ;
-"copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_5" [label="5:  DeclStmt \n   n$14=_fun___variable_initialization(&d1:int) [line 67, column 3]\n  n$13=*&x2.f:int [line 67, column 16]\n  *&d1:int=(1 / n$13) [line 67, column 3]\n  EXIT_SCOPE(n$13,n$14); [line 67, column 3]\n " shape="box"]
+"copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_5" [label="5:  DeclStmt \n   n$14=_fun___variable_initialization(&d1:int) assign_last [line 67, column 3]\n  n$13=*&x2.f:int [line 67, column 16]\n  *&d1:int=(1 / n$13) [line 67, column 3]\n  EXIT_SCOPE(n$13,n$14); [line 67, column 3]\n " shape="box"]
 	
 
 	 "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_5" -> "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_4" ;
-"copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_6" [label="6:  DeclStmt \n   n$16=_fun___variable_initialization(&x2:copy_move_constructor::X) [line 66, column 3]\n  n$15=_fun_copy_move_constructor::X_X(&x2:copy_move_constructor::X*,&x1:copy_move_constructor::X&) [line 66, column 10]\n  EXIT_SCOPE(n$15,n$16); [line 66, column 10]\n " shape="box"]
+"copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_6" [label="6:  DeclStmt \n   n$16=_fun___variable_initialization(&x2:copy_move_constructor::X) assign_last [line 66, column 3]\n  n$15=_fun_copy_move_constructor::X_X(&x2:copy_move_constructor::X*,&x1:copy_move_constructor::X&) [line 66, column 10]\n  EXIT_SCOPE(n$15,n$16); [line 66, column 10]\n " shape="box"]
 	
 
 	 "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_6" -> "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_5" ;
@@ -50,7 +50,7 @@ digraph cfg {
 	
 
 	 "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_7" -> "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_6" ;
-"copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_8" [label="8:  DeclStmt \n   n$18=_fun___variable_initialization(&x1:copy_move_constructor::X) [line 64, column 3]\n  n$17=_fun_copy_move_constructor::X_X(&x1:copy_move_constructor::X*) [line 64, column 5]\n  EXIT_SCOPE(n$17,n$18); [line 64, column 5]\n " shape="box"]
+"copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_8" [label="8:  DeclStmt \n   n$18=_fun___variable_initialization(&x1:copy_move_constructor::X) assign_last [line 64, column 3]\n  n$17=_fun_copy_move_constructor::X_X(&x1:copy_move_constructor::X*) [line 64, column 5]\n  EXIT_SCOPE(n$17,n$18); [line 64, column 5]\n " shape="box"]
 	
 
 	 "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_8" -> "copyX_moveX_div1#copy_move_constructor#6853813819184662211.00e91897e7d9fcfa93de911bba9a1399_7" ;
@@ -65,7 +65,7 @@ digraph cfg {
 	
 
 	 "copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_3" -> "copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_2" ;
-"copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_4" [label="4:  DeclStmt \n   n$7=_fun___variable_initialization(&y2:copy_move_constructor::Y) [line 51, column 3]\n  n$6=_fun_copy_move_constructor::Y_Y(&y2:copy_move_constructor::Y*,&y1:copy_move_constructor::Y&) [line 51, column 10]\n  EXIT_SCOPE(n$6,n$7); [line 51, column 10]\n " shape="box"]
+"copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_4" [label="4:  DeclStmt \n   n$7=_fun___variable_initialization(&y2:copy_move_constructor::Y) assign_last [line 51, column 3]\n  n$6=_fun_copy_move_constructor::Y_Y(&y2:copy_move_constructor::Y*,&y1:copy_move_constructor::Y&) [line 51, column 10]\n  EXIT_SCOPE(n$6,n$7); [line 51, column 10]\n " shape="box"]
 	
 
 	 "copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_4" -> "copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_3" ;
@@ -73,7 +73,7 @@ digraph cfg {
 	
 
 	 "copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_5" -> "copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_4" ;
-"copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_6" [label="6:  DeclStmt \n   n$9=_fun___variable_initialization(&y1:copy_move_constructor::Y) [line 49, column 3]\n  n$8=_fun_copy_move_constructor::Y_Y(&y1:copy_move_constructor::Y*) [line 49, column 5]\n  EXIT_SCOPE(n$8,n$9); [line 49, column 5]\n " shape="box"]
+"copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_6" [label="6:  DeclStmt \n   n$9=_fun___variable_initialization(&y1:copy_move_constructor::Y) assign_last [line 49, column 3]\n  n$8=_fun_copy_move_constructor::Y_Y(&y1:copy_move_constructor::Y*) [line 49, column 5]\n  EXIT_SCOPE(n$8,n$9); [line 49, column 5]\n " shape="box"]
 	
 
 	 "copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_6" -> "copyY_div0#copy_move_constructor#17079397845524781987.61211209ec1f961073f3adafcd080bfb_5" ;
@@ -88,15 +88,15 @@ digraph cfg {
 	
 
 	 "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_3" -> "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_2" ;
-"copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_4" [label="4:  DeclStmt \n   n$12=_fun___variable_initialization(&d2:int) [line 77, column 3]\n  n$10=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$7:copy_move_constructor::Y) [line 77, column 16]\n  n$9=_fun_copy_move_constructor::getY(2:int,&0$?%__sil_tmpSIL_materialize_temp__n$7:copy_move_constructor::Y*) [line 77, column 16]\n  n$11=*&0$?%__sil_tmpSIL_materialize_temp__n$7.f:int [line 77, column 16]\n  *&d2:int=(1 / n$11) [line 77, column 3]\n  EXIT_SCOPE(n$9,n$10,n$11,n$12,0$?%__sil_tmpSIL_materialize_temp__n$7); [line 77, column 3]\n " shape="box"]
+"copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_4" [label="4:  DeclStmt \n   n$12=_fun___variable_initialization(&d2:int) assign_last [line 77, column 3]\n  n$10=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$7:copy_move_constructor::Y) assign_last [line 77, column 16]\n  n$9=_fun_copy_move_constructor::getY(2:int,&0$?%__sil_tmpSIL_materialize_temp__n$7:copy_move_constructor::Y*) assign_last [line 77, column 16]\n  n$11=*&0$?%__sil_tmpSIL_materialize_temp__n$7.f:int [line 77, column 16]\n  *&d2:int=(1 / n$11) [line 77, column 3]\n  EXIT_SCOPE(n$9,n$10,n$11,n$12,0$?%__sil_tmpSIL_materialize_temp__n$7); [line 77, column 3]\n " shape="box"]
 	
 
 	 "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_4" -> "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_3" ;
-"copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_5" [label="5:  DeclStmt \n   n$14=_fun___variable_initialization(&d1:int) [line 76, column 3]\n  n$13=*&y2.f:int [line 76, column 16]\n  *&d1:int=(1 / n$13) [line 76, column 3]\n  EXIT_SCOPE(n$13,n$14); [line 76, column 3]\n " shape="box"]
+"copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_5" [label="5:  DeclStmt \n   n$14=_fun___variable_initialization(&d1:int) assign_last [line 76, column 3]\n  n$13=*&y2.f:int [line 76, column 16]\n  *&d1:int=(1 / n$13) [line 76, column 3]\n  EXIT_SCOPE(n$13,n$14); [line 76, column 3]\n " shape="box"]
 	
 
 	 "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_5" -> "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_4" ;
-"copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_6" [label="6:  DeclStmt \n   n$16=_fun___variable_initialization(&y2:copy_move_constructor::Y) [line 75, column 3]\n  n$15=_fun_copy_move_constructor::Y_Y(&y2:copy_move_constructor::Y*,&y1:copy_move_constructor::Y&) [line 75, column 10]\n  EXIT_SCOPE(n$15,n$16); [line 75, column 10]\n " shape="box"]
+"copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_6" [label="6:  DeclStmt \n   n$16=_fun___variable_initialization(&y2:copy_move_constructor::Y) assign_last [line 75, column 3]\n  n$15=_fun_copy_move_constructor::Y_Y(&y2:copy_move_constructor::Y*,&y1:copy_move_constructor::Y&) [line 75, column 10]\n  EXIT_SCOPE(n$15,n$16); [line 75, column 10]\n " shape="box"]
 	
 
 	 "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_6" -> "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_5" ;
@@ -104,7 +104,7 @@ digraph cfg {
 	
 
 	 "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_7" -> "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_6" ;
-"copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_8" [label="8:  DeclStmt \n   n$18=_fun___variable_initialization(&y1:copy_move_constructor::Y) [line 73, column 3]\n  n$17=_fun_copy_move_constructor::Y_Y(&y1:copy_move_constructor::Y*) [line 73, column 5]\n  EXIT_SCOPE(n$17,n$18); [line 73, column 5]\n " shape="box"]
+"copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_8" [label="8:  DeclStmt \n   n$18=_fun___variable_initialization(&y1:copy_move_constructor::Y) assign_last [line 73, column 3]\n  n$17=_fun_copy_move_constructor::Y_Y(&y1:copy_move_constructor::Y*) [line 73, column 5]\n  EXIT_SCOPE(n$17,n$18); [line 73, column 5]\n " shape="box"]
 	
 
 	 "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_8" -> "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_7" ;
@@ -123,7 +123,7 @@ digraph cfg {
 	
 
 	 "getX#copy_move_constructor(class copy_move_constructor::X)#2211685783611424509.3ed1bf77442fb4e47b3afdd1dd669b7a_4" -> "getX#copy_move_constructor(class copy_move_constructor::X)#2211685783611424509.3ed1bf77442fb4e47b3afdd1dd669b7a_3" ;
-"getX#copy_move_constructor(class copy_move_constructor::X)#2211685783611424509.3ed1bf77442fb4e47b3afdd1dd669b7a_5" [label="5:  DeclStmt \n   n$7=_fun___variable_initialization(&x:copy_move_constructor::X) [line 28, column 3]\n  n$6=_fun_copy_move_constructor::X_X(&x:copy_move_constructor::X*) [line 28, column 5]\n  EXIT_SCOPE(n$6,n$7); [line 28, column 5]\n " shape="box"]
+"getX#copy_move_constructor(class copy_move_constructor::X)#2211685783611424509.3ed1bf77442fb4e47b3afdd1dd669b7a_5" [label="5:  DeclStmt \n   n$7=_fun___variable_initialization(&x:copy_move_constructor::X) assign_last [line 28, column 3]\n  n$6=_fun_copy_move_constructor::X_X(&x:copy_move_constructor::X*) [line 28, column 5]\n  EXIT_SCOPE(n$6,n$7); [line 28, column 5]\n " shape="box"]
 	
 
 	 "getX#copy_move_constructor(class copy_move_constructor::X)#2211685783611424509.3ed1bf77442fb4e47b3afdd1dd669b7a_5" -> "getX#copy_move_constructor(class copy_move_constructor::X)#2211685783611424509.3ed1bf77442fb4e47b3afdd1dd669b7a_4" ;
@@ -142,7 +142,7 @@ digraph cfg {
 	
 
 	 "getY#copy_move_constructor(class copy_move_constructor::Y)#1712013823822590270.ad9dd85c67bb69fcd76f4c34bc426f28_4" -> "getY#copy_move_constructor(class copy_move_constructor::Y)#1712013823822590270.ad9dd85c67bb69fcd76f4c34bc426f28_3" ;
-"getY#copy_move_constructor(class copy_move_constructor::Y)#1712013823822590270.ad9dd85c67bb69fcd76f4c34bc426f28_5" [label="5:  DeclStmt \n   n$7=_fun___variable_initialization(&y:copy_move_constructor::Y) [line 34, column 3]\n  n$6=_fun_copy_move_constructor::Y_Y(&y:copy_move_constructor::Y*) [line 34, column 5]\n  EXIT_SCOPE(n$6,n$7); [line 34, column 5]\n " shape="box"]
+"getY#copy_move_constructor(class copy_move_constructor::Y)#1712013823822590270.ad9dd85c67bb69fcd76f4c34bc426f28_5" [label="5:  DeclStmt \n   n$7=_fun___variable_initialization(&y:copy_move_constructor::Y) assign_last [line 34, column 3]\n  n$6=_fun_copy_move_constructor::Y_Y(&y:copy_move_constructor::Y*) [line 34, column 5]\n  EXIT_SCOPE(n$6,n$7); [line 34, column 5]\n " shape="box"]
 	
 
 	 "getY#copy_move_constructor(class copy_move_constructor::Y)#1712013823822590270.ad9dd85c67bb69fcd76f4c34bc426f28_5" -> "getY#copy_move_constructor(class copy_move_constructor::Y)#1712013823822590270.ad9dd85c67bb69fcd76f4c34bc426f28_4" ;
@@ -153,7 +153,7 @@ digraph cfg {
 "moveX_div0#copy_move_constructor#2229557375196326562.f23c95e594ab41ba50090dccb989c3e3_2" [label="2: Exit copy_move_constructor::moveX_div0 \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 46, column 42]\n " color=yellow style=filled]
 	
 
-"moveX_div0#copy_move_constructor#2229557375196326562.f23c95e594ab41ba50090dccb989c3e3_3" [label="3:  Return Stmt \n   n$3=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:copy_move_constructor::X) [line 46, column 31]\n  n$2=_fun_copy_move_constructor::getX(0:int,&0$?%__sil_tmpSIL_materialize_temp__n$0:copy_move_constructor::X*) [line 46, column 31]\n  n$4=*&0$?%__sil_tmpSIL_materialize_temp__n$0.f:int [line 46, column 31]\n  *&return:int=(1 / n$4) [line 46, column 20]\n  EXIT_SCOPE(n$2,n$3,n$4,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 46, column 20]\n  APPLY_ABSTRACTION; [line 46, column 20]\n " shape="box"]
+"moveX_div0#copy_move_constructor#2229557375196326562.f23c95e594ab41ba50090dccb989c3e3_3" [label="3:  Return Stmt \n   n$3=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:copy_move_constructor::X) assign_last [line 46, column 31]\n  n$2=_fun_copy_move_constructor::getX(0:int,&0$?%__sil_tmpSIL_materialize_temp__n$0:copy_move_constructor::X*) assign_last [line 46, column 31]\n  n$4=*&0$?%__sil_tmpSIL_materialize_temp__n$0.f:int [line 46, column 31]\n  *&return:int=(1 / n$4) [line 46, column 20]\n  EXIT_SCOPE(n$2,n$3,n$4,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 46, column 20]\n  APPLY_ABSTRACTION; [line 46, column 20]\n " shape="box"]
 	
 
 	 "moveX_div0#copy_move_constructor#2229557375196326562.f23c95e594ab41ba50090dccb989c3e3_3" -> "moveX_div0#copy_move_constructor#2229557375196326562.f23c95e594ab41ba50090dccb989c3e3_2" ;
@@ -164,7 +164,7 @@ digraph cfg {
 "moveY_div0#copy_move_constructor#15307842160732522395.eee7693240d3ce27d5c30f34d771cb57_2" [label="2: Exit copy_move_constructor::moveY_div0 \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 55, column 42]\n " color=yellow style=filled]
 	
 
-"moveY_div0#copy_move_constructor#15307842160732522395.eee7693240d3ce27d5c30f34d771cb57_3" [label="3:  Return Stmt \n   n$3=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:copy_move_constructor::Y) [line 55, column 31]\n  n$2=_fun_copy_move_constructor::getY(1:int,&0$?%__sil_tmpSIL_materialize_temp__n$0:copy_move_constructor::Y*) [line 55, column 31]\n  n$4=*&0$?%__sil_tmpSIL_materialize_temp__n$0.f:int [line 55, column 31]\n  *&return:int=(1 / n$4) [line 55, column 20]\n  EXIT_SCOPE(n$2,n$3,n$4,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 55, column 20]\n  APPLY_ABSTRACTION; [line 55, column 20]\n " shape="box"]
+"moveY_div0#copy_move_constructor#15307842160732522395.eee7693240d3ce27d5c30f34d771cb57_3" [label="3:  Return Stmt \n   n$3=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:copy_move_constructor::Y) assign_last [line 55, column 31]\n  n$2=_fun_copy_move_constructor::getY(1:int,&0$?%__sil_tmpSIL_materialize_temp__n$0:copy_move_constructor::Y*) assign_last [line 55, column 31]\n  n$4=*&0$?%__sil_tmpSIL_materialize_temp__n$0.f:int [line 55, column 31]\n  *&return:int=(1 / n$4) [line 55, column 20]\n  EXIT_SCOPE(n$2,n$3,n$4,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 55, column 20]\n  APPLY_ABSTRACTION; [line 55, column 20]\n " shape="box"]
 	
 
 	 "moveY_div0#copy_move_constructor#15307842160732522395.eee7693240d3ce27d5c30f34d771cb57_3" -> "moveY_div0#copy_move_constructor#15307842160732522395.eee7693240d3ce27d5c30f34d771cb57_2" ;
@@ -179,11 +179,11 @@ digraph cfg {
 	
 
 	 "moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_3" -> "moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_2" ;
-"moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_4" [label="4:  DeclStmt \n   n$7=_fun___variable_initialization(&y2:copy_move_constructor::Y) [line 59, column 3]\n  n$6=_fun_copy_move_constructor::Y_Y(&y2:copy_move_constructor::Y*,&y1:copy_move_constructor::Y&) [line 59, column 10]\n  EXIT_SCOPE(n$6,n$7); [line 59, column 10]\n " shape="box"]
+"moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_4" [label="4:  DeclStmt \n   n$7=_fun___variable_initialization(&y2:copy_move_constructor::Y) assign_last [line 59, column 3]\n  n$6=_fun_copy_move_constructor::Y_Y(&y2:copy_move_constructor::Y*,&y1:copy_move_constructor::Y&) [line 59, column 10]\n  EXIT_SCOPE(n$6,n$7); [line 59, column 10]\n " shape="box"]
 	
 
 	 "moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_4" -> "moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_3" ;
-"moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_5" [label="5:  DeclStmt \n   n$13=_fun___variable_initialization(&y1:copy_move_constructor::Y) [line 58, column 3]\n  n$11=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$8:copy_move_constructor::Y const ) [line 58, column 10]\n  n$10=_fun_copy_move_constructor::getY(2:int,&0$?%__sil_tmpSIL_materialize_temp__n$8:copy_move_constructor::Y*) [line 58, column 10]\n  n$12=_fun_copy_move_constructor::Y_Y(&y1:copy_move_constructor::Y*,&0$?%__sil_tmpSIL_materialize_temp__n$8:copy_move_constructor::Y const &) [line 58, column 10]\n  EXIT_SCOPE(n$10,n$11,n$12,n$13,0$?%__sil_tmpSIL_materialize_temp__n$8); [line 58, column 10]\n " shape="box"]
+"moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_5" [label="5:  DeclStmt \n   n$13=_fun___variable_initialization(&y1:copy_move_constructor::Y) assign_last [line 58, column 3]\n  n$11=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$8:copy_move_constructor::Y const ) assign_last [line 58, column 10]\n  n$10=_fun_copy_move_constructor::getY(2:int,&0$?%__sil_tmpSIL_materialize_temp__n$8:copy_move_constructor::Y*) assign_last [line 58, column 10]\n  n$12=_fun_copy_move_constructor::Y_Y(&y1:copy_move_constructor::Y*,&0$?%__sil_tmpSIL_materialize_temp__n$8:copy_move_constructor::Y const &) [line 58, column 10]\n  EXIT_SCOPE(n$10,n$11,n$12,n$13,0$?%__sil_tmpSIL_materialize_temp__n$8); [line 58, column 10]\n " shape="box"]
 	
 
 	 "moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_5" -> "moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_4" ;

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   n$2=_fun___variable_initialization(&y:Y) [line 23, column 15]\n  n$1=_fun_Y_Y(&y:Y*) [line 23, column 17]\n  EXIT_SCOPE(n$1,n$2,y); [line 23, column 17]\n  APPLY_ABSTRACTION; [line 23, column 17]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   n$2=_fun___variable_initialization(&y:Y) assign_last [line 23, column 15]\n  n$1=_fun_Y_Y(&y:Y*) [line 23, column 17]\n  EXIT_SCOPE(n$1,n$2,y); [line 23, column 17]\n  APPLY_ABSTRACTION; [line 23, column 17]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "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   n$5=_fun___variable_initialization(&x:X) [line 22, column 14]\n  n$2=_fun___variable_initialization(&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$3=_fun___infer_skip_function(&0$?%__sil_tmpSIL_materialize_temp__n$1:int const [5*4] const ) [line 22, column 20]\n  n$4=_fun_X_X(&x:X*,n$3: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,n$4,n$5,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   n$5=_fun___variable_initialization(&x:X) assign_last [line 22, column 14]\n  n$2=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:int const [5*4] const ) assign_last [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$3=_fun___infer_skip_function(&0$?%__sil_tmpSIL_materialize_temp__n$1:int const [5*4] const ) [line 22, column 20]\n  n$4=_fun_X_X(&x:X*,n$3: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,n$4,n$5,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" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -22,7 +22,7 @@ digraph cfg {
 	
 
 	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_3" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_6" ;
-"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&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,n$4); [line 13, column 10]\n  APPLY_ABSTRACTION; [line 13, column 10]\n " shape="box"]
+"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_4" [label="4:  DeclStmt \n   n$4=_fun___variable_initialization(&i:int const *) assign_last [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,n$4); [line 13, column 10]\n  APPLY_ABSTRACTION; [line 13, column 10]\n " shape="box"]
 	
 
 	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_4" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_3" ;

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

@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "assign_temp_div0#temp_object#6618523570396537240.fa2055065ca23850cee50c855993cd3a_3" -> "assign_temp_div0#temp_object#6618523570396537240.fa2055065ca23850cee50c855993cd3a_2" ;
-"assign_temp_div0#temp_object#6618523570396537240.fa2055065ca23850cee50c855993cd3a_4" [label="4:  DeclStmt \n   n$9=_fun___variable_initialization(&x:temp_object::X) [line 27, column 3]\n  n$7=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$5:temp_object::X const ) [line 27, column 9]\n  n$6=_fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$5:temp_object::X const *,0:int,1:int) [line 27, column 9]\n  n$8=_fun_temp_object::X_X(&x:temp_object::X*,&0$?%__sil_tmpSIL_materialize_temp__n$5:temp_object::X const &) [line 27, column 9]\n  EXIT_SCOPE(n$6,n$7,n$8,n$9,0$?%__sil_tmpSIL_materialize_temp__n$5); [line 27, column 9]\n " shape="box"]
+"assign_temp_div0#temp_object#6618523570396537240.fa2055065ca23850cee50c855993cd3a_4" [label="4:  DeclStmt \n   n$9=_fun___variable_initialization(&x:temp_object::X) assign_last [line 27, column 3]\n  n$7=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$5:temp_object::X const ) assign_last [line 27, column 9]\n  n$6=_fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$5:temp_object::X const *,0:int,1:int) [line 27, column 9]\n  n$8=_fun_temp_object::X_X(&x:temp_object::X*,&0$?%__sil_tmpSIL_materialize_temp__n$5:temp_object::X const &) [line 27, column 9]\n  EXIT_SCOPE(n$6,n$7,n$8,n$9,0$?%__sil_tmpSIL_materialize_temp__n$5); [line 27, column 9]\n " shape="box"]
 	
 
 	 "assign_temp_div0#temp_object#6618523570396537240.fa2055065ca23850cee50c855993cd3a_4" -> "assign_temp_div0#temp_object#6618523570396537240.fa2055065ca23850cee50c855993cd3a_3" ;
@@ -33,7 +33,7 @@ digraph cfg {
 "getX#temp_object(class temp_object::X)#4720444219866178245.c6d7bacbd2aa751dffef569ff17890e7_2" [label="2: Exit temp_object::getX \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 24, column 40]\n " color=yellow style=filled]
 	
 
-"getX#temp_object(class temp_object::X)#4720444219866178245.c6d7bacbd2aa751dffef569ff17890e7_3" [label="3:  Return Stmt \n   n$0=*&__return_param:temp_object::X* [line 24, column 24]\n  n$5=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:temp_object::X const ) [line 24, column 31]\n  n$2=*&a:int [line 24, column 33]\n  n$3=*&b:int [line 24, column 36]\n  n$4=_fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$1:temp_object::X const *,n$2:int,n$3:int) [line 24, column 31]\n  n$6=_fun_temp_object::X_X(n$0:temp_object::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:temp_object::X const &) [line 24, column 31]\n  NULLIFY(&a); [line 24, column 31]\n  NULLIFY(&b); [line 24, column 31]\n  NULLIFY(&__return_param); [line 24, column 31]\n  EXIT_SCOPE(n$0,n$2,n$3,n$4,n$5,n$6,a,b,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1); [line 24, column 31]\n  APPLY_ABSTRACTION; [line 24, column 31]\n " shape="box"]
+"getX#temp_object(class temp_object::X)#4720444219866178245.c6d7bacbd2aa751dffef569ff17890e7_3" [label="3:  Return Stmt \n   n$0=*&__return_param:temp_object::X* [line 24, column 24]\n  n$5=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:temp_object::X const ) assign_last [line 24, column 31]\n  n$2=*&a:int [line 24, column 33]\n  n$3=*&b:int [line 24, column 36]\n  n$4=_fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$1:temp_object::X const *,n$2:int,n$3:int) [line 24, column 31]\n  n$6=_fun_temp_object::X_X(n$0:temp_object::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:temp_object::X const &) [line 24, column 31]\n  NULLIFY(&a); [line 24, column 31]\n  NULLIFY(&b); [line 24, column 31]\n  NULLIFY(&__return_param); [line 24, column 31]\n  EXIT_SCOPE(n$0,n$2,n$3,n$4,n$5,n$6,a,b,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1); [line 24, column 31]\n  APPLY_ABSTRACTION; [line 24, column 31]\n " shape="box"]
 	
 
 	 "getX#temp_object(class temp_object::X)#4720444219866178245.c6d7bacbd2aa751dffef569ff17890e7_3" -> "getX#temp_object(class temp_object::X)#4720444219866178245.c6d7bacbd2aa751dffef569ff17890e7_2" ;
@@ -44,7 +44,7 @@ digraph cfg {
 "getX_field_div0#temp_object#12698122843139253036.854c4a3940ca05110785248e1303db49_2" [label="2: Exit temp_object::getX_field_div0 \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 37, column 51]\n " color=yellow style=filled]
 	
 
-"getX_field_div0#temp_object#12698122843139253036.854c4a3940ca05110785248e1303db49_3" [label="3:  Return Stmt \n   n$3=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X) [line 37, column 36]\n  n$2=_fun_temp_object::getX(0:int,1:int,&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X*) [line 37, column 36]\n  n$4=*&0$?%__sil_tmpSIL_materialize_temp__n$0.f:int [line 37, column 36]\n  n$5=_fun_temp_object::div(n$4:int) [line 37, column 32]\n  *&return:int=n$5 [line 37, column 25]\n  EXIT_SCOPE(n$2,n$3,n$4,n$5,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 37, column 25]\n  APPLY_ABSTRACTION; [line 37, column 25]\n " shape="box"]
+"getX_field_div0#temp_object#12698122843139253036.854c4a3940ca05110785248e1303db49_3" [label="3:  Return Stmt \n   n$3=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X) assign_last [line 37, column 36]\n  n$2=_fun_temp_object::getX(0:int,1:int,&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X*) assign_last [line 37, column 36]\n  n$4=*&0$?%__sil_tmpSIL_materialize_temp__n$0.f:int [line 37, column 36]\n  n$5=_fun_temp_object::div(n$4:int) [line 37, column 32]\n  *&return:int=n$5 [line 37, column 25]\n  EXIT_SCOPE(n$2,n$3,n$4,n$5,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 37, column 25]\n  APPLY_ABSTRACTION; [line 37, column 25]\n " shape="box"]
 	
 
 	 "getX_field_div0#temp_object#12698122843139253036.854c4a3940ca05110785248e1303db49_3" -> "getX_field_div0#temp_object#12698122843139253036.854c4a3940ca05110785248e1303db49_2" ;
@@ -55,7 +55,7 @@ digraph cfg {
 "getX_field_div1#temp_object#11953596240866039963.ee557e5aaabf95f2c8b1284adfc7249e_2" [label="2: Exit temp_object::getX_field_div1 \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 43, column 51]\n " color=yellow style=filled]
 	
 
-"getX_field_div1#temp_object#11953596240866039963.ee557e5aaabf95f2c8b1284adfc7249e_3" [label="3:  Return Stmt \n   n$3=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X) [line 43, column 36]\n  n$2=_fun_temp_object::getX(1:int,0:int,&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X*) [line 43, column 36]\n  n$4=*&0$?%__sil_tmpSIL_materialize_temp__n$0.f:int [line 43, column 36]\n  n$5=_fun_temp_object::div(n$4:int) [line 43, column 32]\n  *&return:int=n$5 [line 43, column 25]\n  EXIT_SCOPE(n$2,n$3,n$4,n$5,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 43, column 25]\n  APPLY_ABSTRACTION; [line 43, column 25]\n " shape="box"]
+"getX_field_div1#temp_object#11953596240866039963.ee557e5aaabf95f2c8b1284adfc7249e_3" [label="3:  Return Stmt \n   n$3=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X) assign_last [line 43, column 36]\n  n$2=_fun_temp_object::getX(1:int,0:int,&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X*) assign_last [line 43, column 36]\n  n$4=*&0$?%__sil_tmpSIL_materialize_temp__n$0.f:int [line 43, column 36]\n  n$5=_fun_temp_object::div(n$4:int) [line 43, column 32]\n  *&return:int=n$5 [line 43, column 25]\n  EXIT_SCOPE(n$2,n$3,n$4,n$5,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 43, column 25]\n  APPLY_ABSTRACTION; [line 43, column 25]\n " shape="box"]
 	
 
 	 "getX_field_div1#temp_object#11953596240866039963.ee557e5aaabf95f2c8b1284adfc7249e_3" -> "getX_field_div1#temp_object#11953596240866039963.ee557e5aaabf95f2c8b1284adfc7249e_2" ;
@@ -66,7 +66,7 @@ digraph cfg {
 "getX_method_div0#temp_object#10654710522454889600.9c743f651914acdd07ad2c70becfd89c_2" [label="2: Exit temp_object::getX_method_div0 \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 39, column 51]\n " color=yellow style=filled]
 	
 
-"getX_method_div0#temp_object#10654710522454889600.9c743f651914acdd07ad2c70becfd89c_3" [label="3:  Return Stmt \n   n$3=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X) [line 39, column 33]\n  n$2=_fun_temp_object::getX(0:int,1:int,&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X*) [line 39, column 33]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X [line 39, column 33]\n  n$5=_fun_temp_object::X_div(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X&) [line 39, column 33]\n  *&return:int=n$5 [line 39, column 26]\n  EXIT_SCOPE(_,n$2,n$3,n$5,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 39, column 26]\n  APPLY_ABSTRACTION; [line 39, column 26]\n " shape="box"]
+"getX_method_div0#temp_object#10654710522454889600.9c743f651914acdd07ad2c70becfd89c_3" [label="3:  Return Stmt \n   n$3=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X) assign_last [line 39, column 33]\n  n$2=_fun_temp_object::getX(0:int,1:int,&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X*) assign_last [line 39, column 33]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X [line 39, column 33]\n  n$5=_fun_temp_object::X_div(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X&) [line 39, column 33]\n  *&return:int=n$5 [line 39, column 26]\n  EXIT_SCOPE(_,n$2,n$3,n$5,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 39, column 26]\n  APPLY_ABSTRACTION; [line 39, column 26]\n " shape="box"]
 	
 
 	 "getX_method_div0#temp_object#10654710522454889600.9c743f651914acdd07ad2c70becfd89c_3" -> "getX_method_div0#temp_object#10654710522454889600.9c743f651914acdd07ad2c70becfd89c_2" ;
@@ -77,7 +77,7 @@ digraph cfg {
 "temp_field2_div0#temp_object#17763200808338657027.dd874be310bbf8e78129b073d73ad49f_2" [label="2: Exit temp_object::temp_field2_div0 \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 33, column 46]\n " color=yellow style=filled]
 	
 
-"temp_field2_div0#temp_object#17763200808338657027.dd874be310bbf8e78129b073d73ad49f_3" [label="3:  Return Stmt \n   n$2=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X) [line 33, column 37]\n  n$1=_fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X*,0:int) [line 33, column 37]\n  n$3=*&0$?%__sil_tmpSIL_materialize_temp__n$0.f:int [line 33, column 37]\n  n$4=_fun_temp_object::div(n$3:int) [line 33, column 33]\n  *&return:int=n$4 [line 33, column 26]\n  EXIT_SCOPE(n$1,n$2,n$3,n$4,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 33, column 26]\n  APPLY_ABSTRACTION; [line 33, column 26]\n " shape="box"]
+"temp_field2_div0#temp_object#17763200808338657027.dd874be310bbf8e78129b073d73ad49f_3" [label="3:  Return Stmt \n   n$2=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X) assign_last [line 33, column 37]\n  n$1=_fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X*,0:int) [line 33, column 37]\n  n$3=*&0$?%__sil_tmpSIL_materialize_temp__n$0.f:int [line 33, column 37]\n  n$4=_fun_temp_object::div(n$3:int) [line 33, column 33]\n  *&return:int=n$4 [line 33, column 26]\n  EXIT_SCOPE(n$1,n$2,n$3,n$4,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 33, column 26]\n  APPLY_ABSTRACTION; [line 33, column 26]\n " shape="box"]
 	
 
 	 "temp_field2_div0#temp_object#17763200808338657027.dd874be310bbf8e78129b073d73ad49f_3" -> "temp_field2_div0#temp_object#17763200808338657027.dd874be310bbf8e78129b073d73ad49f_2" ;
@@ -88,7 +88,7 @@ digraph cfg {
 "temp_field_div0#temp_object#15412040659245592666.f5d0fb2d0c8f868e114b6379ad654aef_2" [label="2: Exit temp_object::temp_field_div0 \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 31, column 48]\n " color=yellow style=filled]
 	
 
-"temp_field_div0#temp_object#15412040659245592666.f5d0fb2d0c8f868e114b6379ad654aef_3" [label="3:  Return Stmt \n   n$2=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X) [line 31, column 36]\n  n$1=_fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X*,0:int,1:int) [line 31, column 36]\n  n$3=*&0$?%__sil_tmpSIL_materialize_temp__n$0.f:int [line 31, column 36]\n  n$4=_fun_temp_object::div(n$3:int) [line 31, column 32]\n  *&return:int=n$4 [line 31, column 25]\n  EXIT_SCOPE(n$1,n$2,n$3,n$4,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 31, column 25]\n  APPLY_ABSTRACTION; [line 31, column 25]\n " shape="box"]
+"temp_field_div0#temp_object#15412040659245592666.f5d0fb2d0c8f868e114b6379ad654aef_3" [label="3:  Return Stmt \n   n$2=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X) assign_last [line 31, column 36]\n  n$1=_fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X*,0:int,1:int) [line 31, column 36]\n  n$3=*&0$?%__sil_tmpSIL_materialize_temp__n$0.f:int [line 31, column 36]\n  n$4=_fun_temp_object::div(n$3:int) [line 31, column 32]\n  *&return:int=n$4 [line 31, column 25]\n  EXIT_SCOPE(n$1,n$2,n$3,n$4,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 31, column 25]\n  APPLY_ABSTRACTION; [line 31, column 25]\n " shape="box"]
 	
 
 	 "temp_field_div0#temp_object#15412040659245592666.f5d0fb2d0c8f868e114b6379ad654aef_3" -> "temp_field_div0#temp_object#15412040659245592666.f5d0fb2d0c8f868e114b6379ad654aef_2" ;
@@ -99,7 +99,7 @@ digraph cfg {
 "temp_field_div1#temp_object#14919979518945721169.463c8bf1b85b2fefc9473e70e135e02d_2" [label="2: Exit temp_object::temp_field_div1 \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 41, column 48]\n " color=yellow style=filled]
 	
 
-"temp_field_div1#temp_object#14919979518945721169.463c8bf1b85b2fefc9473e70e135e02d_3" [label="3:  Return Stmt \n   n$2=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X) [line 41, column 36]\n  n$1=_fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X*,1:int,0:int) [line 41, column 36]\n  n$3=*&0$?%__sil_tmpSIL_materialize_temp__n$0.f:int [line 41, column 36]\n  n$4=_fun_temp_object::div(n$3:int) [line 41, column 32]\n  *&return:int=n$4 [line 41, column 25]\n  EXIT_SCOPE(n$1,n$2,n$3,n$4,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 41, column 25]\n  APPLY_ABSTRACTION; [line 41, column 25]\n " shape="box"]
+"temp_field_div1#temp_object#14919979518945721169.463c8bf1b85b2fefc9473e70e135e02d_3" [label="3:  Return Stmt \n   n$2=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X) assign_last [line 41, column 36]\n  n$1=_fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X*,1:int,0:int) [line 41, column 36]\n  n$3=*&0$?%__sil_tmpSIL_materialize_temp__n$0.f:int [line 41, column 36]\n  n$4=_fun_temp_object::div(n$3:int) [line 41, column 32]\n  *&return:int=n$4 [line 41, column 25]\n  EXIT_SCOPE(n$1,n$2,n$3,n$4,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 41, column 25]\n  APPLY_ABSTRACTION; [line 41, column 25]\n " shape="box"]
 	
 
 	 "temp_field_div1#temp_object#14919979518945721169.463c8bf1b85b2fefc9473e70e135e02d_3" -> "temp_field_div1#temp_object#14919979518945721169.463c8bf1b85b2fefc9473e70e135e02d_2" ;
@@ -110,7 +110,7 @@ digraph cfg {
 "temp_method_div0#temp_object#17009651611825801298.b27a48cdb872e8bc72f1181813e5d666_2" [label="2: Exit temp_object::temp_method_div0 \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 35, column 48]\n " color=yellow style=filled]
 	
 
-"temp_method_div0#temp_object#17009651611825801298.b27a48cdb872e8bc72f1181813e5d666_3" [label="3:  Return Stmt \n   n$2=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X) [line 35, column 33]\n  n$1=_fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X*,0:int,1:int) [line 35, column 33]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X [line 35, column 33]\n  n$4=_fun_temp_object::X_div(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X&) [line 35, column 33]\n  *&return:int=n$4 [line 35, column 26]\n  EXIT_SCOPE(_,n$1,n$2,n$4,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 35, column 26]\n  APPLY_ABSTRACTION; [line 35, column 26]\n " shape="box"]
+"temp_method_div0#temp_object#17009651611825801298.b27a48cdb872e8bc72f1181813e5d666_3" [label="3:  Return Stmt \n   n$2=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X) assign_last [line 35, column 33]\n  n$1=_fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X*,0:int,1:int) [line 35, column 33]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X [line 35, column 33]\n  n$4=_fun_temp_object::X_div(&0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X&) [line 35, column 33]\n  *&return:int=n$4 [line 35, column 26]\n  EXIT_SCOPE(_,n$1,n$2,n$4,0$?%__sil_tmpSIL_materialize_temp__n$0); [line 35, column 26]\n  APPLY_ABSTRACTION; [line 35, column 26]\n " shape="box"]
 	
 
 	 "temp_method_div0#temp_object#17009651611825801298.b27a48cdb872e8bc72f1181813e5d666_3" -> "temp_method_div0#temp_object#17009651611825801298.b27a48cdb872e8bc72f1181813e5d666_2" ;

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

@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "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   n$7=_fun___variable_initialization(&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$8=_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$9=_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,n$9,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   n$7=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$5:std::runtime_error const ) assign_last [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$8=_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$9=_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,n$9,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" -> "FN_deref_null_after_catch_bad#4627123003703707696.43441e3badf1bb571cbe770f9d51a51c_3" ;
@@ -35,7 +35,7 @@ digraph cfg {
 	
 
 	 "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   n$5=_fun___variable_initialization(&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$6=_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$7=_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,n$7,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   n$5=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$3:std::runtime_error const ) assign_last [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$6=_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$7=_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,n$7,0$?%__sil_tmpSIL_materialize_temp__n$3); [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" ;
@@ -44,7 +44,7 @@ digraph cfg {
 	
 
 	 "FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_5" -> "FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_2" ;
-"FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_6" [label="6:  DeclStmt \n   n$12=_fun___variable_initialization(&i:int*) [line 36, column 3]\n  *&i:int*=null [line 36, column 3]\n  EXIT_SCOPE(n$12); [line 36, column 3]\n " shape="box"]
+"FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_6" [label="6:  DeclStmt \n   n$12=_fun___variable_initialization(&i:int*) assign_last [line 36, column 3]\n  *&i:int*=null [line 36, column 3]\n  EXIT_SCOPE(n$12); [line 36, column 3]\n " shape="box"]
 	
 
 	 "FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_6" -> "FN_deref_null_in_catch_bad#9297890526029657977.c83eec7c9ab8ce2e38ddbc08f8c3dfeb_4" ;
@@ -73,11 +73,11 @@ digraph cfg {
 	
 
 	 "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   n$7=_fun___variable_initialization(&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$8=_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$9=_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,n$9,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   n$7=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$5:std::length_error const ) assign_last [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$8=_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$9=_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,n$9,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" -> "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_4" ;
-"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_8" [label="8:  ObjCCPPThrow \n   n$14=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$12:std::range_error const ) [line 62, column 13]\n  n$13=_fun_std::range_error_range_error(&0$?%__sil_tmpSIL_materialize_temp__n$12:std::range_error const *,\"error\":char const *) [line 62, column 13]\n  n$15=_fun_std::range_error_range_error(&0$?%__sil_tmp__temp_construct_n$11:std::range_error*,&0$?%__sil_tmpSIL_materialize_temp__n$12:std::range_error const &) [line 62, column 13]\n  n$16=_fun___infer_objc_cpp_throw(&0$?%__sil_tmp__temp_construct_n$11:std::range_error) [line 62, column 7]\n  EXIT_SCOPE(n$13,n$14,n$15,n$16,0$?%__sil_tmpSIL_materialize_temp__n$12); [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   n$14=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$12:std::range_error const ) assign_last [line 62, column 13]\n  n$13=_fun_std::range_error_range_error(&0$?%__sil_tmpSIL_materialize_temp__n$12:std::range_error const *,\"error\":char const *) [line 62, column 13]\n  n$15=_fun_std::range_error_range_error(&0$?%__sil_tmp__temp_construct_n$11:std::range_error*,&0$?%__sil_tmpSIL_materialize_temp__n$12:std::range_error const &) [line 62, column 13]\n  n$16=_fun___infer_objc_cpp_throw(&0$?%__sil_tmp__temp_construct_n$11:std::range_error) [line 62, column 7]\n  EXIT_SCOPE(n$13,n$14,n$15,n$16,0$?%__sil_tmpSIL_materialize_temp__n$12); [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" ;
@@ -89,12 +89,12 @@ digraph cfg {
 	
 
 	 "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_10" -> "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_2" ;
-"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_11" [label="11:  DeclStmt \n   n$26=_fun___variable_initialization(&j:int*) [line 57, column 3]\n  *&j:int*=null [line 57, column 3]\n  EXIT_SCOPE(n$26); [line 57, column 3]\n " shape="box"]
+"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_11" [label="11:  DeclStmt \n   n$26=_fun___variable_initialization(&j:int*) assign_last [line 57, column 3]\n  *&j:int*=null [line 57, column 3]\n  EXIT_SCOPE(n$26); [line 57, column 3]\n " shape="box"]
 	
 
 	 "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_11" -> "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_5" ;
 	 "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_11" -> "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_6" ;
-"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_12" [label="12:  DeclStmt \n   n$27=_fun___variable_initialization(&i:int*) [line 56, column 3]\n  *&i:int*=null [line 56, column 3]\n  EXIT_SCOPE(n$27); [line 56, column 3]\n " shape="box"]
+"FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_12" [label="12:  DeclStmt \n   n$27=_fun___variable_initialization(&i:int*) assign_last [line 56, column 3]\n  *&i:int*=null [line 56, column 3]\n  EXIT_SCOPE(n$27); [line 56, column 3]\n " shape="box"]
 	
 
 	 "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_12" -> "FN_multiple_catches_bad#4595182522053295670.680a793e449c2d7439ff6441ca69fa98_11" ;
@@ -105,7 +105,7 @@ digraph cfg {
 "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_3" [label="3:  ObjCCPPThrow \n   n$4=_fun___variable_initialization(&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$5=_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$6=_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,n$6,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   n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$2:std::runtime_error const ) assign_last [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$5=_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$6=_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,n$6,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" -> "basic_throw_ok#10529188890980782893.c9e1b8dd080b2621cfca65612331859d_2" ;
@@ -131,11 +131,11 @@ digraph cfg {
 	
 
 	 "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   n$6=_fun___variable_initialization(&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$7=_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$8=_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,n$8,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   n$6=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$4:std::runtime_error const ) assign_last [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$7=_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$8=_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,n$8,0$?%__sil_tmpSIL_materialize_temp__n$4); [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" ;
-"dead_deref_null_after_throw_ok#12025371096822526715.42d41c040f3a321bb94f60bf7b55d001_5" [label="5:  DeclStmt \n   n$9=_fun___variable_initialization(&i:int*) [line 30, column 3]\n  *&i:int*=null [line 30, column 3]\n  EXIT_SCOPE(n$9); [line 30, column 3]\n " shape="box"]
+"dead_deref_null_after_throw_ok#12025371096822526715.42d41c040f3a321bb94f60bf7b55d001_5" [label="5:  DeclStmt \n   n$9=_fun___variable_initialization(&i:int*) assign_last [line 30, column 3]\n  *&i:int*=null [line 30, column 3]\n  EXIT_SCOPE(n$9); [line 30, column 3]\n " shape="box"]
 	
 
 	 "dead_deref_null_after_throw_ok#12025371096822526715.42d41c040f3a321bb94f60bf7b55d001_5" -> "dead_deref_null_after_throw_ok#12025371096822526715.42d41c040f3a321bb94f60bf7b55d001_4" ;

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

@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_3" -> "bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_2" ;
-"bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_4" [label="4:  DeclStmt \n   n$8=_fun___variable_initialization(&func:bar::lambda_shared_lambda_lambda1.cpp:9:15) [line 9, column 3]\n  n$6=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$5:bar::lambda_shared_lambda_lambda1.cpp:9:15) [line 9, column 15]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$5:bar::lambda_shared_lambda_lambda1.cpp:9:15=(_fun_bar::lambda_shared_lambda_lambda1.cpp:9:15_operator()) [line 9, column 15]\n  n$7=_fun_bar::lambda_shared_lambda_lambda1.cpp:9:15_(&func:bar::lambda_shared_lambda_lambda1.cpp:9:15*,&0$?%__sil_tmpSIL_materialize_temp__n$5:bar::lambda_shared_lambda_lambda1.cpp:9:15&) [line 9, column 15]\n  EXIT_SCOPE(n$6,n$7,n$8,0$?%__sil_tmpSIL_materialize_temp__n$5); [line 9, column 15]\n " shape="box"]
+"bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_4" [label="4:  DeclStmt \n   n$8=_fun___variable_initialization(&func:bar::lambda_shared_lambda_lambda1.cpp:9:15) assign_last [line 9, column 3]\n  n$6=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$5:bar::lambda_shared_lambda_lambda1.cpp:9:15) assign_last [line 9, column 15]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$5:bar::lambda_shared_lambda_lambda1.cpp:9:15=(_fun_bar::lambda_shared_lambda_lambda1.cpp:9:15_operator()) [line 9, column 15]\n  n$7=_fun_bar::lambda_shared_lambda_lambda1.cpp:9:15_(&func:bar::lambda_shared_lambda_lambda1.cpp:9:15*,&0$?%__sil_tmpSIL_materialize_temp__n$5:bar::lambda_shared_lambda_lambda1.cpp:9:15&) [line 9, column 15]\n  EXIT_SCOPE(n$6,n$7,n$8,0$?%__sil_tmpSIL_materialize_temp__n$5); [line 9, column 15]\n " shape="box"]
 	
 
 	 "bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_4" -> "bar#13629960763458822780.27859d4aca4c920a20241f1b78082005_3" ;
@@ -26,11 +26,11 @@ digraph cfg {
 	
 
 	 "capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_3" -> "capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_2" ;
-"capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_4" [label="4:  Call _fun_capture_by_ref::lambda_shared_lambda_lambda1.cpp:36:3_operator() \n   n$4=_fun___variable_initialization(&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$5=_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,n$5,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   n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$3:capture_by_ref::lambda_shared_lambda_lambda1.cpp:36:3) assign_last [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$5=_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,n$5,0$?%__sil_tmpSIL_materialize_temp__n$3); [line 36, column 3]\n " shape="box"]
 	
 
 	 "capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_4" -> "capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_3" ;
-"capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_5" [label="5:  DeclStmt \n   n$6=_fun___variable_initialization(&x:int) [line 35, column 3]\n  *&x:int=0 [line 35, column 3]\n  EXIT_SCOPE(n$6); [line 35, column 3]\n " shape="box"]
+"capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_5" [label="5:  DeclStmt \n   n$6=_fun___variable_initialization(&x:int) assign_last [line 35, column 3]\n  *&x:int=0 [line 35, column 3]\n  EXIT_SCOPE(n$6); [line 35, column 3]\n " shape="box"]
 	
 
 	 "capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_5" -> "capture_by_ref#4375601249296069049.1d794578c048d96b25fb1e90dbaa8225_4" ;
@@ -45,11 +45,11 @@ digraph cfg {
 	
 
 	 "foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_3" -> "foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_2" ;
-"foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_4" [label="4:  DeclStmt \n   n$10=_fun___variable_initialization(&y:foo::lambda_shared_lambda_lambda1.cpp:18:12) [line 18, column 3]\n  n$8=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$7:foo::lambda_shared_lambda_lambda1.cpp:18:12) [line 18, column 12]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$7:foo::lambda_shared_lambda_lambda1.cpp:18:12=(_fun_foo::lambda_shared_lambda_lambda1.cpp:18:12_operator()) [line 18, column 12]\n  n$9=_fun_foo::lambda_shared_lambda_lambda1.cpp:18:12_(&y:foo::lambda_shared_lambda_lambda1.cpp:18:12*,&0$?%__sil_tmpSIL_materialize_temp__n$7:foo::lambda_shared_lambda_lambda1.cpp:18:12&) [line 18, column 12]\n  EXIT_SCOPE(n$8,n$9,n$10,0$?%__sil_tmpSIL_materialize_temp__n$7); [line 18, column 12]\n " shape="box"]
+"foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_4" [label="4:  DeclStmt \n   n$10=_fun___variable_initialization(&y:foo::lambda_shared_lambda_lambda1.cpp:18:12) assign_last [line 18, column 3]\n  n$8=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$7:foo::lambda_shared_lambda_lambda1.cpp:18:12) assign_last [line 18, column 12]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$7:foo::lambda_shared_lambda_lambda1.cpp:18:12=(_fun_foo::lambda_shared_lambda_lambda1.cpp:18:12_operator()) [line 18, column 12]\n  n$9=_fun_foo::lambda_shared_lambda_lambda1.cpp:18:12_(&y:foo::lambda_shared_lambda_lambda1.cpp:18:12*,&0$?%__sil_tmpSIL_materialize_temp__n$7:foo::lambda_shared_lambda_lambda1.cpp:18:12&) [line 18, column 12]\n  EXIT_SCOPE(n$8,n$9,n$10,0$?%__sil_tmpSIL_materialize_temp__n$7); [line 18, column 12]\n " shape="box"]
 	
 
 	 "foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_4" -> "foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_3" ;
-"foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_5" [label="5:  DeclStmt \n   n$14=_fun___variable_initialization(&unused:foo::lambda_shared_lambda_lambda1.cpp:17:17) [line 17, column 3]\n  n$12=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$11:foo::lambda_shared_lambda_lambda1.cpp:17:17) [line 17, column 17]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$11:foo::lambda_shared_lambda_lambda1.cpp:17:17=(_fun_foo::lambda_shared_lambda_lambda1.cpp:17:17_operator()) [line 17, column 17]\n  n$13=_fun_foo::lambda_shared_lambda_lambda1.cpp:17:17_(&unused:foo::lambda_shared_lambda_lambda1.cpp:17:17*,&0$?%__sil_tmpSIL_materialize_temp__n$11:foo::lambda_shared_lambda_lambda1.cpp:17:17&) [line 17, column 17]\n  EXIT_SCOPE(n$12,n$13,n$14,0$?%__sil_tmpSIL_materialize_temp__n$11); [line 17, column 17]\n " shape="box"]
+"foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_5" [label="5:  DeclStmt \n   n$14=_fun___variable_initialization(&unused:foo::lambda_shared_lambda_lambda1.cpp:17:17) assign_last [line 17, column 3]\n  n$12=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$11:foo::lambda_shared_lambda_lambda1.cpp:17:17) assign_last [line 17, column 17]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$11:foo::lambda_shared_lambda_lambda1.cpp:17:17=(_fun_foo::lambda_shared_lambda_lambda1.cpp:17:17_operator()) [line 17, column 17]\n  n$13=_fun_foo::lambda_shared_lambda_lambda1.cpp:17:17_(&unused:foo::lambda_shared_lambda_lambda1.cpp:17:17*,&0$?%__sil_tmpSIL_materialize_temp__n$11:foo::lambda_shared_lambda_lambda1.cpp:17:17&) [line 17, column 17]\n  EXIT_SCOPE(n$12,n$13,n$14,0$?%__sil_tmpSIL_materialize_temp__n$11); [line 17, column 17]\n " shape="box"]
 	
 
 	 "foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_5" -> "foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_4" ;
@@ -64,7 +64,7 @@ digraph cfg {
 	
 
 	 "fooOK#5521302935427608539.9c36ec052efdd50972817d895666852a_3" -> "fooOK#5521302935427608539.9c36ec052efdd50972817d895666852a_2" ;
-"fooOK#5521302935427608539.9c36ec052efdd50972817d895666852a_4" [label="4:  DeclStmt \n   n$8=_fun___variable_initialization(&y:fooOK::lambda_shared_lambda_lambda1.cpp:24:12) [line 24, column 3]\n  n$6=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$5:fooOK::lambda_shared_lambda_lambda1.cpp:24:12) [line 24, column 12]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$5:fooOK::lambda_shared_lambda_lambda1.cpp:24:12=(_fun_fooOK::lambda_shared_lambda_lambda1.cpp:24:12_operator()) [line 24, column 12]\n  n$7=_fun_fooOK::lambda_shared_lambda_lambda1.cpp:24:12_(&y:fooOK::lambda_shared_lambda_lambda1.cpp:24:12*,&0$?%__sil_tmpSIL_materialize_temp__n$5:fooOK::lambda_shared_lambda_lambda1.cpp:24:12&) [line 24, column 12]\n  EXIT_SCOPE(n$6,n$7,n$8,0$?%__sil_tmpSIL_materialize_temp__n$5); [line 24, column 12]\n " shape="box"]
+"fooOK#5521302935427608539.9c36ec052efdd50972817d895666852a_4" [label="4:  DeclStmt \n   n$8=_fun___variable_initialization(&y:fooOK::lambda_shared_lambda_lambda1.cpp:24:12) assign_last [line 24, column 3]\n  n$6=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$5:fooOK::lambda_shared_lambda_lambda1.cpp:24:12) assign_last [line 24, column 12]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$5:fooOK::lambda_shared_lambda_lambda1.cpp:24:12=(_fun_fooOK::lambda_shared_lambda_lambda1.cpp:24:12_operator()) [line 24, column 12]\n  n$7=_fun_fooOK::lambda_shared_lambda_lambda1.cpp:24:12_(&y:fooOK::lambda_shared_lambda_lambda1.cpp:24:12*,&0$?%__sil_tmpSIL_materialize_temp__n$5:fooOK::lambda_shared_lambda_lambda1.cpp:24:12&) [line 24, column 12]\n  EXIT_SCOPE(n$6,n$7,n$8,0$?%__sil_tmpSIL_materialize_temp__n$5); [line 24, column 12]\n " shape="box"]
 	
 
 	 "fooOK#5521302935427608539.9c36ec052efdd50972817d895666852a_4" -> "fooOK#5521302935427608539.9c36ec052efdd50972817d895666852a_3" ;
@@ -75,11 +75,11 @@ digraph cfg {
 "init_capture1#11582985675627962568.58b9ce334267f411dc5e1c70bd53eb81_2" [label="2: Exit init_capture1 \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 42, column 1]\n " color=yellow style=filled]
 	
 
-"init_capture1#11582985675627962568.58b9ce334267f411dc5e1c70bd53eb81_3" [label="3:  DeclStmt \n   n$2=_fun___variable_initialization(&i:int) [line 41, column 10]\n  *&i:int=0 [line 41, column 10]\n  EXIT_SCOPE(n$2); [line 41, column 10]\n " shape="box"]
+"init_capture1#11582985675627962568.58b9ce334267f411dc5e1c70bd53eb81_3" [label="3:  DeclStmt \n   n$2=_fun___variable_initialization(&i:int) assign_last [line 41, column 10]\n  *&i:int=0 [line 41, column 10]\n  EXIT_SCOPE(n$2); [line 41, column 10]\n " shape="box"]
 	
 
 	 "init_capture1#11582985675627962568.58b9ce334267f411dc5e1c70bd53eb81_3" -> "init_capture1#11582985675627962568.58b9ce334267f411dc5e1c70bd53eb81_4" ;
-"init_capture1#11582985675627962568.58b9ce334267f411dc5e1c70bd53eb81_4" [label="4:  Return Stmt \n   n$3=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:init_capture1::lambda_shared_lambda_lambda1.cpp:41:10) [line 41, column 10]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$1:init_capture1::lambda_shared_lambda_lambda1.cpp:41:10=(_fun_init_capture1::lambda_shared_lambda_lambda1.cpp:41:10_operator(),&i) [line 41, column 10]\n  n$4=_fun_init_capture1::lambda_shared_lambda_lambda1.cpp:41:10_operator()(&0$?%__sil_tmpSIL_materialize_temp__n$1:init_capture1::lambda_shared_lambda_lambda1.cpp:41:10&) [line 41, column 10]\n  *&return:int=n$4 [line 41, column 3]\n  NULLIFY(&i); [line 41, column 3]\n  EXIT_SCOPE(n$3,n$4,i,0$?%__sil_tmpSIL_materialize_temp__n$1); [line 41, column 3]\n  APPLY_ABSTRACTION; [line 41, column 3]\n " shape="box"]
+"init_capture1#11582985675627962568.58b9ce334267f411dc5e1c70bd53eb81_4" [label="4:  Return Stmt \n   n$3=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:init_capture1::lambda_shared_lambda_lambda1.cpp:41:10) assign_last [line 41, column 10]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$1:init_capture1::lambda_shared_lambda_lambda1.cpp:41:10=(_fun_init_capture1::lambda_shared_lambda_lambda1.cpp:41:10_operator(),&i) [line 41, column 10]\n  n$4=_fun_init_capture1::lambda_shared_lambda_lambda1.cpp:41:10_operator()(&0$?%__sil_tmpSIL_materialize_temp__n$1:init_capture1::lambda_shared_lambda_lambda1.cpp:41:10&) [line 41, column 10]\n  *&return:int=n$4 [line 41, column 3]\n  NULLIFY(&i); [line 41, column 3]\n  EXIT_SCOPE(n$3,n$4,i,0$?%__sil_tmpSIL_materialize_temp__n$1); [line 41, column 3]\n  APPLY_ABSTRACTION; [line 41, column 3]\n " shape="box"]
 	
 
 	 "init_capture1#11582985675627962568.58b9ce334267f411dc5e1c70bd53eb81_4" -> "init_capture1#11582985675627962568.58b9ce334267f411dc5e1c70bd53eb81_2" ;
@@ -90,23 +90,23 @@ digraph cfg {
 "init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_2" [label="2: Exit init_capture2 \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 47, column 1]\n " color=yellow style=filled]
 	
 
-"init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_3" [label="3:  DeclStmt \n   n$2=_fun___variable_initialization(&c:int) [line 46, column 10]\n  *&c:int=3 [line 46, column 10]\n  EXIT_SCOPE(n$2); [line 46, column 10]\n " shape="box"]
+"init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_3" [label="3:  DeclStmt \n   n$2=_fun___variable_initialization(&c:int) assign_last [line 46, column 10]\n  *&c:int=3 [line 46, column 10]\n  EXIT_SCOPE(n$2); [line 46, column 10]\n " shape="box"]
 	
 
 	 "init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_3" -> "init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_6" ;
-"init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_4" [label="4:  DeclStmt \n   n$3=_fun___variable_initialization(&b:int) [line 46, column 10]\n  *&b:int=0 [line 46, column 10]\n  EXIT_SCOPE(n$3); [line 46, column 10]\n " shape="box"]
+"init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_4" [label="4:  DeclStmt \n   n$3=_fun___variable_initialization(&b:int) assign_last [line 46, column 10]\n  *&b:int=0 [line 46, column 10]\n  EXIT_SCOPE(n$3); [line 46, column 10]\n " shape="box"]
 	
 
 	 "init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_4" -> "init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_3" ;
-"init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&a:int) [line 46, column 10]\n  n$4=*&i:int [line 46, column 15]\n  *&a:int=n$4 [line 46, column 10]\n  NULLIFY(&i); [line 46, column 10]\n  EXIT_SCOPE(n$4,n$5,i); [line 46, column 10]\n " shape="box"]
+"init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_5" [label="5:  DeclStmt \n   n$5=_fun___variable_initialization(&a:int) assign_last [line 46, column 10]\n  n$4=*&i:int [line 46, column 15]\n  *&a:int=n$4 [line 46, column 10]\n  NULLIFY(&i); [line 46, column 10]\n  EXIT_SCOPE(n$4,n$5,i); [line 46, column 10]\n " shape="box"]
 	
 
 	 "init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_5" -> "init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_4" ;
-"init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_6" [label="6:  Return Stmt \n   n$6=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:init_capture2::lambda_shared_lambda_lambda1.cpp:46:10) [line 46, column 10]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$1:init_capture2::lambda_shared_lambda_lambda1.cpp:46:10=(_fun_init_capture2::lambda_shared_lambda_lambda1.cpp:46:10_operator(),&a,&b,&c) [line 46, column 10]\n  n$7=_fun_init_capture2::lambda_shared_lambda_lambda1.cpp:46:10_operator()(&0$?%__sil_tmpSIL_materialize_temp__n$1:init_capture2::lambda_shared_lambda_lambda1.cpp:46:10&) [line 46, column 10]\n  *&return:int=n$7 [line 46, column 3]\n  NULLIFY(&a); [line 46, column 3]\n  NULLIFY(&b); [line 46, column 3]\n  NULLIFY(&c); [line 46, column 3]\n  EXIT_SCOPE(n$6,n$7,a,b,c,0$?%__sil_tmpSIL_materialize_temp__n$1); [line 46, column 3]\n  APPLY_ABSTRACTION; [line 46, column 3]\n " shape="box"]
+"init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_6" [label="6:  Return Stmt \n   n$6=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:init_capture2::lambda_shared_lambda_lambda1.cpp:46:10) assign_last [line 46, column 10]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$1:init_capture2::lambda_shared_lambda_lambda1.cpp:46:10=(_fun_init_capture2::lambda_shared_lambda_lambda1.cpp:46:10_operator(),&a,&b,&c) [line 46, column 10]\n  n$7=_fun_init_capture2::lambda_shared_lambda_lambda1.cpp:46:10_operator()(&0$?%__sil_tmpSIL_materialize_temp__n$1:init_capture2::lambda_shared_lambda_lambda1.cpp:46:10&) [line 46, column 10]\n  *&return:int=n$7 [line 46, column 3]\n  NULLIFY(&a); [line 46, column 3]\n  NULLIFY(&b); [line 46, column 3]\n  NULLIFY(&c); [line 46, column 3]\n  EXIT_SCOPE(n$6,n$7,a,b,c,0$?%__sil_tmpSIL_materialize_temp__n$1); [line 46, column 3]\n  APPLY_ABSTRACTION; [line 46, column 3]\n " shape="box"]
 	
 
 	 "init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_6" -> "init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_2" ;
-"init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_7" [label="7:  DeclStmt \n   n$9=_fun___variable_initialization(&i:int) [line 45, column 3]\n  *&i:int=0 [line 45, column 3]\n  EXIT_SCOPE(n$9); [line 45, column 3]\n " shape="box"]
+"init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_7" [label="7:  DeclStmt \n   n$9=_fun___variable_initialization(&i:int) assign_last [line 45, column 3]\n  *&i:int=0 [line 45, column 3]\n  EXIT_SCOPE(n$9); [line 45, column 3]\n " shape="box"]
 	
 
 	 "init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_7" -> "init_capture2#11582143449720942167.039b5039af3b7807e4b00950523a9f3a_5" ;
@@ -117,15 +117,15 @@ digraph cfg {
 "normal_capture#5533029764254319855.11493b249dddd657790695e287170b84_2" [label="2: Exit normal_capture \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 32, column 1]\n " color=yellow style=filled]
 	
 
-"normal_capture#5533029764254319855.11493b249dddd657790695e287170b84_3" [label="3:  Return Stmt \n   n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:normal_capture::lambda_shared_lambda_lambda1.cpp:31:10) [line 31, column 10]\n  n$3=*&x:int [line 31, column 10]\n  n$2=*&y:int [line 31, column 10]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$1:normal_capture::lambda_shared_lambda_lambda1.cpp:31:10=(_fun_normal_capture::lambda_shared_lambda_lambda1.cpp:31:10_operator(),(n$3 &x:int),(n$2 &y:int)) [line 31, column 10]\n  n$5=_fun_normal_capture::lambda_shared_lambda_lambda1.cpp:31:10_operator()(&0$?%__sil_tmpSIL_materialize_temp__n$1:normal_capture::lambda_shared_lambda_lambda1.cpp:31:10&) [line 31, column 10]\n  *&return:int=n$5 [line 31, column 3]\n  NULLIFY(&y); [line 31, column 3]\n  NULLIFY(&x); [line 31, column 3]\n  EXIT_SCOPE(n$2,n$3,n$4,n$5,y,0$?%__sil_tmpSIL_materialize_temp__n$1,x); [line 31, column 3]\n  APPLY_ABSTRACTION; [line 31, column 3]\n " shape="box"]
+"normal_capture#5533029764254319855.11493b249dddd657790695e287170b84_3" [label="3:  Return Stmt \n   n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:normal_capture::lambda_shared_lambda_lambda1.cpp:31:10) assign_last [line 31, column 10]\n  n$3=*&x:int [line 31, column 10]\n  n$2=*&y:int [line 31, column 10]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$1:normal_capture::lambda_shared_lambda_lambda1.cpp:31:10=(_fun_normal_capture::lambda_shared_lambda_lambda1.cpp:31:10_operator(),(n$3 &x:int),(n$2 &y:int)) [line 31, column 10]\n  n$5=_fun_normal_capture::lambda_shared_lambda_lambda1.cpp:31:10_operator()(&0$?%__sil_tmpSIL_materialize_temp__n$1:normal_capture::lambda_shared_lambda_lambda1.cpp:31:10&) [line 31, column 10]\n  *&return:int=n$5 [line 31, column 3]\n  NULLIFY(&y); [line 31, column 3]\n  NULLIFY(&x); [line 31, column 3]\n  EXIT_SCOPE(n$2,n$3,n$4,n$5,y,0$?%__sil_tmpSIL_materialize_temp__n$1,x); [line 31, column 3]\n  APPLY_ABSTRACTION; [line 31, column 3]\n " shape="box"]
 	
 
 	 "normal_capture#5533029764254319855.11493b249dddd657790695e287170b84_3" -> "normal_capture#5533029764254319855.11493b249dddd657790695e287170b84_2" ;
-"normal_capture#5533029764254319855.11493b249dddd657790695e287170b84_4" [label="4:  DeclStmt \n   n$7=_fun___variable_initialization(&y:int) [line 30, column 3]\n  *&y:int=2 [line 30, column 3]\n  EXIT_SCOPE(n$7); [line 30, column 3]\n " shape="box"]
+"normal_capture#5533029764254319855.11493b249dddd657790695e287170b84_4" [label="4:  DeclStmt \n   n$7=_fun___variable_initialization(&y:int) assign_last [line 30, column 3]\n  *&y:int=2 [line 30, column 3]\n  EXIT_SCOPE(n$7); [line 30, column 3]\n " shape="box"]
 	
 
 	 "normal_capture#5533029764254319855.11493b249dddd657790695e287170b84_4" -> "normal_capture#5533029764254319855.11493b249dddd657790695e287170b84_3" ;
-"normal_capture#5533029764254319855.11493b249dddd657790695e287170b84_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&x:int) [line 29, column 3]\n  *&x:int=1 [line 29, column 3]\n  EXIT_SCOPE(n$8); [line 29, column 3]\n " shape="box"]
+"normal_capture#5533029764254319855.11493b249dddd657790695e287170b84_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&x:int) assign_last [line 29, column 3]\n  *&x:int=1 [line 29, column 3]\n  EXIT_SCOPE(n$8); [line 29, column 3]\n " shape="box"]
 	
 
 	 "normal_capture#5533029764254319855.11493b249dddd657790695e287170b84_5" -> "normal_capture#5533029764254319855.11493b249dddd657790695e287170b84_4" ;
@@ -140,15 +140,15 @@ digraph cfg {
 	
 
 	 "struct_capture#7773507847510274281.f3db763dc0b20b24ec397f7802254c90_3" -> "struct_capture#7773507847510274281.f3db763dc0b20b24ec397f7802254c90_2" ;
-"struct_capture#7773507847510274281.f3db763dc0b20b24ec397f7802254c90_4" [label="4:  DeclStmt \n   n$14=_fun___variable_initialization(&f:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12) [line 77, column 3]\n  n$12=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$9:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12) [line 77, column 12]\n  n$11=*&x:SomeStruct [line 77, column 12]\n  n$10=*&y:SomeStruct [line 77, column 12]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$9:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12=(_fun_struct_capture::lambda_shared_lambda_lambda1.cpp:77:12_operator(),(n$11 &x:SomeStruct),(n$10 &y:SomeStruct)) [line 77, column 12]\n  n$13=_fun_struct_capture::lambda_shared_lambda_lambda1.cpp:77:12_(&f:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12*,&0$?%__sil_tmpSIL_materialize_temp__n$9:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12&) [line 77, column 12]\n  EXIT_SCOPE(n$10,n$11,n$12,n$13,n$14,0$?%__sil_tmpSIL_materialize_temp__n$9); [line 77, column 12]\n " shape="box"]
+"struct_capture#7773507847510274281.f3db763dc0b20b24ec397f7802254c90_4" [label="4:  DeclStmt \n   n$14=_fun___variable_initialization(&f:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12) assign_last [line 77, column 3]\n  n$12=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$9:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12) assign_last [line 77, column 12]\n  n$11=*&x:SomeStruct [line 77, column 12]\n  n$10=*&y:SomeStruct [line 77, column 12]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$9:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12=(_fun_struct_capture::lambda_shared_lambda_lambda1.cpp:77:12_operator(),(n$11 &x:SomeStruct),(n$10 &y:SomeStruct)) [line 77, column 12]\n  n$13=_fun_struct_capture::lambda_shared_lambda_lambda1.cpp:77:12_(&f:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12*,&0$?%__sil_tmpSIL_materialize_temp__n$9:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12&) [line 77, column 12]\n  EXIT_SCOPE(n$10,n$11,n$12,n$13,n$14,0$?%__sil_tmpSIL_materialize_temp__n$9); [line 77, column 12]\n " shape="box"]
 	
 
 	 "struct_capture#7773507847510274281.f3db763dc0b20b24ec397f7802254c90_4" -> "struct_capture#7773507847510274281.f3db763dc0b20b24ec397f7802254c90_3" ;
-"struct_capture#7773507847510274281.f3db763dc0b20b24ec397f7802254c90_5" [label="5:  DeclStmt \n   n$16=_fun___variable_initialization(&y:SomeStruct) [line 76, column 3]\n  n$15=_fun_SomeStruct_SomeStruct(&y:SomeStruct*) [line 76, column 14]\n  EXIT_SCOPE(n$15,n$16); [line 76, column 14]\n " shape="box"]
+"struct_capture#7773507847510274281.f3db763dc0b20b24ec397f7802254c90_5" [label="5:  DeclStmt \n   n$16=_fun___variable_initialization(&y:SomeStruct) assign_last [line 76, column 3]\n  n$15=_fun_SomeStruct_SomeStruct(&y:SomeStruct*) [line 76, column 14]\n  EXIT_SCOPE(n$15,n$16); [line 76, column 14]\n " shape="box"]
 	
 
 	 "struct_capture#7773507847510274281.f3db763dc0b20b24ec397f7802254c90_5" -> "struct_capture#7773507847510274281.f3db763dc0b20b24ec397f7802254c90_4" ;
-"struct_capture#7773507847510274281.f3db763dc0b20b24ec397f7802254c90_6" [label="6:  DeclStmt \n   n$18=_fun___variable_initialization(&x:SomeStruct) [line 75, column 3]\n  n$17=_fun_SomeStruct_SomeStruct(&x:SomeStruct*) [line 75, column 14]\n  EXIT_SCOPE(n$17,n$18); [line 75, column 14]\n " shape="box"]
+"struct_capture#7773507847510274281.f3db763dc0b20b24ec397f7802254c90_6" [label="6:  DeclStmt \n   n$18=_fun___variable_initialization(&x:SomeStruct) assign_last [line 75, column 3]\n  n$17=_fun_SomeStruct_SomeStruct(&x:SomeStruct*) [line 75, column 14]\n  EXIT_SCOPE(n$17,n$18); [line 75, column 14]\n " shape="box"]
 	
 
 	 "struct_capture#7773507847510274281.f3db763dc0b20b24ec397f7802254c90_6" -> "struct_capture#7773507847510274281.f3db763dc0b20b24ec397f7802254c90_5" ;
@@ -163,7 +163,7 @@ digraph cfg {
 	
 
 	 "capture_this_explicit#Capture#(13194085360619722149).2dba35a78268b10ad413414cc832a8f0_3" -> "capture_this_explicit#Capture#(13194085360619722149).2dba35a78268b10ad413414cc832a8f0_2" ;
-"capture_this_explicit#Capture#(13194085360619722149).2dba35a78268b10ad413414cc832a8f0_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&lambda:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19) [line 51, column 5]\n  n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19) [line 51, column 19]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19=(_fun_Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19_operator(),&this) [line 51, column 19]\n  n$5=_fun_Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19_(&lambda:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19*,&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19&) [line 51, column 19]\n  NULLIFY(&this); [line 51, column 19]\n  EXIT_SCOPE(n$4,n$5,n$6,0$?%__sil_tmpSIL_materialize_temp__n$3,this); [line 51, column 19]\n " shape="box"]
+"capture_this_explicit#Capture#(13194085360619722149).2dba35a78268b10ad413414cc832a8f0_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&lambda:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19) assign_last [line 51, column 5]\n  n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19) assign_last [line 51, column 19]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19=(_fun_Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19_operator(),&this) [line 51, column 19]\n  n$5=_fun_Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19_(&lambda:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19*,&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19&) [line 51, column 19]\n  NULLIFY(&this); [line 51, column 19]\n  EXIT_SCOPE(n$4,n$5,n$6,0$?%__sil_tmpSIL_materialize_temp__n$3,this); [line 51, column 19]\n " shape="box"]
 	
 
 	 "capture_this_explicit#Capture#(13194085360619722149).2dba35a78268b10ad413414cc832a8f0_4" -> "capture_this_explicit#Capture#(13194085360619722149).2dba35a78268b10ad413414cc832a8f0_3" ;
@@ -178,7 +178,7 @@ digraph cfg {
 	
 
 	 "capture_this_with_auto#Capture#(15696525048884093218).38be242109186a45cc282c38962c68e2_3" -> "capture_this_with_auto#Capture#(15696525048884093218).38be242109186a45cc282c38962c68e2_2" ;
-"capture_this_with_auto#Capture#(15696525048884093218).38be242109186a45cc282c38962c68e2_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&lambda:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19) [line 65, column 5]\n  n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19) [line 65, column 19]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19=(_fun_Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19_operator(),&this) [line 65, column 19]\n  n$5=_fun_Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19_(&lambda:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19*,&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19&) [line 65, column 19]\n  NULLIFY(&this); [line 65, column 19]\n  EXIT_SCOPE(n$4,n$5,n$6,0$?%__sil_tmpSIL_materialize_temp__n$3,this); [line 65, column 19]\n " shape="box"]
+"capture_this_with_auto#Capture#(15696525048884093218).38be242109186a45cc282c38962c68e2_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&lambda:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19) assign_last [line 65, column 5]\n  n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19) assign_last [line 65, column 19]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19=(_fun_Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19_operator(),&this) [line 65, column 19]\n  n$5=_fun_Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19_(&lambda:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19*,&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19&) [line 65, column 19]\n  NULLIFY(&this); [line 65, column 19]\n  EXIT_SCOPE(n$4,n$5,n$6,0$?%__sil_tmpSIL_materialize_temp__n$3,this); [line 65, column 19]\n " shape="box"]
 	
 
 	 "capture_this_with_auto#Capture#(15696525048884093218).38be242109186a45cc282c38962c68e2_4" -> "capture_this_with_auto#Capture#(15696525048884093218).38be242109186a45cc282c38962c68e2_3" ;
@@ -193,7 +193,7 @@ digraph cfg {
 	
 
 	 "capture_star_this#Capture#(2506493005619132138).63fd6aa2a7efbd48dc1a62c0c2bd2161_3" -> "capture_star_this#Capture#(2506493005619132138).63fd6aa2a7efbd48dc1a62c0c2bd2161_2" ;
-"capture_star_this#Capture#(2506493005619132138).63fd6aa2a7efbd48dc1a62c0c2bd2161_4" [label="4:  DeclStmt \n   n$7=_fun___variable_initialization(&lambda:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19) [line 55, column 5]\n  n$5=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19) [line 55, column 19]\n  n$4=*&this:Capture* [line 55, column 19]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19=(_fun_Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19_operator(),(n$4 &this:Capture*)) [line 55, column 19]\n  n$6=_fun_Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19_(&lambda:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19*,&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19&) [line 55, column 19]\n  NULLIFY(&this); [line 55, column 19]\n  EXIT_SCOPE(n$4,n$5,n$6,n$7,0$?%__sil_tmpSIL_materialize_temp__n$3,this); [line 55, column 19]\n " shape="box"]
+"capture_star_this#Capture#(2506493005619132138).63fd6aa2a7efbd48dc1a62c0c2bd2161_4" [label="4:  DeclStmt \n   n$7=_fun___variable_initialization(&lambda:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19) assign_last [line 55, column 5]\n  n$5=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19) assign_last [line 55, column 19]\n  n$4=*&this:Capture* [line 55, column 19]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19=(_fun_Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19_operator(),(n$4 &this:Capture*)) [line 55, column 19]\n  n$6=_fun_Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19_(&lambda:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19*,&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19&) [line 55, column 19]\n  NULLIFY(&this); [line 55, column 19]\n  EXIT_SCOPE(n$4,n$5,n$6,n$7,0$?%__sil_tmpSIL_materialize_temp__n$3,this); [line 55, column 19]\n " shape="box"]
 	
 
 	 "capture_star_this#Capture#(2506493005619132138).63fd6aa2a7efbd48dc1a62c0c2bd2161_4" -> "capture_star_this#Capture#(2506493005619132138).63fd6aa2a7efbd48dc1a62c0c2bd2161_3" ;
@@ -208,7 +208,7 @@ digraph cfg {
 	
 
 	 "capture_this_with_equal#Capture#(805776379555510952).ecd73e9a4e2bef0d060a242b61508f10_3" -> "capture_this_with_equal#Capture#(805776379555510952).ecd73e9a4e2bef0d060a242b61508f10_2" ;
-"capture_this_with_equal#Capture#(805776379555510952).ecd73e9a4e2bef0d060a242b61508f10_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&lambda:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19) [line 61, column 5]\n  n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19) [line 61, column 19]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19=(_fun_Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19_operator(),&this) [line 61, column 19]\n  n$5=_fun_Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19_(&lambda:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19*,&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19&) [line 61, column 19]\n  NULLIFY(&this); [line 61, column 19]\n  EXIT_SCOPE(n$4,n$5,n$6,0$?%__sil_tmpSIL_materialize_temp__n$3,this); [line 61, column 19]\n " shape="box"]
+"capture_this_with_equal#Capture#(805776379555510952).ecd73e9a4e2bef0d060a242b61508f10_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&lambda:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19) assign_last [line 61, column 5]\n  n$4=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19) assign_last [line 61, column 19]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19=(_fun_Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19_operator(),&this) [line 61, column 19]\n  n$5=_fun_Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19_(&lambda:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19*,&0$?%__sil_tmpSIL_materialize_temp__n$3:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19&) [line 61, column 19]\n  NULLIFY(&this); [line 61, column 19]\n  EXIT_SCOPE(n$4,n$5,n$6,0$?%__sil_tmpSIL_materialize_temp__n$3,this); [line 61, column 19]\n " shape="box"]
 	
 
 	 "capture_this_with_equal#Capture#(805776379555510952).ecd73e9a4e2bef0d060a242b61508f10_4" -> "capture_this_with_equal#Capture#(805776379555510952).ecd73e9a4e2bef0d060a242b61508f10_3" ;
@@ -485,7 +485,7 @@ digraph cfg {
 	
 
 	 "operator()#lambda_shared_lambda_lambda1.cpp:9:15#bar#(7708532531154088338).ffe36bb5dd46814f3461661fb80e3e06_3" -> "operator()#lambda_shared_lambda_lambda1.cpp:9:15#bar#(7708532531154088338).ffe36bb5dd46814f3461661fb80e3e06_2" ;
-"operator()#lambda_shared_lambda_lambda1.cpp:9:15#bar#(7708532531154088338).ffe36bb5dd46814f3461661fb80e3e06_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&i:int) [line 10, column 5]\n  *&i:int=0 [line 10, column 5]\n  EXIT_SCOPE(n$2); [line 10, column 5]\n " shape="box"]
+"operator()#lambda_shared_lambda_lambda1.cpp:9:15#bar#(7708532531154088338).ffe36bb5dd46814f3461661fb80e3e06_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&i:int) assign_last [line 10, column 5]\n  *&i:int=0 [line 10, column 5]\n  EXIT_SCOPE(n$2); [line 10, column 5]\n " shape="box"]
 	
 
 	 "operator()#lambda_shared_lambda_lambda1.cpp:9:15#bar#(7708532531154088338).ffe36bb5dd46814f3461661fb80e3e06_4" -> "operator()#lambda_shared_lambda_lambda1.cpp:9:15#bar#(7708532531154088338).ffe36bb5dd46814f3461661fb80e3e06_3" ;

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

@@ -51,7 +51,7 @@ digraph cfg {
 "dummy_struct#__infer_globals_initializer_pass_by_val.24fe54080733cebf362d2b34e691bb44_2" [label="2: Exit __infer_globals_initializer_pass_by_val::dummy_struct \n  " color=yellow style=filled]
 	
 
-"dummy_struct#__infer_globals_initializer_pass_by_val.24fe54080733cebf362d2b34e691bb44_3" [label="3:  DeclStmt \n   n$0=_fun___variable_initialization(&#GB<codetoanalyze/cpp/shared/methods/byvals.cpp|ice>$pass_by_val::dummy_struct:pass_by_val::PlainStruct) [line 15, column 1]\n  *&#GB<codetoanalyze/cpp/shared/methods/byvals.cpp|ice>$pass_by_val::dummy_struct.x:int=0 [line 15, column 25]\n  *&#GB<codetoanalyze/cpp/shared/methods/byvals.cpp|ice>$pass_by_val::dummy_struct.y:int*=null [line 15, column 25]\n  EXIT_SCOPE(n$0); [line 15, column 25]\n  APPLY_ABSTRACTION; [line 15, column 25]\n " shape="box"]
+"dummy_struct#__infer_globals_initializer_pass_by_val.24fe54080733cebf362d2b34e691bb44_3" [label="3:  DeclStmt \n   n$0=_fun___variable_initialization(&#GB<codetoanalyze/cpp/shared/methods/byvals.cpp|ice>$pass_by_val::dummy_struct:pass_by_val::PlainStruct) assign_last [line 15, column 1]\n  *&#GB<codetoanalyze/cpp/shared/methods/byvals.cpp|ice>$pass_by_val::dummy_struct.x:int=0 [line 15, column 25]\n  *&#GB<codetoanalyze/cpp/shared/methods/byvals.cpp|ice>$pass_by_val::dummy_struct.y:int*=null [line 15, column 25]\n  EXIT_SCOPE(n$0); [line 15, column 25]\n  APPLY_ABSTRACTION; [line 15, column 25]\n " shape="box"]
 	
 
 	 "dummy_struct#__infer_globals_initializer_pass_by_val.24fe54080733cebf362d2b34e691bb44_3" -> "dummy_struct#__infer_globals_initializer_pass_by_val.24fe54080733cebf362d2b34e691bb44_2" ;
@@ -84,7 +84,7 @@ digraph cfg {
 "make_id<int,_int_&,_int_&,_int>#pass_by_val(class pass_by_val::Id<int>)#6647322778693099135.704a07df7f1fd4912e21bd274744a5e0_2" [label="2: Exit pass_by_val::make_id<int,_int_&,_int_&,_int> \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 60, column 1]\n " color=yellow style=filled]
 	
 
-"make_id<int,_int_&,_int_&,_int>#pass_by_val(class pass_by_val::Id<int>)#6647322778693099135.704a07df7f1fd4912e21bd274744a5e0_3" [label="3:  Return Stmt \n   n$0=*&__return_param:pass_by_val::Id<int>* [line 59, column 3]\n  n$10=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>) [line 59, column 10]\n  n$2=*&args:int& [line 59, column 35]\n  n$3=_fun_std::forward<int_&>(n$2:int&) [line 59, column 16]\n  n$4=*n$3:int [line 59, column 16]\n  n$5=*&args:int& [line 59, column 35]\n  n$6=_fun_std::forward<int_&>(n$5:int&) [line 59, column 16]\n  n$7=*&args:int& [line 59, column 35]\n  n$8=_fun_std::forward<int>(n$7:int&) [line 59, column 16]\n  n$9=_fun_pass_by_val::Id<int>_Id(&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>*,n$4:int,n$6:int&,n$8:int&) [line 59, column 10]\n  n$11=_fun_pass_by_val::Id<int>_Id(n$0:pass_by_val::Id<int>*,&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>&) [line 59, column 10]\n  NULLIFY(&args); [line 59, column 10]\n  NULLIFY(&__return_param); [line 59, column 10]\n  NULLIFY(&args); [line 59, column 10]\n  NULLIFY(&args); [line 59, column 10]\n  EXIT_SCOPE(n$0,n$2,n$3,n$4,n$5,n$6,n$7,n$8,n$9,n$10,n$11,args,__return_param,args,args,0$?%__sil_tmpSIL_materialize_temp__n$1); [line 59, column 10]\n  APPLY_ABSTRACTION; [line 59, column 10]\n " shape="box"]
+"make_id<int,_int_&,_int_&,_int>#pass_by_val(class pass_by_val::Id<int>)#6647322778693099135.704a07df7f1fd4912e21bd274744a5e0_3" [label="3:  Return Stmt \n   n$0=*&__return_param:pass_by_val::Id<int>* [line 59, column 3]\n  n$10=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>) assign_last [line 59, column 10]\n  n$2=*&args:int& [line 59, column 35]\n  n$3=_fun_std::forward<int_&>(n$2:int&) [line 59, column 16]\n  n$4=*n$3:int [line 59, column 16]\n  n$5=*&args:int& [line 59, column 35]\n  n$6=_fun_std::forward<int_&>(n$5:int&) [line 59, column 16]\n  n$7=*&args:int& [line 59, column 35]\n  n$8=_fun_std::forward<int>(n$7:int&) [line 59, column 16]\n  n$9=_fun_pass_by_val::Id<int>_Id(&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>*,n$4:int,n$6:int&,n$8:int&) [line 59, column 10]\n  n$11=_fun_pass_by_val::Id<int>_Id(n$0:pass_by_val::Id<int>*,&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>&) [line 59, column 10]\n  NULLIFY(&args); [line 59, column 10]\n  NULLIFY(&__return_param); [line 59, column 10]\n  NULLIFY(&args); [line 59, column 10]\n  NULLIFY(&args); [line 59, column 10]\n  EXIT_SCOPE(n$0,n$2,n$3,n$4,n$5,n$6,n$7,n$8,n$9,n$10,n$11,args,__return_param,args,args,0$?%__sil_tmpSIL_materialize_temp__n$1); [line 59, column 10]\n  APPLY_ABSTRACTION; [line 59, column 10]\n " shape="box"]
 	
 
 	 "make_id<int,_int_&,_int_&,_int>#pass_by_val(class pass_by_val::Id<int>)#6647322778693099135.704a07df7f1fd4912e21bd274744a5e0_3" -> "make_id<int,_int_&,_int_&,_int>#pass_by_val(class pass_by_val::Id<int>)#6647322778693099135.704a07df7f1fd4912e21bd274744a5e0_2" ;
@@ -95,15 +95,15 @@ digraph cfg {
 "perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_2" [label="2: Exit pass_by_val::perfect_forwarding_by_ref \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 65, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$2); [line 65, column 1]\n  NULLIFY(&b); [line 65, column 1]\n  NULLIFY(&a); [line 65, column 1]\n " color=yellow style=filled]
 	
 
-"perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_3" [label="3:  Return Stmt \n   n$0=*&__return_param:pass_by_val::Id<int>* [line 64, column 3]\n  n$6=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>) [line 64, column 10]\n  n$3=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$2:int) [line 64, column 29]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$2:int=2 [line 64, column 29]\n  n$5=_fun_pass_by_val::make_id<int,_int_&,_int_&,_int>(&a:int&,&b:int&,&0$?%__sil_tmpSIL_materialize_temp__n$2:int&,&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>*) [line 64, column 10]\n  n$7=_fun_pass_by_val::Id<int>_Id(n$0:pass_by_val::Id<int>*,&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>&) [line 64, column 10]\n  NULLIFY(&__return_param); [line 64, column 10]\n  EXIT_SCOPE(n$0,n$3,n$5,n$6,n$7,a,__return_param,b,0$?%__sil_tmpSIL_materialize_temp__n$2,0$?%__sil_tmpSIL_materialize_temp__n$1); [line 64, column 10]\n  APPLY_ABSTRACTION; [line 64, column 10]\n " shape="box"]
+"perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_3" [label="3:  Return Stmt \n   n$0=*&__return_param:pass_by_val::Id<int>* [line 64, column 3]\n  n$6=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>) assign_last [line 64, column 10]\n  n$3=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$2:int) assign_last [line 64, column 29]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$2:int=2 [line 64, column 29]\n  n$5=_fun_pass_by_val::make_id<int,_int_&,_int_&,_int>(&a:int&,&b:int&,&0$?%__sil_tmpSIL_materialize_temp__n$2:int&,&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>*) assign_last [line 64, column 10]\n  n$7=_fun_pass_by_val::Id<int>_Id(n$0:pass_by_val::Id<int>*,&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>&) [line 64, column 10]\n  NULLIFY(&__return_param); [line 64, column 10]\n  EXIT_SCOPE(n$0,n$3,n$5,n$6,n$7,a,__return_param,b,0$?%__sil_tmpSIL_materialize_temp__n$2,0$?%__sil_tmpSIL_materialize_temp__n$1); [line 64, column 10]\n  APPLY_ABSTRACTION; [line 64, column 10]\n " shape="box"]
 	
 
 	 "perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_3" -> "perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_2" ;
-"perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_4" [label="4:  DeclStmt \n   n$9=_fun___variable_initialization(&b:int) [line 63, column 3]\n  *&b:int=1 [line 63, column 3]\n  EXIT_SCOPE(n$9); [line 63, column 3]\n " shape="box"]
+"perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_4" [label="4:  DeclStmt \n   n$9=_fun___variable_initialization(&b:int) assign_last [line 63, column 3]\n  *&b:int=1 [line 63, column 3]\n  EXIT_SCOPE(n$9); [line 63, column 3]\n " shape="box"]
 	
 
 	 "perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_4" -> "perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_3" ;
-"perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_5" [label="5:  DeclStmt \n   n$10=_fun___variable_initialization(&a:int) [line 63, column 3]\n  *&a:int=0 [line 63, column 3]\n  EXIT_SCOPE(n$10); [line 63, column 3]\n " shape="box"]
+"perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_5" [label="5:  DeclStmt \n   n$10=_fun___variable_initialization(&a:int) assign_last [line 63, column 3]\n  *&a:int=0 [line 63, column 3]\n  EXIT_SCOPE(n$10); [line 63, column 3]\n " shape="box"]
 	
 
 	 "perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_5" -> "perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_4" ;

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

@@ -32,11 +32,11 @@ digraph cfg {
 	
 
 	 "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_8" -> "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_2" ;
-"branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_9" [label="9:  DeclStmt \n   n$13=_fun___variable_initialization(&v:int) [line 35, column 5]\n  _=*&x:conversion_operator::X [line 35, column 13]\n  n$12=_fun_conversion_operator::X_operator_int(&x:conversion_operator::X&) [line 35, column 13]\n  *&v:int=n$12 [line 35, column 5]\n  EXIT_SCOPE(_,n$12,n$13); [line 35, column 5]\n " shape="box"]
+"branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_9" [label="9:  DeclStmt \n   n$13=_fun___variable_initialization(&v:int) assign_last [line 35, column 5]\n  _=*&x:conversion_operator::X [line 35, column 13]\n  n$12=_fun_conversion_operator::X_operator_int(&x:conversion_operator::X&) [line 35, column 13]\n  *&v:int=n$12 [line 35, column 5]\n  EXIT_SCOPE(_,n$12,n$13); [line 35, column 5]\n " shape="box"]
 	
 
 	 "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_9" -> "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_8" ;
-"branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_10" [label="10:  DeclStmt \n   n$17=_fun___variable_initialization(&x:conversion_operator::X) [line 33, column 3]\n  n$16=_fun_conversion_operator::X_X(&x:conversion_operator::X*,0:int,1:_Bool) [line 33, column 5]\n  EXIT_SCOPE(n$16,n$17); [line 33, column 5]\n " shape="box"]
+"branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_10" [label="10:  DeclStmt \n   n$17=_fun___variable_initialization(&x:conversion_operator::X) assign_last [line 33, column 3]\n  n$16=_fun_conversion_operator::X_X(&x:conversion_operator::X*,0:int,1:_Bool) [line 33, column 5]\n  EXIT_SCOPE(n$16,n$17); [line 33, column 5]\n " shape="box"]
 	
 
 	 "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_10" -> "branch_div0#conversion_operator#6762751670974669482.0ad6ec49c1dc8988836c6e44e9d2b402_5" ;
@@ -72,11 +72,11 @@ digraph cfg {
 	
 
 	 "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_8" -> "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_2" ;
-"branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_9" [label="9:  DeclStmt \n   n$13=_fun___variable_initialization(&v:int) [line 64, column 5]\n  _=*&x:conversion_operator::X [line 64, column 13]\n  n$12=_fun_conversion_operator::X_operator_int(&x:conversion_operator::X&) [line 64, column 13]\n  *&v:int=n$12 [line 64, column 5]\n  EXIT_SCOPE(_,n$12,n$13); [line 64, column 5]\n " shape="box"]
+"branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_9" [label="9:  DeclStmt \n   n$13=_fun___variable_initialization(&v:int) assign_last [line 64, column 5]\n  _=*&x:conversion_operator::X [line 64, column 13]\n  n$12=_fun_conversion_operator::X_operator_int(&x:conversion_operator::X&) [line 64, column 13]\n  *&v:int=n$12 [line 64, column 5]\n  EXIT_SCOPE(_,n$12,n$13); [line 64, column 5]\n " shape="box"]
 	
 
 	 "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_9" -> "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_8" ;
-"branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_10" [label="10:  DeclStmt \n   n$17=_fun___variable_initialization(&x:conversion_operator::X) [line 62, column 3]\n  n$16=_fun_conversion_operator::X_X(&x:conversion_operator::X*,1:int,1:_Bool) [line 62, column 5]\n  EXIT_SCOPE(n$16,n$17); [line 62, column 5]\n " shape="box"]
+"branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_10" [label="10:  DeclStmt \n   n$17=_fun___variable_initialization(&x:conversion_operator::X) assign_last [line 62, column 3]\n  n$16=_fun_conversion_operator::X_X(&x:conversion_operator::X*,1:int,1:_Bool) [line 62, column 5]\n  EXIT_SCOPE(n$16,n$17); [line 62, column 5]\n " shape="box"]
 	
 
 	 "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_10" -> "branch_div1#conversion_operator#6025807300888085665.f3ee34cea9ff5d10407119d4b377adc2_5" ;
@@ -112,11 +112,11 @@ digraph cfg {
 	
 
 	 "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_8" -> "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_2" ;
-"branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_9" [label="9:  DeclStmt \n   n$13=_fun___variable_initialization(&v:int) [line 55, column 5]\n  _=*&x:conversion_operator::X [line 55, column 13]\n  n$12=_fun_conversion_operator::X_operator_int(&x:conversion_operator::X&) [line 55, column 13]\n  *&v:int=n$12 [line 55, column 5]\n  EXIT_SCOPE(_,n$12,n$13); [line 55, column 5]\n " shape="box"]
+"branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_9" [label="9:  DeclStmt \n   n$13=_fun___variable_initialization(&v:int) assign_last [line 55, column 5]\n  _=*&x:conversion_operator::X [line 55, column 13]\n  n$12=_fun_conversion_operator::X_operator_int(&x:conversion_operator::X&) [line 55, column 13]\n  *&v:int=n$12 [line 55, column 5]\n  EXIT_SCOPE(_,n$12,n$13); [line 55, column 5]\n " shape="box"]
 	
 
 	 "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_9" -> "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_8" ;
-"branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_10" [label="10:  DeclStmt \n   n$17=_fun___variable_initialization(&x:conversion_operator::X) [line 53, column 3]\n  n$16=_fun_conversion_operator::X_X(&x:conversion_operator::X*,0:int,0:_Bool) [line 53, column 5]\n  EXIT_SCOPE(n$16,n$17); [line 53, column 5]\n " shape="box"]
+"branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_10" [label="10:  DeclStmt \n   n$17=_fun___variable_initialization(&x:conversion_operator::X) assign_last [line 53, column 3]\n  n$16=_fun_conversion_operator::X_X(&x:conversion_operator::X*,0:int,0:_Bool) [line 53, column 5]\n  EXIT_SCOPE(n$16,n$17); [line 53, column 5]\n " shape="box"]
 	
 
 	 "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_10" -> "branch_no_div#conversion_operator#18429458682592639842.4c7cf0cc20989fd2ea431840e11b2521_5" ;
@@ -127,7 +127,7 @@ digraph cfg {
 "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$23); [line 50, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$11); [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$12); [line 50, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$24); [line 50, column 1]\n " color=yellow style=filled]
 	
 
-"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_3" [label="3:  Return Stmt \n   n$7=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:conversion_operator::X) [line 49, column 10]\n  n$5=_fun___variable_initialization(&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*) [line 49, column 13]\n  n$6=_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$9=_fun_conversion_operator::X_operator_int(&0$?%__sil_tmpSIL_materialize_temp__n$0:conversion_operator::X&) [line 49, column 10]\n  *&return:int=n$9 [line 49, column 3]\n  EXIT_SCOPE(_,_,n$4,n$5,n$6,n$7,n$9,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"]
+"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_3" [label="3:  Return Stmt \n   n$7=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$0:conversion_operator::X) assign_last [line 49, column 10]\n  n$5=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X const ) assign_last [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$6=_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$9=_fun_conversion_operator::X_operator_int(&0$?%__sil_tmpSIL_materialize_temp__n$0:conversion_operator::X&) [line 49, column 10]\n  *&return:int=n$9 [line 49, column 3]\n  EXIT_SCOPE(_,_,n$4,n$5,n$6,n$7,n$9,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"]
 	
 
 	 "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_3" -> "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_2" ;
@@ -135,7 +135,7 @@ 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   n$18=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$11:conversion_operator::X) [line 45, column 7]\n  n$16=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$12:conversion_operator::X const ) [line 45, column 10]\n  _=*&y:conversion_operator::Y [line 45, column 10]\n  n$15=_fun_conversion_operator::Y_operator_X(&y:conversion_operator::Y&,&0$?%__sil_tmpSIL_materialize_temp__n$12:conversion_operator::X*) [line 45, column 10]\n  n$17=_fun_conversion_operator::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$11:conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$12:conversion_operator::X const &) [line 45, column 7]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$11:conversion_operator::X [line 45, column 7]\n  n$20=_fun_conversion_operator::X_operator_bool(&0$?%__sil_tmpSIL_materialize_temp__n$11:conversion_operator::X&) [line 45, column 7]\n  EXIT_SCOPE(_,_,n$15,n$16,n$17,n$18,0$?%__sil_tmpSIL_materialize_temp__n$12,0$?%__sil_tmpSIL_materialize_temp__n$11); [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   n$18=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$11:conversion_operator::X) assign_last [line 45, column 7]\n  n$16=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$12:conversion_operator::X const ) assign_last [line 45, column 10]\n  _=*&y:conversion_operator::Y [line 45, column 10]\n  n$15=_fun_conversion_operator::Y_operator_X(&y:conversion_operator::Y&,&0$?%__sil_tmpSIL_materialize_temp__n$12:conversion_operator::X*) assign_last [line 45, column 10]\n  n$17=_fun_conversion_operator::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$11:conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$12:conversion_operator::X const &) [line 45, column 7]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$11:conversion_operator::X [line 45, column 7]\n  n$20=_fun_conversion_operator::X_operator_bool(&0$?%__sil_tmpSIL_materialize_temp__n$11:conversion_operator::X&) [line 45, column 7]\n  EXIT_SCOPE(_,_,n$15,n$16,n$17,n$18,0$?%__sil_tmpSIL_materialize_temp__n$12,0$?%__sil_tmpSIL_materialize_temp__n$11); [line 45, column 7]\n " shape="box"]
 	
 
 	 "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_5" -> "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_6" ;
@@ -152,7 +152,7 @@ digraph cfg {
 	
 
 	 "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   n$33=_fun___variable_initialization(&v:int) [line 46, column 5]\n  n$30=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$23:conversion_operator::X) [line 46, column 13]\n  n$28=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$24:conversion_operator::X const ) [line 46, column 16]\n  _=*&y:conversion_operator::Y [line 46, column 16]\n  n$27=_fun_conversion_operator::Y_operator_X(&y:conversion_operator::Y&,&0$?%__sil_tmpSIL_materialize_temp__n$24:conversion_operator::X*) [line 46, column 16]\n  n$29=_fun_conversion_operator::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$23:conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$24:conversion_operator::X const &) [line 46, column 13]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$23:conversion_operator::X [line 46, column 13]\n  n$32=_fun_conversion_operator::X_operator_int(&0$?%__sil_tmpSIL_materialize_temp__n$23:conversion_operator::X&) [line 46, column 13]\n  *&v:int=n$32 [line 46, column 5]\n  EXIT_SCOPE(_,_,n$27,n$28,n$29,n$30,n$32,n$33,0$?%__sil_tmpSIL_materialize_temp__n$24,y,0$?%__sil_tmpSIL_materialize_temp__n$23); [line 46, column 5]\n " shape="box"]
+"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_9" [label="9:  DeclStmt \n   n$33=_fun___variable_initialization(&v:int) assign_last [line 46, column 5]\n  n$30=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$23:conversion_operator::X) assign_last [line 46, column 13]\n  n$28=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$24:conversion_operator::X const ) assign_last [line 46, column 16]\n  _=*&y:conversion_operator::Y [line 46, column 16]\n  n$27=_fun_conversion_operator::Y_operator_X(&y:conversion_operator::Y&,&0$?%__sil_tmpSIL_materialize_temp__n$24:conversion_operator::X*) assign_last [line 46, column 16]\n  n$29=_fun_conversion_operator::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$23:conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$24:conversion_operator::X const &) [line 46, column 13]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$23:conversion_operator::X [line 46, column 13]\n  n$32=_fun_conversion_operator::X_operator_int(&0$?%__sil_tmpSIL_materialize_temp__n$23:conversion_operator::X&) [line 46, column 13]\n  *&v:int=n$32 [line 46, column 5]\n  EXIT_SCOPE(_,_,n$27,n$28,n$29,n$30,n$32,n$33,0$?%__sil_tmpSIL_materialize_temp__n$24,y,0$?%__sil_tmpSIL_materialize_temp__n$23); [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   n$37=_fun___variable_initialization(&y:conversion_operator::Y) [line 42, column 3]\n  n$36=_fun_conversion_operator::Y_Y(&y:conversion_operator::Y*) [line 42, column 5]\n  EXIT_SCOPE(n$36,n$37); [line 42, column 5]\n " shape="box"]
+"y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_12" [label="12:  DeclStmt \n   n$37=_fun___variable_initialization(&y:conversion_operator::Y) assign_last [line 42, column 3]\n  n$36=_fun_conversion_operator::Y_Y(&y:conversion_operator::Y*) [line 42, column 5]\n  EXIT_SCOPE(n$36,n$37); [line 42, column 5]\n " shape="box"]
 	
 
 	 "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_12" -> "y_branch_div0#conversion_operator#7606471872775172252.4a93f184f35976e9e7dc6663bc4d47a2_11" ;
@@ -227,7 +227,7 @@ digraph cfg {
 "operator_X#Y#conversion_operator(class conversion_operator::X)#(9875474444891926125).86894a9a1bdbf53dc3721d092420d60c_2" [label="2: Exit conversion_operator::Y_operator_X \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 27, column 34]\n " color=yellow style=filled]
 	
 
-"operator_X#Y#conversion_operator(class conversion_operator::X)#(9875474444891926125).86894a9a1bdbf53dc3721d092420d60c_3" [label="3:  Return Stmt \n   n$0=*&__return_param:conversion_operator::X* [line 27, column 18]\n  n$7=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X const ) [line 27, column 25]\n  n$2=*&this:conversion_operator::Y* [line 27, column 27]\n  n$3=*n$2.f:int [line 27, column 27]\n  n$4=*&this:conversion_operator::Y* [line 27, column 30]\n  n$5=*n$4.b:int [line 27, column 30]\n  n$6=_fun_conversion_operator::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X const *,n$3:int,n$5:_Bool) [line 27, column 25]\n  n$8=_fun_conversion_operator::X_X(n$0:conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X const &) [line 27, column 25]\n  NULLIFY(&__return_param); [line 27, column 25]\n  NULLIFY(&this); [line 27, column 25]\n  EXIT_SCOPE(n$0,n$2,n$3,n$4,n$5,n$6,n$7,n$8,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 27, column 25]\n  APPLY_ABSTRACTION; [line 27, column 25]\n " shape="box"]
+"operator_X#Y#conversion_operator(class conversion_operator::X)#(9875474444891926125).86894a9a1bdbf53dc3721d092420d60c_3" [label="3:  Return Stmt \n   n$0=*&__return_param:conversion_operator::X* [line 27, column 18]\n  n$7=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X const ) assign_last [line 27, column 25]\n  n$2=*&this:conversion_operator::Y* [line 27, column 27]\n  n$3=*n$2.f:int [line 27, column 27]\n  n$4=*&this:conversion_operator::Y* [line 27, column 30]\n  n$5=*n$4.b:int [line 27, column 30]\n  n$6=_fun_conversion_operator::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X const *,n$3:int,n$5:_Bool) [line 27, column 25]\n  n$8=_fun_conversion_operator::X_X(n$0:conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X const &) [line 27, column 25]\n  NULLIFY(&__return_param); [line 27, column 25]\n  NULLIFY(&this); [line 27, column 25]\n  EXIT_SCOPE(n$0,n$2,n$3,n$4,n$5,n$6,n$7,n$8,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 27, column 25]\n  APPLY_ABSTRACTION; [line 27, column 25]\n " shape="box"]
 	
 
 	 "operator_X#Y#conversion_operator(class conversion_operator::X)#(9875474444891926125).86894a9a1bdbf53dc3721d092420d60c_3" -> "operator_X#Y#conversion_operator(class conversion_operator::X)#(9875474444891926125).86894a9a1bdbf53dc3721d092420d60c_2" ;

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

@@ -26,7 +26,7 @@ digraph cfg {
 	
 
 	 "fun#A#(6769533171018954461).6e614e38165b38606d6bb10131a47562_3" -> "fun#A#(6769533171018954461).6e614e38165b38606d6bb10131a47562_2" ;
-"fun#A#(6769533171018954461).6e614e38165b38606d6bb10131a47562_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&c:int) [line 16, column 5]\n  *&c:int=10 [line 16, column 5]\n  EXIT_SCOPE(n$2); [line 16, column 5]\n " shape="box"]
+"fun#A#(6769533171018954461).6e614e38165b38606d6bb10131a47562_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&c:int) assign_last [line 16, column 5]\n  *&c:int=10 [line 16, column 5]\n  EXIT_SCOPE(n$2); [line 16, column 5]\n " shape="box"]
 	
 
 	 "fun#A#(6769533171018954461).6e614e38165b38606d6bb10131a47562_4" -> "fun#A#(6769533171018954461).6e614e38165b38606d6bb10131a47562_3" ;

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

@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_3" -> "test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_2" ;
-"test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_4" [label="4:  DeclStmt \n   n$11=_fun___variable_initialization(&x:X) [line 20, column 3]\n  n$9=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$4:X) [line 20, column 9]\n  n$5=*&a:A* [line 20, column 9]\n  _=*n$5:A [line 20, column 9]\n  n$8=_fun_A_get(n$5:A*,1:int,&0$?%__sil_tmpSIL_materialize_temp__n$4:X*) [line 20, column 9]\n  n$10=_fun_X_X(&x:X*,&0$?%__sil_tmpSIL_materialize_temp__n$4:X&) [line 20, column 9]\n  NULLIFY(&a); [line 20, column 9]\n  EXIT_SCOPE(_,n$5,n$8,n$9,n$10,n$11,a,0$?%__sil_tmpSIL_materialize_temp__n$4); [line 20, column 9]\n " shape="box"]
+"test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_4" [label="4:  DeclStmt \n   n$11=_fun___variable_initialization(&x:X) assign_last [line 20, column 3]\n  n$9=_fun___variable_initialization(&0$?%__sil_tmpSIL_materialize_temp__n$4:X) assign_last [line 20, column 9]\n  n$5=*&a:A* [line 20, column 9]\n  _=*n$5:A [line 20, column 9]\n  n$8=_fun_A_get(n$5:A*,1:int,&0$?%__sil_tmpSIL_materialize_temp__n$4:X*) assign_last [line 20, column 9]\n  n$10=_fun_X_X(&x:X*,&0$?%__sil_tmpSIL_materialize_temp__n$4:X&) [line 20, column 9]\n  NULLIFY(&a); [line 20, column 9]\n  EXIT_SCOPE(_,n$5,n$8,n$9,n$10,n$11,a,0$?%__sil_tmpSIL_materialize_temp__n$4); [line 20, column 9]\n " shape="box"]
 	
 
 	 "test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_4" -> "test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_3" ;
@@ -26,7 +26,7 @@ digraph cfg {
 	
 
 	 "get#A(class X)#(1761444600576643509).0f83d3543d984a8645cb78162580d93f_3" -> "get#A(class X)#(1761444600576643509).0f83d3543d984a8645cb78162580d93f_2" ;
-"get#A(class X)#(1761444600576643509).0f83d3543d984a8645cb78162580d93f_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&x:X) [line 14, column 5]\n  n$5=_fun_X_X(&x:X*) [line 14, column 7]\n  EXIT_SCOPE(n$5,n$6); [line 14, column 7]\n " shape="box"]
+"get#A(class X)#(1761444600576643509).0f83d3543d984a8645cb78162580d93f_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&x:X) assign_last [line 14, column 5]\n  n$5=_fun_X_X(&x:X*) [line 14, column 7]\n  EXIT_SCOPE(n$5,n$6); [line 14, column 7]\n " shape="box"]
 	
 
 	 "get#A(class X)#(1761444600576643509).0f83d3543d984a8645cb78162580d93f_4" -> "get#A(class X)#(1761444600576643509).0f83d3543d984a8645cb78162580d93f_3" ;

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

@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "call_virtual_destructor#6847397116347440235.d267757a410b72cac399f5e3d0ee0f45_3" -> "call_virtual_destructor#6847397116347440235.d267757a410b72cac399f5e3d0ee0f45_2" ;
-"call_virtual_destructor#6847397116347440235.d267757a410b72cac399f5e3d0ee0f45_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&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,n$5); [line 69, column 3]\n " shape="box"]
+"call_virtual_destructor#6847397116347440235.d267757a410b72cac399f5e3d0ee0f45_4" [label="4:  DeclStmt \n   n$5=_fun___variable_initialization(&trgl:Polygon*) assign_last [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,n$5); [line 69, column 3]\n " shape="box"]
 	
 
 	 "call_virtual_destructor#6847397116347440235.d267757a410b72cac399f5e3d0ee0f45_4" -> "call_virtual_destructor#6847397116347440235.d267757a410b72cac399f5e3d0ee0f45_3" ;
@@ -26,11 +26,11 @@ digraph cfg {
 	
 
 	 "poly_area#4209622570361008343.816833144841084a7fd6071bbff4c354_3" -> "poly_area#4209622570361008343.816833144841084a7fd6071bbff4c354_2" ;
-"poly_area#4209622570361008343.816833144841084a7fd6071bbff4c354_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&ppoly3:Polygon*) [line 53, column 3]\n  *&ppoly3:Polygon*=&poly [line 53, column 3]\n  EXIT_SCOPE(n$6); [line 53, column 3]\n " shape="box"]
+"poly_area#4209622570361008343.816833144841084a7fd6071bbff4c354_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&ppoly3:Polygon*) assign_last [line 53, column 3]\n  *&ppoly3:Polygon*=&poly [line 53, column 3]\n  EXIT_SCOPE(n$6); [line 53, column 3]\n " shape="box"]
 	
 
 	 "poly_area#4209622570361008343.816833144841084a7fd6071bbff4c354_4" -> "poly_area#4209622570361008343.816833144841084a7fd6071bbff4c354_3" ;
-"poly_area#4209622570361008343.816833144841084a7fd6071bbff4c354_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&poly:Polygon) [line 52, column 3]\n  n$7=_fun_Polygon_Polygon(&poly:Polygon*) [line 52, column 11]\n  EXIT_SCOPE(n$7,n$8); [line 52, column 11]\n " shape="box"]
+"poly_area#4209622570361008343.816833144841084a7fd6071bbff4c354_5" [label="5:  DeclStmt \n   n$8=_fun___variable_initialization(&poly:Polygon) assign_last [line 52, column 3]\n  n$7=_fun_Polygon_Polygon(&poly:Polygon*) [line 52, column 11]\n  EXIT_SCOPE(n$7,n$8); [line 52, column 11]\n " shape="box"]
 	
 
 	 "poly_area#4209622570361008343.816833144841084a7fd6071bbff4c354_5" -> "poly_area#4209622570361008343.816833144841084a7fd6071bbff4c354_4" ;
@@ -49,11 +49,11 @@ digraph cfg {
 	
 
 	 "rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_4" -> "rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_3" ;
-"rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_5" [label="5:  DeclStmt \n   n$9=_fun___variable_initialization(&ppoly1:Polygon*) [line 38, column 3]\n  *&ppoly1:Rectangle*=&rect [line 38, column 3]\n  EXIT_SCOPE(n$9); [line 38, column 3]\n " shape="box"]
+"rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_5" [label="5:  DeclStmt \n   n$9=_fun___variable_initialization(&ppoly1:Polygon*) assign_last [line 38, column 3]\n  *&ppoly1:Rectangle*=&rect [line 38, column 3]\n  EXIT_SCOPE(n$9); [line 38, column 3]\n " shape="box"]
 	
 
 	 "rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_5" -> "rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_4" ;
-"rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_6" [label="6:  DeclStmt \n   n$11=_fun___variable_initialization(&rect:Rectangle) [line 37, column 3]\n  n$10=_fun_Rectangle_Rectangle(&rect:Rectangle*) [line 37, column 13]\n  EXIT_SCOPE(n$10,n$11); [line 37, column 13]\n " shape="box"]
+"rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_6" [label="6:  DeclStmt \n   n$11=_fun___variable_initialization(&rect:Rectangle) assign_last [line 37, column 3]\n  n$10=_fun_Rectangle_Rectangle(&rect:Rectangle*) [line 37, column 13]\n  EXIT_SCOPE(n$10,n$11); [line 37, column 13]\n " shape="box"]
 	
 
 	 "rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_6" -> "rect_area#9087317270636867019.dedb17c23e2d96ddd6e1087003e78815_5" ;
@@ -72,15 +72,15 @@ digraph cfg {
 	
 
 	 "tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_4" -> "tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_3" ;
-"tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_5" [label="5:  DeclStmt \n   n$11=_fun___variable_initialization(&ppoly2:Polygon*) [line 46, column 3]\n  *&ppoly2:Triangle*=&trgl [line 46, column 3]\n  EXIT_SCOPE(n$11); [line 46, column 3]\n " shape="box"]
+"tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_5" [label="5:  DeclStmt \n   n$11=_fun___variable_initialization(&ppoly2:Polygon*) assign_last [line 46, column 3]\n  *&ppoly2:Triangle*=&trgl [line 46, column 3]\n  EXIT_SCOPE(n$11); [line 46, column 3]\n " shape="box"]
 	
 
 	 "tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_5" -> "tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_4" ;
-"tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_6" [label="6:  DeclStmt \n   n$13=_fun___variable_initialization(&poly:Polygon) [line 45, column 3]\n  n$12=_fun_Polygon_Polygon(&poly:Polygon*) [line 45, column 11]\n  EXIT_SCOPE(n$12,n$13); [line 45, column 11]\n " shape="box"]
+"tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_6" [label="6:  DeclStmt \n   n$13=_fun___variable_initialization(&poly:Polygon) assign_last [line 45, column 3]\n  n$12=_fun_Polygon_Polygon(&poly:Polygon*) [line 45, column 11]\n  EXIT_SCOPE(n$12,n$13); [line 45, column 11]\n " shape="box"]
 	
 
 	 "tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_6" -> "tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_5" ;
-"tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_7" [label="7:  DeclStmt \n   n$15=_fun___variable_initialization(&trgl:Triangle) [line 44, column 3]\n  n$14=_fun_Triangle_Triangle(&trgl:Triangle*) [line 44, column 12]\n  EXIT_SCOPE(n$14,n$15); [line 44, column 12]\n " shape="box"]
+"tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_7" [label="7:  DeclStmt \n   n$15=_fun___variable_initialization(&trgl:Triangle) assign_last [line 44, column 3]\n  n$14=_fun_Triangle_Triangle(&trgl:Triangle*) [line 44, column 12]\n  EXIT_SCOPE(n$14,n$15); [line 44, column 12]\n " shape="box"]
 	
 
 	 "tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_7" -> "tri_area#1215149030941579879.cc7663ab4ea89457778545059b70bc38_6" ;
@@ -99,15 +99,15 @@ digraph cfg {
 	
 
 	 "tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_4" -> "tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_3" ;
-"tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_5" [label="5:  DeclStmt \n   n$11=_fun___variable_initialization(&ppoly2:Polygon*) [line 60, column 3]\n  *&ppoly2:Triangle*=&trgl [line 60, column 3]\n  EXIT_SCOPE(n$11); [line 60, column 3]\n " shape="box"]
+"tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_5" [label="5:  DeclStmt \n   n$11=_fun___variable_initialization(&ppoly2:Polygon*) assign_last [line 60, column 3]\n  *&ppoly2:Triangle*=&trgl [line 60, column 3]\n  EXIT_SCOPE(n$11); [line 60, column 3]\n " shape="box"]
 	
 
 	 "tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_5" -> "tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_4" ;
-"tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_6" [label="6:  DeclStmt \n   n$13=_fun___variable_initialization(&poly:Polygon) [line 59, column 3]\n  n$12=_fun_Polygon_Polygon(&poly:Polygon*) [line 59, column 11]\n  EXIT_SCOPE(n$12,n$13); [line 59, column 11]\n " shape="box"]
+"tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_6" [label="6:  DeclStmt \n   n$13=_fun___variable_initialization(&poly:Polygon) assign_last [line 59, column 3]\n  n$12=_fun_Polygon_Polygon(&poly:Polygon*) [line 59, column 11]\n  EXIT_SCOPE(n$12,n$13); [line 59, column 11]\n " shape="box"]
 	
 
 	 "tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_6" -> "tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_5" ;
-"tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_7" [label="7:  DeclStmt \n   n$15=_fun___variable_initialization(&trgl:Triangle) [line 58, column 3]\n  n$14=_fun_Triangle_Triangle(&trgl:Triangle*) [line 58, column 12]\n  EXIT_SCOPE(n$14,n$15); [line 58, column 12]\n " shape="box"]
+"tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_7" [label="7:  DeclStmt \n   n$15=_fun___variable_initialization(&trgl:Triangle) assign_last [line 58, column 3]\n  n$14=_fun_Triangle_Triangle(&trgl:Triangle*) [line 58, column 12]\n  EXIT_SCOPE(n$14,n$15); [line 58, column 12]\n " shape="box"]
 	
 
 	 "tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_7" -> "tri_not_virtual_area#9435562296359660595.88e7106fc7dcfd34401502a9deb415ac_6" ;
@@ -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   n$6=_fun___variable_initialization(&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,n$6,this); [line 31, column 5]\n " shape="box"]
+"area#Triangle#(14534668876010564879).b2c96bbb8f170e9d12180637dc0d6da3_4" [label="4:  DeclStmt \n   n$6=_fun___variable_initialization(&x:int) assign_last [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,n$6,this); [line 31, column 5]\n " shape="box"]
 	
 
 	 "area#Triangle#(14534668876010564879).b2c96bbb8f170e9d12180637dc0d6da3_4" -> "area#Triangle#(14534668876010564879).b2c96bbb8f170e9d12180637dc0d6da3_3" ;

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

@@ -66,7 +66,7 @@ digraph cfg {
 	
 
 	 "type_alias_div0#11064282270104671255.675c026241b82e6430f7456d997b57b4_3" -> "type_alias_div0#11064282270104671255.675c026241b82e6430f7456d997b57b4_2" ;
-"type_alias_div0#11064282270104671255.675c026241b82e6430f7456d997b57b4_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&x:int) [line 38, column 3]\n  *&x:int=0 [line 38, column 3]\n  EXIT_SCOPE(n$2); [line 38, column 3]\n " shape="box"]
+"type_alias_div0#11064282270104671255.675c026241b82e6430f7456d997b57b4_4" [label="4:  DeclStmt \n   n$2=_fun___variable_initialization(&x:int) assign_last [line 38, column 3]\n  *&x:int=0 [line 38, column 3]\n  EXIT_SCOPE(n$2); [line 38, column 3]\n " shape="box"]
 	
 
 	 "type_alias_div0#11064282270104671255.675c026241b82e6430f7456d997b57b4_4" -> "type_alias_div0#11064282270104671255.675c026241b82e6430f7456d997b57b4_3" ;

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

@@ -31,7 +31,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   n$7=_fun___variable_initialization(&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,n$7); [line 49, column 18]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   n$7=_fun___variable_initialization(&rect2:foo::Rectangle) assign_last [line 49, column 3]\n  n$6=_fun_foo::Rectangle_Rectangle(&rect2:foo::Rectangle*) [line 49, column 18]\n  EXIT_SCOPE(n$6,n$7); [line 49, column 18]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
@@ -39,11 +39,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   n$11=_fun___variable_initialization(&rect1:bar::Rectangle) [line 46, column 3]\n  n$10=_fun_bar::Rectangle_Rectangle(&rect1:bar::Rectangle*) [line 46, column 18]\n  EXIT_SCOPE(n$10,n$11); [line 46, column 18]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   n$11=_fun___variable_initialization(&rect1:bar::Rectangle) assign_last [line 46, column 3]\n  n$10=_fun_bar::Rectangle_Rectangle(&rect1:bar::Rectangle*) [line 46, column 18]\n  EXIT_SCOPE(n$10,n$11); [line 46, column 18]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  DeclStmt \n   n$13=_fun___variable_initialization(&x:foo::my_record) [line 44, column 3]\n  n$12=_fun_foo::my_record_(&x:foo::my_record*) [line 44, column 18]\n  EXIT_SCOPE(n$12,n$13); [line 44, column 18]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  DeclStmt \n   n$13=_fun___variable_initialization(&x:foo::my_record) assign_last [line 44, column 3]\n  n$12=_fun_foo::my_record_(&x:foo::my_record*) [line 44, column 18]\n  EXIT_SCOPE(n$12,n$13); [line 44, column 18]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
@@ -54,7 +54,7 @@ digraph cfg {
 "pi#__infer_globals_initializer_bar.1155d696836634e07d40a8f71831e209_2" [label="2: Exit __infer_globals_initializer_bar::pi \n  " color=yellow style=filled]
 	
 
-"pi#__infer_globals_initializer_bar.1155d696836634e07d40a8f71831e209_3" [label="3:  DeclStmt \n   n$0=_fun___variable_initialization(&#GB<codetoanalyze/cpp/shared/namespace/namespace.cpp|ice>$bar::pi:double const ) [line 27, column 1]\n  *&#GB<codetoanalyze/cpp/shared/namespace/namespace.cpp|ice>$bar::pi:double=3.1416 [line 27, column 1]\n  EXIT_SCOPE(n$0); [line 27, column 1]\n  APPLY_ABSTRACTION; [line 27, column 1]\n " shape="box"]
+"pi#__infer_globals_initializer_bar.1155d696836634e07d40a8f71831e209_3" [label="3:  DeclStmt \n   n$0=_fun___variable_initialization(&#GB<codetoanalyze/cpp/shared/namespace/namespace.cpp|ice>$bar::pi:double const ) assign_last [line 27, column 1]\n  *&#GB<codetoanalyze/cpp/shared/namespace/namespace.cpp|ice>$bar::pi:double=3.1416 [line 27, column 1]\n  EXIT_SCOPE(n$0); [line 27, column 1]\n  APPLY_ABSTRACTION; [line 27, column 1]\n " shape="box"]
 	
 
 	 "pi#__infer_globals_initializer_bar.1155d696836634e07d40a8f71831e209_3" -> "pi#__infer_globals_initializer_bar.1155d696836634e07d40a8f71831e209_2" ;
@@ -65,7 +65,7 @@ digraph cfg {
 "rect#__infer_globals_initializer_bar.4a1fbff7dd04d46c33088cc2bed92914_2" [label="2: Exit __infer_globals_initializer_bar::rect \n  " color=yellow style=filled]
 	
 
-"rect#__infer_globals_initializer_bar.4a1fbff7dd04d46c33088cc2bed92914_3" [label="3:  DeclStmt \n   n$1=_fun___variable_initialization(&#GB<codetoanalyze/cpp/shared/namespace/namespace.cpp|!pod>$bar::rect:bar::Rectangle) [line 30, column 1]\n  n$0=_fun_bar::Rectangle_Rectangle(&#GB<codetoanalyze/cpp/shared/namespace/namespace.cpp|!pod>$bar::rect:bar::Rectangle*) [line 36, column 3]\n  EXIT_SCOPE(n$0,n$1); [line 36, column 3]\n  APPLY_ABSTRACTION; [line 36, column 3]\n " shape="box"]
+"rect#__infer_globals_initializer_bar.4a1fbff7dd04d46c33088cc2bed92914_3" [label="3:  DeclStmt \n   n$1=_fun___variable_initialization(&#GB<codetoanalyze/cpp/shared/namespace/namespace.cpp|!pod>$bar::rect:bar::Rectangle) assign_last [line 30, column 1]\n  n$0=_fun_bar::Rectangle_Rectangle(&#GB<codetoanalyze/cpp/shared/namespace/namespace.cpp|!pod>$bar::rect:bar::Rectangle*) [line 36, column 3]\n  EXIT_SCOPE(n$0,n$1); [line 36, column 3]\n  APPLY_ABSTRACTION; [line 36, column 3]\n " shape="box"]
 	
 
 	 "rect#__infer_globals_initializer_bar.4a1fbff7dd04d46c33088cc2bed92914_3" -> "rect#__infer_globals_initializer_bar.4a1fbff7dd04d46c33088cc2bed92914_2" ;

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

@@ -11,7 +11,7 @@ digraph cfg {
 	
 
 	 "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_3" -> "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_8" ;
-"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_4" [label="4:  DeclStmt \n   n$1=_fun___variable_initialization(&i:int) [line 17, column 8]\n  *&i:int=10 [line 17, column 8]\n  EXIT_SCOPE(n$1); [line 17, column 8]\n  APPLY_ABSTRACTION; [line 17, column 8]\n " shape="box"]
+"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_4" [label="4:  DeclStmt \n   n$1=_fun___variable_initialization(&i:int) assign_last [line 17, column 8]\n  *&i:int=10 [line 17, column 8]\n  EXIT_SCOPE(n$1); [line 17, column 8]\n  APPLY_ABSTRACTION; [line 17, column 8]\n " shape="box"]
 	
 
 	 "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_4" -> "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_3" ;
@@ -27,16 +27,16 @@ digraph cfg {
 	
 
 	 "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_7" -> "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_2" ;
-"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_8" [label="8:  DeclStmt \n   n$5=_fun___variable_initialization(&x:int) [line 17, column 20]\n  n$4=*&i:int [line 17, column 28]\n  *&x:int=n$4 [line 17, column 20]\n  EXIT_SCOPE(n$4,n$5); [line 17, column 20]\n " shape="box"]
+"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_8" [label="8:  DeclStmt \n   n$5=_fun___variable_initialization(&x:int) assign_last [line 17, column 20]\n  n$4=*&i:int [line 17, column 28]\n  *&x:int=n$4 [line 17, column 20]\n  EXIT_SCOPE(n$4,n$5); [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$7=*&x:int [line 18, column 15]\n  n$8=*&result:int [line 18, column 5]\n  *&result:int=(n$8 + n$7) [line 18, column 5]\n  EXIT_SCOPE(n$7,n$8); [line 18, column 5]\n " shape="box"]
+"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_9" [label="9:  BinaryOperatorStmt: AddAssign \n   n$7=*&x:int [line 18, column 15]\n  n$8=*&result:int [line 18, column 5]\n  *&result:int=(n$8 + n$7) [line 18, column 5]\n  NULLIFY(&x); [line 18, column 5]\n  EXIT_SCOPE(n$7,n$8,x); [line 18, column 5]\n " shape="box"]
 	
 
 	 "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_9" -> "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_5" ;
-"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_10" [label="10:  DeclStmt \n   n$10=_fun___variable_initialization(&result:int) [line 16, column 3]\n  *&result:int=0 [line 16, column 3]\n  EXIT_SCOPE(n$10); [line 16, column 3]\n " shape="box"]
+"init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_10" [label="10:  DeclStmt \n   n$10=_fun___variable_initialization(&result:int) assign_last [line 16, column 3]\n  *&result:int=0 [line 16, column 3]\n  EXIT_SCOPE(n$10); [line 16, column 3]\n " shape="box"]
 	
 
 	 "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_10" -> "init_with_scoped_var#8128013931289981830.1ee58ae56eeb1744bf4b3cc5c8cf5d42_4" ;
@@ -51,7 +51,7 @@ digraph cfg {
 	
 
 	 "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_3" -> "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_8" ;
-"simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_4" [label="4:  DeclStmt \n   n$1=_fun___variable_initialization(&i:int) [line 10, column 8]\n  *&i:int=0 [line 10, column 8]\n  EXIT_SCOPE(n$1); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
+"simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_4" [label="4:  DeclStmt \n   n$1=_fun___variable_initialization(&i:int) assign_last [line 10, column 8]\n  *&i:int=0 [line 10, column 8]\n  EXIT_SCOPE(n$1); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
 	
 
 	 "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_4" -> "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_3" ;
@@ -67,16 +67,16 @@ digraph cfg {
 	
 
 	 "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_7" -> "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_2" ;
-"simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_8" [label="8:  DeclStmt \n   n$4=_fun___variable_initialization(&x:int) [line 10, column 19]\n  *&x:int=2 [line 10, column 19]\n  EXIT_SCOPE(n$4); [line 10, column 19]\n " shape="box"]
+"simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_8" [label="8:  DeclStmt \n   n$4=_fun___variable_initialization(&x:int) assign_last [line 10, column 19]\n  *&x:int=2 [line 10, column 19]\n  EXIT_SCOPE(n$4); [line 10, column 19]\n " shape="box"]
 	
 
 	 "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$6=*&x:int [line 11, column 15]\n  n$7=*&result:int [line 11, column 5]\n  *&result:int=(n$7 + n$6) [line 11, column 5]\n  EXIT_SCOPE(n$6,n$7); [line 11, column 5]\n " shape="box"]
+"simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_9" [label="9:  BinaryOperatorStmt: AddAssign \n   n$6=*&x:int [line 11, column 15]\n  n$7=*&result:int [line 11, column 5]\n  *&result:int=(n$7 + n$6) [line 11, column 5]\n  NULLIFY(&x); [line 11, column 5]\n  EXIT_SCOPE(n$6,n$7,x); [line 11, column 5]\n " shape="box"]
 	
 
 	 "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_9" -> "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_5" ;
-"simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_10" [label="10:  DeclStmt \n   n$9=_fun___variable_initialization(&result:int) [line 9, column 3]\n  *&result:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$9); [line 9, column 3]\n " shape="box"]
+"simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_10" [label="10:  DeclStmt \n   n$9=_fun___variable_initialization(&result:int) assign_last [line 9, column 3]\n  *&result:int=0 [line 9, column 3]\n  EXIT_SCOPE(n$9); [line 9, column 3]\n " shape="box"]
 	
 
 	 "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_10" -> "simple_init#1527365342003611175.8f75bf8cf2aefccd4d47ab9274e1f9af_4" ;