[cfg] run pre-analysis lazily in ondemand

Summary:
This also prints the CFGs *after* pre-analysis for individual procedures
in infer-out/captured/<filename>/<proc>.dot. One can also look up the
CFGs before pre-analysis in infer-out/captured/proc_cfgs_frontend.dot.

Context: I want to add a pre-analysis that needs to look at proc
attributes inter-procedurally. For this to make sense it has to happen
*after* all of capture, and before analysis.

Thus, this diff brings back the lazy running of the pre-analysis like in
D15803492, except that we still make sure to run the pre-analyses
systematically regardless of the checkers being run by running the
pre-analysis from ondemand.ml. Also we don't need to re-introduce the
"did_preanalysis" proc attribute for the same reason that the
pre-analysis is now run once and for all by ondemand.ml (instead of each
individual checker back in the days).

This has the benefit of running the pre-analysis only when needed, and
the drawback that several concurrent processes analysing the same proc
descs will duplicate work. Since pre-analyses are supposed to be very
fast I assume that neither is a big deal. If they become more expensive
then the benefit gets bigger and the drawback is just the same as with
regular analyses.

Reviewed By: skcho

Differential Revision: D18573920

fbshipit-source-id: de350eaef

infer/src/IR/DotCfg.ml

@@ -96,33 +96,26 @@ let pp_cfgnode pdesc fmt (n : Procdesc.Node.t) =
   List.iter ~f:(fun n' -> print_edge n n' true) (Procdesc.Node.get_exn n)
 
 
-(** Print the flowgraphs in [cfg]. Nodes are printed only if (a) their location is [source] or
-(b) [Config.dotty_cfg_libs] is set. This triggers preanalysis. *)
-let print_icfg source fmt cfg =
+let print_pdesc source fmt pdesc =
   let print_node pdesc node =
     let loc = Procdesc.Node.get_loc node in
     if Config.dotty_cfg_libs || SourceFile.equal loc.Location.file source then
       F.fprintf fmt "%a@\n" (pp_cfgnode pdesc) node
   in
-  let print_pdesc pdesc =
   Procdesc.get_nodes pdesc
   |> List.sort ~compare:Procdesc.Node.compare
   |> List.iter ~f:(fun node -> print_node pdesc node)
-  in
-  Cfg.iter_sorted cfg ~f:(fun pdesc -> print_pdesc pdesc)
 
 
-let write_icfg_dotty_to_file source cfg fname =
+let with_dot_file fname ~pp =
   let chan = Out_channel.create fname in
   let fmt = Format.formatter_of_out_channel chan in
   (* avoid phabricator thinking this file was generated by substituting substring with %s *)
-  F.fprintf fmt "@[/* %@%s */@\ndigraph cfg {@\n" "generated" ;
-  print_icfg source fmt cfg ;
-  F.fprintf fmt "}@]@." ;
+  F.fprintf fmt "@[/* %@%s */@\ndigraph cfg {@\n%t}@]@." "generated" pp ;
   Out_channel.close chan
 
 
-let emit source cfg =
+let emit_frontend_cfg source cfg =
   let fname =
     match Config.icfg_dotty_outfile with
     | Some file ->
@@ -132,6 +125,18 @@ let emit source cfg =
     | None ->
         DB.filename_to_string
           (DB.Results_dir.path_to_filename (DB.Results_dir.Abs_source_dir source)
-             [Config.dotty_output])
+             [Config.dotty_frontend_output])
+  in
+  with_dot_file fname ~pp:(fun fmt ->
+      Cfg.iter_sorted cfg ~f:(fun pdesc -> print_pdesc source fmt pdesc) )
+
+
+let emit_proc_desc source proc_desc =
+  let filename =
+    let db_name =
+      DB.Results_dir.path_to_filename (DB.Results_dir.Abs_source_dir source)
+        [Typ.Procname.to_filename (Procdesc.get_proc_name proc_desc)]
+    in
+    DB.filename_to_string db_name ^ ".dot"
   in
-  write_icfg_dotty_to_file source cfg fname
+  with_dot_file filename ~pp:(fun fmt -> print_pdesc source fmt proc_desc)

infer/src/IR/DotCfg.mli

@@ -8,5 +8,8 @@
 
 open! IStd
 
-val emit : SourceFile.t -> Cfg.t -> unit
+val emit_frontend_cfg : SourceFile.t -> Cfg.t -> unit
 (** emit the given {!Cfg.t} in the "dot" format to a file determined by {!Config} values *)
+
+val emit_proc_desc : SourceFile.t -> Procdesc.t -> unit
+(** emit the given {!Procdesc.t} in the "dot" format to a file in infer-out/captured/ *)

infer/src/backend/InferAnalyze.ml

@@ -25,7 +25,7 @@ let analyze_target : SchedulerTypes.target Tasks.doer =
     L.task_progress SourceFile.pp source_file ~f:(fun () ->
         Ondemand.analyze_file exe_env source_file ;
         if Topl.is_active () && Config.debug_mode then
-          DotCfg.emit (Topl.sourcefile ()) (Topl.cfg ()) ;
+          DotCfg.emit_frontend_cfg (Topl.sourcefile ()) (Topl.cfg ()) ;
         if Config.write_html then Printer.write_all_html_files source_file )
   in
   (* In call-graph scheduling, log progress every [per_procedure_logging_granularity] procedures.

infer/src/backend/ondemand.ml

@@ -175,6 +175,9 @@ let run_proc_analysis ~caller_pdesc callee_pdesc =
       Typ.Procname.pp callee_pname ;
   let preprocess () =
     incr nesting ;
+    Preanal.do_preanalysis (Option.value_exn !exe_env_ref) callee_pdesc ;
+    if Config.debug_mode then
+      DotCfg.emit_proc_desc (Procdesc.get_attributes callee_pdesc).translation_unit callee_pdesc ;
     let initial_callee_summary = Summary.OnDisk.reset callee_pdesc in
     add_active callee_pname ; initial_callee_summary
   in

infer/src/backend/preanal.ml

@@ -210,8 +210,9 @@ module FunctionPointerSubstitution = struct
     if updated then Attributes.store ~proc_desc:(Some pdesc) (Procdesc.get_attributes pdesc)
 end
 
-let do_preanalysis pdesc tenv =
+let do_preanalysis exe_env pdesc =
   let summary = Summary.OnDisk.reset pdesc in
+  let tenv = Exe_env.get_tenv exe_env (Procdesc.get_proc_name pdesc) in
   if
     Config.function_pointer_specialization
     && not (Typ.Procname.is_java (Procdesc.get_proc_name pdesc))

infer/src/backend/preanal.mli

@@ -8,5 +8,5 @@
 
 open! IStd
 
-val do_preanalysis : Procdesc.t -> Tenv.t -> unit
+val do_preanalysis : Exe_env.t -> Procdesc.t -> unit
 (** Various preanalysis passes for transforming the IR in useful ways *)

infer/src/base/Config.ml

@@ -184,7 +184,7 @@ let default_failure_name = "ASSERTION_FAILURE"
 let default_in_zip_results_dir = "infer"
 
 (** Dotty output filename **)
-let dotty_output = "icfg.dot"
+let dotty_frontend_output = "proc_cfgs_frontend.dot"
 
 let driver_stats_dir_name = "driver_stats"
 

infer/src/base/Config.mli

@@ -83,7 +83,7 @@ val default_failure_name : string
 
 val default_in_zip_results_dir : string
 
-val dotty_output : string
+val dotty_frontend_output : string
 
 val driver_stats_dir_name : string
 

infer/src/clang/cFrontend.ml

@@ -52,17 +52,14 @@ let do_source_file (translation_unit_context : CFrontend_config.translation_unit
   let cfg = compute_icfg translation_unit_context tenv ast in
   L.(debug Capture Verbose)
     "@\n End building call/cfg graph for '%a'.@\n" SourceFile.pp source_file ;
-  (* This part below is a boilerplate in every frontends. *)
-  (* This could be moved in the cfg_infer module *)
   NullabilityPreanalysis.analysis cfg tenv ;
-  Typ.Procname.Hash.iter (fun _ pdesc -> Preanal.do_preanalysis pdesc tenv) cfg ;
   SourceFiles.add source_file cfg (Tenv.FileLocal tenv) (Some integer_type_widths) ;
   if Config.debug_mode then Tenv.store_debug_file_for_source source_file tenv ;
   if
     Config.debug_mode || Config.testing_mode || Config.frontend_tests
     || Option.is_some Config.icfg_dotty_outfile
-  then DotCfg.emit source_file cfg ;
-  L.(debug Capture Verbose) "Stored on disk:@[<v>%a@]@." Cfg.pp_proc_signatures cfg ;
+  then DotCfg.emit_frontend_cfg source_file cfg ;
+  L.debug Capture Verbose "Stored on disk:@[<v>%a@]@." Cfg.pp_proc_signatures cfg ;
   let procedures_translated_summary =
     EventLogger.ProceduresTranslatedSummary
       { procedures_translated_total= !CFrontend_config.procedures_attempted

infer/src/infer.ml

@@ -190,8 +190,8 @@ let () =
                     Procdesc.load proc_name
                     |> Option.iter ~f:(fun cfg -> Typ.Procname.Hash.add cfgs proc_name cfg) ) ;
                 (* emit the dot file in captured/... *)
-                DotCfg.emit source_file cfgs ) ;
-            L.result "CFGs written in %s/*/%s@." Config.captured_dir Config.dotty_output )
+                DotCfg.emit_frontend_cfg source_file cfgs ) ;
+            L.result "CFGs written in %s/*/%s@." Config.captured_dir Config.dotty_frontend_output )
       | false, false ->
           let if_some key opt args =
             match opt with None -> args | Some arg -> key :: string_of_int arg :: args

infer/src/java/jMain.ml

@@ -19,10 +19,9 @@ let init_global_state source_file =
   JContext.reset_exn_node_table ()
 
 
-let store_icfg tenv source_file cfg =
-  Typ.Procname.Hash.iter (fun _ pdesc -> Preanal.do_preanalysis pdesc tenv) cfg ;
+let store_icfg source_file cfg =
   SourceFiles.add source_file cfg Tenv.Global None ;
-  if Config.debug_mode || Config.frontend_tests then DotCfg.emit source_file cfg ;
+  if Config.debug_mode || Config.frontend_tests then DotCfg.emit_frontend_cfg source_file cfg ;
   ()
 
 
@@ -35,7 +34,7 @@ let do_source_file linereader classes program tenv source_basename package_opt s
     JFrontend.compute_source_icfg linereader classes program tenv source_basename package_opt
       source_file
   in
-  store_icfg tenv source_file cfg
+  store_icfg source_file cfg
 
 
 let capture_libs linereader program tenv =
@@ -49,8 +48,7 @@ let capture_libs linereader program tenv =
         let fake_source_file = SourceFile.from_abs_path (JFrontend.path_of_cached_classname cn) in
         init_global_state fake_source_file ;
         let cfg = JFrontend.compute_class_icfg fake_source_file linereader program tenv node in
-        store_icfg tenv fake_source_file cfg ;
-        JFrontend.cache_classname cn
+        store_icfg fake_source_file cfg ; JFrontend.cache_classname cn
   in
   JBasics.ClassMap.iter (capture_class tenv) (JClasspath.get_classmap program)
 

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

@@ -7,7 +7,7 @@ digraph cfg {
 "fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_2" [label="2: Exit internal::fun \n  " color=yellow style=filled]
 	
 
-"fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 10, column 25]\n  *&return:int=n$0 [line 10, column 18]\n  NULLIFY(&a); [line 10, column 18]\n  EXIT_SCOPE(n$0,a); [line 10, column 18]\n  APPLY_ABSTRACTION; [line 10, column 18]\n " shape="box"]
+"fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 10, column 25]\n  *&return:int=n$0 [line 10, column 18]\n " shape="box"]
 	
 
 	 "fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_3" -> "fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_2" ;
@@ -15,30 +15,30 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n   NULLIFY(&x); [line 22, column 1]\n  NULLIFY(&s); [line 22, column 1]\n " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Destruction(Scope) \n   _=*&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>> [line 22, column 1]\n  n$1=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>::~basic_string(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*) injected [line 22, column 1]\n  _=*&x:std::shared_ptr<int> [line 22, column 1]\n  n$3=_fun_std::shared_ptr<int>::~shared_ptr(&x:std::shared_ptr<int>*) injected [line 22, column 1]\n  EXIT_SCOPE(_,_,n$1,n$3,s,x); [line 22, column 1]\n  APPLY_ABSTRACTION; [line 22, column 1]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Destruction(Scope) \n   _=*&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>> [line 22, column 1]\n  n$1=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>::~basic_string(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*) injected [line 22, column 1]\n  _=*&x:std::shared_ptr<int> [line 22, column 1]\n  n$3=_fun_std::shared_ptr<int>::~shared_ptr(&x:std::shared_ptr<int>*) injected [line 22, column 1]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 20, column 15]\n  EXIT_SCOPE(n$5); [line 20, column 15]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 20, column 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x:std::shared_ptr<int>); [line 19, column 3]\n  n$6=_fun_std::shared_ptr<int>::shared_ptr(&x:std::shared_ptr<int>*) [line 19, column 24]\n  EXIT_SCOPE(n$6); [line 19, column 24]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x:std::shared_ptr<int>); [line 19, column 3]\n  n$6=_fun_std::shared_ptr<int>::shared_ptr(&x:std::shared_ptr<int>*) [line 19, column 24]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_external::fun \n   n$7=_fun_external::fun(1:int) [line 18, column 3]\n  EXIT_SCOPE(n$7); [line 18, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_external::fun \n   n$7=_fun_external::fun(1:int) [line 18, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal_exclude::fun \n   n$8=_fun_internal_exclude::fun(1:int) [line 17, column 3]\n  EXIT_SCOPE(n$8); [line 17, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal_exclude::fun \n   n$8=_fun_internal_exclude::fun(1:int) [line 17, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  Call _fun_internal::fun \n   n$9=_fun_internal::fun(1:int) [line 16, column 3]\n  EXIT_SCOPE(n$9); [line 16, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  Call _fun_internal::fun \n   n$9=_fun_internal::fun(1:int) [line 16, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
@@ -49,11 +49,11 @@ digraph cfg {
 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_2" [label="2: Exit unused_deref_in_header \n  " color=yellow style=filled]
 	
 
-"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 16, column 11]\n  n$1=*n$0:int [line 16, column 10]\n  *&return:int=n$1 [line 16, column 3]\n  NULLIFY(&a); [line 16, column 3]\n  EXIT_SCOPE(n$0,n$1,a); [line 16, column 3]\n  APPLY_ABSTRACTION; [line 16, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 16, column 11]\n  n$1=*n$0:int [line 16, column 10]\n  *&return:int=n$1 [line 16, column 3]\n " shape="box"]
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_2" ;
-"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 15, column 3]\n  n$2=_fun_internal::used_in_main_header(0:int) [line 15, column 11]\n  *&x:int=n$2 [line 15, column 3]\n  NULLIFY(&x); [line 15, column 3]\n  EXIT_SCOPE(n$2,x); [line 15, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 15, column 3]\n  n$2=_fun_internal::used_in_main_header(0:int) [line 15, column 11]\n  *&x:int=n$2 [line 15, column 3]\n " shape="box"]
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" ;
@@ -64,7 +64,7 @@ digraph cfg {
 "used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_2" [label="2: Exit internal::used_in_main_header \n  " color=yellow style=filled]
 	
 
-"used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 17, column 41]\n  *&return:int=n$0 [line 17, column 34]\n  NULLIFY(&a); [line 17, column 34]\n  EXIT_SCOPE(n$0,a); [line 17, column 34]\n  APPLY_ABSTRACTION; [line 17, column 34]\n " shape="box"]
+"used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 17, column 41]\n  *&return:int=n$0 [line 17, column 34]\n " shape="box"]
 	
 
 	 "used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_3" -> "used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_2" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_2" [label="2: Exit internal::fun \n  " color=yellow style=filled]
 	
 
-"fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 10, column 25]\n  *&return:int=n$0 [line 10, column 18]\n  NULLIFY(&a); [line 10, column 18]\n  EXIT_SCOPE(n$0,a); [line 10, column 18]\n  APPLY_ABSTRACTION; [line 10, column 18]\n " shape="box"]
+"fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 10, column 25]\n  *&return:int=n$0 [line 10, column 18]\n " shape="box"]
 	
 
 	 "fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_3" -> "fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_2" ;
@@ -15,30 +15,30 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n   NULLIFY(&x); [line 22, column 1]\n  NULLIFY(&s); [line 22, column 1]\n " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Destruction(Scope) \n   _=*&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>> [line 22, column 1]\n  n$1=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>::~basic_string(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*) injected [line 22, column 1]\n  _=*&x:std::shared_ptr<int> [line 22, column 1]\n  n$3=_fun_std::shared_ptr<int>::~shared_ptr(&x:std::shared_ptr<int>*) injected [line 22, column 1]\n  EXIT_SCOPE(_,_,n$1,n$3,s,x); [line 22, column 1]\n  APPLY_ABSTRACTION; [line 22, column 1]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Destruction(Scope) \n   _=*&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>> [line 22, column 1]\n  n$1=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>::~basic_string(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*) injected [line 22, column 1]\n  _=*&x:std::shared_ptr<int> [line 22, column 1]\n  n$3=_fun_std::shared_ptr<int>::~shared_ptr(&x:std::shared_ptr<int>*) injected [line 22, column 1]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 20, column 15]\n  EXIT_SCOPE(n$5); [line 20, column 15]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 20, column 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x:std::shared_ptr<int>); [line 19, column 3]\n  n$6=_fun_std::shared_ptr<int>::shared_ptr(&x:std::shared_ptr<int>*) [line 19, column 24]\n  EXIT_SCOPE(n$6); [line 19, column 24]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x:std::shared_ptr<int>); [line 19, column 3]\n  n$6=_fun_std::shared_ptr<int>::shared_ptr(&x:std::shared_ptr<int>*) [line 19, column 24]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_external::fun \n   n$7=_fun_external::fun(1:int) [line 18, column 3]\n  EXIT_SCOPE(n$7); [line 18, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_external::fun \n   n$7=_fun_external::fun(1:int) [line 18, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal_exclude::fun \n   n$8=_fun_internal_exclude::fun(1:int) [line 17, column 3]\n  EXIT_SCOPE(n$8); [line 17, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal_exclude::fun \n   n$8=_fun_internal_exclude::fun(1:int) [line 17, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  Call _fun_internal::fun \n   n$9=_fun_internal::fun(1:int) [line 16, column 3]\n  EXIT_SCOPE(n$9); [line 16, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  Call _fun_internal::fun \n   n$9=_fun_internal::fun(1:int) [line 16, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
@@ -49,11 +49,11 @@ digraph cfg {
 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_2" [label="2: Exit unused_deref_in_header \n  " color=yellow style=filled]
 	
 
-"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 16, column 11]\n  n$1=*n$0:int [line 16, column 10]\n  *&return:int=n$1 [line 16, column 3]\n  NULLIFY(&a); [line 16, column 3]\n  EXIT_SCOPE(n$0,n$1,a); [line 16, column 3]\n  APPLY_ABSTRACTION; [line 16, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 16, column 11]\n  n$1=*n$0:int [line 16, column 10]\n  *&return:int=n$1 [line 16, column 3]\n " shape="box"]
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_2" ;
-"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 15, column 3]\n  n$2=_fun_internal::used_in_main_header(0:int) [line 15, column 11]\n  *&x:int=n$2 [line 15, column 3]\n  NULLIFY(&x); [line 15, column 3]\n  EXIT_SCOPE(n$2,x); [line 15, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 15, column 3]\n  n$2=_fun_internal::used_in_main_header(0:int) [line 15, column 11]\n  *&x:int=n$2 [line 15, column 3]\n " shape="box"]
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" ;
@@ -64,7 +64,7 @@ digraph cfg {
 "used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_2" [label="2: Exit internal::used_in_main_header \n  " color=yellow style=filled]
 	
 
-"used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 17, column 41]\n  *&return:int=n$0 [line 17, column 34]\n  NULLIFY(&a); [line 17, column 34]\n  EXIT_SCOPE(n$0,a); [line 17, column 34]\n  APPLY_ABSTRACTION; [line 17, column 34]\n " shape="box"]
+"used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 17, column 41]\n  *&return:int=n$0 [line 17, column 34]\n " shape="box"]
 	
 
 	 "used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_3" -> "used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_2" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_2" [label="2: Exit internal::fun \n  " color=yellow style=filled]
 	
 
-"fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 10, column 25]\n  *&return:int=n$0 [line 10, column 18]\n  NULLIFY(&a); [line 10, column 18]\n  EXIT_SCOPE(n$0,a); [line 10, column 18]\n  APPLY_ABSTRACTION; [line 10, column 18]\n " shape="box"]
+"fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 10, column 25]\n  *&return:int=n$0 [line 10, column 18]\n " shape="box"]
 	
 
 	 "fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_3" -> "fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_2" ;
@@ -15,30 +15,30 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n   NULLIFY(&x); [line 22, column 1]\n  NULLIFY(&s); [line 22, column 1]\n " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Destruction(Scope) \n   _=*&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>> [line 22, column 1]\n  n$1=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>::~basic_string(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*) injected [line 22, column 1]\n  _=*&x:std::shared_ptr<int> [line 22, column 1]\n  n$3=_fun_std::shared_ptr<int>::~shared_ptr(&x:std::shared_ptr<int>*) injected [line 22, column 1]\n  EXIT_SCOPE(_,_,n$1,n$3,s,x); [line 22, column 1]\n  APPLY_ABSTRACTION; [line 22, column 1]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Destruction(Scope) \n   _=*&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>> [line 22, column 1]\n  n$1=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>::~basic_string(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*) injected [line 22, column 1]\n  _=*&x:std::shared_ptr<int> [line 22, column 1]\n  n$3=_fun_std::shared_ptr<int>::~shared_ptr(&x:std::shared_ptr<int>*) injected [line 22, column 1]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 20, column 15]\n  EXIT_SCOPE(n$5); [line 20, column 15]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 20, column 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x:std::shared_ptr<int>); [line 19, column 3]\n  n$6=_fun_std::shared_ptr<int>::shared_ptr(&x:std::shared_ptr<int>*) [line 19, column 24]\n  EXIT_SCOPE(n$6); [line 19, column 24]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x:std::shared_ptr<int>); [line 19, column 3]\n  n$6=_fun_std::shared_ptr<int>::shared_ptr(&x:std::shared_ptr<int>*) [line 19, column 24]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_external::fun \n   n$7=_fun_external::fun(1:int) [line 18, column 3]\n  EXIT_SCOPE(n$7); [line 18, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_external::fun \n   n$7=_fun_external::fun(1:int) [line 18, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal_exclude::fun \n   n$8=_fun_internal_exclude::fun(1:int) [line 17, column 3]\n  EXIT_SCOPE(n$8); [line 17, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal_exclude::fun \n   n$8=_fun_internal_exclude::fun(1:int) [line 17, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  Call _fun_internal::fun \n   n$9=_fun_internal::fun(1:int) [line 16, column 3]\n  EXIT_SCOPE(n$9); [line 16, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  Call _fun_internal::fun \n   n$9=_fun_internal::fun(1:int) [line 16, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
@@ -49,11 +49,11 @@ digraph cfg {
 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_2" [label="2: Exit unused_deref_in_header \n  " color=yellow style=filled]
 	
 
-"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 16, column 11]\n  n$1=*n$0:int [line 16, column 10]\n  *&return:int=n$1 [line 16, column 3]\n  NULLIFY(&a); [line 16, column 3]\n  EXIT_SCOPE(n$0,n$1,a); [line 16, column 3]\n  APPLY_ABSTRACTION; [line 16, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 16, column 11]\n  n$1=*n$0:int [line 16, column 10]\n  *&return:int=n$1 [line 16, column 3]\n " shape="box"]
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_2" ;
-"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 15, column 3]\n  n$2=_fun_internal::used_in_main_header(0:int) [line 15, column 11]\n  *&x:int=n$2 [line 15, column 3]\n  NULLIFY(&x); [line 15, column 3]\n  EXIT_SCOPE(n$2,x); [line 15, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 15, column 3]\n  n$2=_fun_internal::used_in_main_header(0:int) [line 15, column 11]\n  *&x:int=n$2 [line 15, column 3]\n " shape="box"]
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" ;
@@ -64,7 +64,7 @@ digraph cfg {
 "used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_2" [label="2: Exit internal::used_in_main_header \n  " color=yellow style=filled]
 	
 
-"used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 17, column 41]\n  *&return:int=n$0 [line 17, column 34]\n  NULLIFY(&a); [line 17, column 34]\n  EXIT_SCOPE(n$0,a); [line 17, column 34]\n  APPLY_ABSTRACTION; [line 17, column 34]\n " shape="box"]
+"used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 17, column 41]\n  *&return:int=n$0 [line 17, column 34]\n " shape="box"]
 	
 
 	 "used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_3" -> "used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_2" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_2" [label="2: Exit internal::fun \n  " color=yellow style=filled]
 	
 
-"fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 10, column 25]\n  *&return:int=n$0 [line 10, column 18]\n  NULLIFY(&a); [line 10, column 18]\n  EXIT_SCOPE(n$0,a); [line 10, column 18]\n  APPLY_ABSTRACTION; [line 10, column 18]\n " shape="box"]
+"fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 10, column 25]\n  *&return:int=n$0 [line 10, column 18]\n " shape="box"]
 	
 
 	 "fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_3" -> "fun#internal#3922054098004616643.55c3f2ad552457f847bc1570fce79224_2" ;
@@ -15,30 +15,30 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n   NULLIFY(&x); [line 22, column 1]\n  NULLIFY(&s); [line 22, column 1]\n " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Destruction(Scope) \n   _=*&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>> [line 22, column 1]\n  n$1=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>::~basic_string(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*) injected [line 22, column 1]\n  _=*&x:std::shared_ptr<int> [line 22, column 1]\n  n$3=_fun_std::shared_ptr<int>::~shared_ptr(&x:std::shared_ptr<int>*) injected [line 22, column 1]\n  EXIT_SCOPE(_,_,n$1,n$3,s,x); [line 22, column 1]\n  APPLY_ABSTRACTION; [line 22, column 1]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Destruction(Scope) \n   _=*&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>> [line 22, column 1]\n  n$1=_fun_std::basic_string<char,std::char_traits<char>,std::allocator<char>>::~basic_string(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*) injected [line 22, column 1]\n  _=*&x:std::shared_ptr<int> [line 22, column 1]\n  n$3=_fun_std::shared_ptr<int>::~shared_ptr(&x:std::shared_ptr<int>*) injected [line 22, column 1]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 20, column 15]\n  EXIT_SCOPE(n$5); [line 20, column 15]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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(&s:std::basic_string<char,std::char_traits<char>,std::allocator<char>>*,\"1234\":char const *) [line 20, column 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x:std::shared_ptr<int>); [line 19, column 3]\n  n$6=_fun_std::shared_ptr<int>::shared_ptr(&x:std::shared_ptr<int>*) [line 19, column 24]\n  EXIT_SCOPE(n$6); [line 19, column 24]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x:std::shared_ptr<int>); [line 19, column 3]\n  n$6=_fun_std::shared_ptr<int>::shared_ptr(&x:std::shared_ptr<int>*) [line 19, column 24]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_external::fun \n   n$7=_fun_external::fun(1:int) [line 18, column 3]\n  EXIT_SCOPE(n$7); [line 18, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_external::fun \n   n$7=_fun_external::fun(1:int) [line 18, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal_exclude::fun \n   n$8=_fun_internal_exclude::fun(1:int) [line 17, column 3]\n  EXIT_SCOPE(n$8); [line 17, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal_exclude::fun \n   n$8=_fun_internal_exclude::fun(1:int) [line 17, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  Call _fun_internal::fun \n   n$9=_fun_internal::fun(1:int) [line 16, column 3]\n  EXIT_SCOPE(n$9); [line 16, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  Call _fun_internal::fun \n   n$9=_fun_internal::fun(1:int) [line 16, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
@@ -49,11 +49,11 @@ digraph cfg {
 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_2" [label="2: Exit unused_deref_in_header \n  " color=yellow style=filled]
 	
 
-"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 16, column 11]\n  n$1=*n$0:int [line 16, column 10]\n  *&return:int=n$1 [line 16, column 3]\n  NULLIFY(&a); [line 16, column 3]\n  EXIT_SCOPE(n$0,n$1,a); [line 16, column 3]\n  APPLY_ABSTRACTION; [line 16, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 16, column 11]\n  n$1=*n$0:int [line 16, column 10]\n  *&return:int=n$1 [line 16, column 3]\n " shape="box"]
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_2" ;
-"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 15, column 3]\n  n$2=_fun_internal::used_in_main_header(0:int) [line 15, column 11]\n  *&x:int=n$2 [line 15, column 3]\n  NULLIFY(&x); [line 15, column 3]\n  EXIT_SCOPE(n$2,x); [line 15, column 3]\n " shape="box"]
+"unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 15, column 3]\n  n$2=_fun_internal::used_in_main_header(0:int) [line 15, column 11]\n  *&x:int=n$2 [line 15, column 3]\n " shape="box"]
 	
 
 	 "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_4" -> "unused_deref_in_header#15260603227785084028.ec2f844a26989dc35e9856ba0d7a485b_3" ;
@@ -64,7 +64,7 @@ digraph cfg {
 "used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_2" [label="2: Exit internal::used_in_main_header \n  " color=yellow style=filled]
 	
 
-"used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 17, column 41]\n  *&return:int=n$0 [line 17, column 34]\n  NULLIFY(&a); [line 17, column 34]\n  EXIT_SCOPE(n$0,a); [line 17, column 34]\n  APPLY_ABSTRACTION; [line 17, column 34]\n " shape="box"]
+"used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 17, column 41]\n  *&return:int=n$0 [line 17, column 34]\n " shape="box"]
 	
 
 	 "used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_3" -> "used_in_main_header#internal#16695915931787022844.43e60de71a2b141c8436dddf68ff1b63_2" ;

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

@@ -7,31 +7,31 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 21, column 3]\n  APPLY_ABSTRACTION; [line 21, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 21, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: XorAssign \n   n$0=*&b:int [line 20, column 3]\n  *&b:int=(n$0 ^ 1) [line 20, column 3]\n  NULLIFY(&b); [line 20, column 3]\n  EXIT_SCOPE(n$0,b); [line 20, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: XorAssign \n   n$0=*&b:int [line 20, column 3]\n  *&b:int=(n$0 ^ 1) [line 20, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: OrAssign \n   n$1=*&b:int [line 19, column 3]\n  *&b:int=(n$1 | 1) [line 19, column 3]\n  EXIT_SCOPE(n$1); [line 19, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: OrAssign \n   n$1=*&b:int [line 19, column 3]\n  *&b:int=(n$1 | 1) [line 19, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: AndAssign \n   n$2=*&b:int [line 18, column 3]\n  *&b:int=(n$2 & 1) [line 18, column 3]\n  EXIT_SCOPE(n$2); [line 18, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: AndAssign \n   n$2=*&b:int [line 18, column 3]\n  *&b:int=(n$2 & 1) [line 18, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: RemAssing \n   n$3=*&b:int [line 17, column 3]\n  *&b:int=(n$3 % 1) [line 17, column 3]\n  EXIT_SCOPE(n$3); [line 17, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: RemAssing \n   n$3=*&b:int [line 17, column 3]\n  *&b:int=(n$3 % 1) [line 17, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: ShrAssign \n   n$4=*&b:int [line 16, column 3]\n  *&b:int=(n$4 >> 1) [line 16, column 3]\n  EXIT_SCOPE(n$4); [line 16, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: ShrAssign \n   n$4=*&b:int [line 16, column 3]\n  *&b:int=(n$4 >> 1) [line 16, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  BinaryOperatorStmt: ShlAssign \n   n$5=*&b:int [line 15, column 3]\n  *&b:int=(n$5 << 1) [line 15, column 3]\n  EXIT_SCOPE(n$5); [line 15, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  BinaryOperatorStmt: ShlAssign \n   n$5=*&b:int [line 15, column 3]\n  *&b:int=(n$5 << 1) [line 15, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
@@ -39,19 +39,19 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  BinaryOperatorStmt: MulAssign \n   n$6=*&x:double [line 13, column 3]\n  *&x:double=(n$6 * 1.) [line 13, column 3]\n  NULLIFY(&x); [line 13, column 3]\n  EXIT_SCOPE(n$6,x); [line 13, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  BinaryOperatorStmt: MulAssign \n   n$6=*&x:double [line 13, column 3]\n  *&x:double=(n$6 * 1.) [line 13, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  BinaryOperatorStmt: DivAssign \n   n$7=*&x:double [line 12, column 3]\n  *&x:double=(n$7 / 1.) [line 12, column 3]\n  EXIT_SCOPE(n$7); [line 12, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  BinaryOperatorStmt: DivAssign \n   n$7=*&x:double [line 12, column 3]\n  *&x:double=(n$7 / 1.) [line 12, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
-"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  BinaryOperatorStmt: SubAssign \n   n$8=*&x:double [line 11, column 3]\n  *&x:double=(n$8 - 1.) [line 11, column 3]\n  EXIT_SCOPE(n$8); [line 11, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  BinaryOperatorStmt: SubAssign \n   n$8=*&x:double [line 11, column 3]\n  *&x:double=(n$8 - 1.) [line 11, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
-"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  BinaryOperatorStmt: AddAssign \n   n$9=*&x:double [line 10, column 3]\n  *&x:double=(n$9 + 1.) [line 10, column 3]\n  EXIT_SCOPE(n$9); [line 10, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  BinaryOperatorStmt: AddAssign \n   n$9=*&x:double [line 10, column 3]\n  *&x:double=(n$9 + 1.) [line 10, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;

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

@@ -7,15 +7,15 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 20, column 3]\n  APPLY_ABSTRACTION; [line 20, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 20, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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(overflow_int); [line 18, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(overflow_int:int); [line 18, column 3]\n  *&overflow_int:int=9223372036854775808 [line 18, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(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(large_int); [line 17, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(large_int:int); [line 17, column 3]\n  *&large_int:int=9223372036854775807 [line 17, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;

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

@@ -12,23 +12,23 @@ digraph cfg {
 	
 
 	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_3" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_8" ;
-"neg_bool.e953d6477eaaeafaa430423a26fbaac9_4" [label="4: Prune (true branch, boolean exp) \n   n$1=*&a:_Bool [line 12, column 33]\n  PRUNE(n$1, true); [line 12, column 33]\n  NULLIFY(&a); [line 12, column 33]\n  EXIT_SCOPE(n$1,a); [line 12, column 33]\n " shape="invhouse"]
+"neg_bool.e953d6477eaaeafaa430423a26fbaac9_4" [label="4: Prune (true branch, boolean exp) \n   n$1=*&a:_Bool [line 12, column 33]\n  PRUNE(n$1, true); [line 12, column 33]\n " shape="invhouse"]
 	
 
 	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_4" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_6" ;
-"neg_bool.e953d6477eaaeafaa430423a26fbaac9_5" [label="5: Prune (false branch, boolean exp) \n   n$1=*&a:_Bool [line 12, column 33]\n  PRUNE(!n$1, false); [line 12, column 33]\n  NULLIFY(&a); [line 12, column 33]\n  EXIT_SCOPE(n$1,a); [line 12, column 33]\n " shape="invhouse"]
+"neg_bool.e953d6477eaaeafaa430423a26fbaac9_5" [label="5: Prune (false branch, boolean exp) \n   n$1=*&a:_Bool [line 12, column 33]\n  PRUNE(!n$1, false); [line 12, column 33]\n " shape="invhouse"]
 	
 
 	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_5" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_7" ;
-"neg_bool.e953d6477eaaeafaa430423a26fbaac9_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 12, column 32]\n  APPLY_ABSTRACTION; [line 12, column 32]\n " shape="box"]
+"neg_bool.e953d6477eaaeafaa430423a26fbaac9_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 12, column 32]\n " shape="box"]
 	
 
 	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_6" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_3" ;
-"neg_bool.e953d6477eaaeafaa430423a26fbaac9_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 12, column 32]\n  APPLY_ABSTRACTION; [line 12, column 32]\n " shape="box"]
+"neg_bool.e953d6477eaaeafaa430423a26fbaac9_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 12, column 32]\n " shape="box"]
 	
 
 	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_7" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_3" ;
-"neg_bool.e953d6477eaaeafaa430423a26fbaac9_8" [label="8:  Return Stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 12, column 32]\n  *&return:int=n$2 [line 12, column 25]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 12, column 25]\n  EXIT_SCOPE(n$2,0$?%__sil_tmpSIL_temp_conditional___n$0); [line 12, column 25]\n  APPLY_ABSTRACTION; [line 12, column 25]\n " shape="box"]
+"neg_bool.e953d6477eaaeafaa430423a26fbaac9_8" [label="8:  Return Stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 12, column 32]\n  *&return:int=n$2 [line 12, column 25]\n " shape="box"]
 	
 
 	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_8" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_2" ;
@@ -44,23 +44,23 @@ digraph cfg {
 	
 
 	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_3" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_8" ;
-"neg_char.53ef6b31d84386046a4728d1c45b5f7a_4" [label="4: Prune (true branch, boolean exp) \n   n$1=*&a:char [line 10, column 32]\n  PRUNE(n$1, true); [line 10, column 32]\n  NULLIFY(&a); [line 10, column 32]\n  EXIT_SCOPE(n$1,a); [line 10, column 32]\n " shape="invhouse"]
+"neg_char.53ef6b31d84386046a4728d1c45b5f7a_4" [label="4: Prune (true branch, boolean exp) \n   n$1=*&a:char [line 10, column 32]\n  PRUNE(n$1, true); [line 10, column 32]\n " shape="invhouse"]
 	
 
 	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_4" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_6" ;
-"neg_char.53ef6b31d84386046a4728d1c45b5f7a_5" [label="5: Prune (false branch, boolean exp) \n   n$1=*&a:char [line 10, column 32]\n  PRUNE(!n$1, false); [line 10, column 32]\n  NULLIFY(&a); [line 10, column 32]\n  EXIT_SCOPE(n$1,a); [line 10, column 32]\n " shape="invhouse"]
+"neg_char.53ef6b31d84386046a4728d1c45b5f7a_5" [label="5: Prune (false branch, boolean exp) \n   n$1=*&a:char [line 10, column 32]\n  PRUNE(!n$1, false); [line 10, column 32]\n " shape="invhouse"]
 	
 
 	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_5" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_7" ;
-"neg_char.53ef6b31d84386046a4728d1c45b5f7a_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 10, column 31]\n  APPLY_ABSTRACTION; [line 10, column 31]\n " shape="box"]
+"neg_char.53ef6b31d84386046a4728d1c45b5f7a_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 10, column 31]\n " shape="box"]
 	
 
 	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_6" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_3" ;
-"neg_char.53ef6b31d84386046a4728d1c45b5f7a_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 10, column 31]\n  APPLY_ABSTRACTION; [line 10, column 31]\n " shape="box"]
+"neg_char.53ef6b31d84386046a4728d1c45b5f7a_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 10, column 31]\n " shape="box"]
 	
 
 	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_7" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_3" ;
-"neg_char.53ef6b31d84386046a4728d1c45b5f7a_8" [label="8:  Return Stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 10, column 31]\n  *&return:int=n$2 [line 10, column 24]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 10, column 24]\n  EXIT_SCOPE(n$2,0$?%__sil_tmpSIL_temp_conditional___n$0); [line 10, column 24]\n  APPLY_ABSTRACTION; [line 10, column 24]\n " shape="box"]
+"neg_char.53ef6b31d84386046a4728d1c45b5f7a_8" [label="8:  Return Stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 10, column 31]\n  *&return:int=n$2 [line 10, column 24]\n " shape="box"]
 	
 
 	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_8" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_2" ;
@@ -76,23 +76,23 @@ digraph cfg {
 	
 
 	 "neg_int.2aa25aca565c41dd997912d11504462c_3" -> "neg_int.2aa25aca565c41dd997912d11504462c_8" ;
-"neg_int.2aa25aca565c41dd997912d11504462c_4" [label="4: Prune (true branch, boolean exp) \n   n$1=*&a:int [line 8, column 30]\n  PRUNE(n$1, true); [line 8, column 30]\n  NULLIFY(&a); [line 8, column 30]\n  EXIT_SCOPE(n$1,a); [line 8, column 30]\n " shape="invhouse"]
+"neg_int.2aa25aca565c41dd997912d11504462c_4" [label="4: Prune (true branch, boolean exp) \n   n$1=*&a:int [line 8, column 30]\n  PRUNE(n$1, true); [line 8, column 30]\n " shape="invhouse"]
 	
 
 	 "neg_int.2aa25aca565c41dd997912d11504462c_4" -> "neg_int.2aa25aca565c41dd997912d11504462c_6" ;
-"neg_int.2aa25aca565c41dd997912d11504462c_5" [label="5: Prune (false branch, boolean exp) \n   n$1=*&a:int [line 8, column 30]\n  PRUNE(!n$1, false); [line 8, column 30]\n  NULLIFY(&a); [line 8, column 30]\n  EXIT_SCOPE(n$1,a); [line 8, column 30]\n " shape="invhouse"]
+"neg_int.2aa25aca565c41dd997912d11504462c_5" [label="5: Prune (false branch, boolean exp) \n   n$1=*&a:int [line 8, column 30]\n  PRUNE(!n$1, false); [line 8, column 30]\n " shape="invhouse"]
 	
 
 	 "neg_int.2aa25aca565c41dd997912d11504462c_5" -> "neg_int.2aa25aca565c41dd997912d11504462c_7" ;
-"neg_int.2aa25aca565c41dd997912d11504462c_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 8, column 29]\n  APPLY_ABSTRACTION; [line 8, column 29]\n " shape="box"]
+"neg_int.2aa25aca565c41dd997912d11504462c_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 8, column 29]\n " shape="box"]
 	
 
 	 "neg_int.2aa25aca565c41dd997912d11504462c_6" -> "neg_int.2aa25aca565c41dd997912d11504462c_3" ;
-"neg_int.2aa25aca565c41dd997912d11504462c_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 8, column 29]\n  APPLY_ABSTRACTION; [line 8, column 29]\n " shape="box"]
+"neg_int.2aa25aca565c41dd997912d11504462c_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 8, column 29]\n " shape="box"]
 	
 
 	 "neg_int.2aa25aca565c41dd997912d11504462c_7" -> "neg_int.2aa25aca565c41dd997912d11504462c_3" ;
-"neg_int.2aa25aca565c41dd997912d11504462c_8" [label="8:  Return Stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 8, column 29]\n  *&return:int=n$2 [line 8, column 22]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 8, column 22]\n  EXIT_SCOPE(n$2,0$?%__sil_tmpSIL_temp_conditional___n$0); [line 8, column 22]\n  APPLY_ABSTRACTION; [line 8, column 22]\n " shape="box"]
+"neg_int.2aa25aca565c41dd997912d11504462c_8" [label="8:  Return Stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 8, column 29]\n  *&return:int=n$2 [line 8, column 22]\n " shape="box"]
 	
 
 	 "neg_int.2aa25aca565c41dd997912d11504462c_8" -> "neg_int.2aa25aca565c41dd997912d11504462c_2" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 11, column 10]\n  n$1=*&z:int [line 11, column 14]\n  *&return:int=(n$0 + n$1) [line 11, column 3]\n  NULLIFY(&z); [line 11, column 3]\n  NULLIFY(&x); [line 11, column 3]\n  EXIT_SCOPE(n$0,n$1,z,x); [line 11, column 3]\n  APPLY_ABSTRACTION; [line 11, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 11, column 10]\n  n$1=*&z:int [line 11, column 14]\n  *&return:int=(n$0 + n$1) [line 11, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -4,54 +4,54 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n   NULLIFY(&a); [line 31, column 1]\n " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 30, column 3]\n  APPLY_ABSTRACTION; [line 30, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 30, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&a:int [line 28, column 7]\n  *&a:int=n$0 [line 28, column 3]\n  EXIT_SCOPE(n$0,a); [line 28, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&a:int [line 28, column 7]\n  *&a:int=n$0 [line 28, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$1=*&b:int* [line 27, column 4]\n  n$2=*&b:int* [line 27, column 9]\n  n$3=*n$2:int [line 27, column 8]\n  *n$1:int=(n$3 + 1) [line 27, column 3]\n  NULLIFY(&b); [line 27, column 3]\n  EXIT_SCOPE(n$1,n$2,n$3,b); [line 27, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$1=*&b:int* [line 27, column 4]\n  n$2=*&b:int* [line 27, column 9]\n  n$3=*n$2:int [line 27, column 8]\n  *n$1:int=(n$3 + 1) [line 27, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   n$4=*&b:int* [line 26, column 9]\n  n$5=*(n$4 + 1):int [line 26, column 7]\n  *&a:int=n$5 [line 26, column 3]\n  EXIT_SCOPE(n$4,n$5); [line 26, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   n$4=*&b:int* [line 26, column 9]\n  n$5=*(n$4 + 1):int [line 26, column 7]\n  *&a:int=n$5 [line 26, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   *&b:int*=&a [line 25, column 3]\n  EXIT_SCOPE(a); [line 25, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   *&b:int*=&a [line 25, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   n$6=*&x:int [line 20, column 7]\n  *&x:int=(n$6 - 1) [line 20, column 7]\n  *&y:int=n$6 [line 20, column 3]\n  NULLIFY(&y); [line 20, column 3]\n  NULLIFY(&x); [line 20, column 3]\n  EXIT_SCOPE(n$6,y,x); [line 20, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   n$6=*&x:int [line 20, column 7]\n  *&x:int=(n$6 - 1) [line 20, column 7]\n  *&y:int=n$6 [line 20, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  BinaryOperatorStmt: Assign \n   n$7=*&x:int [line 19, column 7]\n  *&x:int=(n$7 - 1) [line 19, column 7]\n  *&y:int=(n$7 - 1) [line 19, column 3]\n  NULLIFY(&y); [line 19, column 3]\n  EXIT_SCOPE(n$7,y); [line 19, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  BinaryOperatorStmt: Assign \n   n$7=*&x:int [line 19, column 7]\n  *&x:int=(n$7 - 1) [line 19, column 7]\n  *&y:int=(n$7 - 1) [line 19, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  BinaryOperatorStmt: Assign \n   n$8=*&x:int [line 17, column 7]\n  *&x:int=(n$8 + 1) [line 17, column 7]\n  *&y:int=(n$8 + 1) [line 17, column 3]\n  NULLIFY(&y); [line 17, column 3]\n  EXIT_SCOPE(n$8,y); [line 17, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  BinaryOperatorStmt: Assign \n   n$8=*&x:int [line 17, column 7]\n  *&x:int=(n$8 + 1) [line 17, column 7]\n  *&y:int=(n$8 + 1) [line 17, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  BinaryOperatorStmt: Assign \n   n$9=*&x:int [line 16, column 7]\n  *&x:int=(n$9 + 1) [line 16, column 7]\n  *&y:int=n$9 [line 16, column 3]\n  NULLIFY(&y); [line 16, column 3]\n  EXIT_SCOPE(n$9,y); [line 16, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  BinaryOperatorStmt: Assign \n   n$9=*&x:int [line 16, column 7]\n  *&x:int=(n$9 + 1) [line 16, column 7]\n  *&y:int=n$9 [line 16, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  BinaryOperatorStmt: Assign \n   n$10=*&x:int [line 14, column 8]\n  *&y:int=n$10 [line 14, column 3]\n  NULLIFY(&y); [line 14, column 3]\n  EXIT_SCOPE(n$10,y); [line 14, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  BinaryOperatorStmt: Assign \n   n$10=*&x:int [line 14, column 8]\n  *&y:int=n$10 [line 14, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
-"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  BinaryOperatorStmt: Assign \n   n$11=*&x:int [line 13, column 8]\n  *&y:int=-n$11 [line 13, column 3]\n  NULLIFY(&y); [line 13, column 3]\n  EXIT_SCOPE(n$11,y); [line 13, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  BinaryOperatorStmt: Assign \n   n$11=*&x:int [line 13, column 8]\n  *&y:int=-n$11 [line 13, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
-"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  BinaryOperatorStmt: Assign \n   n$12=*&x:int [line 12, column 8]\n  *&y:int=~n$12 [line 12, column 3]\n  NULLIFY(&y); [line 12, column 3]\n  EXIT_SCOPE(n$12,y); [line 12, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  BinaryOperatorStmt: Assign \n   n$12=*&x:int [line 12, column 8]\n  *&y:int=~n$12 [line 12, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_2" [label="2: Exit revert \n  " color=yellow style=filled]
 	
 
-"revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_3" [label="3:  Return Stmt \n   n$0=*&e:_Bool [line 10, column 30]\n  *&return:_Bool=n$0 [line 10, column 23]\n  NULLIFY(&e); [line 10, column 23]\n  EXIT_SCOPE(n$0,e); [line 10, column 23]\n  APPLY_ABSTRACTION; [line 10, column 23]\n " shape="box"]
+"revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_3" [label="3:  Return Stmt \n   n$0=*&e:_Bool [line 10, column 30]\n  *&return:_Bool=n$0 [line 10, column 23]\n " shape="box"]
 	
 
 	 "revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_3" -> "revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_2" ;

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

@@ -18,28 +18,28 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: LT \n   n$1=*&x:int [line 12, column 9]\n  NULLIFY(&x); [line 12, column 9]\n  EXIT_SCOPE(x); [line 12, column 9]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: LT \n   n$1=*&x:int [line 12, column 9]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5: Prune (true branch, boolean exp) \n   PRUNE((n$1 < 2), true); [line 12, column 9]\n  EXIT_SCOPE(n$1); [line 12, column 9]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5: Prune (true branch, boolean exp) \n   PRUNE((n$1 < 2), true); [line 12, column 9]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (false branch, boolean exp) \n   PRUNE(!(n$1 < 2), false); [line 12, column 9]\n  EXIT_SCOPE(n$1); [line 12, column 9]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (false branch, boolean exp) \n   PRUNE(!(n$1 < 2), false); [line 12, column 9]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 12, column 9]\n  APPLY_ABSTRACTION; [line 12, column 9]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 12, column 9]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 12, column 9]\n  APPLY_ABSTRACTION; [line 12, column 9]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 12, column 9]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  Call _fun_check \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 12, column 9]\n  n$3=_fun_check(n$2:int) [line 12, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 12, column 3]\n  EXIT_SCOPE(n$2,n$3,0$?%__sil_tmpSIL_temp_conditional___n$0); [line 12, column 3]\n  APPLY_ABSTRACTION; [line 12, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  Call _fun_check \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 12, column 9]\n  n$3=_fun_check(n$2:int) [line 12, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

infer/tests/codetoanalyze/c/frontend/c_prototype/prototype.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:  Return Stmt \n   *&return:int=0 [line 20, column 3]\n  APPLY_ABSTRACTION; [line 20, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 20, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=_fun_sum(2:int,3:int) [line 18, column 11]\n  *&total:int=n$0 [line 18, column 3]\n  NULLIFY(&total); [line 18, column 3]\n  EXIT_SCOPE(n$0,total); [line 18, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=_fun_sum(2:int,3:int) [line 18, column 11]\n  *&total:int=n$0 [line 18, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
@@ -22,7 +22,7 @@ digraph cfg {
 "sum.1d623b89683f9ce4e074de1676d12416_2" [label="2: Exit sum \n  " color=yellow style=filled]
 	
 
-"sum.1d623b89683f9ce4e074de1676d12416_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 23, column 32]\n  n$1=*&b:int [line 23, column 36]\n  *&return:int=(n$0 + n$1) [line 23, column 25]\n  NULLIFY(&a); [line 23, column 25]\n  NULLIFY(&b); [line 23, column 25]\n  EXIT_SCOPE(n$0,n$1,a,b); [line 23, column 25]\n  APPLY_ABSTRACTION; [line 23, column 25]\n " shape="box"]
+"sum.1d623b89683f9ce4e074de1676d12416_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 23, column 32]\n  n$1=*&b:int [line 23, column 36]\n  *&return:int=(n$0 + n$1) [line 23, column 25]\n " shape="box"]
 	
 
 	 "sum.1d623b89683f9ce4e074de1676d12416_3" -> "sum.1d623b89683f9ce4e074de1676d12416_2" ;

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

@@ -7,15 +7,15 @@ digraph cfg {
 "comma_1.bafaed8336991f5a2e612ee2580c1506_2" [label="2: Exit comma_1 \n  " color=yellow style=filled]
 	
 
-"comma_1.bafaed8336991f5a2e612ee2580c1506_3" [label="3:  Return Stmt \n   n$0=*&d:int [line 11, column 10]\n  *&return:int=n$0 [line 11, column 3]\n  NULLIFY(&d); [line 11, column 3]\n  EXIT_SCOPE(n$0,d); [line 11, column 3]\n  APPLY_ABSTRACTION; [line 11, column 3]\n " shape="box"]
+"comma_1.bafaed8336991f5a2e612ee2580c1506_3" [label="3:  Return Stmt \n   n$0=*&d:int [line 11, column 10]\n  *&return:int=n$0 [line 11, column 3]\n " shape="box"]
 	
 
 	 "comma_1.bafaed8336991f5a2e612ee2580c1506_3" -> "comma_1.bafaed8336991f5a2e612ee2580c1506_2" ;
-"comma_1.bafaed8336991f5a2e612ee2580c1506_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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,a,b); [line 10, column 3]\n " shape="box"]
+"comma_1.bafaed8336991f5a2e612ee2580c1506_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "comma_1.bafaed8336991f5a2e612ee2580c1506_4" -> "comma_1.bafaed8336991f5a2e612ee2580c1506_3" ;
-"comma_1.bafaed8336991f5a2e612ee2580c1506_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 9, column 3]\n  *&b:int=7 [line 9, column 3]\n  NULLIFY(&b); [line 9, column 3]\n  EXIT_SCOPE(b); [line 9, column 3]\n " shape="box"]
+"comma_1.bafaed8336991f5a2e612ee2580c1506_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 9, column 3]\n  *&b:int=7 [line 9, column 3]\n " shape="box"]
 	
 
 	 "comma_1.bafaed8336991f5a2e612ee2580c1506_5" -> "comma_1.bafaed8336991f5a2e612ee2580c1506_4" ;
@@ -30,15 +30,15 @@ digraph cfg {
 "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_2" [label="2: Exit comma_2 \n  " color=yellow style=filled]
 	
 
-"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_3" [label="3:  Return Stmt \n   n$0=*&d:int [line 17, column 10]\n  *&return:int=n$0 [line 17, column 3]\n  NULLIFY(&d); [line 17, column 3]\n  EXIT_SCOPE(n$0,d); [line 17, column 3]\n  APPLY_ABSTRACTION; [line 17, column 3]\n " shape="box"]
+"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_3" [label="3:  Return Stmt \n   n$0=*&d:int [line 17, column 10]\n  *&return:int=n$0 [line 17, column 3]\n " shape="box"]
 	
 
 	 "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_3" -> "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_2" ;
-"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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,b,a); [line 16, column 3]\n " shape="box"]
+"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_4" -> "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_3" ;
-"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 15, column 3]\n  *&b:int=7 [line 15, column 3]\n  NULLIFY(&b); [line 15, column 3]\n  EXIT_SCOPE(b); [line 15, column 3]\n " shape="box"]
+"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 15, column 3]\n  *&b:int=7 [line 15, column 3]\n " shape="box"]
 	
 
 	 "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_5" -> "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_4" ;
@@ -53,19 +53,19 @@ digraph cfg {
 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_2" [label="2: Exit comma_3 \n  " color=yellow style=filled]
 	
 
-"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_3" [label="3:  Return Stmt \n   n$0=*&d:int [line 23, column 10]\n  *&return:int=n$0 [line 23, column 3]\n  NULLIFY(&d); [line 23, column 3]\n  EXIT_SCOPE(n$0,d); [line 23, column 3]\n  APPLY_ABSTRACTION; [line 23, column 3]\n " shape="box"]
+"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_3" [label="3:  Return Stmt \n   n$0=*&d:int [line 23, column 10]\n  *&return:int=n$0 [line 23, column 3]\n " shape="box"]
 	
 
 	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_3" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_2" ;
-"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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,c,b,a); [line 22, column 3]\n " shape="box"]
+"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_4" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_3" ;
-"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(c:int); [line 21, column 3]\n  *&c:int=3 [line 21, column 3]\n  NULLIFY(&c); [line 21, column 3]\n  EXIT_SCOPE(c); [line 21, column 3]\n " shape="box"]
+"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(c:int); [line 21, column 3]\n  *&c:int=3 [line 21, column 3]\n " shape="box"]
 	
 
 	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_5" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_4" ;
-"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 21, column 3]\n  *&b:int=7 [line 21, column 3]\n  NULLIFY(&b); [line 21, column 3]\n  EXIT_SCOPE(b); [line 21, column 3]\n " shape="box"]
+"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 21, column 3]\n  *&b:int=7 [line 21, column 3]\n " shape="box"]
 	
 
 	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_6" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_5" ;

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

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

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

@@ -21,11 +21,11 @@ digraph cfg {
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_5" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_7" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_6" [label="6:  ConditionalStmt Branch \n   n$1=*&z:int [line 24, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$1 [line 24, column 13]\n  EXIT_SCOPE(n$1); [line 24, column 13]\n  APPLY_ABSTRACTION; [line 24, column 13]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_6" [label="6:  ConditionalStmt Branch \n   n$1=*&z:int [line 24, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$1 [line 24, column 13]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_6" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_3" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_7" [label="7:  ConditionalStmt Branch \n   n$2=*&z:int [line 24, column 21]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$2 [line 24, column 13]\n  EXIT_SCOPE(n$2); [line 24, column 13]\n  APPLY_ABSTRACTION; [line 24, column 13]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_7" [label="7:  ConditionalStmt Branch \n   n$2=*&z:int [line 24, column 21]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$2 [line 24, column 13]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_7" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_3" ;
@@ -41,15 +41,15 @@ digraph cfg {
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_10" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_12" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_11" [label="11:  ConditionalStmt Branch \n   n$5=*&z:int [line 24, column 31]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=n$5 [line 24, column 27]\n  NULLIFY(&z); [line 24, column 27]\n  EXIT_SCOPE(n$5,z); [line 24, column 27]\n  APPLY_ABSTRACTION; [line 24, column 27]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_11" [label="11:  ConditionalStmt Branch \n   n$5=*&z:int [line 24, column 31]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=n$5 [line 24, column 27]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_11" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_8" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_12" [label="12:  ConditionalStmt Branch \n   n$6=*&z:int [line 24, column 35]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=n$6 [line 24, column 27]\n  NULLIFY(&z); [line 24, column 27]\n  EXIT_SCOPE(n$6,z); [line 24, column 27]\n  APPLY_ABSTRACTION; [line 24, column 27]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_12" [label="12:  ConditionalStmt Branch \n   n$6=*&z:int [line 24, column 35]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=n$6 [line 24, column 27]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_12" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_8" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(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,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   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_13" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_2" ;
@@ -65,15 +65,15 @@ digraph cfg {
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_16" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_18" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_17" [label="17:  ConditionalStmt Branch \n   n$9=*&z:int [line 22, column 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=n$9 [line 22, column 18]\n  EXIT_SCOPE(n$9); [line 22, column 18]\n  APPLY_ABSTRACTION; [line 22, column 18]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_17" [label="17:  ConditionalStmt Branch \n   n$9=*&z:int [line 22, column 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=n$9 [line 22, column 18]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_17" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_14" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_18" [label="18:  ConditionalStmt Branch \n   n$10=*&z:int [line 22, column 26]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=n$10 [line 22, column 18]\n  EXIT_SCOPE(n$10); [line 22, column 18]\n  APPLY_ABSTRACTION; [line 22, column 18]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_18" [label="18:  ConditionalStmt Branch \n   n$10=*&z:int [line 22, column 26]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=n$10 [line 22, column 18]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_18" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_14" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_19" [label="19:  DeclStmt \n   VARIABLE_DECLARED(y2:int); [line 22, column 3]\n  n$11=*&0$?%__sil_tmpSIL_temp_conditional___n$8:int [line 22, column 18]\n  *&y2:int=(77 + n$11) [line 22, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$8); [line 22, column 3]\n  NULLIFY(&y2); [line 22, column 3]\n  EXIT_SCOPE(n$11,0$?%__sil_tmpSIL_temp_conditional___n$8,y2); [line 22, column 3]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_19" [label="19:  DeclStmt \n   VARIABLE_DECLARED(y2:int); [line 22, column 3]\n  n$11=*&0$?%__sil_tmpSIL_temp_conditional___n$8:int [line 22, column 18]\n  *&y2:int=(77 + n$11) [line 22, column 3]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_19" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_4" ;
@@ -90,15 +90,15 @@ digraph cfg {
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_22" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_24" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_23" [label="23:  ConditionalStmt Branch \n   n$13=*&z:int [line 20, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$12:int=n$13 [line 20, column 13]\n  EXIT_SCOPE(n$13); [line 20, column 13]\n  APPLY_ABSTRACTION; [line 20, column 13]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_23" [label="23:  ConditionalStmt Branch \n   n$13=*&z:int [line 20, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$12:int=n$13 [line 20, column 13]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_23" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_20" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_24" [label="24:  ConditionalStmt Branch \n   n$14=*&z:int [line 20, column 21]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$12:int=n$14 [line 20, column 13]\n  EXIT_SCOPE(n$14); [line 20, column 13]\n  APPLY_ABSTRACTION; [line 20, column 13]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_24" [label="24:  ConditionalStmt Branch \n   n$14=*&z:int [line 20, column 21]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$12:int=n$14 [line 20, column 13]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_24" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_20" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_25" [label="25:  DeclStmt \n   VARIABLE_DECLARED(y1:int); [line 20, column 3]\n  n$15=*&0$?%__sil_tmpSIL_temp_conditional___n$12:int [line 20, column 13]\n  *&y1:int=(n$15 + 77) [line 20, column 3]\n  NULLIFY(&y1); [line 20, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$12); [line 20, column 3]\n  EXIT_SCOPE(n$15,y1,0$?%__sil_tmpSIL_temp_conditional___n$12); [line 20, column 3]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_25" [label="25:  DeclStmt \n   VARIABLE_DECLARED(y1:int); [line 20, column 3]\n  n$15=*&0$?%__sil_tmpSIL_temp_conditional___n$12:int [line 20, column 13]\n  *&y1:int=(n$15 + 77) [line 20, column 3]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_25" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_15" ;
@@ -116,11 +116,11 @@ digraph cfg {
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_28" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_30" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_29" [label="29:  ConditionalStmt Branch \n   n$17=*&z:int [line 17, column 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$16:int=n$17 [line 17, column 9]\n  EXIT_SCOPE(n$17); [line 17, column 9]\n  APPLY_ABSTRACTION; [line 17, column 9]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_29" [label="29:  ConditionalStmt Branch \n   n$17=*&z:int [line 17, column 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$16:int=n$17 [line 17, column 9]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_29" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_26" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_30" [label="30:  ConditionalStmt Branch \n   n$18=*&z:int [line 17, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$16:int=n$18 [line 17, column 9]\n  EXIT_SCOPE(n$18); [line 17, column 9]\n  APPLY_ABSTRACTION; [line 17, column 9]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_30" [label="30:  ConditionalStmt Branch \n   n$18=*&z:int [line 17, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$16:int=n$18 [line 17, column 9]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_30" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_26" ;
@@ -136,15 +136,15 @@ digraph cfg {
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_33" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_35" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_34" [label="34:  ConditionalStmt Branch \n   n$21=*&z:int [line 17, column 27]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$20:int=n$21 [line 17, column 23]\n  EXIT_SCOPE(n$21); [line 17, column 23]\n  APPLY_ABSTRACTION; [line 17, column 23]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_34" [label="34:  ConditionalStmt Branch \n   n$21=*&z:int [line 17, column 27]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$20:int=n$21 [line 17, column 23]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_34" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_31" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_35" [label="35:  ConditionalStmt Branch \n   n$22=*&z:int [line 17, column 31]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$20:int=n$22 [line 17, column 23]\n  EXIT_SCOPE(n$22); [line 17, column 23]\n  APPLY_ABSTRACTION; [line 17, column 23]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_35" [label="35:  ConditionalStmt Branch \n   n$22=*&z:int [line 17, column 31]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$20:int=n$22 [line 17, column 23]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_35" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_31" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_36" [label="36:  BinaryOperatorStmt: Assign \n   n$19=*&0$?%__sil_tmpSIL_temp_conditional___n$16:int [line 17, column 9]\n  n$23=*&0$?%__sil_tmpSIL_temp_conditional___n$20:int [line 17, column 23]\n  *&x3:int=(n$19 + n$23) [line 17, column 3]\n  NULLIFY(&x3); [line 17, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$16); [line 17, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$20); [line 17, column 3]\n  EXIT_SCOPE(n$19,n$23,x3,0$?%__sil_tmpSIL_temp_conditional___n$16,0$?%__sil_tmpSIL_temp_conditional___n$20); [line 17, column 3]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_36" [label="36:  BinaryOperatorStmt: Assign \n   n$19=*&0$?%__sil_tmpSIL_temp_conditional___n$16:int [line 17, column 9]\n  n$23=*&0$?%__sil_tmpSIL_temp_conditional___n$20:int [line 17, column 23]\n  *&x3:int=(n$19 + n$23) [line 17, column 3]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_36" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_21" ;
@@ -161,15 +161,15 @@ digraph cfg {
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_39" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_41" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_40" [label="40:  ConditionalStmt Branch \n   n$25=*&z:int [line 14, column 18]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$24:int=n$25 [line 14, column 14]\n  EXIT_SCOPE(n$25); [line 14, column 14]\n  APPLY_ABSTRACTION; [line 14, column 14]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_40" [label="40:  ConditionalStmt Branch \n   n$25=*&z:int [line 14, column 18]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$24:int=n$25 [line 14, column 14]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_40" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_37" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_41" [label="41:  ConditionalStmt Branch \n   n$26=*&z:int [line 14, column 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$24:int=n$26 [line 14, column 14]\n  EXIT_SCOPE(n$26); [line 14, column 14]\n  APPLY_ABSTRACTION; [line 14, column 14]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_41" [label="41:  ConditionalStmt Branch \n   n$26=*&z:int [line 14, column 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$24:int=n$26 [line 14, column 14]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_41" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_37" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_42" [label="42:  BinaryOperatorStmt: Assign \n   n$27=*&0$?%__sil_tmpSIL_temp_conditional___n$24:int [line 14, column 14]\n  *&x2:int=(77 + n$27) [line 14, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$24); [line 14, column 3]\n  NULLIFY(&x2); [line 14, column 3]\n  EXIT_SCOPE(n$27,0$?%__sil_tmpSIL_temp_conditional___n$24,x2); [line 14, column 3]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_42" [label="42:  BinaryOperatorStmt: Assign \n   n$27=*&0$?%__sil_tmpSIL_temp_conditional___n$24:int [line 14, column 14]\n  *&x2:int=(77 + n$27) [line 14, column 3]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_42" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_27" ;
@@ -186,15 +186,15 @@ digraph cfg {
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_45" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_47" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_46" [label="46:  ConditionalStmt Branch \n   n$29=*&z:int [line 11, column 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$28:int=n$29 [line 11, column 9]\n  EXIT_SCOPE(n$29); [line 11, column 9]\n  APPLY_ABSTRACTION; [line 11, column 9]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_46" [label="46:  ConditionalStmt Branch \n   n$29=*&z:int [line 11, column 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$28:int=n$29 [line 11, column 9]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_46" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_43" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_47" [label="47:  ConditionalStmt Branch \n   n$30=*&z:int [line 11, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$28:int=n$30 [line 11, column 9]\n  EXIT_SCOPE(n$30); [line 11, column 9]\n  APPLY_ABSTRACTION; [line 11, column 9]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_47" [label="47:  ConditionalStmt Branch \n   n$30=*&z:int [line 11, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$28:int=n$30 [line 11, column 9]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_47" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_43" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_48" [label="48:  BinaryOperatorStmt: Assign \n   n$31=*&0$?%__sil_tmpSIL_temp_conditional___n$28:int [line 11, column 9]\n  *&x1:int=(n$31 + 77) [line 11, column 3]\n  NULLIFY(&x1); [line 11, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$28); [line 11, column 3]\n  EXIT_SCOPE(n$31,x1,0$?%__sil_tmpSIL_temp_conditional___n$28); [line 11, column 3]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_48" [label="48:  BinaryOperatorStmt: Assign \n   n$31=*&0$?%__sil_tmpSIL_temp_conditional___n$28:int [line 11, column 9]\n  *&x1:int=(n$31 + 77) [line 11, column 3]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_48" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_38" ;

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

@@ -23,36 +23,36 @@ digraph cfg {
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_6" -> "bar.37b51d194a7513e45b56f6524f2d51f2_8" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 22, column 17]\n  APPLY_ABSTRACTION; [line 22, column 17]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 22, column 17]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_7" -> "bar.37b51d194a7513e45b56f6524f2d51f2_4" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=2 [line 22, column 17]\n  APPLY_ABSTRACTION; [line 22, column 17]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=2 [line 22, column 17]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_8" -> "bar.37b51d194a7513e45b56f6524f2d51f2_4" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_9" [label="9:  BinaryOperatorStmt: GT \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 22, column 17]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 22, column 17]\n  EXIT_SCOPE(0$?%__sil_tmpSIL_temp_conditional___n$1); [line 22, column 17]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_9" [label="9:  BinaryOperatorStmt: GT \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 22, column 17]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_9" -> "bar.37b51d194a7513e45b56f6524f2d51f2_10" ;
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_9" -> "bar.37b51d194a7513e45b56f6524f2d51f2_11" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_10" [label="10: Prune (true branch, boolean exp) \n   PRUNE((n$2 > 1), true); [line 22, column 16]\n  EXIT_SCOPE(n$2); [line 22, column 16]\n " shape="invhouse"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_10" [label="10: Prune (true branch, boolean exp) \n   PRUNE((n$2 > 1), true); [line 22, column 16]\n " shape="invhouse"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_10" -> "bar.37b51d194a7513e45b56f6524f2d51f2_12" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_11" [label="11: Prune (false branch, boolean exp) \n   PRUNE(!(n$2 > 1), false); [line 22, column 16]\n  EXIT_SCOPE(n$2); [line 22, column 16]\n " shape="invhouse"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_11" [label="11: Prune (false branch, boolean exp) \n   PRUNE(!(n$2 > 1), false); [line 22, column 16]\n " shape="invhouse"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_11" -> "bar.37b51d194a7513e45b56f6524f2d51f2_13" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_12" [label="12:  ConditionalStmt Branch \n   *&x:int=1 [line 22, column 39]\n  n$3=*&x:int [line 22, column 39]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$3 [line 22, column 16]\n  NULLIFY(&x); [line 22, column 16]\n  EXIT_SCOPE(n$3,x); [line 22, column 16]\n  APPLY_ABSTRACTION; [line 22, column 16]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_12" [label="12:  ConditionalStmt Branch \n   *&x:int=1 [line 22, column 39]\n  n$3=*&x:int [line 22, column 39]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$3 [line 22, column 16]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_12" -> "bar.37b51d194a7513e45b56f6524f2d51f2_3" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_13" [label="13:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 22, column 16]\n  APPLY_ABSTRACTION; [line 22, column 16]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_13" [label="13:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 22, column 16]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_13" -> "bar.37b51d194a7513e45b56f6524f2d51f2_3" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_14" [label="14:  Return Stmt \n   n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 22, column 16]\n  *&return:int=(0 + n$4) [line 22, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 22, column 3]\n  EXIT_SCOPE(n$4,0$?%__sil_tmpSIL_temp_conditional___n$0); [line 22, column 3]\n  APPLY_ABSTRACTION; [line 22, column 3]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_14" [label="14:  Return Stmt \n   n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 22, column 16]\n  *&return:int=(0 + n$4) [line 22, column 3]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_14" -> "bar.37b51d194a7513e45b56f6524f2d51f2_2" ;
@@ -65,23 +65,23 @@ digraph cfg {
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_16" -> "bar.37b51d194a7513e45b56f6524f2d51f2_17" ;
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_16" -> "bar.37b51d194a7513e45b56f6524f2d51f2_18" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_17" [label="17: Prune (true branch, boolean exp) \n   PRUNE((n$6 > 1), true); [line 21, column 7]\n  EXIT_SCOPE(n$6); [line 21, column 7]\n " shape="invhouse"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_17" [label="17: Prune (true branch, boolean exp) \n   PRUNE((n$6 > 1), true); [line 21, column 7]\n " shape="invhouse"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_17" -> "bar.37b51d194a7513e45b56f6524f2d51f2_19" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_18" [label="18: Prune (false branch, boolean exp) \n   PRUNE(!(n$6 > 1), false); [line 21, column 7]\n  EXIT_SCOPE(n$6); [line 21, column 7]\n " shape="invhouse"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_18" [label="18: Prune (false branch, boolean exp) \n   PRUNE(!(n$6 > 1), false); [line 21, column 7]\n " shape="invhouse"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_18" -> "bar.37b51d194a7513e45b56f6524f2d51f2_20" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_19" [label="19:  ConditionalStmt Branch \n   n$7=*&x:int [line 21, column 22]\n  *&x:int=(n$7 + 1) [line 21, column 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int=(n$7 + 1) [line 21, column 7]\n  NULLIFY(&x); [line 21, column 7]\n  EXIT_SCOPE(n$7,x); [line 21, column 7]\n  APPLY_ABSTRACTION; [line 21, column 7]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_19" [label="19:  ConditionalStmt Branch \n   n$7=*&x:int [line 21, column 22]\n  *&x:int=(n$7 + 1) [line 21, column 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int=(n$7 + 1) [line 21, column 7]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_19" -> "bar.37b51d194a7513e45b56f6524f2d51f2_15" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_20" [label="20:  ConditionalStmt Branch \n   n$8=*&x:int [line 21, column 30]\n  *&x:int=(n$8 - 1) [line 21, column 30]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int=n$8 [line 21, column 7]\n  NULLIFY(&x); [line 21, column 7]\n  EXIT_SCOPE(n$8,x); [line 21, column 7]\n  APPLY_ABSTRACTION; [line 21, column 7]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_20" [label="20:  ConditionalStmt Branch \n   n$8=*&x:int [line 21, column 30]\n  *&x:int=(n$8 - 1) [line 21, column 30]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int=n$8 [line 21, column 7]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_20" -> "bar.37b51d194a7513e45b56f6524f2d51f2_15" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_21" [label="21:  BinaryOperatorStmt: Assign \n   n$9=*&0$?%__sil_tmpSIL_temp_conditional___n$5:int [line 21, column 7]\n  *&y:int=n$9 [line 21, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$5); [line 21, column 3]\n  NULLIFY(&y); [line 21, column 3]\n  EXIT_SCOPE(n$9,0$?%__sil_tmpSIL_temp_conditional___n$5,y); [line 21, column 3]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_21" [label="21:  BinaryOperatorStmt: Assign \n   n$9=*&0$?%__sil_tmpSIL_temp_conditional___n$5:int [line 21, column 7]\n  *&y:int=n$9 [line 21, column 3]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_21" -> "bar.37b51d194a7513e45b56f6524f2d51f2_5" ;
@@ -105,15 +105,15 @@ digraph cfg {
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_5" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_7" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 16, column 16]\n  APPLY_ABSTRACTION; [line 16, column 16]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 16, column 16]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_6" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 16, column 16]\n  APPLY_ABSTRACTION; [line 16, column 16]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 16, column 16]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_7" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_8" [label="8:  Return Stmt \n   n$1=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 16, column 16]\n  *&return:int=(0 + n$1) [line 16, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 16, column 3]\n  EXIT_SCOPE(n$1,0$?%__sil_tmpSIL_temp_conditional___n$0); [line 16, column 3]\n  APPLY_ABSTRACTION; [line 16, column 3]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_8" [label="8:  Return Stmt \n   n$1=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 16, column 16]\n  *&return:int=(0 + n$1) [line 16, column 3]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_8" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_2" ;
@@ -130,7 +130,7 @@ digraph cfg {
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_11" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_14" ;
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_11" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_15" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_12" [label="12:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 15, column 8]\n  APPLY_ABSTRACTION; [line 15, column 8]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_12" [label="12:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 15, column 8]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_12" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_9" ;
@@ -146,19 +146,19 @@ digraph cfg {
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_15" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_17" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_16" [label="16:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 15, column 21]\n  APPLY_ABSTRACTION; [line 15, column 21]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_16" [label="16:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 15, column 21]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_16" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_13" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_17" [label="17:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=2 [line 15, column 21]\n  APPLY_ABSTRACTION; [line 15, column 21]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_17" [label="17:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=2 [line 15, column 21]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_17" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_13" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_18" [label="18:  ConditionalStmt Branch \n   n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 15, column 21]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$4 [line 15, column 8]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$3); [line 15, column 8]\n  EXIT_SCOPE(n$4,0$?%__sil_tmpSIL_temp_conditional___n$3); [line 15, column 8]\n  APPLY_ABSTRACTION; [line 15, column 8]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_18" [label="18:  ConditionalStmt Branch \n   n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 15, column 21]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$4 [line 15, column 8]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_18" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_9" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_19" [label="19:  BinaryOperatorStmt: Assign \n   n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 15, column 8]\n  *&n:int=n$5 [line 15, column 3]\n  NULLIFY(&n); [line 15, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$2); [line 15, column 3]\n  EXIT_SCOPE(n$5,n,0$?%__sil_tmpSIL_temp_conditional___n$2); [line 15, column 3]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_19" [label="19:  BinaryOperatorStmt: Assign \n   n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 15, column 8]\n  *&n:int=n$5 [line 15, column 3]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_19" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_4" ;
@@ -167,7 +167,7 @@ digraph cfg {
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_20" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_28" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_21" [label="21: Prune (true branch, boolean exp) \n   PRUNE((3 < 4), true); [line 14, column 13]\n  NULLIFY(&y); [line 14, column 13]\n  NULLIFY(&x); [line 14, column 13]\n  EXIT_SCOPE(y,x); [line 14, column 13]\n  APPLY_ABSTRACTION; [line 14, column 13]\n " shape="invhouse"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_21" [label="21: Prune (true branch, boolean exp) \n   PRUNE((3 < 4), true); [line 14, column 13]\n " shape="invhouse"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_21" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_26" ;
@@ -175,28 +175,28 @@ digraph cfg {
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_22" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_23" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_23" [label="23:  BinaryOperatorStmt: LT \n   n$7=*&x:int [line 14, column 28]\n  *&x:int=(n$7 + 1) [line 14, column 28]\n  n$8=*&y:int [line 14, column 35]\n  NULLIFY(&y); [line 14, column 35]\n  NULLIFY(&x); [line 14, column 35]\n  EXIT_SCOPE(y,x); [line 14, column 35]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_23" [label="23:  BinaryOperatorStmt: LT \n   n$7=*&x:int [line 14, column 28]\n  *&x:int=(n$7 + 1) [line 14, column 28]\n  n$8=*&y:int [line 14, column 35]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_23" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_24" ;
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_23" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_25" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_24" [label="24: Prune (true branch, boolean exp) \n   PRUNE((7 < (n$7 - n$8)), true); [line 14, column 22]\n  EXIT_SCOPE(n$7,n$8); [line 14, column 22]\n  APPLY_ABSTRACTION; [line 14, column 22]\n " shape="invhouse"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_24" [label="24: Prune (true branch, boolean exp) \n   PRUNE((7 < (n$7 - n$8)), true); [line 14, column 22]\n " shape="invhouse"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_24" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_26" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_25" [label="25: Prune (false branch, boolean exp) \n   PRUNE(!(7 < (n$7 - n$8)), false); [line 14, column 22]\n  EXIT_SCOPE(n$7,n$8); [line 14, column 22]\n " shape="invhouse"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_25" [label="25: Prune (false branch, boolean exp) \n   PRUNE(!(7 < (n$7 - n$8)), false); [line 14, column 22]\n " shape="invhouse"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_25" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_27" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_26" [label="26:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=1 [line 14, column 12]\n  APPLY_ABSTRACTION; [line 14, column 12]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_26" [label="26:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=1 [line 14, column 12]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_26" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_20" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_27" [label="27:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=2 [line 14, column 12]\n  APPLY_ABSTRACTION; [line 14, column 12]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_27" [label="27:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=2 [line 14, column 12]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_27" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_20" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_28" [label="28:  DeclStmt \n   VARIABLE_DECLARED(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,0$?%__sil_tmpSIL_temp_conditional___n$6,n); [line 14, column 3]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_28" [label="28:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_28" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_10" ;
@@ -210,7 +210,7 @@ digraph cfg {
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_30" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_29" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_31" [label="31: Prune (true branch, if) \n   PRUNE((3 < 4), true); [line 10, column 7]\n  NULLIFY(&x); [line 10, column 7]\n  EXIT_SCOPE(x); [line 10, column 7]\n  APPLY_ABSTRACTION; [line 10, column 7]\n " shape="invhouse"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_31" [label="31: Prune (true branch, if) \n   PRUNE((3 < 4), true); [line 10, column 7]\n " shape="invhouse"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_31" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_36" ;
@@ -223,15 +223,15 @@ digraph cfg {
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_33" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_34" ;
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_33" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_35" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_34" [label="34: Prune (true branch, if) \n   PRUNE((7 < n$11), true); [line 10, column 16]\n  NULLIFY(&x); [line 10, column 16]\n  EXIT_SCOPE(n$11,x); [line 10, column 16]\n  APPLY_ABSTRACTION; [line 10, column 16]\n " shape="invhouse"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_34" [label="34: Prune (true branch, if) \n   PRUNE((7 < n$11), true); [line 10, column 16]\n " shape="invhouse"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_34" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_36" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_35" [label="35: Prune (false branch, if) \n   PRUNE(!(7 < n$11), false); [line 10, column 16]\n  EXIT_SCOPE(n$11); [line 10, column 16]\n  APPLY_ABSTRACTION; [line 10, column 16]\n " shape="invhouse"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_35" [label="35: Prune (false branch, if) \n   PRUNE(!(7 < n$11), false); [line 10, column 16]\n " shape="invhouse"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_35" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_30" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_36" [label="36:  BinaryOperatorStmt: Assign \n   *&x:int=0 [line 11, column 5]\n  APPLY_ABSTRACTION; [line 11, column 5]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_36" [label="36:  BinaryOperatorStmt: Assign \n   *&x:int=0 [line 11, column 5]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_36" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_30" ;

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

@@ -12,23 +12,23 @@ digraph cfg {
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_3" -> "test.098f6bcd4621d373cade4e832627b4f6_8" ;
-"test.098f6bcd4621d373cade4e832627b4f6_4" [label="4: Prune (true branch, boolean exp) \n   n$1=*&b:int [line 12, column 32]\n  PRUNE(n$1, true); [line 12, column 32]\n  EXIT_SCOPE(n$1); [line 12, column 32]\n " shape="invhouse"]
+"test.098f6bcd4621d373cade4e832627b4f6_4" [label="4: Prune (true branch, boolean exp) \n   n$1=*&b:int [line 12, column 32]\n  PRUNE(n$1, true); [line 12, column 32]\n " shape="invhouse"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_4" -> "test.098f6bcd4621d373cade4e832627b4f6_6" ;
-"test.098f6bcd4621d373cade4e832627b4f6_5" [label="5: Prune (false branch, boolean exp) \n   n$1=*&b:int [line 12, column 32]\n  PRUNE(!n$1, false); [line 12, column 32]\n  NULLIFY(&b); [line 12, column 32]\n  EXIT_SCOPE(n$1,b); [line 12, column 32]\n " shape="invhouse"]
+"test.098f6bcd4621d373cade4e832627b4f6_5" [label="5: Prune (false branch, boolean exp) \n   n$1=*&b:int [line 12, column 32]\n  PRUNE(!n$1, false); [line 12, column 32]\n " shape="invhouse"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_5" -> "test.098f6bcd4621d373cade4e832627b4f6_7" ;
-"test.098f6bcd4621d373cade4e832627b4f6_6" [label="6:  ConditionalStmt Branch \n   n$2=*&b:int [line 12, column 36]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$2 [line 12, column 32]\n  NULLIFY(&b); [line 12, column 32]\n  EXIT_SCOPE(n$2,b); [line 12, column 32]\n  APPLY_ABSTRACTION; [line 12, column 32]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_6" [label="6:  ConditionalStmt Branch \n   n$2=*&b:int [line 12, column 36]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$2 [line 12, column 32]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_6" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;
-"test.098f6bcd4621d373cade4e832627b4f6_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 12, column 32]\n  APPLY_ABSTRACTION; [line 12, column 32]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 12, column 32]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_7" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;
-"test.098f6bcd4621d373cade4e832627b4f6_8" [label="8:  Return Stmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 12, column 32]\n  n$4=_fun_test2(n$3:int) [line 12, column 26]\n  *&return:int=n$4 [line 12, column 19]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 12, column 19]\n  EXIT_SCOPE(n$3,n$4,0$?%__sil_tmpSIL_temp_conditional___n$0); [line 12, column 19]\n  APPLY_ABSTRACTION; [line 12, column 19]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_8" [label="8:  Return Stmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 12, column 32]\n  n$4=_fun_test2(n$3:int) [line 12, column 26]\n  *&return:int=n$4 [line 12, column 19]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_8" -> "test.098f6bcd4621d373cade4e832627b4f6_2" ;
@@ -40,7 +40,7 @@ digraph cfg {
 "test1.5a105e8b9d40e1329780d62ea2265d8a_2" [label="2: Exit test1 \n  " color=yellow style=filled]
 	
 
-"test1.5a105e8b9d40e1329780d62ea2265d8a_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 16, column 10]\n  *&return:int=n$0 [line 16, column 3]\n  NULLIFY(&x); [line 16, column 3]\n  EXIT_SCOPE(n$0,x); [line 16, column 3]\n  APPLY_ABSTRACTION; [line 16, column 3]\n " shape="box"]
+"test1.5a105e8b9d40e1329780d62ea2265d8a_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 16, column 10]\n  *&return:int=n$0 [line 16, column 3]\n " shape="box"]
 	
 
 	 "test1.5a105e8b9d40e1329780d62ea2265d8a_3" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_2" ;
@@ -48,23 +48,23 @@ digraph cfg {
 	
 
 	 "test1.5a105e8b9d40e1329780d62ea2265d8a_4" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_9" ;
-"test1.5a105e8b9d40e1329780d62ea2265d8a_5" [label="5: Prune (true branch, boolean exp) \n   n$2=*&b:int [line 15, column 11]\n  PRUNE(n$2, true); [line 15, column 11]\n  EXIT_SCOPE(n$2); [line 15, column 11]\n " shape="invhouse"]
+"test1.5a105e8b9d40e1329780d62ea2265d8a_5" [label="5: Prune (true branch, boolean exp) \n   n$2=*&b:int [line 15, column 11]\n  PRUNE(n$2, true); [line 15, column 11]\n " shape="invhouse"]
 	
 
 	 "test1.5a105e8b9d40e1329780d62ea2265d8a_5" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_7" ;
-"test1.5a105e8b9d40e1329780d62ea2265d8a_6" [label="6: Prune (false branch, boolean exp) \n   n$2=*&b:int [line 15, column 11]\n  PRUNE(!n$2, false); [line 15, column 11]\n  NULLIFY(&b); [line 15, column 11]\n  EXIT_SCOPE(n$2,b); [line 15, column 11]\n " shape="invhouse"]
+"test1.5a105e8b9d40e1329780d62ea2265d8a_6" [label="6: Prune (false branch, boolean exp) \n   n$2=*&b:int [line 15, column 11]\n  PRUNE(!n$2, false); [line 15, column 11]\n " shape="invhouse"]
 	
 
 	 "test1.5a105e8b9d40e1329780d62ea2265d8a_6" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_8" ;
-"test1.5a105e8b9d40e1329780d62ea2265d8a_7" [label="7:  ConditionalStmt Branch \n   n$3=*&b:int [line 15, column 15]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$3 [line 15, column 11]\n  NULLIFY(&b); [line 15, column 11]\n  EXIT_SCOPE(n$3,b); [line 15, column 11]\n  APPLY_ABSTRACTION; [line 15, column 11]\n " shape="box"]
+"test1.5a105e8b9d40e1329780d62ea2265d8a_7" [label="7:  ConditionalStmt Branch \n   n$3=*&b:int [line 15, column 15]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$3 [line 15, column 11]\n " shape="box"]
 	
 
 	 "test1.5a105e8b9d40e1329780d62ea2265d8a_7" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_4" ;
-"test1.5a105e8b9d40e1329780d62ea2265d8a_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 15, column 11]\n  APPLY_ABSTRACTION; [line 15, column 11]\n " shape="box"]
+"test1.5a105e8b9d40e1329780d62ea2265d8a_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 15, column 11]\n " shape="box"]
 	
 
 	 "test1.5a105e8b9d40e1329780d62ea2265d8a_8" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_4" ;
-"test1.5a105e8b9d40e1329780d62ea2265d8a_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(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,0$?%__sil_tmpSIL_temp_conditional___n$1); [line 15, column 3]\n " shape="box"]
+"test1.5a105e8b9d40e1329780d62ea2265d8a_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "test1.5a105e8b9d40e1329780d62ea2265d8a_9" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_3" ;
@@ -75,7 +75,7 @@ digraph cfg {
 "test2.ad0234829205b9033196ba818f7a872b_2" [label="2: Exit test2 \n  " color=yellow style=filled]
 	
 
-"test2.ad0234829205b9033196ba818f7a872b_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 10, column 27]\n  *&return:int=n$0 [line 10, column 20]\n  NULLIFY(&x); [line 10, column 20]\n  EXIT_SCOPE(n$0,x); [line 10, column 20]\n  APPLY_ABSTRACTION; [line 10, column 20]\n " shape="box"]
+"test2.ad0234829205b9033196ba818f7a872b_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 10, column 27]\n  *&return:int=n$0 [line 10, column 20]\n " shape="box"]
 	
 
 	 "test2.ad0234829205b9033196ba818f7a872b_3" -> "test2.ad0234829205b9033196ba818f7a872b_2" ;
@@ -86,7 +86,7 @@ digraph cfg {
 "test3.8ad8757baa8564dc136c1e07507f4a98_2" [label="2: Exit test3 \n  " color=yellow style=filled]
 	
 
-"test3.8ad8757baa8564dc136c1e07507f4a98_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 21, column 10]\n  *&return:int=n$0 [line 21, column 3]\n  NULLIFY(&x); [line 21, column 3]\n  EXIT_SCOPE(n$0,x); [line 21, column 3]\n  APPLY_ABSTRACTION; [line 21, column 3]\n " shape="box"]
+"test3.8ad8757baa8564dc136c1e07507f4a98_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 21, column 10]\n  *&return:int=n$0 [line 21, column 3]\n " shape="box"]
 	
 
 	 "test3.8ad8757baa8564dc136c1e07507f4a98_3" -> "test3.8ad8757baa8564dc136c1e07507f4a98_2" ;
@@ -98,24 +98,24 @@ digraph cfg {
 	
 
 	 "test3.8ad8757baa8564dc136c1e07507f4a98_5" -> "test3.8ad8757baa8564dc136c1e07507f4a98_7" ;
-"test3.8ad8757baa8564dc136c1e07507f4a98_6" [label="6: Prune (false branch, boolean exp) \n   PRUNE(!n$1, false); [line 20, column 11]\n  EXIT_SCOPE(n$1); [line 20, column 11]\n " shape="invhouse"]
+"test3.8ad8757baa8564dc136c1e07507f4a98_6" [label="6: Prune (false branch, boolean exp) \n   PRUNE(!n$1, false); [line 20, column 11]\n " shape="invhouse"]
 	
 
 	 "test3.8ad8757baa8564dc136c1e07507f4a98_6" -> "test3.8ad8757baa8564dc136c1e07507f4a98_8" ;
-"test3.8ad8757baa8564dc136c1e07507f4a98_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$1 [line 20, column 11]\n  EXIT_SCOPE(n$1); [line 20, column 11]\n  APPLY_ABSTRACTION; [line 20, column 11]\n " shape="box"]
+"test3.8ad8757baa8564dc136c1e07507f4a98_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$1 [line 20, column 11]\n " shape="box"]
 	
 
 	 "test3.8ad8757baa8564dc136c1e07507f4a98_7" -> "test3.8ad8757baa8564dc136c1e07507f4a98_4" ;
-"test3.8ad8757baa8564dc136c1e07507f4a98_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 20, column 11]\n  APPLY_ABSTRACTION; [line 20, column 11]\n " shape="box"]
+"test3.8ad8757baa8564dc136c1e07507f4a98_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 20, column 11]\n " shape="box"]
 	
 
 	 "test3.8ad8757baa8564dc136c1e07507f4a98_8" -> "test3.8ad8757baa8564dc136c1e07507f4a98_4" ;
-"test3.8ad8757baa8564dc136c1e07507f4a98_9" [label="9:  BinaryConditionalStmt Init \n   n$1=*&b:int [line 20, column 11]\n  NULLIFY(&b); [line 20, column 11]\n  EXIT_SCOPE(b); [line 20, column 11]\n " shape="box"]
+"test3.8ad8757baa8564dc136c1e07507f4a98_9" [label="9:  BinaryConditionalStmt Init \n   n$1=*&b:int [line 20, column 11]\n " shape="box"]
 	
 
 	 "test3.8ad8757baa8564dc136c1e07507f4a98_9" -> "test3.8ad8757baa8564dc136c1e07507f4a98_5" ;
 	 "test3.8ad8757baa8564dc136c1e07507f4a98_9" -> "test3.8ad8757baa8564dc136c1e07507f4a98_6" ;
-"test3.8ad8757baa8564dc136c1e07507f4a98_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(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,0$?%__sil_tmpSIL_temp_conditional___n$2); [line 20, column 3]\n " shape="box"]
+"test3.8ad8757baa8564dc136c1e07507f4a98_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "test3.8ad8757baa8564dc136c1e07507f4a98_10" -> "test3.8ad8757baa8564dc136c1e07507f4a98_3" ;
@@ -134,24 +134,24 @@ digraph cfg {
 	
 
 	 "test4.86985e105f79b95d6bc918fb45ec7727_4" -> "test4.86985e105f79b95d6bc918fb45ec7727_6" ;
-"test4.86985e105f79b95d6bc918fb45ec7727_5" [label="5: Prune (false branch, boolean exp) \n   PRUNE(!n$0, false); [line 24, column 33]\n  EXIT_SCOPE(n$0); [line 24, column 33]\n " shape="invhouse"]
+"test4.86985e105f79b95d6bc918fb45ec7727_5" [label="5: Prune (false branch, boolean exp) \n   PRUNE(!n$0, false); [line 24, column 33]\n " shape="invhouse"]
 	
 
 	 "test4.86985e105f79b95d6bc918fb45ec7727_5" -> "test4.86985e105f79b95d6bc918fb45ec7727_7" ;
-"test4.86985e105f79b95d6bc918fb45ec7727_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$0 [line 24, column 33]\n  EXIT_SCOPE(n$0); [line 24, column 33]\n  APPLY_ABSTRACTION; [line 24, column 33]\n " shape="box"]
+"test4.86985e105f79b95d6bc918fb45ec7727_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$0 [line 24, column 33]\n " shape="box"]
 	
 
 	 "test4.86985e105f79b95d6bc918fb45ec7727_6" -> "test4.86985e105f79b95d6bc918fb45ec7727_3" ;
-"test4.86985e105f79b95d6bc918fb45ec7727_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 24, column 33]\n  APPLY_ABSTRACTION; [line 24, column 33]\n " shape="box"]
+"test4.86985e105f79b95d6bc918fb45ec7727_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 24, column 33]\n " shape="box"]
 	
 
 	 "test4.86985e105f79b95d6bc918fb45ec7727_7" -> "test4.86985e105f79b95d6bc918fb45ec7727_3" ;
-"test4.86985e105f79b95d6bc918fb45ec7727_8" [label="8:  BinaryConditionalStmt Init \n   n$0=*&b:int [line 24, column 33]\n  NULLIFY(&b); [line 24, column 33]\n  EXIT_SCOPE(b); [line 24, column 33]\n " shape="box"]
+"test4.86985e105f79b95d6bc918fb45ec7727_8" [label="8:  BinaryConditionalStmt Init \n   n$0=*&b:int [line 24, column 33]\n " shape="box"]
 	
 
 	 "test4.86985e105f79b95d6bc918fb45ec7727_8" -> "test4.86985e105f79b95d6bc918fb45ec7727_4" ;
 	 "test4.86985e105f79b95d6bc918fb45ec7727_8" -> "test4.86985e105f79b95d6bc918fb45ec7727_5" ;
-"test4.86985e105f79b95d6bc918fb45ec7727_9" [label="9:  Return Stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 24, column 33]\n  n$3=_fun_test2(n$2:int) [line 24, column 27]\n  *&return:int=n$3 [line 24, column 20]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 24, column 20]\n  EXIT_SCOPE(n$2,n$3,0$?%__sil_tmpSIL_temp_conditional___n$1); [line 24, column 20]\n  APPLY_ABSTRACTION; [line 24, column 20]\n " shape="box"]
+"test4.86985e105f79b95d6bc918fb45ec7727_9" [label="9:  Return Stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 24, column 33]\n  n$3=_fun_test2(n$2:int) [line 24, column 27]\n  *&return:int=n$3 [line 24, column 20]\n " shape="box"]
 	
 
 	 "test4.86985e105f79b95d6bc918fb45ec7727_9" -> "test4.86985e105f79b95d6bc918fb45ec7727_2" ;
@@ -170,24 +170,24 @@ digraph cfg {
 	
 
 	 "test5.e3d704f3542b44a621ebed70dc0efe13_4" -> "test5.e3d704f3542b44a621ebed70dc0efe13_6" ;
-"test5.e3d704f3542b44a621ebed70dc0efe13_5" [label="5: Prune (false branch, boolean exp) \n   PRUNE(!n$0, false); [line 26, column 27]\n  EXIT_SCOPE(n$0); [line 26, column 27]\n " shape="invhouse"]
+"test5.e3d704f3542b44a621ebed70dc0efe13_5" [label="5: Prune (false branch, boolean exp) \n   PRUNE(!n$0, false); [line 26, column 27]\n " shape="invhouse"]
 	
 
 	 "test5.e3d704f3542b44a621ebed70dc0efe13_5" -> "test5.e3d704f3542b44a621ebed70dc0efe13_7" ;
-"test5.e3d704f3542b44a621ebed70dc0efe13_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$0 [line 26, column 27]\n  EXIT_SCOPE(n$0); [line 26, column 27]\n  APPLY_ABSTRACTION; [line 26, column 27]\n " shape="box"]
+"test5.e3d704f3542b44a621ebed70dc0efe13_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$0 [line 26, column 27]\n " shape="box"]
 	
 
 	 "test5.e3d704f3542b44a621ebed70dc0efe13_6" -> "test5.e3d704f3542b44a621ebed70dc0efe13_3" ;
-"test5.e3d704f3542b44a621ebed70dc0efe13_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 26, column 27]\n  APPLY_ABSTRACTION; [line 26, column 27]\n " shape="box"]
+"test5.e3d704f3542b44a621ebed70dc0efe13_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 26, column 27]\n " shape="box"]
 	
 
 	 "test5.e3d704f3542b44a621ebed70dc0efe13_7" -> "test5.e3d704f3542b44a621ebed70dc0efe13_3" ;
-"test5.e3d704f3542b44a621ebed70dc0efe13_8" [label="8:  BinaryConditionalStmt Init \n   n$0=*&b:int [line 26, column 27]\n  NULLIFY(&b); [line 26, column 27]\n  EXIT_SCOPE(b); [line 26, column 27]\n " shape="box"]
+"test5.e3d704f3542b44a621ebed70dc0efe13_8" [label="8:  BinaryConditionalStmt Init \n   n$0=*&b:int [line 26, column 27]\n " shape="box"]
 	
 
 	 "test5.e3d704f3542b44a621ebed70dc0efe13_8" -> "test5.e3d704f3542b44a621ebed70dc0efe13_4" ;
 	 "test5.e3d704f3542b44a621ebed70dc0efe13_8" -> "test5.e3d704f3542b44a621ebed70dc0efe13_5" ;
-"test5.e3d704f3542b44a621ebed70dc0efe13_9" [label="9:  Return Stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 26, column 27]\n  *&return:int=n$2 [line 26, column 20]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 26, column 20]\n  EXIT_SCOPE(n$2,0$?%__sil_tmpSIL_temp_conditional___n$1); [line 26, column 20]\n  APPLY_ABSTRACTION; [line 26, column 20]\n " shape="box"]
+"test5.e3d704f3542b44a621ebed70dc0efe13_9" [label="9:  Return Stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 26, column 27]\n  *&return:int=n$2 [line 26, column 20]\n " shape="box"]
 	
 
 	 "test5.e3d704f3542b44a621ebed70dc0efe13_9" -> "test5.e3d704f3542b44a621ebed70dc0efe13_2" ;
@@ -199,7 +199,7 @@ digraph cfg {
 "test6.4cfad7076129962ee70c36839a1e3e15_2" [label="2: Exit test6 \n  " color=yellow style=filled]
 	
 
-"test6.4cfad7076129962ee70c36839a1e3e15_3" [label="3:  Return Stmt \n   n$0=*&z:int [line 30, column 10]\n  *&return:int=n$0 [line 30, column 3]\n  NULLIFY(&z); [line 30, column 3]\n  EXIT_SCOPE(n$0,z); [line 30, column 3]\n  APPLY_ABSTRACTION; [line 30, column 3]\n " shape="box"]
+"test6.4cfad7076129962ee70c36839a1e3e15_3" [label="3:  Return Stmt \n   n$0=*&z:int [line 30, column 10]\n  *&return:int=n$0 [line 30, column 3]\n " shape="box"]
 	
 
 	 "test6.4cfad7076129962ee70c36839a1e3e15_3" -> "test6.4cfad7076129962ee70c36839a1e3e15_2" ;
@@ -215,15 +215,15 @@ digraph cfg {
 	
 
 	 "test6.4cfad7076129962ee70c36839a1e3e15_6" -> "test6.4cfad7076129962ee70c36839a1e3e15_8" ;
-"test6.4cfad7076129962ee70c36839a1e3e15_7" [label="7:  ConditionalStmt Branch \n   n$2=*&p:int* [line 29, column 16]\n  n$3=*n$2:int [line 29, column 15]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$3 [line 29, column 11]\n  NULLIFY(&p); [line 29, column 11]\n  EXIT_SCOPE(n$2,n$3,p); [line 29, column 11]\n  APPLY_ABSTRACTION; [line 29, column 11]\n " shape="box"]
+"test6.4cfad7076129962ee70c36839a1e3e15_7" [label="7:  ConditionalStmt Branch \n   n$2=*&p:int* [line 29, column 16]\n  n$3=*n$2:int [line 29, column 15]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$3 [line 29, column 11]\n " shape="box"]
 	
 
 	 "test6.4cfad7076129962ee70c36839a1e3e15_7" -> "test6.4cfad7076129962ee70c36839a1e3e15_4" ;
-"test6.4cfad7076129962ee70c36839a1e3e15_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=0 [line 29, column 11]\n  APPLY_ABSTRACTION; [line 29, column 11]\n " shape="box"]
+"test6.4cfad7076129962ee70c36839a1e3e15_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=0 [line 29, column 11]\n " shape="box"]
 	
 
 	 "test6.4cfad7076129962ee70c36839a1e3e15_8" -> "test6.4cfad7076129962ee70c36839a1e3e15_4" ;
-"test6.4cfad7076129962ee70c36839a1e3e15_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(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,0$?%__sil_tmpSIL_temp_conditional___n$1); [line 29, column 3]\n " shape="box"]
+"test6.4cfad7076129962ee70c36839a1e3e15_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "test6.4cfad7076129962ee70c36839a1e3e15_9" -> "test6.4cfad7076129962ee70c36839a1e3e15_3" ;
@@ -242,24 +242,24 @@ digraph cfg {
 	
 
 	 "test7.b04083e53e242626595e2b8ea327e525_4" -> "test7.b04083e53e242626595e2b8ea327e525_6" ;
-"test7.b04083e53e242626595e2b8ea327e525_5" [label="5: Prune (false branch, boolean exp) \n   PRUNE(!n$1, false); [line 33, column 27]\n  EXIT_SCOPE(n$1); [line 33, column 27]\n " shape="invhouse"]
+"test7.b04083e53e242626595e2b8ea327e525_5" [label="5: Prune (false branch, boolean exp) \n   PRUNE(!n$1, false); [line 33, column 27]\n " shape="invhouse"]
 	
 
 	 "test7.b04083e53e242626595e2b8ea327e525_5" -> "test7.b04083e53e242626595e2b8ea327e525_7" ;
-"test7.b04083e53e242626595e2b8ea327e525_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$1 [line 33, column 27]\n  EXIT_SCOPE(n$1); [line 33, column 27]\n  APPLY_ABSTRACTION; [line 33, column 27]\n " shape="box"]
+"test7.b04083e53e242626595e2b8ea327e525_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$1 [line 33, column 27]\n " shape="box"]
 	
 
 	 "test7.b04083e53e242626595e2b8ea327e525_6" -> "test7.b04083e53e242626595e2b8ea327e525_3" ;
-"test7.b04083e53e242626595e2b8ea327e525_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=2 [line 33, column 27]\n  APPLY_ABSTRACTION; [line 33, column 27]\n " shape="box"]
+"test7.b04083e53e242626595e2b8ea327e525_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=2 [line 33, column 27]\n " shape="box"]
 	
 
 	 "test7.b04083e53e242626595e2b8ea327e525_7" -> "test7.b04083e53e242626595e2b8ea327e525_3" ;
-"test7.b04083e53e242626595e2b8ea327e525_8" [label="8:  BinaryConditionalStmt Init \n   n$0=_fun_test2(2:int) [line 33, column 37]\n  n$1=_fun_test2((2 + n$0):int) [line 33, column 27]\n  EXIT_SCOPE(n$0); [line 33, column 27]\n " shape="box"]
+"test7.b04083e53e242626595e2b8ea327e525_8" [label="8:  BinaryConditionalStmt Init \n   n$0=_fun_test2(2:int) [line 33, column 37]\n  n$1=_fun_test2((2 + n$0):int) [line 33, column 27]\n " shape="box"]
 	
 
 	 "test7.b04083e53e242626595e2b8ea327e525_8" -> "test7.b04083e53e242626595e2b8ea327e525_4" ;
 	 "test7.b04083e53e242626595e2b8ea327e525_8" -> "test7.b04083e53e242626595e2b8ea327e525_5" ;
-"test7.b04083e53e242626595e2b8ea327e525_9" [label="9:  Return Stmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 33, column 27]\n  *&return:int=n$3 [line 33, column 20]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$2); [line 33, column 20]\n  EXIT_SCOPE(n$3,0$?%__sil_tmpSIL_temp_conditional___n$2); [line 33, column 20]\n  APPLY_ABSTRACTION; [line 33, column 20]\n " shape="box"]
+"test7.b04083e53e242626595e2b8ea327e525_9" [label="9:  Return Stmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 33, column 27]\n  *&return:int=n$3 [line 33, column 20]\n " shape="box"]
 	
 
 	 "test7.b04083e53e242626595e2b8ea327e525_9" -> "test7.b04083e53e242626595e2b8ea327e525_2" ;

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

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

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

@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 54, column 3]\n  APPLY_ABSTRACTION; [line 54, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 54, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -15,41 +15,41 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5: Prune (true branch, if) \n   n$0=*&spec:char* [line 47, column 8]\n  PRUNE(!n$0, true); [line 47, column 8]\n  NULLIFY(&spec); [line 47, column 8]\n  EXIT_SCOPE(n$0,spec); [line 47, column 8]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5: Prune (true branch, if) \n   n$0=*&spec:char* [line 47, column 8]\n  PRUNE(!n$0, true); [line 47, column 8]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (false branch, if) \n   n$0=*&spec:char* [line 47, column 8]\n  PRUNE(n$0, false); [line 47, column 8]\n  EXIT_SCOPE(n$0); [line 47, column 8]\n  APPLY_ABSTRACTION; [line 47, column 8]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (false branch, if) \n   n$0=*&spec:char* [line 47, column 8]\n  PRUNE(n$0, false); [line 47, column 8]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   n$1=_fun_getenv(\"BLOCK_SIZE\":char*) [line 47, column 25]\n  *&spec:char*=n$1 [line 47, column 18]\n  n$2=*&spec:char* [line 47, column 18]\n  EXIT_SCOPE(n$1); [line 47, column 18]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   n$1=_fun_getenv(\"BLOCK_SIZE\":char*) [line 47, column 25]\n  *&spec:char*=n$1 [line 47, column 18]\n  n$2=*&spec:char* [line 47, column 18]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (true branch, if) \n   PRUNE(!n$2, true); [line 47, column 18]\n  NULLIFY(&spec); [line 47, column 18]\n  EXIT_SCOPE(n$2,spec); [line 47, column 18]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (true branch, if) \n   PRUNE(!n$2, true); [line 47, column 18]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (false branch, if) \n   PRUNE(n$2, false); [line 47, column 18]\n  EXIT_SCOPE(n$2); [line 47, column 18]\n  APPLY_ABSTRACTION; [line 47, column 18]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (false branch, if) \n   PRUNE(n$2, false); [line 47, column 18]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  BinaryOperatorStmt: Assign \n   n$3=_fun_getenv(\"BLOCKSIZE\":char*) [line 47, column 59]\n  *&spec:char*=n$3 [line 47, column 52]\n  n$4=*&spec:char* [line 47, column 52]\n  EXIT_SCOPE(n$3); [line 47, column 52]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  BinaryOperatorStmt: Assign \n   n$3=_fun_getenv(\"BLOCKSIZE\":char*) [line 47, column 59]\n  *&spec:char*=n$3 [line 47, column 52]\n  n$4=*&spec:char* [line 47, column 52]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11: Prune (true branch, if) \n   PRUNE(!n$4, true); [line 47, column 52]\n  NULLIFY(&spec); [line 47, column 52]\n  EXIT_SCOPE(n$4,spec); [line 47, column 52]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11: Prune (true branch, if) \n   PRUNE(!n$4, true); [line 47, column 52]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12: Prune (false branch, if) \n   PRUNE(n$4, false); [line 47, column 52]\n  EXIT_SCOPE(n$4); [line 47, column 52]\n  APPLY_ABSTRACTION; [line 47, column 52]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12: Prune (false branch, if) \n   PRUNE(n$4, false); [line 47, column 52]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
-"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  BinaryOperatorStmt: Assign \n   *&block_size:char*=null [line 48, column 5]\n  NULLIFY(&block_size); [line 48, column 5]\n  EXIT_SCOPE(block_size); [line 48, column 5]\n  APPLY_ABSTRACTION; [line 48, column 5]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  BinaryOperatorStmt: Assign \n   *&block_size:char*=null [line 48, column 5]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -57,24 +57,24 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  BinaryOperatorStmt: EQ \n   n$5=*&spec:char* [line 50, column 10]\n  n$6=*n$5:char [line 50, column 9]\n  NULLIFY(&spec); [line 50, column 9]\n  EXIT_SCOPE(n$5,spec); [line 50, column 9]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  BinaryOperatorStmt: EQ \n   n$5=*&spec:char* [line 50, column 10]\n  n$6=*n$5:char [line 50, column 9]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_16" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_17" ;
-"main.fad58de7366495db4650cfefac2fcd61_16" [label="16: Prune (true branch, if) \n   PRUNE((n$6 == 39), true); [line 50, column 9]\n  EXIT_SCOPE(n$6); [line 50, column 9]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_16" [label="16: Prune (true branch, if) \n   PRUNE((n$6 == 39), true); [line 50, column 9]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_16" -> "main.fad58de7366495db4650cfefac2fcd61_18" ;
-"main.fad58de7366495db4650cfefac2fcd61_17" [label="17: Prune (false branch, if) \n   PRUNE(!(n$6 == 39), false); [line 50, column 9]\n  EXIT_SCOPE(n$6); [line 50, column 9]\n  APPLY_ABSTRACTION; [line 50, column 9]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_17" [label="17: Prune (false branch, if) \n   PRUNE(!(n$6 == 39), false); [line 50, column 9]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_17" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
-"main.fad58de7366495db4650cfefac2fcd61_18" [label="18:  BinaryOperatorStmt: Assign \n   *&block_size:char*=null [line 51, column 7]\n  NULLIFY(&block_size); [line 51, column 7]\n  EXIT_SCOPE(block_size); [line 51, column 7]\n  APPLY_ABSTRACTION; [line 51, column 7]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_18" [label="18:  BinaryOperatorStmt: Assign \n   *&block_size:char*=null [line 51, column 7]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_18" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
-"main.fad58de7366495db4650cfefac2fcd61_19" [label="19:  BinaryOperatorStmt: Assign \n   n$10=_fun_getenv(\"BLOCK\":char*) [line 45, column 10]\n  *&spec:char*=n$10 [line 45, column 3]\n  EXIT_SCOPE(n$10); [line 45, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_19" [label="19:  BinaryOperatorStmt: Assign \n   n$10=_fun_getenv(\"BLOCK\":char*) [line 45, column 10]\n  *&spec:char*=n$10 [line 45, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_19" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
@@ -91,36 +91,36 @@ digraph cfg {
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_3" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_4" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_4" [label="4:  between_join_and_exit \n   APPLY_ABSTRACTION; [line 20, column 3]\n " shape="box"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_4" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_2" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_5" [label="5: Prune (true branch, if) \n   n$1=*&x:int* [line 20, column 8]\n  PRUNE(!n$1, true); [line 20, column 8]\n  NULLIFY(&x); [line 20, column 8]\n  EXIT_SCOPE(n$1,x); [line 20, column 8]\n " shape="invhouse"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_5" [label="5: Prune (true branch, if) \n   n$1=*&x:int* [line 20, column 8]\n  PRUNE(!n$1, true); [line 20, column 8]\n " shape="invhouse"]
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_5" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_7" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_6" [label="6: Prune (false branch, if) \n   n$1=*&x:int* [line 20, column 8]\n  PRUNE(n$1, false); [line 20, column 8]\n  EXIT_SCOPE(n$1); [line 20, column 8]\n  APPLY_ABSTRACTION; [line 20, column 8]\n " shape="invhouse"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_6" [label="6: Prune (false branch, if) \n   n$1=*&x:int* [line 20, column 8]\n  PRUNE(n$1, false); [line 20, column 8]\n " shape="invhouse"]
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_6" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_11" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_7" [label="7:  BinaryOperatorStmt: Assign \n   n$2=_fun_getenv(\"BLOCK\":char*) [line 20, column 19]\n  *&x:int*=(int*)n$2 [line 20, column 15]\n  n$3=*&x:int* [line 20, column 15]\n  EXIT_SCOPE(n$2); [line 20, column 15]\n " shape="box"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_7" [label="7:  BinaryOperatorStmt: Assign \n   n$2=_fun_getenv(\"BLOCK\":char*) [line 20, column 19]\n  *&x:int*=(int*)n$2 [line 20, column 15]\n  n$3=*&x:int* [line 20, column 15]\n " shape="box"]
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_7" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_8" ;
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_7" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_9" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_8" [label="8: Prune (true branch, if) \n   PRUNE(!n$3, true); [line 20, column 15]\n  NULLIFY(&x); [line 20, column 15]\n  EXIT_SCOPE(n$3,x); [line 20, column 15]\n " shape="invhouse"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_8" [label="8: Prune (true branch, if) \n   PRUNE(!n$3, true); [line 20, column 15]\n " shape="invhouse"]
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_8" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_10" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_9" [label="9: Prune (false branch, if) \n   PRUNE(n$3, false); [line 20, column 15]\n  EXIT_SCOPE(n$3); [line 20, column 15]\n  APPLY_ABSTRACTION; [line 20, column 15]\n " shape="invhouse"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_9" [label="9: Prune (false branch, if) \n   PRUNE(n$3, false); [line 20, column 15]\n " shape="invhouse"]
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_9" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_11" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_10" [label="10:  BinaryOperatorStmt: Assign \n   *&x:int*=17 [line 21, column 5]\n  NULLIFY(&x); [line 21, column 5]\n  EXIT_SCOPE(x); [line 21, column 5]\n  APPLY_ABSTRACTION; [line 21, column 5]\n " shape="box"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_10" [label="10:  BinaryOperatorStmt: Assign \n   *&x:int*=17 [line 21, column 5]\n " shape="box"]
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_10" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_3" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_11" [label="11:  BinaryOperatorStmt: Assign \n   n$4=*&x:int* [line 23, column 6]\n  *n$4:int=32 [line 23, column 5]\n  NULLIFY(&x); [line 23, column 5]\n  EXIT_SCOPE(n$4,x); [line 23, column 5]\n  APPLY_ABSTRACTION; [line 23, column 5]\n " shape="box"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_11" [label="11:  BinaryOperatorStmt: Assign \n   n$4=*&x:int* [line 23, column 6]\n  *n$4:int=32 [line 23, column 5]\n " shape="box"]
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_11" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_3" ;
@@ -135,7 +135,7 @@ digraph cfg {
 	
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_3" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_4" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_4" [label="4:  between_join_and_exit \n   APPLY_ABSTRACTION; [line 12, column 3]\n " shape="box"]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_4" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_2" ;
@@ -144,32 +144,32 @@ digraph cfg {
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_5" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_6" ;
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_5" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_7" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_6" [label="6: Prune (true branch, if) \n   PRUNE((n$1 == null), true); [line 12, column 7]\n  EXIT_SCOPE(n$1); [line 12, column 7]\n  APPLY_ABSTRACTION; [line 12, column 7]\n " shape="invhouse"]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_6" [label="6: Prune (true branch, if) \n   PRUNE((n$1 == null), true); [line 12, column 7]\n " shape="invhouse"]
 	
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_6" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_11" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$1 == null), false); [line 12, column 7]\n  EXIT_SCOPE(n$1); [line 12, column 7]\n " shape="invhouse"]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$1 == null), false); [line 12, column 7]\n " shape="invhouse"]
 	
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_7" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_8" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_8" [label="8:  BinaryOperatorStmt: EQ \n   n$2=*&x:int* [line 12, column 18]\n  n$3=*n$2:int [line 12, column 17]\n  NULLIFY(&x); [line 12, column 17]\n  EXIT_SCOPE(n$2,x); [line 12, column 17]\n " shape="box"]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_8" [label="8:  BinaryOperatorStmt: EQ \n   n$2=*&x:int* [line 12, column 18]\n  n$3=*n$2:int [line 12, column 17]\n " shape="box"]
 	
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_8" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_9" ;
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_8" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_10" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_9" [label="9: Prune (true branch, if) \n   PRUNE((n$3 == 2), true); [line 12, column 17]\n  EXIT_SCOPE(n$3); [line 12, column 17]\n  APPLY_ABSTRACTION; [line 12, column 17]\n " shape="invhouse"]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_9" [label="9: Prune (true branch, if) \n   PRUNE((n$3 == 2), true); [line 12, column 17]\n " shape="invhouse"]
 	
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_9" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_11" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_10" [label="10: Prune (false branch, if) \n   PRUNE(!(n$3 == 2), false); [line 12, column 17]\n  EXIT_SCOPE(n$3); [line 12, column 17]\n " shape="invhouse"]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_10" [label="10: Prune (false branch, if) \n   PRUNE(!(n$3 == 2), false); [line 12, column 17]\n " shape="invhouse"]
 	
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_10" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_12" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_11" [label="11:  BinaryOperatorStmt: Assign \n   *&x:int*=17 [line 13, column 5]\n  NULLIFY(&x); [line 13, column 5]\n  EXIT_SCOPE(x); [line 13, column 5]\n  APPLY_ABSTRACTION; [line 13, column 5]\n " shape="box"]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_11" [label="11:  BinaryOperatorStmt: Assign \n   *&x:int*=17 [line 13, column 5]\n " shape="box"]
 	
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_11" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_3" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_12" [label="12:  BinaryOperatorStmt: Assign \n   *&x:int*=32 [line 15, column 5]\n  NULLIFY(&x); [line 15, column 5]\n  EXIT_SCOPE(x); [line 15, column 5]\n  APPLY_ABSTRACTION; [line 15, column 5]\n " shape="box"]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_12" [label="12:  BinaryOperatorStmt: Assign \n   *&x:int*=32 [line 15, column 5]\n " shape="box"]
 	
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_12" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_3" ;
@@ -185,45 +185,45 @@ digraph cfg {
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_3" -> "test_loop.254a9d372f8f45542e409771135b9322_4" ;
 	 "test_loop.254a9d372f8f45542e409771135b9322_3" -> "test_loop.254a9d372f8f45542e409771135b9322_5" ;
-"test_loop.254a9d372f8f45542e409771135b9322_4" [label="4: Prune (true branch, while) \n   n$0=*&spec:char* [line 34, column 12]\n  PRUNE(!n$0, true); [line 34, column 12]\n  NULLIFY(&spec); [line 34, column 12]\n  EXIT_SCOPE(n$0,spec); [line 34, column 12]\n " shape="invhouse"]
+"test_loop.254a9d372f8f45542e409771135b9322_4" [label="4: Prune (true branch, while) \n   n$0=*&spec:char* [line 34, column 12]\n  PRUNE(!n$0, true); [line 34, column 12]\n " shape="invhouse"]
 	
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_4" -> "test_loop.254a9d372f8f45542e409771135b9322_6" ;
-"test_loop.254a9d372f8f45542e409771135b9322_5" [label="5: Prune (false branch, while) \n   n$0=*&spec:char* [line 34, column 12]\n  PRUNE(n$0, false); [line 34, column 12]\n  NULLIFY(&spec); [line 34, column 12]\n  EXIT_SCOPE(n$0,spec); [line 34, column 12]\n  APPLY_ABSTRACTION; [line 34, column 12]\n " shape="invhouse"]
+"test_loop.254a9d372f8f45542e409771135b9322_5" [label="5: Prune (false branch, while) \n   n$0=*&spec:char* [line 34, column 12]\n  PRUNE(n$0, false); [line 34, column 12]\n " shape="invhouse"]
 	
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_5" -> "test_loop.254a9d372f8f45542e409771135b9322_2" ;
-"test_loop.254a9d372f8f45542e409771135b9322_6" [label="6:  BinaryOperatorStmt: Assign \n   n$1=_fun_getenv(\"BLOCK_SIZE\":char*) [line 34, column 29]\n  *&spec:char*=n$1 [line 34, column 22]\n  n$2=*&spec:char* [line 34, column 22]\n  NULLIFY(&spec); [line 34, column 22]\n  EXIT_SCOPE(n$1,spec); [line 34, column 22]\n " shape="box"]
+"test_loop.254a9d372f8f45542e409771135b9322_6" [label="6:  BinaryOperatorStmt: Assign \n   n$1=_fun_getenv(\"BLOCK_SIZE\":char*) [line 34, column 29]\n  *&spec:char*=n$1 [line 34, column 22]\n  n$2=*&spec:char* [line 34, column 22]\n " shape="box"]
 	
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_6" -> "test_loop.254a9d372f8f45542e409771135b9322_7" ;
 	 "test_loop.254a9d372f8f45542e409771135b9322_6" -> "test_loop.254a9d372f8f45542e409771135b9322_8" ;
-"test_loop.254a9d372f8f45542e409771135b9322_7" [label="7: Prune (true branch, while) \n   PRUNE(!n$2, true); [line 34, column 22]\n  EXIT_SCOPE(n$2); [line 34, column 22]\n " shape="invhouse"]
+"test_loop.254a9d372f8f45542e409771135b9322_7" [label="7: Prune (true branch, while) \n   PRUNE(!n$2, true); [line 34, column 22]\n " shape="invhouse"]
 	
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_7" -> "test_loop.254a9d372f8f45542e409771135b9322_9" ;
-"test_loop.254a9d372f8f45542e409771135b9322_8" [label="8: Prune (false branch, while) \n   PRUNE(n$2, false); [line 34, column 22]\n  EXIT_SCOPE(n$2); [line 34, column 22]\n  APPLY_ABSTRACTION; [line 34, column 22]\n " shape="invhouse"]
+"test_loop.254a9d372f8f45542e409771135b9322_8" [label="8: Prune (false branch, while) \n   PRUNE(n$2, false); [line 34, column 22]\n " shape="invhouse"]
 	
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_8" -> "test_loop.254a9d372f8f45542e409771135b9322_2" ;
-"test_loop.254a9d372f8f45542e409771135b9322_9" [label="9:  BinaryOperatorStmt: Assign \n   n$3=_fun_getenv(\"BLOCKSIZE\":char*) [line 35, column 20]\n  *&spec:char*=n$3 [line 35, column 13]\n  n$4=*&spec:char* [line 35, column 13]\n  EXIT_SCOPE(n$3); [line 35, column 13]\n " shape="box"]
+"test_loop.254a9d372f8f45542e409771135b9322_9" [label="9:  BinaryOperatorStmt: Assign \n   n$3=_fun_getenv(\"BLOCKSIZE\":char*) [line 35, column 20]\n  *&spec:char*=n$3 [line 35, column 13]\n  n$4=*&spec:char* [line 35, column 13]\n " shape="box"]
 	
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_9" -> "test_loop.254a9d372f8f45542e409771135b9322_10" ;
 	 "test_loop.254a9d372f8f45542e409771135b9322_9" -> "test_loop.254a9d372f8f45542e409771135b9322_11" ;
-"test_loop.254a9d372f8f45542e409771135b9322_10" [label="10: Prune (true branch, while) \n   PRUNE(!n$4, true); [line 35, column 13]\n  EXIT_SCOPE(n$4); [line 35, column 13]\n " shape="invhouse"]
+"test_loop.254a9d372f8f45542e409771135b9322_10" [label="10: Prune (true branch, while) \n   PRUNE(!n$4, true); [line 35, column 13]\n " shape="invhouse"]
 	
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_10" -> "test_loop.254a9d372f8f45542e409771135b9322_12" ;
-"test_loop.254a9d372f8f45542e409771135b9322_11" [label="11: Prune (false branch, while) \n   PRUNE(n$4, false); [line 35, column 13]\n  NULLIFY(&spec); [line 35, column 13]\n  EXIT_SCOPE(n$4,spec); [line 35, column 13]\n  APPLY_ABSTRACTION; [line 35, column 13]\n " shape="invhouse"]
+"test_loop.254a9d372f8f45542e409771135b9322_11" [label="11: Prune (false branch, while) \n   PRUNE(n$4, false); [line 35, column 13]\n " shape="invhouse"]
 	
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_11" -> "test_loop.254a9d372f8f45542e409771135b9322_2" ;
-"test_loop.254a9d372f8f45542e409771135b9322_12" [label="12:  BinaryOperatorStmt: Assign \n   *&block_size:char*=null [line 36, column 5]\n  NULLIFY(&block_size); [line 36, column 5]\n  EXIT_SCOPE(block_size); [line 36, column 5]\n  APPLY_ABSTRACTION; [line 36, column 5]\n " shape="box"]
+"test_loop.254a9d372f8f45542e409771135b9322_12" [label="12:  BinaryOperatorStmt: Assign \n   *&block_size:char*=null [line 36, column 5]\n " shape="box"]
 	
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_12" -> "test_loop.254a9d372f8f45542e409771135b9322_3" ;
-"test_loop.254a9d372f8f45542e409771135b9322_13" [label="13:  BinaryOperatorStmt: Assign \n   n$6=_fun_getenv(\"BLOCK\":char*) [line 32, column 10]\n  *&spec:char*=n$6 [line 32, column 3]\n  EXIT_SCOPE(n$6); [line 32, column 3]\n  APPLY_ABSTRACTION; [line 32, column 3]\n " shape="box"]
+"test_loop.254a9d372f8f45542e409771135b9322_13" [label="13:  BinaryOperatorStmt: Assign \n   n$6=_fun_getenv(\"BLOCK\":char*) [line 32, column 10]\n  *&spec:char*=n$6 [line 32, column 3]\n " shape="box"]
 	
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_13" -> "test_loop.254a9d372f8f45542e409771135b9322_3" ;

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

@@ -11,28 +11,28 @@ digraph cfg {
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_3" -> "bar.37b51d194a7513e45b56f6524f2d51f2_4" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_4" [label="4:  between_join_and_exit \n   APPLY_ABSTRACTION; [line 11, column 3]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_4" -> "bar.37b51d194a7513e45b56f6524f2d51f2_2" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_5" [label="5:  Call _fun_identity \n   n$0=*&x:int [line 11, column 16]\n  n$1=_fun_identity(n$0:int) [line 11, column 7]\n  NULLIFY(&x); [line 11, column 7]\n  EXIT_SCOPE(n$0,x); [line 11, column 7]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_5" [label="5:  Call _fun_identity \n   n$0=*&x:int [line 11, column 16]\n  n$1=_fun_identity(n$0:int) [line 11, column 7]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_5" -> "bar.37b51d194a7513e45b56f6524f2d51f2_6" ;
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_5" -> "bar.37b51d194a7513e45b56f6524f2d51f2_7" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_6" [label="6: Prune (true branch, if) \n   PRUNE(n$1, true); [line 11, column 7]\n  EXIT_SCOPE(n$1); [line 11, column 7]\n " shape="invhouse"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_6" [label="6: Prune (true branch, if) \n   PRUNE(n$1, true); [line 11, column 7]\n " shape="invhouse"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_6" -> "bar.37b51d194a7513e45b56f6524f2d51f2_8" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_7" [label="7: Prune (false branch, if) \n   PRUNE(!n$1, false); [line 11, column 7]\n  EXIT_SCOPE(n$1); [line 11, column 7]\n " shape="invhouse"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_7" [label="7: Prune (false branch, if) \n   PRUNE(!n$1, false); [line 11, column 7]\n " shape="invhouse"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_7" -> "bar.37b51d194a7513e45b56f6524f2d51f2_9" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_8" [label="8:  Return Stmt \n   *&return:int=1 [line 12, column 5]\n  APPLY_ABSTRACTION; [line 12, column 5]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_8" [label="8:  Return Stmt \n   *&return:int=1 [line 12, column 5]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_8" -> "bar.37b51d194a7513e45b56f6524f2d51f2_2" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_9" [label="9:  Return Stmt \n   *&return:int=0 [line 14, column 5]\n  APPLY_ABSTRACTION; [line 14, column 5]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_9" [label="9:  Return Stmt \n   *&return:int=0 [line 14, column 5]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_9" -> "bar.37b51d194a7513e45b56f6524f2d51f2_2" ;
@@ -48,7 +48,7 @@ digraph cfg {
 	
 
 	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_3" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_4" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_4" [label="4:  between_join_and_exit \n   APPLY_ABSTRACTION; [line 20, column 3]\n " shape="box"]
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
 	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_4" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_2" ;
@@ -56,40 +56,40 @@ digraph cfg {
 	
 
 	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_5" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_10" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_6" [label="6: Prune (true branch, boolean exp) \n   n$1=*&x:int [line 20, column 17]\n  PRUNE(n$1, true); [line 20, column 17]\n  NULLIFY(&x); [line 20, column 17]\n  EXIT_SCOPE(n$1,x); [line 20, column 17]\n " shape="invhouse"]
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_6" [label="6: Prune (true branch, boolean exp) \n   n$1=*&x:int [line 20, column 17]\n  PRUNE(n$1, true); [line 20, column 17]\n " shape="invhouse"]
 	
 
 	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_6" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_8" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_7" [label="7: Prune (false branch, boolean exp) \n   n$1=*&x:int [line 20, column 17]\n  PRUNE(!n$1, false); [line 20, column 17]\n  NULLIFY(&x); [line 20, column 17]\n  EXIT_SCOPE(n$1,x); [line 20, column 17]\n " shape="invhouse"]
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_7" [label="7: Prune (false branch, boolean exp) \n   n$1=*&x:int [line 20, column 17]\n  PRUNE(!n$1, false); [line 20, column 17]\n " shape="invhouse"]
 	
 
 	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_7" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_9" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 20, column 16]\n  APPLY_ABSTRACTION; [line 20, column 16]\n " shape="box"]
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 20, column 16]\n " shape="box"]
 	
 
 	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_8" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_5" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_9" [label="9:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 20, column 16]\n  APPLY_ABSTRACTION; [line 20, column 16]\n " shape="box"]
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_9" [label="9:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 20, column 16]\n " shape="box"]
 	
 
 	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_9" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_5" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_10" [label="10:  Call _fun_identity \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 20, column 16]\n  n$3=_fun_identity(n$2:int) [line 20, column 7]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 20, column 7]\n  EXIT_SCOPE(n$2,0$?%__sil_tmpSIL_temp_conditional___n$0); [line 20, column 7]\n " shape="box"]
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_10" [label="10:  Call _fun_identity \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 20, column 16]\n  n$3=_fun_identity(n$2:int) [line 20, column 7]\n " shape="box"]
 	
 
 	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_10" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_11" ;
 	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_10" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_12" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_11" [label="11: Prune (true branch, if) \n   PRUNE(n$3, true); [line 20, column 7]\n  EXIT_SCOPE(n$3); [line 20, column 7]\n " shape="invhouse"]
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_11" [label="11: Prune (true branch, if) \n   PRUNE(n$3, true); [line 20, column 7]\n " shape="invhouse"]
 	
 
 	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_11" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_13" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_12" [label="12: Prune (false branch, if) \n   PRUNE(!n$3, false); [line 20, column 7]\n  EXIT_SCOPE(n$3); [line 20, column 7]\n " shape="invhouse"]
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_12" [label="12: Prune (false branch, if) \n   PRUNE(!n$3, false); [line 20, column 7]\n " shape="invhouse"]
 	
 
 	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_12" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_14" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_13" [label="13:  Return Stmt \n   *&return:int=1 [line 21, column 5]\n  APPLY_ABSTRACTION; [line 21, column 5]\n " shape="box"]
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_13" [label="13:  Return Stmt \n   *&return:int=1 [line 21, column 5]\n " shape="box"]
 	
 
 	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_13" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_2" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_14" [label="14:  Return Stmt \n   *&return:int=0 [line 23, column 5]\n  APPLY_ABSTRACTION; [line 23, column 5]\n " shape="box"]
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_14" [label="14:  Return Stmt \n   *&return:int=0 [line 23, column 5]\n " shape="box"]
 	
 
 	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_14" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_2" ;
@@ -100,7 +100,7 @@ digraph cfg {
 "identity.ff483d1ff591898a9942916050d2ca3f_2" [label="2: Exit identity \n  " color=yellow style=filled]
 	
 
-"identity.ff483d1ff591898a9942916050d2ca3f_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 8, column 30]\n  *&return:int=n$0 [line 8, column 23]\n  NULLIFY(&x); [line 8, column 23]\n  EXIT_SCOPE(n$0,x); [line 8, column 23]\n  APPLY_ABSTRACTION; [line 8, column 23]\n " shape="box"]
+"identity.ff483d1ff591898a9942916050d2ca3f_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 8, column 30]\n  *&return:int=n$0 [line 8, column 23]\n " shape="box"]
 	
 
 	 "identity.ff483d1ff591898a9942916050d2ca3f_3" -> "identity.ff483d1ff591898a9942916050d2ca3f_2" ;
@@ -116,23 +116,23 @@ digraph cfg {
 	
 
 	 "neg.f24c2c15b9d03797c6874986a8d19516_3" -> "neg.f24c2c15b9d03797c6874986a8d19516_8" ;
-"neg.f24c2c15b9d03797c6874986a8d19516_4" [label="4: Prune (true branch, boolean exp) \n   n$1=*&x:int [line 27, column 26]\n  PRUNE(n$1, true); [line 27, column 26]\n  NULLIFY(&x); [line 27, column 26]\n  EXIT_SCOPE(n$1,x); [line 27, column 26]\n " shape="invhouse"]
+"neg.f24c2c15b9d03797c6874986a8d19516_4" [label="4: Prune (true branch, boolean exp) \n   n$1=*&x:int [line 27, column 26]\n  PRUNE(n$1, true); [line 27, column 26]\n " shape="invhouse"]
 	
 
 	 "neg.f24c2c15b9d03797c6874986a8d19516_4" -> "neg.f24c2c15b9d03797c6874986a8d19516_6" ;
-"neg.f24c2c15b9d03797c6874986a8d19516_5" [label="5: Prune (false branch, boolean exp) \n   n$1=*&x:int [line 27, column 26]\n  PRUNE(!n$1, false); [line 27, column 26]\n  NULLIFY(&x); [line 27, column 26]\n  EXIT_SCOPE(n$1,x); [line 27, column 26]\n " shape="invhouse"]
+"neg.f24c2c15b9d03797c6874986a8d19516_5" [label="5: Prune (false branch, boolean exp) \n   n$1=*&x:int [line 27, column 26]\n  PRUNE(!n$1, false); [line 27, column 26]\n " shape="invhouse"]
 	
 
 	 "neg.f24c2c15b9d03797c6874986a8d19516_5" -> "neg.f24c2c15b9d03797c6874986a8d19516_7" ;
-"neg.f24c2c15b9d03797c6874986a8d19516_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 27, column 25]\n  APPLY_ABSTRACTION; [line 27, column 25]\n " shape="box"]
+"neg.f24c2c15b9d03797c6874986a8d19516_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 27, column 25]\n " shape="box"]
 	
 
 	 "neg.f24c2c15b9d03797c6874986a8d19516_6" -> "neg.f24c2c15b9d03797c6874986a8d19516_3" ;
-"neg.f24c2c15b9d03797c6874986a8d19516_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 27, column 25]\n  APPLY_ABSTRACTION; [line 27, column 25]\n " shape="box"]
+"neg.f24c2c15b9d03797c6874986a8d19516_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 27, column 25]\n " shape="box"]
 	
 
 	 "neg.f24c2c15b9d03797c6874986a8d19516_7" -> "neg.f24c2c15b9d03797c6874986a8d19516_3" ;
-"neg.f24c2c15b9d03797c6874986a8d19516_8" [label="8:  Return Stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 27, column 25]\n  *&return:int=n$2 [line 27, column 18]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 27, column 18]\n  EXIT_SCOPE(n$2,0$?%__sil_tmpSIL_temp_conditional___n$0); [line 27, column 18]\n  APPLY_ABSTRACTION; [line 27, column 18]\n " shape="box"]
+"neg.f24c2c15b9d03797c6874986a8d19516_8" [label="8:  Return Stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 27, column 25]\n  *&return:int=n$2 [line 27, column 18]\n " shape="box"]
 	
 
 	 "neg.f24c2c15b9d03797c6874986a8d19516_8" -> "neg.f24c2c15b9d03797c6874986a8d19516_2" ;

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

@@ -20,15 +20,15 @@ digraph cfg {
 	
 
 	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_5" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_7" ;
-"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_6" [label="6:  ConditionalStmt Branch \n   n$1=_fun_ret_ptr(4:int) [line 20, column 50]\n  n$2=*n$1.field:int [line 20, column 49]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$2 [line 20, column 45]\n  EXIT_SCOPE(n$1,n$2); [line 20, column 45]\n  APPLY_ABSTRACTION; [line 20, column 45]\n " shape="box"]
+"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_6" [label="6:  ConditionalStmt Branch \n   n$1=_fun_ret_ptr(4:int) [line 20, column 50]\n  n$2=*n$1.field:int [line 20, column 49]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$2 [line 20, column 45]\n " shape="box"]
 	
 
 	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_6" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_3" ;
-"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 20, column 45]\n  APPLY_ABSTRACTION; [line 20, column 45]\n " shape="box"]
+"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 20, column 45]\n " shape="box"]
 	
 
 	 "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   VARIABLE_DECLARED(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,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   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_8" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_2" ;
@@ -52,15 +52,15 @@ digraph cfg {
 	
 
 	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_5" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_7" ;
-"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=2 [line 18, column 54]\n  APPLY_ABSTRACTION; [line 18, column 54]\n " shape="box"]
+"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=2 [line 18, column 54]\n " shape="box"]
 	
 
 	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_6" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_3" ;
-"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=3 [line 18, column 54]\n  APPLY_ABSTRACTION; [line 18, column 54]\n " shape="box"]
+"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=3 [line 18, column 54]\n " shape="box"]
 	
 
 	 "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   VARIABLE_DECLARED(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,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   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_8" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_2" ;
@@ -84,15 +84,15 @@ digraph cfg {
 	
 
 	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_5" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_7" ;
-"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_6" [label="6:  ConditionalStmt Branch \n   n$1=*&p:s* [line 15, column 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:s*=n$1 [line 15, column 12]\n  NULLIFY(&p); [line 15, column 12]\n  EXIT_SCOPE(n$1,p); [line 15, column 12]\n  APPLY_ABSTRACTION; [line 15, column 12]\n " shape="box"]
+"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_6" [label="6:  ConditionalStmt Branch \n   n$1=*&p:s* [line 15, column 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:s*=n$1 [line 15, column 12]\n " shape="box"]
 	
 
 	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_6" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_3" ;
-"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_7" [label="7:  ConditionalStmt Branch \n   n$2=*&q:s* [line 15, column 20]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:s*=n$2 [line 15, column 12]\n  NULLIFY(&q); [line 15, column 12]\n  EXIT_SCOPE(n$2,q); [line 15, column 12]\n  APPLY_ABSTRACTION; [line 15, column 12]\n " shape="box"]
+"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_7" [label="7:  ConditionalStmt Branch \n   n$2=*&q:s* [line 15, column 20]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:s*=n$2 [line 15, column 12]\n " shape="box"]
 	
 
 	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_7" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_3" ;
-"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(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,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   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_8" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_2" ;

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

@@ -20,11 +20,11 @@ digraph cfg {
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_5" -> "preincrement.db7c6523f16e1ab3058057cee6614472_7" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_6" [label="6:  ConditionalStmt Branch \n   n$1=*&p:s* [line 16, column 8]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:s*=n$1 [line 16, column 4]\n  NULLIFY(&p); [line 16, column 4]\n  EXIT_SCOPE(n$1,p); [line 16, column 4]\n  APPLY_ABSTRACTION; [line 16, column 4]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_6" [label="6:  ConditionalStmt Branch \n   n$1=*&p:s* [line 16, column 8]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:s*=n$1 [line 16, column 4]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_6" -> "preincrement.db7c6523f16e1ab3058057cee6614472_3" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_7" [label="7:  ConditionalStmt Branch \n   n$2=*&p:s* [line 16, column 12]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:s*=n$2 [line 16, column 4]\n  NULLIFY(&p); [line 16, column 4]\n  EXIT_SCOPE(n$2,p); [line 16, column 4]\n  APPLY_ABSTRACTION; [line 16, column 4]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_7" [label="7:  ConditionalStmt Branch \n   n$2=*&p:s* [line 16, column 12]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:s*=n$2 [line 16, column 4]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_7" -> "preincrement.db7c6523f16e1ab3058057cee6614472_3" ;
@@ -40,15 +40,15 @@ digraph cfg {
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_10" -> "preincrement.db7c6523f16e1ab3058057cee6614472_12" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_11" [label="11:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 16, column 21]\n  APPLY_ABSTRACTION; [line 16, column 21]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_11" [label="11:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 16, column 21]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_11" -> "preincrement.db7c6523f16e1ab3058057cee6614472_8" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_12" [label="12:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=7 [line 16, column 21]\n  APPLY_ABSTRACTION; [line 16, column 21]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_12" [label="12:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=7 [line 16, column 21]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_12" -> "preincrement.db7c6523f16e1ab3058057cee6614472_8" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_13" [label="13:  BinaryOperatorStmt: AddAssign \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:s* [line 16, column 4]\n  n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$4:int [line 16, column 21]\n  n$6=*n$3.x:int [line 16, column 3]\n  *n$3.x:int=(n$6 + n$5) [line 16, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 16, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$4); [line 16, column 3]\n  EXIT_SCOPE(n$3,n$5,n$6,0$?%__sil_tmpSIL_temp_conditional___n$0,0$?%__sil_tmpSIL_temp_conditional___n$4); [line 16, column 3]\n  APPLY_ABSTRACTION; [line 16, column 3]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_13" [label="13:  BinaryOperatorStmt: AddAssign \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:s* [line 16, column 4]\n  n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$4:int [line 16, column 21]\n  n$6=*n$3.x:int [line 16, column 3]\n  *n$3.x:int=(n$6 + n$5) [line 16, column 3]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_13" -> "preincrement.db7c6523f16e1ab3058057cee6614472_2" ;
@@ -64,15 +64,15 @@ digraph cfg {
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_16" -> "preincrement.db7c6523f16e1ab3058057cee6614472_18" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_17" [label="17:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=3 [line 15, column 11]\n  APPLY_ABSTRACTION; [line 15, column 11]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_17" [label="17:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=3 [line 15, column 11]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_17" -> "preincrement.db7c6523f16e1ab3058057cee6614472_14" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_18" [label="18:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=7 [line 15, column 11]\n  APPLY_ABSTRACTION; [line 15, column 11]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_18" [label="18:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=7 [line 15, column 11]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_18" -> "preincrement.db7c6523f16e1ab3058057cee6614472_14" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_19" [label="19:  BinaryOperatorStmt: AddAssign \n   n$7=*&p:s* [line 15, column 3]\n  n$9=*&0$?%__sil_tmpSIL_temp_conditional___n$8:int [line 15, column 11]\n  n$10=*n$7.x:int [line 15, column 3]\n  *n$7.x:int=(n$10 + n$9) [line 15, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$8); [line 15, column 3]\n  EXIT_SCOPE(n$7,n$9,n$10,0$?%__sil_tmpSIL_temp_conditional___n$8); [line 15, column 3]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_19" [label="19:  BinaryOperatorStmt: AddAssign \n   n$7=*&p:s* [line 15, column 3]\n  n$9=*&0$?%__sil_tmpSIL_temp_conditional___n$8:int [line 15, column 11]\n  n$10=*n$7.x:int [line 15, column 3]\n  *n$7.x:int=(n$10 + n$9) [line 15, column 3]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_19" -> "preincrement.db7c6523f16e1ab3058057cee6614472_4" ;
@@ -89,20 +89,20 @@ digraph cfg {
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_22" -> "preincrement.db7c6523f16e1ab3058057cee6614472_24" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_23" [label="23:  ConditionalStmt Branch \n   n$12=*&p:s* [line 14, column 8]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$11:s*=n$12 [line 14, column 4]\n  EXIT_SCOPE(n$12); [line 14, column 4]\n  APPLY_ABSTRACTION; [line 14, column 4]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_23" [label="23:  ConditionalStmt Branch \n   n$12=*&p:s* [line 14, column 8]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$11:s*=n$12 [line 14, column 4]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_23" -> "preincrement.db7c6523f16e1ab3058057cee6614472_20" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_24" [label="24:  ConditionalStmt Branch \n   n$13=*&p:s* [line 14, column 12]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$11:s*=n$13 [line 14, column 4]\n  EXIT_SCOPE(n$13); [line 14, column 4]\n  APPLY_ABSTRACTION; [line 14, column 4]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_24" [label="24:  ConditionalStmt Branch \n   n$13=*&p:s* [line 14, column 12]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$11:s*=n$13 [line 14, column 4]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_24" -> "preincrement.db7c6523f16e1ab3058057cee6614472_20" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_25" [label="25:  BinaryOperatorStmt: AddAssign \n   n$14=*&0$?%__sil_tmpSIL_temp_conditional___n$11:s* [line 14, column 4]\n  n$15=*n$14.x:int [line 14, column 3]\n  *n$14.x:int=(n$15 + 1) [line 14, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$11); [line 14, column 3]\n  EXIT_SCOPE(n$14,n$15,0$?%__sil_tmpSIL_temp_conditional___n$11); [line 14, column 3]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_25" [label="25:  BinaryOperatorStmt: AddAssign \n   n$14=*&0$?%__sil_tmpSIL_temp_conditional___n$11:s* [line 14, column 4]\n  n$15=*n$14.x:int [line 14, column 3]\n  *n$14.x:int=(n$15 + 1) [line 14, column 3]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_25" -> "preincrement.db7c6523f16e1ab3058057cee6614472_15" ;
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_25" -> "preincrement.db7c6523f16e1ab3058057cee6614472_16" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_26" [label="26:  BinaryOperatorStmt: AddAssign \n   n$16=*&p:s* [line 13, column 3]\n  n$17=*n$16.x:int [line 13, column 3]\n  *n$16.x:int=(n$17 + 1) [line 13, column 3]\n  EXIT_SCOPE(n$16,n$17); [line 13, column 3]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_26" [label="26:  BinaryOperatorStmt: AddAssign \n   n$16=*&p:s* [line 13, column 3]\n  n$17=*n$16.x:int [line 13, column 3]\n  *n$16.x:int=(n$17 + 1) [line 13, column 3]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_26" -> "preincrement.db7c6523f16e1ab3058057cee6614472_21" ;

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

@@ -20,19 +20,19 @@ digraph cfg {
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_5" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_7" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_6" [label="6:  ConditionalStmt Branch \n   n$1=*&p:int* [line 14, column 9]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int*=n$1 [line 14, column 5]\n  NULLIFY(&p); [line 14, column 5]\n  EXIT_SCOPE(n$1,p); [line 14, column 5]\n  APPLY_ABSTRACTION; [line 14, column 5]\n " shape="box"]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_6" [label="6:  ConditionalStmt Branch \n   n$1=*&p:int* [line 14, column 9]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int*=n$1 [line 14, column 5]\n " shape="box"]
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_6" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_3" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_7" [label="7:  ConditionalStmt Branch \n   n$2=*&p:int* [line 14, column 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int*=n$2 [line 14, column 5]\n  NULLIFY(&p); [line 14, column 5]\n  EXIT_SCOPE(n$2,p); [line 14, column 5]\n  APPLY_ABSTRACTION; [line 14, column 5]\n " shape="box"]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_7" [label="7:  ConditionalStmt Branch \n   n$2=*&p:int* [line 14, column 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int*=n$2 [line 14, column 5]\n " shape="box"]
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_7" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_3" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_8" [label="8:  UnaryOperator \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int* [line 14, column 5]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 14, column 5]\n  EXIT_SCOPE(0$?%__sil_tmpSIL_temp_conditional___n$0); [line 14, column 5]\n " shape="box"]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_8" [label="8:  UnaryOperator \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int* [line 14, column 5]\n " shape="box"]
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_8" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_9" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_9" [label="9:  Fallback node \n   n$4=*n$3:int [line 14, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 14, column 3]\n  APPLY_ABSTRACTION; [line 14, column 3]\n " shape="box"]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_9" [label="9:  Fallback node \n   n$4=*n$3:int [line 14, column 3]\n " shape="box"]
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_9" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_2" ;
@@ -48,15 +48,15 @@ digraph cfg {
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_12" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_14" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_13" [label="13:  ConditionalStmt Branch \n   n$6=*&p:int* [line 12, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int*=n$6 [line 12, column 13]\n  EXIT_SCOPE(n$6); [line 12, column 13]\n  APPLY_ABSTRACTION; [line 12, column 13]\n " shape="box"]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_13" [label="13:  ConditionalStmt Branch \n   n$6=*&p:int* [line 12, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int*=n$6 [line 12, column 13]\n " shape="box"]
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_13" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_10" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_14" [label="14:  ConditionalStmt Branch \n   n$7=*&p:int* [line 12, column 21]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int*=n$7 [line 12, column 13]\n  EXIT_SCOPE(n$7); [line 12, column 13]\n  APPLY_ABSTRACTION; [line 12, column 13]\n " shape="box"]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_14" [label="14:  ConditionalStmt Branch \n   n$7=*&p:int* [line 12, column 21]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int*=n$7 [line 12, column 13]\n " shape="box"]
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_14" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_10" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_15" [label="15:  DeclStmt \n   VARIABLE_DECLARED(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,0$?%__sil_tmpSIL_temp_conditional___n$5,y); [line 12, column 3]\n " shape="box"]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_15" [label="15:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_15" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_4" ;
@@ -73,15 +73,15 @@ digraph cfg {
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_18" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_20" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_19" [label="19:  ConditionalStmt Branch \n   n$11=*&p:int* [line 10, column 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$10:int*=n$11 [line 10, column 9]\n  EXIT_SCOPE(n$11); [line 10, column 9]\n  APPLY_ABSTRACTION; [line 10, column 9]\n " shape="box"]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_19" [label="19:  ConditionalStmt Branch \n   n$11=*&p:int* [line 10, column 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$10:int*=n$11 [line 10, column 9]\n " shape="box"]
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_19" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_16" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_20" [label="20:  ConditionalStmt Branch \n   n$12=*&p:int* [line 10, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$10:int*=n$12 [line 10, column 9]\n  EXIT_SCOPE(n$12); [line 10, column 9]\n  APPLY_ABSTRACTION; [line 10, column 9]\n " shape="box"]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_20" [label="20:  ConditionalStmt Branch \n   n$12=*&p:int* [line 10, column 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$10:int*=n$12 [line 10, column 9]\n " shape="box"]
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_20" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_16" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_21" [label="21:  BinaryOperatorStmt: Assign \n   n$13=*&0$?%__sil_tmpSIL_temp_conditional___n$10:int* [line 10, column 9]\n  n$14=*n$13:int [line 10, column 7]\n  *&x:int=n$14 [line 10, column 3]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$10); [line 10, column 3]\n  NULLIFY(&x); [line 10, column 3]\n  EXIT_SCOPE(n$13,n$14,0$?%__sil_tmpSIL_temp_conditional___n$10,x); [line 10, column 3]\n " shape="box"]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_21" [label="21:  BinaryOperatorStmt: Assign \n   n$13=*&0$?%__sil_tmpSIL_temp_conditional___n$10:int* [line 10, column 9]\n  n$14=*n$13:int [line 10, column 7]\n  *&x:int=n$14 [line 10, column 3]\n " shape="box"]
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_21" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_11" ;

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

@@ -7,19 +7,19 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 25, column 3]\n  APPLY_ABSTRACTION; [line 25, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 25, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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(i); [line 24, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 24, column 3]\n  *&i:int=(2 + (2 - 0)) [line 24, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   *&today:int=((unsigned int)2 + (unsigned int)1) [line 23, column 3]\n  NULLIFY(&today); [line 23, column 3]\n  EXIT_SCOPE(today); [line 23, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   *&today:int=((unsigned int)2 + (unsigned int)1) [line 23, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   n$0=*&today:int [line 22, column 11]\n  *&today:int=((unsigned int)n$0 + (unsigned int)4) [line 22, column 3]\n  NULLIFY(&today); [line 22, column 3]\n  EXIT_SCOPE(n$0,today); [line 22, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   n$0=*&today:int [line 22, column 11]\n  *&today:int=((unsigned int)n$0 + (unsigned int)4) [line 22, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
@@ -27,7 +27,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   *&today:int=0 [line 20, column 3]\n  NULLIFY(&today); [line 20, column 3]\n  EXIT_SCOPE(today); [line 20, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   *&today:int=0 [line 20, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;

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   VARIABLE_DECLARED(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(option2); [line 15, column 3]\n  APPLY_ABSTRACTION; [line 15, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(option2:int); [line 15, column 3]\n  *&option2:int=(1 << 1) [line 15, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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(option1); [line 14, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(option1:int); [line 14, column 3]\n  *&option1:int=(1 << 0) [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   VARIABLE_DECLARED(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(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   VARIABLE_DECLARED(foo_g:int); [line 17, column 3]\n  *&foo_g:int=(2 + 10) [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   VARIABLE_DECLARED(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(foo_f); [line 16, column 3]\n " shape="box"]
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(foo_f:int); [line 16, column 3]\n  *&foo_f:int=2 [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   VARIABLE_DECLARED(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(foo_e); [line 15, column 3]\n " shape="box"]
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(foo_e:int); [line 15, column 3]\n  *&foo_e:int=1 [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   VARIABLE_DECLARED(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(foo_d); [line 14, column 3]\n " shape="box"]
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(foo_d:int); [line 14, column 3]\n  *&foo_d:int=11 [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   VARIABLE_DECLARED(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(foo_c); [line 13, column 3]\n " shape="box"]
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(foo_c:int); [line 13, column 3]\n  *&foo_c:int=10 [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   VARIABLE_DECLARED(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(foo_b); [line 12, column 3]\n " shape="box"]
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(foo_b:int); [line 12, column 3]\n  *&foo_b:int=1 [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   VARIABLE_DECLARED(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(foo_a); [line 11, column 3]\n " shape="box"]
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(foo_a:int); [line 11, column 3]\n  *&foo_a:int=0 [line 11, column 3]\n " shape="box"]
 	
 
 	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_9" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_8" ;
@@ -46,7 +46,7 @@ digraph cfg {
 	
 
 	 "other_enum_test.100f3583adf0259001be6c944828c44a_3" -> "other_enum_test.100f3583adf0259001be6c944828c44a_4" ;
-"other_enum_test.100f3583adf0259001be6c944828c44a_4" [label="4:  between_join_and_exit \n   APPLY_ABSTRACTION; [line 23, column 3]\n " shape="box"]
+"other_enum_test.100f3583adf0259001be6c944828c44a_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
 	 "other_enum_test.100f3583adf0259001be6c944828c44a_4" -> "other_enum_test.100f3583adf0259001be6c944828c44a_2" ;
@@ -55,19 +55,19 @@ digraph cfg {
 
 	 "other_enum_test.100f3583adf0259001be6c944828c44a_5" -> "other_enum_test.100f3583adf0259001be6c944828c44a_6" ;
 	 "other_enum_test.100f3583adf0259001be6c944828c44a_5" -> "other_enum_test.100f3583adf0259001be6c944828c44a_7" ;
-"other_enum_test.100f3583adf0259001be6c944828c44a_6" [label="6: Prune (true branch, if) \n   PRUNE(((unsigned int)n$0 == (unsigned int)12), true); [line 23, column 7]\n  EXIT_SCOPE(n$0); [line 23, column 7]\n " shape="invhouse"]
+"other_enum_test.100f3583adf0259001be6c944828c44a_6" [label="6: Prune (true branch, if) \n   PRUNE(((unsigned int)n$0 == (unsigned int)12), true); [line 23, column 7]\n " shape="invhouse"]
 	
 
 	 "other_enum_test.100f3583adf0259001be6c944828c44a_6" -> "other_enum_test.100f3583adf0259001be6c944828c44a_8" ;
-"other_enum_test.100f3583adf0259001be6c944828c44a_7" [label="7: Prune (false branch, if) \n   PRUNE(!((unsigned int)n$0 == (unsigned int)12), false); [line 23, column 7]\n  NULLIFY(&foo_a); [line 23, column 7]\n  NULLIFY(&foo_g); [line 23, column 7]\n  EXIT_SCOPE(n$0,foo_a,foo_g); [line 23, column 7]\n " shape="invhouse"]
+"other_enum_test.100f3583adf0259001be6c944828c44a_7" [label="7: Prune (false branch, if) \n   PRUNE(!((unsigned int)n$0 == (unsigned int)12), false); [line 23, column 7]\n " shape="invhouse"]
 	
 
 	 "other_enum_test.100f3583adf0259001be6c944828c44a_7" -> "other_enum_test.100f3583adf0259001be6c944828c44a_9" ;
-"other_enum_test.100f3583adf0259001be6c944828c44a_8" [label="8:  Return Stmt \n   n$1=*&foo_g:int [line 24, column 12]\n  n$2=*&foo_a:int [line 24, column 20]\n  *&return:int=((unsigned int)n$1 / (unsigned int)n$2) [line 24, column 5]\n  NULLIFY(&foo_a); [line 24, column 5]\n  NULLIFY(&foo_g); [line 24, column 5]\n  EXIT_SCOPE(n$1,n$2,foo_a,foo_g); [line 24, column 5]\n  APPLY_ABSTRACTION; [line 24, column 5]\n " shape="box"]
+"other_enum_test.100f3583adf0259001be6c944828c44a_8" [label="8:  Return Stmt \n   n$1=*&foo_g:int [line 24, column 12]\n  n$2=*&foo_a:int [line 24, column 20]\n  *&return:int=((unsigned int)n$1 / (unsigned int)n$2) [line 24, column 5]\n " shape="box"]
 	
 
 	 "other_enum_test.100f3583adf0259001be6c944828c44a_8" -> "other_enum_test.100f3583adf0259001be6c944828c44a_2" ;
-"other_enum_test.100f3583adf0259001be6c944828c44a_9" [label="9:  Return Stmt \n   *&return:int=0 [line 26, column 5]\n  APPLY_ABSTRACTION; [line 26, column 5]\n " shape="box"]
+"other_enum_test.100f3583adf0259001be6c944828c44a_9" [label="9:  Return Stmt \n   *&return:int=0 [line 26, column 5]\n " shape="box"]
 	
 
 	 "other_enum_test.100f3583adf0259001be6c944828c44a_9" -> "other_enum_test.100f3583adf0259001be6c944828c44a_2" ;

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

@@ -7,11 +7,11 @@ digraph cfg {
 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_2" [label="2: Exit g0 \n  " color=yellow style=filled]
 	
 
-"g0.8ac829e3bb8338d74cfb45ebe834d8e1_3" [label="3:  Return Stmt \n   *&return:int=1 [line 21, column 3]\n  APPLY_ABSTRACTION; [line 21, column 3]\n " shape="box"]
+"g0.8ac829e3bb8338d74cfb45ebe834d8e1_3" [label="3:  Return Stmt \n   *&return:int=1 [line 21, column 3]\n " shape="box"]
 	
 
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_3" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_2" ;
-"g0.8ac829e3bb8338d74cfb45ebe834d8e1_4" [label="4:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 20, column 3]\n  NULLIFY(&a); [line 20, column 3]\n  EXIT_SCOPE(a); [line 20, column 3]\n " shape="box"]
+"g0.8ac829e3bb8338d74cfb45ebe834d8e1_4" [label="4:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 20, column 3]\n " shape="box"]
 	
 
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_4" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_3" ;
@@ -23,7 +23,7 @@ digraph cfg {
 	
 
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_6" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_5" ;
-"g0.8ac829e3bb8338d74cfb45ebe834d8e1_7" [label="7: Skip GotoLabel_stepB \n   APPLY_ABSTRACTION; [line 17, column 1]\n " color="gray"]
+"g0.8ac829e3bb8338d74cfb45ebe834d8e1_7" [label="7: Skip GotoLabel_stepB \n  " color="gray"]
 	
 
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_7" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_6" ;
@@ -36,15 +36,15 @@ digraph cfg {
 
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_9" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_10" ;
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_9" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_11" ;
-"g0.8ac829e3bb8338d74cfb45ebe834d8e1_10" [label="10: Prune (true branch, if) \n   PRUNE((n$3 > 1), true); [line 14, column 7]\n  EXIT_SCOPE(n$3); [line 14, column 7]\n  APPLY_ABSTRACTION; [line 14, column 7]\n " shape="invhouse"]
+"g0.8ac829e3bb8338d74cfb45ebe834d8e1_10" [label="10: Prune (true branch, if) \n   PRUNE((n$3 > 1), true); [line 14, column 7]\n " shape="invhouse"]
 	
 
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_10" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_6" ;
-"g0.8ac829e3bb8338d74cfb45ebe834d8e1_11" [label="11: Prune (false branch, if) \n   PRUNE(!(n$3 > 1), false); [line 14, column 7]\n  EXIT_SCOPE(n$3); [line 14, column 7]\n " shape="invhouse"]
+"g0.8ac829e3bb8338d74cfb45ebe834d8e1_11" [label="11: Prune (false branch, if) \n   PRUNE(!(n$3 > 1), false); [line 14, column 7]\n " shape="invhouse"]
 	
 
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_11" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_8" ;
-"g0.8ac829e3bb8338d74cfb45ebe834d8e1_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 13, column 3]\n  *&a:int=0 [line 13, column 3]\n  NULLIFY(&a); [line 13, column 3]\n  EXIT_SCOPE(a); [line 13, column 3]\n " shape="box"]
+"g0.8ac829e3bb8338d74cfb45ebe834d8e1_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 13, column 3]\n  *&a:int=0 [line 13, column 3]\n " shape="box"]
 	
 
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_12" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_9" ;
@@ -55,11 +55,11 @@ digraph cfg {
 "g1.0120a4f9196a5f9eb9f523f31f914da7_2" [label="2: Exit g1 \n  " color=yellow style=filled]
 	
 
-"g1.0120a4f9196a5f9eb9f523f31f914da7_3" [label="3:  Return Stmt \n   *&return:int=1 [line 32, column 3]\n  APPLY_ABSTRACTION; [line 32, column 3]\n " shape="box"]
+"g1.0120a4f9196a5f9eb9f523f31f914da7_3" [label="3:  Return Stmt \n   *&return:int=1 [line 32, column 3]\n " shape="box"]
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_3" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_2" ;
-"g1.0120a4f9196a5f9eb9f523f31f914da7_4" [label="4:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 31, column 3]\n  NULLIFY(&a); [line 31, column 3]\n  EXIT_SCOPE(a); [line 31, column 3]\n " shape="box"]
+"g1.0120a4f9196a5f9eb9f523f31f914da7_4" [label="4:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 31, column 3]\n " shape="box"]
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_4" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_3" ;
@@ -67,7 +67,7 @@ digraph cfg {
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_5" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_4" ;
-"g1.0120a4f9196a5f9eb9f523f31f914da7_6" [label="6:  Return Stmt \n   *&return:int=0 [line 28, column 3]\n  APPLY_ABSTRACTION; [line 28, column 3]\n " shape="box"]
+"g1.0120a4f9196a5f9eb9f523f31f914da7_6" [label="6:  Return Stmt \n   *&return:int=0 [line 28, column 3]\n " shape="box"]
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_6" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_2" ;
@@ -80,15 +80,15 @@ digraph cfg {
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_8" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_9" ;
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_8" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_10" ;
-"g1.0120a4f9196a5f9eb9f523f31f914da7_9" [label="9: Prune (true branch, if) \n   PRUNE((n$1 > 1), true); [line 26, column 7]\n  EXIT_SCOPE(n$1); [line 26, column 7]\n " shape="invhouse"]
+"g1.0120a4f9196a5f9eb9f523f31f914da7_9" [label="9: Prune (true branch, if) \n   PRUNE((n$1 > 1), true); [line 26, column 7]\n " shape="invhouse"]
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_9" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_5" ;
-"g1.0120a4f9196a5f9eb9f523f31f914da7_10" [label="10: Prune (false branch, if) \n   PRUNE(!(n$1 > 1), false); [line 26, column 7]\n  EXIT_SCOPE(n$1); [line 26, column 7]\n " shape="invhouse"]
+"g1.0120a4f9196a5f9eb9f523f31f914da7_10" [label="10: Prune (false branch, if) \n   PRUNE(!(n$1 > 1), false); [line 26, column 7]\n " shape="invhouse"]
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_10" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_7" ;
-"g1.0120a4f9196a5f9eb9f523f31f914da7_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 25, column 3]\n  *&a:int=0 [line 25, column 3]\n  NULLIFY(&a); [line 25, column 3]\n  EXIT_SCOPE(a); [line 25, column 3]\n " shape="box"]
+"g1.0120a4f9196a5f9eb9f523f31f914da7_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 25, column 3]\n  *&a:int=0 [line 25, column 3]\n " shape="box"]
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_11" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_8" ;
@@ -99,11 +99,11 @@ digraph cfg {
 "g2.e1c80488853d86ab9d6decfe30d8930f_2" [label="2: Exit g2 \n  " color=yellow style=filled]
 	
 
-"g2.e1c80488853d86ab9d6decfe30d8930f_3" [label="3:  Return Stmt \n   *&return:int=1 [line 54, column 3]\n  APPLY_ABSTRACTION; [line 54, column 3]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_3" [label="3:  Return Stmt \n   *&return:int=1 [line 54, column 3]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_3" -> "g2.e1c80488853d86ab9d6decfe30d8930f_2" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_4" [label="4:  BinaryOperatorStmt: Assign \n   *&a:int=3 [line 53, column 3]\n  NULLIFY(&a); [line 53, column 3]\n  EXIT_SCOPE(a); [line 53, column 3]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_4" [label="4:  BinaryOperatorStmt: Assign \n   *&a:int=3 [line 53, column 3]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_4" -> "g2.e1c80488853d86ab9d6decfe30d8930f_3" ;
@@ -111,11 +111,11 @@ digraph cfg {
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_5" -> "g2.e1c80488853d86ab9d6decfe30d8930f_4" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_6" [label="6:  Return Stmt \n   *&return:int=2 [line 50, column 3]\n  APPLY_ABSTRACTION; [line 50, column 3]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_6" [label="6:  Return Stmt \n   *&return:int=2 [line 50, column 3]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_6" -> "g2.e1c80488853d86ab9d6decfe30d8930f_2" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_7" [label="7:  BinaryOperatorStmt: Assign \n   *&a:int=2 [line 49, column 3]\n  NULLIFY(&a); [line 49, column 3]\n  EXIT_SCOPE(a); [line 49, column 3]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_7" [label="7:  BinaryOperatorStmt: Assign \n   *&a:int=2 [line 49, column 3]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_7" -> "g2.e1c80488853d86ab9d6decfe30d8930f_6" ;
@@ -123,7 +123,7 @@ digraph cfg {
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_8" -> "g2.e1c80488853d86ab9d6decfe30d8930f_7" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_9" [label="9:  Return Stmt \n   *&return:int=0 [line 46, column 3]\n  APPLY_ABSTRACTION; [line 46, column 3]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_9" [label="9:  Return Stmt \n   *&return:int=0 [line 46, column 3]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_9" -> "g2.e1c80488853d86ab9d6decfe30d8930f_2" ;
@@ -136,11 +136,11 @@ digraph cfg {
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_11" -> "g2.e1c80488853d86ab9d6decfe30d8930f_12" ;
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_11" -> "g2.e1c80488853d86ab9d6decfe30d8930f_13" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_12" [label="12: Prune (true branch, if) \n   PRUNE((n$2 > 1), true); [line 44, column 7]\n  EXIT_SCOPE(n$2); [line 44, column 7]\n  APPLY_ABSTRACTION; [line 44, column 7]\n " shape="invhouse"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_12" [label="12: Prune (true branch, if) \n   PRUNE((n$2 > 1), true); [line 44, column 7]\n " shape="invhouse"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_12" -> "g2.e1c80488853d86ab9d6decfe30d8930f_14" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_13" [label="13: Prune (false branch, if) \n   PRUNE(!(n$2 > 1), false); [line 44, column 7]\n  EXIT_SCOPE(n$2); [line 44, column 7]\n " shape="invhouse"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_13" [label="13: Prune (false branch, if) \n   PRUNE(!(n$2 > 1), false); [line 44, column 7]\n " shape="invhouse"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_13" -> "g2.e1c80488853d86ab9d6decfe30d8930f_10" ;
@@ -157,11 +157,11 @@ digraph cfg {
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_16" -> "g2.e1c80488853d86ab9d6decfe30d8930f_17" ;
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_16" -> "g2.e1c80488853d86ab9d6decfe30d8930f_18" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_17" [label="17: Prune (true branch, if) \n   PRUNE(!n$6, true); [line 42, column 8]\n  EXIT_SCOPE(n$6); [line 42, column 8]\n " shape="invhouse"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_17" [label="17: Prune (true branch, if) \n   PRUNE(!n$6, true); [line 42, column 8]\n " shape="invhouse"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_17" -> "g2.e1c80488853d86ab9d6decfe30d8930f_8" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_18" [label="18: Prune (false branch, if) \n   PRUNE(n$6, false); [line 42, column 8]\n  EXIT_SCOPE(n$6); [line 42, column 8]\n " shape="invhouse"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_18" [label="18: Prune (false branch, if) \n   PRUNE(n$6, false); [line 42, column 8]\n " shape="invhouse"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_18" -> "g2.e1c80488853d86ab9d6decfe30d8930f_15" ;
@@ -174,19 +174,19 @@ digraph cfg {
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_20" -> "g2.e1c80488853d86ab9d6decfe30d8930f_21" ;
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_20" -> "g2.e1c80488853d86ab9d6decfe30d8930f_22" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_21" [label="21: Prune (true branch, if) \n   PRUNE(!n$10, true); [line 40, column 8]\n  EXIT_SCOPE(n$10); [line 40, column 8]\n " shape="invhouse"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_21" [label="21: Prune (true branch, if) \n   PRUNE(!n$10, true); [line 40, column 8]\n " shape="invhouse"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_21" -> "g2.e1c80488853d86ab9d6decfe30d8930f_5" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_22" [label="22: Prune (false branch, if) \n   PRUNE(n$10, false); [line 40, column 8]\n  EXIT_SCOPE(n$10); [line 40, column 8]\n " shape="invhouse"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_22" [label="22: Prune (false branch, if) \n   PRUNE(n$10, false); [line 40, column 8]\n " shape="invhouse"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_22" -> "g2.e1c80488853d86ab9d6decfe30d8930f_19" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_23" [label="23:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 38, column 3]\n  NULLIFY(&a); [line 38, column 3]\n  EXIT_SCOPE(a); [line 38, column 3]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_23" [label="23:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 38, column 3]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_23" -> "g2.e1c80488853d86ab9d6decfe30d8930f_20" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_24" [label="24:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 36, column 3]\n  *&a:int=0 [line 36, column 3]\n  NULLIFY(&a); [line 36, column 3]\n  EXIT_SCOPE(a); [line 36, column 3]\n  APPLY_ABSTRACTION; [line 36, column 3]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_24" [label="24:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 36, column 3]\n  *&a:int=0 [line 36, column 3]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_24" -> "g2.e1c80488853d86ab9d6decfe30d8930f_14" ;
@@ -197,11 +197,11 @@ digraph cfg {
 "g3.8a9fd7dfda802921fdc4079f9a528ce8_2" [label="2: Exit g3 \n  " color=yellow style=filled]
 	
 
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_3" [label="3:  Return Stmt \n   *&return:int=1 [line 76, column 3]\n  APPLY_ABSTRACTION; [line 76, column 3]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_3" [label="3:  Return Stmt \n   *&return:int=1 [line 76, column 3]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_3" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_2" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"exit\\n\":char*) [line 75, column 3]\n  EXIT_SCOPE(n$0); [line 75, column 3]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"exit\\n\":char*) [line 75, column 3]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_4" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_3" ;
@@ -209,11 +209,11 @@ digraph cfg {
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_5" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_4" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_6" [label="6:  Call _fun_printf \n   n$2=_fun_printf(\"A\\n\":char*) [line 72, column 3]\n  EXIT_SCOPE(n$2); [line 72, column 3]\n  APPLY_ABSTRACTION; [line 72, column 3]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_6" [label="6:  Call _fun_printf \n   n$2=_fun_printf(\"A\\n\":char*) [line 72, column 3]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_6" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_5" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 71, column 3]\n  *&a:int=2 [line 71, column 3]\n  NULLIFY(&a); [line 71, column 3]\n  EXIT_SCOPE(a); [line 71, column 3]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 71, column 3]\n  *&a:int=2 [line 71, column 3]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_7" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_6" ;
@@ -221,11 +221,11 @@ digraph cfg {
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_8" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_7" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_9" [label="9:  Return Stmt \n   *&return:int=0 [line 68, column 3]\n  APPLY_ABSTRACTION; [line 68, column 3]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_9" [label="9:  Return Stmt \n   *&return:int=0 [line 68, column 3]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_9" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_2" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_10" [label="10:  Call _fun_printf \n   n$4=_fun_printf(\"g3\\n\":char*) [line 67, column 3]\n  EXIT_SCOPE(n$4); [line 67, column 3]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_10" [label="10:  Call _fun_printf \n   n$4=_fun_printf(\"g3\\n\":char*) [line 67, column 3]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_10" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_9" ;
@@ -238,11 +238,11 @@ digraph cfg {
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_12" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_13" ;
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_12" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_14" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_13" [label="13: Prune (true branch, if) \n   PRUNE((n$5 > 1), true); [line 65, column 7]\n  EXIT_SCOPE(n$5); [line 65, column 7]\n  APPLY_ABSTRACTION; [line 65, column 7]\n " shape="invhouse"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_13" [label="13: Prune (true branch, if) \n   PRUNE((n$5 > 1), true); [line 65, column 7]\n " shape="invhouse"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_13" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_15" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_14" [label="14: Prune (false branch, if) \n   PRUNE(!(n$5 > 1), false); [line 65, column 7]\n  EXIT_SCOPE(n$5); [line 65, column 7]\n " shape="invhouse"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_14" [label="14: Prune (false branch, if) \n   PRUNE(!(n$5 > 1), false); [line 65, column 7]\n " shape="invhouse"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_14" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_11" ;
@@ -259,11 +259,11 @@ digraph cfg {
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_17" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_18" ;
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_17" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_19" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_18" [label="18: Prune (true branch, if) \n   PRUNE(!n$9, true); [line 63, column 8]\n  EXIT_SCOPE(n$9); [line 63, column 8]\n " shape="invhouse"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_18" [label="18: Prune (true branch, if) \n   PRUNE(!n$9, true); [line 63, column 8]\n " shape="invhouse"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_18" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_8" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_19" [label="19: Prune (false branch, if) \n   PRUNE(n$9, false); [line 63, column 8]\n  EXIT_SCOPE(n$9); [line 63, column 8]\n " shape="invhouse"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_19" [label="19: Prune (false branch, if) \n   PRUNE(n$9, false); [line 63, column 8]\n " shape="invhouse"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_19" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_16" ;
@@ -276,15 +276,15 @@ digraph cfg {
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_21" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_22" ;
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_21" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_23" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_22" [label="22: Prune (true branch, if) \n   PRUNE(!n$13, true); [line 61, column 8]\n  EXIT_SCOPE(n$13); [line 61, column 8]\n  APPLY_ABSTRACTION; [line 61, column 8]\n " shape="invhouse"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_22" [label="22: Prune (true branch, if) \n   PRUNE(!n$13, true); [line 61, column 8]\n " shape="invhouse"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_22" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_5" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_23" [label="23: Prune (false branch, if) \n   PRUNE(n$13, false); [line 61, column 8]\n  EXIT_SCOPE(n$13); [line 61, column 8]\n " shape="invhouse"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_23" [label="23: Prune (false branch, if) \n   PRUNE(n$13, false); [line 61, column 8]\n " shape="invhouse"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_23" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_20" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_24" [label="24:  Call _fun_printf \n   n$17=_fun_printf(\"B\\n\":char*) [line 59, column 3]\n  EXIT_SCOPE(n$17); [line 59, column 3]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_24" [label="24:  Call _fun_printf \n   n$17=_fun_printf(\"B\\n\":char*) [line 59, column 3]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_24" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_21" ;
@@ -295,11 +295,11 @@ digraph cfg {
 "g4.b0b5c8f28ad7834e70a958a8882fa59a_2" [label="2: Exit g4 \n  " color=yellow style=filled]
 	
 
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_3" [label="3:  Return Stmt \n   *&return:int=1 [line 97, column 3]\n  APPLY_ABSTRACTION; [line 97, column 3]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_3" [label="3:  Return Stmt \n   *&return:int=1 [line 97, column 3]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_3" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_2" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"exit\\n\":char*) [line 96, column 3]\n  EXIT_SCOPE(n$0); [line 96, column 3]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"exit\\n\":char*) [line 96, column 3]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_4" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_3" ;
@@ -307,11 +307,11 @@ digraph cfg {
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_5" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_4" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_6" [label="6:  Call _fun_printf \n   n$2=_fun_printf(\"A\\n\":char*) [line 93, column 3]\n  EXIT_SCOPE(n$2); [line 93, column 3]\n  APPLY_ABSTRACTION; [line 93, column 3]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_6" [label="6:  Call _fun_printf \n   n$2=_fun_printf(\"A\\n\":char*) [line 93, column 3]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_6" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_5" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 92, column 3]\n  *&a:int=2 [line 92, column 3]\n  NULLIFY(&a); [line 92, column 3]\n  EXIT_SCOPE(a); [line 92, column 3]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 92, column 3]\n  *&a:int=2 [line 92, column 3]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_7" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_6" ;
@@ -319,7 +319,7 @@ digraph cfg {
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_8" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_7" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_9" [label="9:  Call _fun_printf \n   n$4=_fun_printf(\"g4\\n\":char*) [line 89, column 3]\n  EXIT_SCOPE(n$4); [line 89, column 3]\n  APPLY_ABSTRACTION; [line 89, column 3]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_9" [label="9:  Call _fun_printf \n   n$4=_fun_printf(\"g4\\n\":char*) [line 89, column 3]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_9" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_8" ;
@@ -332,11 +332,11 @@ digraph cfg {
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_11" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_12" ;
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_11" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_13" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_12" [label="12: Prune (true branch, if) \n   PRUNE((n$5 > 1), true); [line 87, column 7]\n  EXIT_SCOPE(n$5); [line 87, column 7]\n  APPLY_ABSTRACTION; [line 87, column 7]\n " shape="invhouse"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_12" [label="12: Prune (true branch, if) \n   PRUNE((n$5 > 1), true); [line 87, column 7]\n " shape="invhouse"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_12" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_14" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_13" [label="13: Prune (false branch, if) \n   PRUNE(!(n$5 > 1), false); [line 87, column 7]\n  EXIT_SCOPE(n$5); [line 87, column 7]\n " shape="invhouse"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_13" [label="13: Prune (false branch, if) \n   PRUNE(!(n$5 > 1), false); [line 87, column 7]\n " shape="invhouse"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_13" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_10" ;
@@ -353,11 +353,11 @@ digraph cfg {
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_16" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_17" ;
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_16" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_18" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_17" [label="17: Prune (true branch, if) \n   PRUNE(!n$9, true); [line 85, column 8]\n  EXIT_SCOPE(n$9); [line 85, column 8]\n  APPLY_ABSTRACTION; [line 85, column 8]\n " shape="invhouse"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_17" [label="17: Prune (true branch, if) \n   PRUNE(!n$9, true); [line 85, column 8]\n " shape="invhouse"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_17" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_8" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_18" [label="18: Prune (false branch, if) \n   PRUNE(n$9, false); [line 85, column 8]\n  EXIT_SCOPE(n$9); [line 85, column 8]\n " shape="invhouse"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_18" [label="18: Prune (false branch, if) \n   PRUNE(n$9, false); [line 85, column 8]\n " shape="invhouse"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_18" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_15" ;
@@ -370,15 +370,15 @@ digraph cfg {
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_20" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_21" ;
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_20" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_22" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_21" [label="21: Prune (true branch, if) \n   PRUNE(!n$13, true); [line 83, column 8]\n  EXIT_SCOPE(n$13); [line 83, column 8]\n  APPLY_ABSTRACTION; [line 83, column 8]\n " shape="invhouse"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_21" [label="21: Prune (true branch, if) \n   PRUNE(!n$13, true); [line 83, column 8]\n " shape="invhouse"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_21" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_5" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_22" [label="22: Prune (false branch, if) \n   PRUNE(n$13, false); [line 83, column 8]\n  EXIT_SCOPE(n$13); [line 83, column 8]\n " shape="invhouse"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_22" [label="22: Prune (false branch, if) \n   PRUNE(n$13, false); [line 83, column 8]\n " shape="invhouse"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_22" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_19" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_23" [label="23:  Call _fun_printf \n   n$17=_fun_printf(\"B\\n\":char*) [line 81, column 3]\n  EXIT_SCOPE(n$17); [line 81, column 3]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_23" [label="23:  Call _fun_printf \n   n$17=_fun_printf(\"B\\n\":char*) [line 81, column 3]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_23" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_20" ;
@@ -393,7 +393,7 @@ digraph cfg {
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_3" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_8" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_4" [label="4:  Call _fun_printf \n   n$1=_fun_printf(\"exit\\n\":char*) [line 118, column 3]\n  EXIT_SCOPE(n$1); [line 118, column 3]\n  APPLY_ABSTRACTION; [line 118, column 3]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_4" [label="4:  Call _fun_printf \n   n$1=_fun_printf(\"exit\\n\":char*) [line 118, column 3]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_4" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_3" ;
@@ -401,15 +401,15 @@ digraph cfg {
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_5" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_4" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_6" [label="6:  Return Stmt \n   *&return:int=1 [line 115, column 3]\n  APPLY_ABSTRACTION; [line 115, column 3]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_6" [label="6:  Return Stmt \n   *&return:int=1 [line 115, column 3]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_6" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_2" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_7" [label="7:  Call _fun_printf \n   n$3=_fun_printf(\"A\\n\":char*) [line 114, column 3]\n  EXIT_SCOPE(n$3); [line 114, column 3]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_7" [label="7:  Call _fun_printf \n   n$3=_fun_printf(\"A\\n\":char*) [line 114, column 3]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_7" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_6" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 113, column 3]\n  *&a:int=2 [line 113, column 3]\n  NULLIFY(&a); [line 113, column 3]\n  EXIT_SCOPE(a); [line 113, column 3]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 113, column 3]\n  *&a:int=2 [line 113, column 3]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_8" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_7" ;
@@ -422,11 +422,11 @@ digraph cfg {
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_10" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_11" ;
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_10" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_12" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_11" [label="11: Prune (true branch, if) \n   PRUNE((n$6 > 1), true); [line 108, column 7]\n  EXIT_SCOPE(n$6); [line 108, column 7]\n  APPLY_ABSTRACTION; [line 108, column 7]\n " shape="invhouse"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_11" [label="11: Prune (true branch, if) \n   PRUNE((n$6 > 1), true); [line 108, column 7]\n " shape="invhouse"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_11" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_13" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_12" [label="12: Prune (false branch, if) \n   PRUNE(!(n$6 > 1), false); [line 108, column 7]\n  EXIT_SCOPE(n$6); [line 108, column 7]\n " shape="invhouse"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_12" [label="12: Prune (false branch, if) \n   PRUNE(!(n$6 > 1), false); [line 108, column 7]\n " shape="invhouse"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_12" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_9" ;
@@ -443,11 +443,11 @@ digraph cfg {
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_15" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_16" ;
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_15" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_17" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_16" [label="16: Prune (true branch, if) \n   PRUNE(!n$10, true); [line 106, column 8]\n  EXIT_SCOPE(n$10); [line 106, column 8]\n  APPLY_ABSTRACTION; [line 106, column 8]\n " shape="invhouse"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_16" [label="16: Prune (true branch, if) \n   PRUNE(!n$10, true); [line 106, column 8]\n " shape="invhouse"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_16" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_3" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_17" [label="17: Prune (false branch, if) \n   PRUNE(n$10, false); [line 106, column 8]\n  EXIT_SCOPE(n$10); [line 106, column 8]\n " shape="invhouse"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_17" [label="17: Prune (false branch, if) \n   PRUNE(n$10, false); [line 106, column 8]\n " shape="invhouse"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_17" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_14" ;
@@ -460,15 +460,15 @@ digraph cfg {
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_19" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_20" ;
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_19" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_21" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_20" [label="20: Prune (true branch, if) \n   PRUNE(!n$14, true); [line 104, column 8]\n  EXIT_SCOPE(n$14); [line 104, column 8]\n  APPLY_ABSTRACTION; [line 104, column 8]\n " shape="invhouse"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_20" [label="20: Prune (true branch, if) \n   PRUNE(!n$14, true); [line 104, column 8]\n " shape="invhouse"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_20" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_5" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_21" [label="21: Prune (false branch, if) \n   PRUNE(n$14, false); [line 104, column 8]\n  EXIT_SCOPE(n$14); [line 104, column 8]\n " shape="invhouse"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_21" [label="21: Prune (false branch, if) \n   PRUNE(n$14, false); [line 104, column 8]\n " shape="invhouse"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_21" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_18" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_22" [label="22:  Call _fun_printf \n   n$18=_fun_printf(\"B\\n\":char*) [line 102, column 3]\n  EXIT_SCOPE(n$18); [line 102, column 3]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_22" [label="22:  Call _fun_printf \n   n$18=_fun_printf(\"B\\n\":char*) [line 102, column 3]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_22" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_19" ;
@@ -483,7 +483,7 @@ digraph cfg {
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_3" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_8" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_4" [label="4:  Call _fun_printf \n   n$1=_fun_printf(\"exit\\n\":char*) [line 140, column 3]\n  EXIT_SCOPE(n$1); [line 140, column 3]\n  APPLY_ABSTRACTION; [line 140, column 3]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_4" [label="4:  Call _fun_printf \n   n$1=_fun_printf(\"exit\\n\":char*) [line 140, column 3]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_4" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_3" ;
@@ -491,15 +491,15 @@ digraph cfg {
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_5" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_4" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_6" [label="6:  Return Stmt \n   *&return:int=1 [line 138, column 3]\n  APPLY_ABSTRACTION; [line 138, column 3]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_6" [label="6:  Return Stmt \n   *&return:int=1 [line 138, column 3]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_6" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_2" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_7" [label="7:  Call _fun_printf \n   n$3=_fun_printf(\"A\\n\":char*) [line 136, column 3]\n  EXIT_SCOPE(n$3); [line 136, column 3]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_7" [label="7:  Call _fun_printf \n   n$3=_fun_printf(\"A\\n\":char*) [line 136, column 3]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_7" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_6" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 135, column 3]\n  *&a:int=2 [line 135, column 3]\n  NULLIFY(&a); [line 135, column 3]\n  EXIT_SCOPE(a); [line 135, column 3]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 135, column 3]\n  *&a:int=2 [line 135, column 3]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_8" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_7" ;
@@ -512,11 +512,11 @@ digraph cfg {
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_10" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_11" ;
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_10" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_12" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_11" [label="11: Prune (true branch, if) \n   PRUNE((n$6 > 1), true); [line 130, column 7]\n  EXIT_SCOPE(n$6); [line 130, column 7]\n  APPLY_ABSTRACTION; [line 130, column 7]\n " shape="invhouse"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_11" [label="11: Prune (true branch, if) \n   PRUNE((n$6 > 1), true); [line 130, column 7]\n " shape="invhouse"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_11" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_13" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_12" [label="12: Prune (false branch, if) \n   PRUNE(!(n$6 > 1), false); [line 130, column 7]\n  EXIT_SCOPE(n$6); [line 130, column 7]\n " shape="invhouse"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_12" [label="12: Prune (false branch, if) \n   PRUNE(!(n$6 > 1), false); [line 130, column 7]\n " shape="invhouse"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_12" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_9" ;
@@ -533,11 +533,11 @@ digraph cfg {
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_15" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_16" ;
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_15" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_17" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_16" [label="16: Prune (true branch, if) \n   PRUNE(!n$10, true); [line 128, column 8]\n  EXIT_SCOPE(n$10); [line 128, column 8]\n  APPLY_ABSTRACTION; [line 128, column 8]\n " shape="invhouse"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_16" [label="16: Prune (true branch, if) \n   PRUNE(!n$10, true); [line 128, column 8]\n " shape="invhouse"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_16" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_3" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_17" [label="17: Prune (false branch, if) \n   PRUNE(n$10, false); [line 128, column 8]\n  EXIT_SCOPE(n$10); [line 128, column 8]\n " shape="invhouse"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_17" [label="17: Prune (false branch, if) \n   PRUNE(n$10, false); [line 128, column 8]\n " shape="invhouse"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_17" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_14" ;
@@ -550,15 +550,15 @@ digraph cfg {
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_19" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_20" ;
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_19" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_21" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_20" [label="20: Prune (true branch, if) \n   PRUNE(!n$14, true); [line 126, column 8]\n  EXIT_SCOPE(n$14); [line 126, column 8]\n  APPLY_ABSTRACTION; [line 126, column 8]\n " shape="invhouse"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_20" [label="20: Prune (true branch, if) \n   PRUNE(!n$14, true); [line 126, column 8]\n " shape="invhouse"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_20" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_5" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_21" [label="21: Prune (false branch, if) \n   PRUNE(n$14, false); [line 126, column 8]\n  EXIT_SCOPE(n$14); [line 126, column 8]\n " shape="invhouse"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_21" [label="21: Prune (false branch, if) \n   PRUNE(n$14, false); [line 126, column 8]\n " shape="invhouse"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_21" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_18" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_22" [label="22:  Call _fun_printf \n   n$18=_fun_printf(\"B\\n\":char*) [line 124, column 3]\n  EXIT_SCOPE(n$18); [line 124, column 3]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_22" [label="22:  Call _fun_printf \n   n$18=_fun_printf(\"B\\n\":char*) [line 124, column 3]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_22" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_19" ;
@@ -569,11 +569,11 @@ digraph cfg {
 "g7.727bb92f57c3951d11695a52c92c2b0c_2" [label="2: Exit g7 \n  " color=yellow style=filled]
 	
 
-"g7.727bb92f57c3951d11695a52c92c2b0c_3" [label="3:  Return Stmt \n   *&return:int=2 [line 164, column 3]\n  APPLY_ABSTRACTION; [line 164, column 3]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_3" [label="3:  Return Stmt \n   *&return:int=2 [line 164, column 3]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_3" -> "g7.727bb92f57c3951d11695a52c92c2b0c_2" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"terminating!\\n\":char*) [line 163, column 3]\n  EXIT_SCOPE(n$0); [line 163, column 3]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"terminating!\\n\":char*) [line 163, column 3]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_4" -> "g7.727bb92f57c3951d11695a52c92c2b0c_3" ;
@@ -585,7 +585,7 @@ digraph cfg {
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_6" -> "g7.727bb92f57c3951d11695a52c92c2b0c_25" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_7" [label="7:  Call _fun_printf \n   n$3=_fun_printf(\"out!\\n\":char*) [line 160, column 3]\n  EXIT_SCOPE(n$3); [line 160, column 3]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_7" [label="7:  Call _fun_printf \n   n$3=_fun_printf(\"out!\\n\":char*) [line 160, column 3]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_7" -> "g7.727bb92f57c3951d11695a52c92c2b0c_6" ;
@@ -602,11 +602,11 @@ digraph cfg {
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_10" -> "g7.727bb92f57c3951d11695a52c92c2b0c_11" ;
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_10" -> "g7.727bb92f57c3951d11695a52c92c2b0c_12" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_11" [label="11: Prune (true branch, while) \n   PRUNE((n$5 < 10), true); [line 146, column 10]\n  EXIT_SCOPE(n$5); [line 146, column 10]\n  APPLY_ABSTRACTION; [line 146, column 10]\n " shape="invhouse"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_11" [label="11: Prune (true branch, while) \n   PRUNE((n$5 < 10), true); [line 146, column 10]\n " shape="invhouse"]
 	
 
 	 "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  EXIT_SCOPE(n$5,j,k,i); [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 " shape="invhouse"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_12" -> "g7.727bb92f57c3951d11695a52c92c2b0c_8" ;
@@ -619,11 +619,11 @@ digraph cfg {
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_14" -> "g7.727bb92f57c3951d11695a52c92c2b0c_15" ;
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_14" -> "g7.727bb92f57c3951d11695a52c92c2b0c_16" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_15" [label="15: Prune (true branch, while) \n   PRUNE((n$6 < 10), true); [line 147, column 12]\n  EXIT_SCOPE(n$6); [line 147, column 12]\n  APPLY_ABSTRACTION; [line 147, column 12]\n " shape="invhouse"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_15" [label="15: Prune (true branch, while) \n   PRUNE((n$6 < 10), true); [line 147, column 12]\n " shape="invhouse"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_15" -> "g7.727bb92f57c3951d11695a52c92c2b0c_17" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_16" [label="16: Prune (false branch, while) \n   PRUNE(!(n$6 < 10), false); [line 147, column 12]\n  EXIT_SCOPE(n$6); [line 147, column 12]\n  APPLY_ABSTRACTION; [line 147, column 12]\n " shape="invhouse"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_16" [label="16: Prune (false branch, while) \n   PRUNE(!(n$6 < 10), false); [line 147, column 12]\n " shape="invhouse"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_16" -> "g7.727bb92f57c3951d11695a52c92c2b0c_9" ;
@@ -636,11 +636,11 @@ digraph cfg {
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_18" -> "g7.727bb92f57c3951d11695a52c92c2b0c_19" ;
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_18" -> "g7.727bb92f57c3951d11695a52c92c2b0c_20" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_19" [label="19: Prune (true branch, while) \n   PRUNE((n$7 < 10), true); [line 148, column 14]\n  EXIT_SCOPE(n$7); [line 148, column 14]\n " shape="invhouse"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_19" [label="19: Prune (true branch, while) \n   PRUNE((n$7 < 10), true); [line 148, column 14]\n " shape="invhouse"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_19" -> "g7.727bb92f57c3951d11695a52c92c2b0c_26" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_20" [label="20: Prune (false branch, while) \n   PRUNE(!(n$7 < 10), false); [line 148, column 14]\n  EXIT_SCOPE(n$7); [line 148, column 14]\n  APPLY_ABSTRACTION; [line 148, column 14]\n " shape="invhouse"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_20" [label="20: Prune (false branch, while) \n   PRUNE(!(n$7 < 10), false); [line 148, column 14]\n " shape="invhouse"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_20" -> "g7.727bb92f57c3951d11695a52c92c2b0c_13" ;
@@ -648,28 +648,28 @@ 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  NULLIFY(&v); [line 150, column 13]\n  EXIT_SCOPE(v); [line 150, column 13]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_22" [label="22:  BinaryOperatorStmt: GE \n   n$8=*&v:int [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  EXIT_SCOPE(n$8,j,k,i); [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 " shape="invhouse"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_23" -> "g7.727bb92f57c3951d11695a52c92c2b0c_8" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_24" [label="24: Prune (false branch, if) \n   PRUNE(!(n$8 >= 15), false); [line 150, column 13]\n  EXIT_SCOPE(n$8); [line 150, column 13]\n " shape="invhouse"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_24" [label="24: Prune (false branch, if) \n   PRUNE(!(n$8 >= 15), false); [line 150, column 13]\n " shape="invhouse"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_24" -> "g7.727bb92f57c3951d11695a52c92c2b0c_21" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_25" [label="25:  Call _fun_printf \n   n$10=_fun_printf(\"wow\\n\":char*) [line 153, column 11]\n  EXIT_SCOPE(n$10); [line 153, column 11]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_25" [label="25:  Call _fun_printf \n   n$10=_fun_printf(\"wow\\n\":char*) [line 153, column 11]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_25" -> "g7.727bb92f57c3951d11695a52c92c2b0c_5" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_26" [label="26:  DeclStmt \n   VARIABLE_DECLARED(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); [line 149, column 9]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_26" [label="26:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_26" -> "g7.727bb92f57c3951d11695a52c92c2b0c_22" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_27" [label="27:  DeclStmt \n   VARIABLE_DECLARED(k:int); [line 145, column 3]\n  *&k:int=0 [line 145, column 3]\n  APPLY_ABSTRACTION; [line 145, column 3]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_27" [label="27:  DeclStmt \n   VARIABLE_DECLARED(k:int); [line 145, column 3]\n  *&k:int=0 [line 145, column 3]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_27" -> "g7.727bb92f57c3951d11695a52c92c2b0c_9" ;
@@ -688,11 +688,11 @@ digraph cfg {
 "g8.c98b82371573afc08575815d90f5eac4_2" [label="2: Exit g8 \n  " color=yellow style=filled]
 	
 
-"g8.c98b82371573afc08575815d90f5eac4_3" [label="3:  Return Stmt \n   *&return:int=2 [line 187, column 3]\n  APPLY_ABSTRACTION; [line 187, column 3]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_3" [label="3:  Return Stmt \n   *&return:int=2 [line 187, column 3]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_3" -> "g8.c98b82371573afc08575815d90f5eac4_2" ;
-"g8.c98b82371573afc08575815d90f5eac4_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"terminating!\\n\":char*) [line 186, column 3]\n  EXIT_SCOPE(n$0); [line 186, column 3]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"terminating!\\n\":char*) [line 186, column 3]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_4" -> "g8.c98b82371573afc08575815d90f5eac4_3" ;
@@ -700,7 +700,7 @@ digraph cfg {
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_5" -> "g8.c98b82371573afc08575815d90f5eac4_4" ;
-"g8.c98b82371573afc08575815d90f5eac4_6" [label="6:  Call _fun_printf \n   n$2=_fun_printf(\"out!\\n\":char*) [line 184, column 3]\n  EXIT_SCOPE(n$2); [line 184, column 3]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_6" [label="6:  Call _fun_printf \n   n$2=_fun_printf(\"out!\\n\":char*) [line 184, column 3]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_6" -> "g8.c98b82371573afc08575815d90f5eac4_5" ;
@@ -717,11 +717,11 @@ digraph cfg {
 
 	 "g8.c98b82371573afc08575815d90f5eac4_9" -> "g8.c98b82371573afc08575815d90f5eac4_10" ;
 	 "g8.c98b82371573afc08575815d90f5eac4_9" -> "g8.c98b82371573afc08575815d90f5eac4_11" ;
-"g8.c98b82371573afc08575815d90f5eac4_10" [label="10: Prune (true branch, while) \n   PRUNE((n$4 < 10), true); [line 171, column 10]\n  EXIT_SCOPE(n$4); [line 171, column 10]\n  APPLY_ABSTRACTION; [line 171, column 10]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_10" [label="10: Prune (true branch, while) \n   PRUNE((n$4 < 10), true); [line 171, column 10]\n " shape="invhouse"]
 	
 
 	 "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  EXIT_SCOPE(n$4,i,j,k); [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 " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_11" -> "g8.c98b82371573afc08575815d90f5eac4_7" ;
@@ -734,11 +734,11 @@ digraph cfg {
 
 	 "g8.c98b82371573afc08575815d90f5eac4_13" -> "g8.c98b82371573afc08575815d90f5eac4_14" ;
 	 "g8.c98b82371573afc08575815d90f5eac4_13" -> "g8.c98b82371573afc08575815d90f5eac4_15" ;
-"g8.c98b82371573afc08575815d90f5eac4_14" [label="14: Prune (true branch, while) \n   PRUNE((n$5 < 10), true); [line 172, column 12]\n  EXIT_SCOPE(n$5); [line 172, column 12]\n  APPLY_ABSTRACTION; [line 172, column 12]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_14" [label="14: Prune (true branch, while) \n   PRUNE((n$5 < 10), true); [line 172, column 12]\n " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_14" -> "g8.c98b82371573afc08575815d90f5eac4_16" ;
-"g8.c98b82371573afc08575815d90f5eac4_15" [label="15: Prune (false branch, while) \n   PRUNE(!(n$5 < 10), false); [line 172, column 12]\n  EXIT_SCOPE(n$5); [line 172, column 12]\n  APPLY_ABSTRACTION; [line 172, column 12]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_15" [label="15: Prune (false branch, while) \n   PRUNE(!(n$5 < 10), false); [line 172, column 12]\n " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_15" -> "g8.c98b82371573afc08575815d90f5eac4_8" ;
@@ -751,11 +751,11 @@ digraph cfg {
 
 	 "g8.c98b82371573afc08575815d90f5eac4_17" -> "g8.c98b82371573afc08575815d90f5eac4_18" ;
 	 "g8.c98b82371573afc08575815d90f5eac4_17" -> "g8.c98b82371573afc08575815d90f5eac4_19" ;
-"g8.c98b82371573afc08575815d90f5eac4_18" [label="18: Prune (true branch, while) \n   PRUNE((n$6 < 10), true); [line 173, column 14]\n  EXIT_SCOPE(n$6); [line 173, column 14]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_18" [label="18: Prune (true branch, while) \n   PRUNE((n$6 < 10), true); [line 173, column 14]\n " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_18" -> "g8.c98b82371573afc08575815d90f5eac4_26" ;
-"g8.c98b82371573afc08575815d90f5eac4_19" [label="19: Prune (false branch, while) \n   PRUNE(!(n$6 < 10), false); [line 173, column 14]\n  EXIT_SCOPE(n$6); [line 173, column 14]\n  APPLY_ABSTRACTION; [line 173, column 14]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_19" [label="19: Prune (false branch, while) \n   PRUNE(!(n$6 < 10), false); [line 173, column 14]\n " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_19" -> "g8.c98b82371573afc08575815d90f5eac4_12" ;
@@ -763,20 +763,20 @@ digraph cfg {
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_20" -> "g8.c98b82371573afc08575815d90f5eac4_16" ;
-"g8.c98b82371573afc08575815d90f5eac4_21" [label="21:  BinaryOperatorStmt: GE \n   n$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" [label="21:  BinaryOperatorStmt: GE \n   n$7=*&v:int [line 175, column 13]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_21" -> "g8.c98b82371573afc08575815d90f5eac4_22" ;
 	 "g8.c98b82371573afc08575815d90f5eac4_21" -> "g8.c98b82371573afc08575815d90f5eac4_23" ;
-"g8.c98b82371573afc08575815d90f5eac4_22" [label="22: Prune (true branch, if) \n   PRUNE((n$7 >= 15), true); [line 175, column 13]\n  EXIT_SCOPE(n$7); [line 175, column 13]\n  APPLY_ABSTRACTION; [line 175, column 13]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_22" [label="22: Prune (true branch, if) \n   PRUNE((n$7 >= 15), true); [line 175, column 13]\n " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_22" -> "g8.c98b82371573afc08575815d90f5eac4_25" ;
-"g8.c98b82371573afc08575815d90f5eac4_23" [label="23: Prune (false branch, if) \n   PRUNE(!(n$7 >= 15), false); [line 175, column 13]\n  EXIT_SCOPE(n$7); [line 175, column 13]\n  APPLY_ABSTRACTION; [line 175, column 13]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_23" [label="23: Prune (false branch, if) \n   PRUNE(!(n$7 >= 15), false); [line 175, column 13]\n " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_23" -> "g8.c98b82371573afc08575815d90f5eac4_20" ;
-"g8.c98b82371573afc08575815d90f5eac4_24" [label="24:  Call _fun_printf \n   n$8=_fun_printf(\"wow\\n\":char*) [line 177, column 11]\n  EXIT_SCOPE(n$8); [line 177, column 11]\n  APPLY_ABSTRACTION; [line 177, column 11]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_24" [label="24:  Call _fun_printf \n   n$8=_fun_printf(\"wow\\n\":char*) [line 177, column 11]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_24" -> "g8.c98b82371573afc08575815d90f5eac4_20" ;
@@ -784,7 +784,7 @@ digraph cfg {
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_25" -> "g8.c98b82371573afc08575815d90f5eac4_24" ;
-"g8.c98b82371573afc08575815d90f5eac4_26" [label="26:  DeclStmt \n   VARIABLE_DECLARED(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); [line 174, column 9]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_26" [label="26:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_26" -> "g8.c98b82371573afc08575815d90f5eac4_21" ;
@@ -792,11 +792,11 @@ digraph cfg {
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_27" -> "g8.c98b82371573afc08575815d90f5eac4_8" ;
-"g8.c98b82371573afc08575815d90f5eac4_28" [label="28: Prune (true branch, if) \n   n$18=*&q:int [line 169, column 7]\n  PRUNE(n$18, true); [line 169, column 7]\n  NULLIFY(&q); [line 169, column 7]\n  EXIT_SCOPE(n$18,q); [line 169, column 7]\n  APPLY_ABSTRACTION; [line 169, column 7]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_28" [label="28: Prune (true branch, if) \n   n$18=*&q:int [line 169, column 7]\n  PRUNE(n$18, true); [line 169, column 7]\n " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_28" -> "g8.c98b82371573afc08575815d90f5eac4_25" ;
-"g8.c98b82371573afc08575815d90f5eac4_29" [label="29: Prune (false branch, if) \n   n$18=*&q:int [line 169, column 7]\n  PRUNE(!n$18, false); [line 169, column 7]\n  NULLIFY(&q); [line 169, column 7]\n  EXIT_SCOPE(n$18,q); [line 169, column 7]\n " shape="invhouse"]
+"g8.c98b82371573afc08575815d90f5eac4_29" [label="29: Prune (false branch, if) \n   n$18=*&q:int [line 169, column 7]\n  PRUNE(!n$18, false); [line 169, column 7]\n " shape="invhouse"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_29" -> "g8.c98b82371573afc08575815d90f5eac4_27" ;
@@ -820,7 +820,7 @@ digraph cfg {
 "getValue.faa0c7b1433b0c97fcdc15fa47c8180f_2" [label="2: Exit getValue \n  " color=yellow style=filled]
 	
 
-"getValue.faa0c7b1433b0c97fcdc15fa47c8180f_3" [label="3:  Return Stmt \n   *&return:int=2 [line 10, column 18]\n  APPLY_ABSTRACTION; [line 10, column 18]\n " shape="box"]
+"getValue.faa0c7b1433b0c97fcdc15fa47c8180f_3" [label="3:  Return Stmt \n   *&return:int=2 [line 10, column 18]\n " shape="box"]
 	
 
 	 "getValue.faa0c7b1433b0c97fcdc15fa47c8180f_3" -> "getValue.faa0c7b1433b0c97fcdc15fa47c8180f_2" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "jjb1.9d6085e324f8fe61c38e804980fa5cf1_2" [label="2: Exit jjb1 \n  " color=yellow style=filled]
 	
 
-"jjb1.9d6085e324f8fe61c38e804980fa5cf1_3" [label="3:  Return Stmt \n   *&return:int=0 [line 29, column 3]\n  APPLY_ABSTRACTION; [line 29, column 3]\n " shape="box"]
+"jjb1.9d6085e324f8fe61c38e804980fa5cf1_3" [label="3:  Return Stmt \n   *&return:int=0 [line 29, column 3]\n " shape="box"]
 	
 
 	 "jjb1.9d6085e324f8fe61c38e804980fa5cf1_3" -> "jjb1.9d6085e324f8fe61c38e804980fa5cf1_2" ;
@@ -24,11 +24,11 @@ digraph cfg {
 
 	 "jjb1.9d6085e324f8fe61c38e804980fa5cf1_6" -> "jjb1.9d6085e324f8fe61c38e804980fa5cf1_7" ;
 	 "jjb1.9d6085e324f8fe61c38e804980fa5cf1_6" -> "jjb1.9d6085e324f8fe61c38e804980fa5cf1_8" ;
-"jjb1.9d6085e324f8fe61c38e804980fa5cf1_7" [label="7: Prune (true branch, if) \n   PRUNE((n$1 / 2), true); [line 14, column 7]\n  EXIT_SCOPE(n$1); [line 14, column 7]\n  APPLY_ABSTRACTION; [line 14, column 7]\n " shape="invhouse"]
+"jjb1.9d6085e324f8fe61c38e804980fa5cf1_7" [label="7: Prune (true branch, if) \n   PRUNE((n$1 / 2), true); [line 14, column 7]\n " shape="invhouse"]
 	
 
 	 "jjb1.9d6085e324f8fe61c38e804980fa5cf1_7" -> "jjb1.9d6085e324f8fe61c38e804980fa5cf1_16" ;
-"jjb1.9d6085e324f8fe61c38e804980fa5cf1_8" [label="8: Prune (false branch, if) \n   PRUNE(!(n$1 / 2), false); [line 14, column 7]\n  EXIT_SCOPE(n$1); [line 14, column 7]\n  APPLY_ABSTRACTION; [line 14, column 7]\n " shape="invhouse"]
+"jjb1.9d6085e324f8fe61c38e804980fa5cf1_8" [label="8: Prune (false branch, if) \n   PRUNE(!(n$1 / 2), false); [line 14, column 7]\n " shape="invhouse"]
 	
 
 	 "jjb1.9d6085e324f8fe61c38e804980fa5cf1_8" -> "jjb1.9d6085e324f8fe61c38e804980fa5cf1_9" ;
@@ -36,11 +36,11 @@ digraph cfg {
 	
 
 	 "jjb1.9d6085e324f8fe61c38e804980fa5cf1_9" -> "jjb1.9d6085e324f8fe61c38e804980fa5cf1_18" ;
-"jjb1.9d6085e324f8fe61c38e804980fa5cf1_10" [label="10:  Call _fun_print_int \n   n$3=*&x:int [line 19, column 15]\n  n$4=_fun_print_int(n$3:int) [line 19, column 5]\n  EXIT_SCOPE(n$3,n$4); [line 19, column 5]\n  APPLY_ABSTRACTION; [line 19, column 5]\n " shape="box"]
+"jjb1.9d6085e324f8fe61c38e804980fa5cf1_10" [label="10:  Call _fun_print_int \n   n$3=*&x:int [line 19, column 15]\n  n$4=_fun_print_int(n$3:int) [line 19, column 5]\n " shape="box"]
 	
 
 	 "jjb1.9d6085e324f8fe61c38e804980fa5cf1_10" -> "jjb1.9d6085e324f8fe61c38e804980fa5cf1_9" ;
-"jjb1.9d6085e324f8fe61c38e804980fa5cf1_11" [label="11:  UnaryOperator \n   n$5=*&x:int [line 18, column 5]\n  *&x:int=(n$5 - 1) [line 18, column 5]\n  EXIT_SCOPE(n$5); [line 18, column 5]\n " shape="box"]
+"jjb1.9d6085e324f8fe61c38e804980fa5cf1_11" [label="11:  UnaryOperator \n   n$5=*&x:int [line 18, column 5]\n  *&x:int=(n$5 - 1) [line 18, column 5]\n " shape="box"]
 	
 
 	 "jjb1.9d6085e324f8fe61c38e804980fa5cf1_11" -> "jjb1.9d6085e324f8fe61c38e804980fa5cf1_10" ;
@@ -53,11 +53,11 @@ digraph cfg {
 
 	 "jjb1.9d6085e324f8fe61c38e804980fa5cf1_13" -> "jjb1.9d6085e324f8fe61c38e804980fa5cf1_14" ;
 	 "jjb1.9d6085e324f8fe61c38e804980fa5cf1_13" -> "jjb1.9d6085e324f8fe61c38e804980fa5cf1_15" ;
-"jjb1.9d6085e324f8fe61c38e804980fa5cf1_14" [label="14: Prune (true branch, if) \n   PRUNE((n$6 <= 0), true); [line 16, column 9]\n  NULLIFY(&x); [line 16, column 9]\n  NULLIFY(&y); [line 16, column 9]\n  EXIT_SCOPE(n$6,x,y); [line 16, column 9]\n  APPLY_ABSTRACTION; [line 16, column 9]\n " shape="invhouse"]
+"jjb1.9d6085e324f8fe61c38e804980fa5cf1_14" [label="14: Prune (true branch, if) \n   PRUNE((n$6 <= 0), true); [line 16, column 9]\n " shape="invhouse"]
 	
 
 	 "jjb1.9d6085e324f8fe61c38e804980fa5cf1_14" -> "jjb1.9d6085e324f8fe61c38e804980fa5cf1_4" ;
-"jjb1.9d6085e324f8fe61c38e804980fa5cf1_15" [label="15: Prune (false branch, if) \n   PRUNE(!(n$6 <= 0), false); [line 16, column 9]\n  EXIT_SCOPE(n$6); [line 16, column 9]\n " shape="invhouse"]
+"jjb1.9d6085e324f8fe61c38e804980fa5cf1_15" [label="15: Prune (false branch, if) \n   PRUNE(!(n$6 <= 0), false); [line 16, column 9]\n " shape="invhouse"]
 	
 
 	 "jjb1.9d6085e324f8fe61c38e804980fa5cf1_15" -> "jjb1.9d6085e324f8fe61c38e804980fa5cf1_12" ;
@@ -65,15 +65,15 @@ digraph cfg {
 	
 
 	 "jjb1.9d6085e324f8fe61c38e804980fa5cf1_16" -> "jjb1.9d6085e324f8fe61c38e804980fa5cf1_13" ;
-"jjb1.9d6085e324f8fe61c38e804980fa5cf1_17" [label="17:  Call _fun_print_int \n   n$12=*&y:int [line 24, column 15]\n  n$13=_fun_print_int(n$12:int) [line 24, column 5]\n  EXIT_SCOPE(n$12,n$13); [line 24, column 5]\n  APPLY_ABSTRACTION; [line 24, column 5]\n " shape="box"]
+"jjb1.9d6085e324f8fe61c38e804980fa5cf1_17" [label="17:  Call _fun_print_int \n   n$12=*&y:int [line 24, column 15]\n  n$13=_fun_print_int(n$12:int) [line 24, column 5]\n " shape="box"]
 	
 
 	 "jjb1.9d6085e324f8fe61c38e804980fa5cf1_17" -> "jjb1.9d6085e324f8fe61c38e804980fa5cf1_16" ;
-"jjb1.9d6085e324f8fe61c38e804980fa5cf1_18" [label="18:  UnaryOperator \n   n$14=*&y:int [line 23, column 5]\n  *&y:int=(n$14 + 1) [line 23, column 5]\n  EXIT_SCOPE(n$14); [line 23, column 5]\n " shape="box"]
+"jjb1.9d6085e324f8fe61c38e804980fa5cf1_18" [label="18:  UnaryOperator \n   n$14=*&y:int [line 23, column 5]\n  *&y:int=(n$14 + 1) [line 23, column 5]\n " shape="box"]
 	
 
 	 "jjb1.9d6085e324f8fe61c38e804980fa5cf1_18" -> "jjb1.9d6085e324f8fe61c38e804980fa5cf1_17" ;
-"jjb1.9d6085e324f8fe61c38e804980fa5cf1_19" [label="19:  UnaryOperator \n   n$17=*&x:int [line 13, column 3]\n  *&x:int=(n$17 + 1) [line 13, column 3]\n  EXIT_SCOPE(n$17); [line 13, column 3]\n " shape="box"]
+"jjb1.9d6085e324f8fe61c38e804980fa5cf1_19" [label="19:  UnaryOperator \n   n$17=*&x:int [line 13, column 3]\n  *&x:int=(n$17 + 1) [line 13, column 3]\n " shape="box"]
 	
 
 	 "jjb1.9d6085e324f8fe61c38e804980fa5cf1_19" -> "jjb1.9d6085e324f8fe61c38e804980fa5cf1_6" ;

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   VARIABLE_DECLARED(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,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   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "init_const_array.b1cf412cdbd1beaf15a9f6a3789043b9_3" -> "init_const_array.b1cf412cdbd1beaf15a9f6a3789043b9_2" ;
@@ -18,11 +18,11 @@ digraph cfg {
 "init_variable_array.8cdc6857adcb1fd04fb6555d8ce3e4c1_2" [label="2: Exit init_variable_array \n  " color=yellow style=filled]
 	
 
-"init_variable_array.8cdc6857adcb1fd04fb6555d8ce3e4c1_3" [label="3:  Fallback node \n   n$0=*&len:int [line 15, column 9]\n  n$1=*&x:int [line 15, column 15]\n  n$2=_fun___set_array_length(&a:int[_*4],((n$0 + n$1) + 1):int) [line 15, column 9]\n  NULLIFY(&x); [line 15, column 9]\n  NULLIFY(&len); [line 15, column 9]\n  NULLIFY(&a); [line 15, column 9]\n  EXIT_SCOPE(n$0,n$1,n$2,x,len,a); [line 15, column 9]\n  APPLY_ABSTRACTION; [line 15, column 9]\n " shape="box"]
+"init_variable_array.8cdc6857adcb1fd04fb6555d8ce3e4c1_3" [label="3:  Fallback node \n   n$0=*&len:int [line 15, column 9]\n  n$1=*&x:int [line 15, column 15]\n  n$2=_fun___set_array_length(&a:int[_*4],((n$0 + n$1) + 1):int) [line 15, column 9]\n " shape="box"]
 	
 
 	 "init_variable_array.8cdc6857adcb1fd04fb6555d8ce3e4c1_3" -> "init_variable_array.8cdc6857adcb1fd04fb6555d8ce3e4c1_2" ;
-"init_variable_array.8cdc6857adcb1fd04fb6555d8ce3e4c1_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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); [line 14, column 3]\n " shape="box"]
+"init_variable_array.8cdc6857adcb1fd04fb6555d8ce3e4c1_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "init_variable_array.8cdc6857adcb1fd04fb6555d8ce3e4c1_4" -> "init_variable_array.8cdc6857adcb1fd04fb6555d8ce3e4c1_3" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "compound_literal_expr.137fbe19f590ba2423c07134917ec888_2" [label="2: Exit compound_literal_expr \n  " color=yellow style=filled]
 	
 
-"compound_literal_expr.137fbe19f590ba2423c07134917ec888_3" [label="3:  Return Stmt \n   *&0$?%__sil_tmpSIL_compound_literal__n$0.x:int=52 [line 13, column 53]\n  *&0$?%__sil_tmpSIL_compound_literal__n$0.y:int=32 [line 13, column 53]\n  n$1=*&0$?%__sil_tmpSIL_compound_literal__n$0.x:int [line 13, column 38]\n  *&return:int=n$1 [line 13, column 31]\n  NULLIFY(&0$?%__sil_tmpSIL_compound_literal__n$0); [line 13, column 31]\n  EXIT_SCOPE(n$1,0$?%__sil_tmpSIL_compound_literal__n$0); [line 13, column 31]\n  APPLY_ABSTRACTION; [line 13, column 31]\n " shape="box"]
+"compound_literal_expr.137fbe19f590ba2423c07134917ec888_3" [label="3:  Return Stmt \n   *&0$?%__sil_tmpSIL_compound_literal__n$0.x:int=52 [line 13, column 53]\n  *&0$?%__sil_tmpSIL_compound_literal__n$0.y:int=32 [line 13, column 53]\n  n$1=*&0$?%__sil_tmpSIL_compound_literal__n$0.x:int [line 13, column 38]\n  *&return:int=n$1 [line 13, column 31]\n " shape="box"]
 	
 
 	 "compound_literal_expr.137fbe19f590ba2423c07134917ec888_3" -> "compound_literal_expr.137fbe19f590ba2423c07134917ec888_2" ;
@@ -18,11 +18,11 @@ digraph cfg {
 "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_2" [label="2: Exit init_with_compound_literal \n  " color=yellow style=filled]
 	
 
-"init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_3" [label="3:  Return Stmt \n   n$0=*&p.x:int [line 17, column 15]\n  *&return:int=(1 / (n$0 - 32)) [line 17, column 3]\n  NULLIFY(&p); [line 17, column 3]\n  EXIT_SCOPE(n$0,p); [line 17, column 3]\n  APPLY_ABSTRACTION; [line 17, column 3]\n " shape="box"]
+"init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_3" [label="3:  Return Stmt \n   n$0=*&p.x:int [line 17, column 15]\n  *&return:int=(1 / (n$0 - 32)) [line 17, column 3]\n " shape="box"]
 	
 
 	 "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_3" -> "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_2" ;
-"init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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); [line 16, column 20]\n " shape="box"]
+"init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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 " 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   VARIABLE_DECLARED(set_f1_implicit:U); [line 15, column 3]\n  VARIABLE_DECLARED(set_f1_implicit:U); [line 15, column 29]\n  *&set_f1_implicit:int=1 [line 15, column 29]\n  NULLIFY(&set_f1_implicit); [line 15, column 29]\n  EXIT_SCOPE(set_f1_implicit); [line 15, column 29]\n  APPLY_ABSTRACTION; [line 15, column 29]\n " shape="box"]
+"union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(set_f1_implicit:U); [line 15, column 3]\n  VARIABLE_DECLARED(set_f1_implicit:U); [line 15, column 29]\n  *&set_f1_implicit:int=1 [line 15, column 29]\n " shape="box"]
 	
 
 	 "union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_3" -> "union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_2" ;
-"union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(set_f2:U); [line 14, column 3]\n  VARIABLE_DECLARED(set_f2:U); [line 14, column 20]\n  NULLIFY(&set_f2); [line 14, column 20]\n  EXIT_SCOPE(set_f2); [line 14, column 20]\n " shape="box"]
+"union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(set_f2:U); [line 14, column 3]\n  VARIABLE_DECLARED(set_f2:U); [line 14, column 20]\n " shape="box"]
 	
 
 	 "union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_4" -> "union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_3" ;
-"union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(set_f1:U); [line 13, column 3]\n  VARIABLE_DECLARED(set_f1:U); [line 13, column 20]\n  *&set_f1:int=2 [line 13, column 20]\n  NULLIFY(&set_f1); [line 13, column 20]\n  EXIT_SCOPE(set_f1); [line 13, column 20]\n " shape="box"]
+"union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(set_f1:U); [line 13, column 3]\n  VARIABLE_DECLARED(set_f1:U); [line 13, column 20]\n  *&set_f1:int=2 [line 13, column 20]\n " shape="box"]
 	
 
 	 "union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_5" -> "union_initialize_FIXME.324b85335f5d2e418a28cb97eb896f20_4" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "field_set_correctly.b8d9a4294a85d24818c312a099420dce_2" [label="2: Exit field_set_correctly \n  " color=yellow style=filled]
 	
 
-"field_set_correctly.b8d9a4294a85d24818c312a099420dce_3" [label="3:  Return Stmt \n   n$0=*&e.ssn:int [line 34, column 15]\n  *&return:int=(1 / (n$0 - 12)) [line 34, column 3]\n  NULLIFY(&e); [line 34, column 3]\n  EXIT_SCOPE(n$0,e); [line 34, column 3]\n  APPLY_ABSTRACTION; [line 34, column 3]\n " shape="box"]
+"field_set_correctly.b8d9a4294a85d24818c312a099420dce_3" [label="3:  Return Stmt \n   n$0=*&e.ssn:int [line 34, column 15]\n  *&return:int=(1 / (n$0 - 12)) [line 34, column 3]\n " shape="box"]
 	
 
 	 "field_set_correctly.b8d9a4294a85d24818c312a099420dce_3" -> "field_set_correctly.b8d9a4294a85d24818c312a099420dce_2" ;
@@ -22,7 +22,7 @@ digraph cfg {
 "foo.acbd18db4cc2f85cedef654fccc4a4d8_2" [label="2: Exit foo \n  " color=yellow style=filled]
 	
 
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_3" [label="3:  Return Stmt \n   *&return:int=5 [line 13, column 13]\n  APPLY_ABSTRACTION; [line 13, column 13]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_3" [label="3:  Return Stmt \n   *&return:int=5 [line 13, column 13]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_2" ;
@@ -33,11 +33,11 @@ digraph cfg {
 "implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_2" [label="2: Exit implicit_expr_set_correctly \n  " color=yellow style=filled]
 	
 
-"implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_3" [label="3:  Return Stmt \n   n$0=*&imageDrawRect.origin.x.a:int [line 57, column 14]\n  *&return:int=(1 / n$0) [line 57, column 3]\n  NULLIFY(&imageDrawRect); [line 57, column 3]\n  EXIT_SCOPE(n$0,imageDrawRect); [line 57, column 3]\n  APPLY_ABSTRACTION; [line 57, column 3]\n " shape="box"]
+"implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_3" [label="3:  Return Stmt \n   n$0=*&imageDrawRect.origin.x.a:int [line 57, column 14]\n  *&return:int=(1 / n$0) [line 57, column 3]\n " shape="box"]
 	
 
 	 "implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_3" -> "implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_2" ;
-"implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_4" [label="4:  BinaryOperatorStmt: Assign \n   *&imageDrawRect.origin.x.a:int=0 [line 56, column 35]\n  *&imageDrawRect.origin.x.b:int=0 [line 56, column 35]\n  *&imageDrawRect.origin.y:int=0 [line 56, column 35]\n  *&imageDrawRect.z:int=0 [line 56, column 35]\n  *&imageDrawRect.size:int=5 [line 56, column 25]\n  n$1=*&imageDrawRect:rect [line 56, column 19]\n  EXIT_SCOPE(n$1); [line 56, column 19]\n " shape="box"]
+"implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_4" [label="4:  BinaryOperatorStmt: Assign \n   *&imageDrawRect.origin.x.a:int=0 [line 56, column 35]\n  *&imageDrawRect.origin.x.b:int=0 [line 56, column 35]\n  *&imageDrawRect.origin.y:int=0 [line 56, column 35]\n  *&imageDrawRect.z:int=0 [line 56, column 35]\n  *&imageDrawRect.size:int=5 [line 56, column 25]\n  n$1=*&imageDrawRect:rect [line 56, column 19]\n " shape="box"]
 	
 
 	 "implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_4" -> "implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_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   VARIABLE_DECLARED(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,p); [line 15, column 31]\n  APPLY_ABSTRACTION; [line 15, column 31]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -59,11 +59,11 @@ digraph cfg {
 "point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_2" [label="2: Exit point_coords_set_correctly \n  " color=yellow style=filled]
 	
 
-"point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_3" [label="3:  Return Stmt \n   n$0=*&p:Point* [line 19, column 15]\n  n$1=*n$0.x:int [line 19, column 15]\n  *&return:int=(1 / (n$1 - 4)) [line 19, column 3]\n  NULLIFY(&p); [line 19, column 3]\n  EXIT_SCOPE(n$0,n$1,p); [line 19, column 3]\n  APPLY_ABSTRACTION; [line 19, column 3]\n " shape="box"]
+"point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_3" [label="3:  Return Stmt \n   n$0=*&p:Point* [line 19, column 15]\n  n$1=*n$0.x:int [line 19, column 15]\n  *&return:int=(1 / (n$1 - 4)) [line 19, column 3]\n " shape="box"]
 	
 
 	 "point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_3" -> "point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_2" ;
-"point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&p:Point* [line 18, column 4]\n  *n$2.x:int=4 [line 18, column 15]\n  *n$2.y:int=5 [line 18, column 15]\n  n$3=*n$2:Point [line 18, column 8]\n  EXIT_SCOPE(n$2,n$3); [line 18, column 8]\n " shape="box"]
+"point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&p:Point* [line 18, column 4]\n  *n$2.x:int=4 [line 18, column 15]\n  *n$2.y:int=5 [line 18, column 15]\n  n$3=*n$2:Point [line 18, column 8]\n " shape="box"]
 	
 
 	 "point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_4" -> "point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_3" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15, column 3]\n  APPLY_ABSTRACTION; [line 15, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -20,23 +20,23 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch, do while) \n   PRUNE((n$0 < 20), true); [line 13, column 12]\n  EXIT_SCOPE(n$0); [line 13, column 12]\n  APPLY_ABSTRACTION; [line 13, column 12]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch, do while) \n   PRUNE((n$0 < 20), true); [line 13, column 12]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch, do while) \n   PRUNE(!(n$0 < 20), false); [line 13, column 12]\n  NULLIFY(&b); [line 13, column 12]\n  EXIT_SCOPE(n$0,b); [line 13, column 12]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch, do while) \n   PRUNE(!(n$0 < 20), false); [line 13, column 12]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 12, column 5]\n  NULLIFY(&a); [line 12, column 5]\n  EXIT_SCOPE(a); [line 12, column 5]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 12, column 5]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 10, column 3]\n  *&b:int=0 [line 10, column 3]\n  APPLY_ABSTRACTION; [line 10, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 10, column 3]\n  *&b:int=0 [line 10, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 9, column 3]\n  *&a:int=10 [line 9, column 3]\n  NULLIFY(&a); [line 9, column 3]\n  EXIT_SCOPE(a); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 9, column 3]\n  *&a:int=10 [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

@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15, column 3]\n  APPLY_ABSTRACTION; [line 15, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -15,28 +15,28 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   *&b:int=40 [line 13, column 13]\n  n$0=*&b:int [line 13, column 13]\n  NULLIFY(&b); [line 13, column 13]\n  EXIT_SCOPE(b); [line 13, column 13]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   *&b:int=40 [line 13, column 13]\n  n$0=*&b:int [line 13, column 13]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch, do while) \n   PRUNE(n$0, true); [line 13, column 13]\n  EXIT_SCOPE(n$0); [line 13, column 13]\n  APPLY_ABSTRACTION; [line 13, column 13]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch, do while) \n   PRUNE(n$0, true); [line 13, column 13]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch, do while) \n   PRUNE(!n$0, false); [line 13, column 13]\n  EXIT_SCOPE(n$0); [line 13, column 13]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch, do while) \n   PRUNE(!n$0, false); [line 13, column 13]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 12, column 5]\n  NULLIFY(&a); [line 12, column 5]\n  EXIT_SCOPE(a); [line 12, column 5]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 12, column 5]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 10, column 3]\n  *&b:int=0 [line 10, column 3]\n  NULLIFY(&b); [line 10, column 3]\n  EXIT_SCOPE(b); [line 10, column 3]\n  APPLY_ABSTRACTION; [line 10, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 10, column 3]\n  *&b:int=0 [line 10, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 9, column 3]\n  *&a:int=10 [line 9, column 3]\n  NULLIFY(&a); [line 9, column 3]\n  EXIT_SCOPE(a); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 9, column 3]\n  *&a:int=10 [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 18, column 3]\n  APPLY_ABSTRACTION; [line 18, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 18, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -20,11 +20,11 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch, do while) \n   PRUNE((n$0 < 20), true); [line 16, column 12]\n  EXIT_SCOPE(n$0); [line 16, column 12]\n  APPLY_ABSTRACTION; [line 16, column 12]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch, do while) \n   PRUNE((n$0 < 20), true); [line 16, column 12]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch, do while) \n   PRUNE(!(n$0 < 20), false); [line 16, column 12]\n  NULLIFY(&b); [line 16, column 12]\n  EXIT_SCOPE(n$0,b); [line 16, column 12]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch, do while) \n   PRUNE(!(n$0 < 20), false); [line 16, column 12]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
@@ -37,27 +37,27 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10: Prune (true branch, do while) \n   PRUNE((n$1 < 30), true); [line 15, column 14]\n  EXIT_SCOPE(n$1); [line 15, column 14]\n  APPLY_ABSTRACTION; [line 15, column 14]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10: Prune (true branch, do while) \n   PRUNE((n$1 < 30), true); [line 15, column 14]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11: Prune (false branch, do while) \n   PRUNE(!(n$1 < 30), false); [line 15, column 14]\n  EXIT_SCOPE(n$1); [line 15, column 14]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11: Prune (false branch, do while) \n   PRUNE(!(n$1 < 30), false); [line 15, column 14]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  BinaryOperatorStmt: Assign \n   *&a:int=2 [line 14, column 7]\n  NULLIFY(&a); [line 14, column 7]\n  EXIT_SCOPE(a); [line 14, column 7]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  BinaryOperatorStmt: Assign \n   *&a:int=2 [line 14, column 7]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 12, column 5]\n  NULLIFY(&a); [line 12, column 5]\n  EXIT_SCOPE(a); [line 12, column 5]\n  APPLY_ABSTRACTION; [line 12, column 5]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 12, column 5]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 10, column 3]\n  *&b:int=0 [line 10, column 3]\n  APPLY_ABSTRACTION; [line 10, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 10, column 3]\n  *&b:int=0 [line 10, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 9, column 3]\n  *&a:int=10 [line 9, column 3]\n  NULLIFY(&a); [line 9, column 3]\n  EXIT_SCOPE(a); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 9, column 3]\n  *&a:int=10 [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

@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 14, column 3]\n  APPLY_ABSTRACTION; [line 14, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 14, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -15,28 +15,28 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 11, column 8]\n  *&b:int=3 [line 11, column 8]\n  NULLIFY(&b); [line 11, column 8]\n  EXIT_SCOPE(b); [line 11, column 8]\n  APPLY_ABSTRACTION; [line 11, column 8]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 11, column 8]\n  *&b:int=3 [line 11, column 8]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  UnaryOperator \n   n$0=*&i:int [line 11, column 29]\n  *&i:int=(n$0 + 1) [line 11, column 29]\n  EXIT_SCOPE(n$0); [line 11, column 29]\n  APPLY_ABSTRACTION; [line 11, column 29]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  UnaryOperator \n   n$0=*&i:int [line 11, column 29]\n  *&i:int=(n$0 + 1) [line 11, column 29]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   *&b:int=10 [line 11, column 20]\n  n$1=*&b:int [line 11, column 20]\n  NULLIFY(&b); [line 11, column 20]\n  EXIT_SCOPE(b); [line 11, column 20]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   *&b:int=10 [line 11, column 20]\n  n$1=*&b:int [line 11, column 20]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (true branch, for loop) \n   PRUNE(n$1, true); [line 11, column 20]\n  EXIT_SCOPE(n$1); [line 11, column 20]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (true branch, for loop) \n   PRUNE(n$1, true); [line 11, column 20]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (false branch, for loop) \n   PRUNE(!n$1, false); [line 11, column 20]\n  NULLIFY(&i); [line 11, column 20]\n  NULLIFY(&j); [line 11, column 20]\n  EXIT_SCOPE(n$1,i,j); [line 11, column 20]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (false branch, for loop) \n   PRUNE(!n$1, false); [line 11, column 20]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  BinaryOperatorStmt: AddAssign \n   n$2=*&j:int [line 12, column 10]\n  n$3=*&j:int [line 12, column 5]\n  *&j:int=(n$3 + n$2) [line 12, column 5]\n  EXIT_SCOPE(n$2,n$3); [line 12, column 5]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  BinaryOperatorStmt: AddAssign \n   n$2=*&j:int [line 12, column 10]\n  n$3=*&j:int [line 12, column 5]\n  *&j:int=(n$3 + n$2) [line 12, column 5]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   n$0=*&k:int [line 15, column 10]\n  *&return:int=n$0 [line 15, column 3]\n  NULLIFY(&k); [line 15, column 3]\n  EXIT_SCOPE(n$0,k); [line 15, column 3]\n  APPLY_ABSTRACTION; [line 15, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   n$0=*&k:int [line 15, column 10]\n  *&return:int=n$0 [line 15, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -15,11 +15,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 10, column 8]\n  *&i:int=0 [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 10, column 8]\n  *&i:int=0 [line 10, column 8]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  UnaryOperator \n   n$1=*&i:int [line 10, column 27]\n  *&i:int=(n$1 + 1) [line 10, column 27]\n  EXIT_SCOPE(n$1); [line 10, column 27]\n  APPLY_ABSTRACTION; [line 10, column 27]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  UnaryOperator \n   n$1=*&i:int [line 10, column 27]\n  *&i:int=(n$1 + 1) [line 10, column 27]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -28,11 +28,11 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (true branch, for loop) \n   PRUNE((n$2 < 10), true); [line 10, column 19]\n  EXIT_SCOPE(n$2); [line 10, column 19]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (true branch, for loop) \n   PRUNE((n$2 < 10), true); [line 10, column 19]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (false branch, for loop) \n   PRUNE(!(n$2 < 10), false); [line 10, column 19]\n  NULLIFY(&i); [line 10, column 19]\n  EXIT_SCOPE(n$2,i); [line 10, column 19]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (false branch, for loop) \n   PRUNE(!(n$2 < 10), false); [line 10, column 19]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
@@ -40,11 +40,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(j:int); [line 11, column 10]\n  *&j:int=0 [line 11, column 10]\n  APPLY_ABSTRACTION; [line 11, column 10]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(j:int); [line 11, column 10]\n  *&j:int=0 [line 11, column 10]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  UnaryOperator \n   n$3=*&j:int [line 11, column 29]\n  *&j:int=(n$3 + 1) [line 11, column 29]\n  EXIT_SCOPE(n$3); [line 11, column 29]\n  APPLY_ABSTRACTION; [line 11, column 29]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  UnaryOperator \n   n$3=*&j:int [line 11, column 29]\n  *&j:int=(n$3 + 1) [line 11, column 29]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
@@ -53,15 +53,15 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
-"main.fad58de7366495db4650cfefac2fcd61_14" [label="14: Prune (true branch, for loop) \n   PRUNE((n$4 < 10), true); [line 11, column 21]\n  EXIT_SCOPE(n$4); [line 11, column 21]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_14" [label="14: Prune (true branch, for loop) \n   PRUNE((n$4 < 10), true); [line 11, column 21]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_16" ;
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15: Prune (false branch, for loop) \n   PRUNE(!(n$4 < 10), false); [line 11, column 21]\n  NULLIFY(&j); [line 11, column 21]\n  EXIT_SCOPE(n$4,j); [line 11, column 21]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15: Prune (false branch, for loop) \n   PRUNE(!(n$4 < 10), false); [line 11, column 21]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_16" [label="16:  BinaryOperatorStmt: Assign \n   n$5=*&k:int [line 12, column 11]\n  n$6=*&i:int [line 12, column 15]\n  *&k:int=(n$5 + n$6) [line 12, column 7]\n  EXIT_SCOPE(n$5,n$6); [line 12, column 7]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_16" [label="16:  BinaryOperatorStmt: Assign \n   n$5=*&k:int [line 12, column 11]\n  n$6=*&i:int [line 12, column 15]\n  *&k:int=(n$5 + n$6) [line 12, column 7]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_16" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 13, column 3]\n  APPLY_ABSTRACTION; [line 13, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 13, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -16,11 +16,11 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 10, column 8]\n  *&b:int=0 [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 10, column 8]\n  *&b:int=0 [line 10, column 8]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  UnaryOperator \n   n$0=*&b:int [line 10, column 20]\n  *&b:int=(n$0 + 1) [line 10, column 20]\n  EXIT_SCOPE(n$0); [line 10, column 20]\n  APPLY_ABSTRACTION; [line 10, column 20]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  UnaryOperator \n   n$0=*&b:int [line 10, column 20]\n  *&b:int=(n$0 + 1) [line 10, column 20]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -28,11 +28,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (false branch, for loop) \n   PRUNE(!1, false); [line 10, column 16]\n  NULLIFY(&j); [line 10, column 16]\n  NULLIFY(&b); [line 10, column 16]\n  EXIT_SCOPE(j,b); [line 10, column 16]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (false branch, for loop) \n   PRUNE(!1, false); [line 10, column 16]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  BinaryOperatorStmt: AddAssign \n   n$1=*&j:int [line 11, column 10]\n  n$2=*&j:int [line 11, column 5]\n  *&j:int=(n$2 + n$1) [line 11, column 5]\n  EXIT_SCOPE(n$1,n$2); [line 11, column 5]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  BinaryOperatorStmt: AddAssign \n   n$1=*&j:int [line 11, column 10]\n  n$2=*&j:int [line 11, column 5]\n  *&j:int=(n$2 + n$1) [line 11, column 5]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 13, column 3]\n  APPLY_ABSTRACTION; [line 13, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 13, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -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   VARIABLE_DECLARED(b:int); [line 10, column 8]\n  *&b:int=0 [line 10, column 8]\n  NULLIFY(&b); [line 10, column 8]\n  EXIT_SCOPE(b); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(b:int); [line 10, column 8]\n  *&b:int=0 [line 10, column 8]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -24,11 +24,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch, for loop) \n   PRUNE(!1, false); [line 10, column 16]\n  NULLIFY(&j); [line 10, column 16]\n  EXIT_SCOPE(j); [line 10, column 16]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch, for loop) \n   PRUNE(!1, false); [line 10, column 16]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: AddAssign \n   n$1=*&j:int [line 11, column 10]\n  n$2=*&j:int [line 11, column 5]\n  *&j:int=(n$2 + n$1) [line 11, column 5]\n  EXIT_SCOPE(n$1,n$2); [line 11, column 5]\n  APPLY_ABSTRACTION; [line 11, column 5]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: AddAssign \n   n$1=*&j:int [line 11, column 10]\n  n$2=*&j:int [line 11, column 5]\n  *&j:int=(n$2 + n$1) [line 11, column 5]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 12, column 3]\n  APPLY_ABSTRACTION; [line 12, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 12, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -16,11 +16,11 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   *&d:int=0 [line 10, column 8]\n  NULLIFY(&d); [line 10, column 8]\n  EXIT_SCOPE(d); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   *&d:int=0 [line 10, column 8]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch, for loop) \n   PRUNE(1, true); [line 10, column 12]\n  APPLY_ABSTRACTION; [line 10, column 12]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch, for loop) \n   PRUNE(1, true); [line 10, column 12]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -28,7 +28,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(d:int); [line 9, column 3]\n  *&d:int=0 [line 9, column 3]\n  NULLIFY(&d); [line 9, column 3]\n  EXIT_SCOPE(d); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(d:int); [line 9, column 3]\n  *&d:int=0 [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 13, column 3]\n  APPLY_ABSTRACTION; [line 13, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 13, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -20,15 +20,15 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (false branch, for loop) \n   PRUNE(!1, false); [line 12, column 3]\n  NULLIFY(&i); [line 12, column 3]\n  EXIT_SCOPE(i); [line 12, column 3]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (false branch, for loop) \n   PRUNE(!1, false); [line 12, column 3]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  UnaryOperator \n   n$2=*&i:int [line 11, column 5]\n  *&i:int=(n$2 + 1) [line 11, column 5]\n  EXIT_SCOPE(n$2); [line 11, column 5]\n  APPLY_ABSTRACTION; [line 11, column 5]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  UnaryOperator \n   n$2=*&i:int [line 11, column 5]\n  *&i:int=(n$2 + 1) [line 11, column 5]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 9, column 3]\n  *&i:int=0 [line 9, column 3]\n  APPLY_ABSTRACTION; [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 9, column 3]\n  *&i:int=0 [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 13, column 3]\n  APPLY_ABSTRACTION; [line 13, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 13, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -15,11 +15,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 10, column 8]\n  *&i:int=0 [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 10, column 8]\n  *&i:int=0 [line 10, column 8]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  UnaryOperator \n   n$0=*&i:int [line 10, column 27]\n  *&i:int=(n$0 + 1) [line 10, column 27]\n  EXIT_SCOPE(n$0); [line 10, column 27]\n  APPLY_ABSTRACTION; [line 10, column 27]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  UnaryOperator \n   n$0=*&i:int [line 10, column 27]\n  *&i:int=(n$0 + 1) [line 10, column 27]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -28,15 +28,15 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (true branch, for loop) \n   PRUNE((n$1 < 10), true); [line 10, column 19]\n  EXIT_SCOPE(n$1); [line 10, column 19]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (true branch, for loop) \n   PRUNE((n$1 < 10), true); [line 10, column 19]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (false branch, for loop) \n   PRUNE(!(n$1 < 10), false); [line 10, column 19]\n  NULLIFY(&i); [line 10, column 19]\n  NULLIFY(&j); [line 10, column 19]\n  EXIT_SCOPE(n$1,i,j); [line 10, column 19]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (false branch, for loop) \n   PRUNE(!(n$1 < 10), false); [line 10, column 19]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  BinaryOperatorStmt: AddAssign \n   n$2=*&j:int [line 11, column 10]\n  n$3=*&j:int [line 11, column 5]\n  *&j:int=(n$3 + n$2) [line 11, column 5]\n  EXIT_SCOPE(n$2,n$3); [line 11, column 5]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  BinaryOperatorStmt: AddAssign \n   n$2=*&j:int [line 11, column 10]\n  n$3=*&j:int [line 11, column 5]\n  *&j:int=(n$3 + n$2) [line 11, column 5]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   n$0=*&k:int [line 15, column 10]\n  *&return:int=n$0 [line 15, column 3]\n  NULLIFY(&k); [line 15, column 3]\n  EXIT_SCOPE(n$0,k); [line 15, column 3]\n  APPLY_ABSTRACTION; [line 15, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   n$0=*&k:int [line 15, column 10]\n  *&return:int=n$0 [line 15, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -15,11 +15,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 10, column 8]\n  *&i:int=0 [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 10, column 8]\n  *&i:int=0 [line 10, column 8]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  UnaryOperator \n   n$1=*&i:int [line 10, column 27]\n  *&i:int=(n$1 + 1) [line 10, column 27]\n  EXIT_SCOPE(n$1); [line 10, column 27]\n  APPLY_ABSTRACTION; [line 10, column 27]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  UnaryOperator \n   n$1=*&i:int [line 10, column 27]\n  *&i:int=(n$1 + 1) [line 10, column 27]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -28,11 +28,11 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (true branch, for loop) \n   PRUNE((n$2 < 10), true); [line 10, column 19]\n  EXIT_SCOPE(n$2); [line 10, column 19]\n  APPLY_ABSTRACTION; [line 10, column 19]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (true branch, for loop) \n   PRUNE((n$2 < 10), true); [line 10, column 19]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (false branch, for loop) \n   PRUNE(!(n$2 < 10), false); [line 10, column 19]\n  NULLIFY(&i); [line 10, column 19]\n  EXIT_SCOPE(n$2,i); [line 10, column 19]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (false branch, for loop) \n   PRUNE(!(n$2 < 10), false); [line 10, column 19]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
@@ -45,15 +45,15 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12: Prune (true branch, while) \n   PRUNE((n$3 < 10), true); [line 11, column 12]\n  EXIT_SCOPE(n$3); [line 11, column 12]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12: Prune (true branch, while) \n   PRUNE((n$3 < 10), true); [line 11, column 12]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
-"main.fad58de7366495db4650cfefac2fcd61_13" [label="13: Prune (false branch, while) \n   PRUNE(!(n$3 < 10), false); [line 11, column 12]\n  EXIT_SCOPE(n$3); [line 11, column 12]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_13" [label="13: Prune (false branch, while) \n   PRUNE(!(n$3 < 10), false); [line 11, column 12]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  UnaryOperator \n   n$4=*&k:int [line 12, column 7]\n  *&k:int=(n$4 + 1) [line 12, column 7]\n  EXIT_SCOPE(n$4); [line 12, column 7]\n  APPLY_ABSTRACTION; [line 12, column 7]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  UnaryOperator \n   n$4=*&k:int [line 12, column 7]\n  *&k:int=(n$4 + 1) [line 12, column 7]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 13, column 3]\n  APPLY_ABSTRACTION; [line 13, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 13, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -20,19 +20,19 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch, while) \n   PRUNE((n$0 <= 10), true); [line 10, column 10]\n  EXIT_SCOPE(n$0); [line 10, column 10]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch, while) \n   PRUNE((n$0 <= 10), true); [line 10, column 10]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch, while) \n   PRUNE(!(n$0 <= 10), false); [line 10, column 10]\n  NULLIFY(&i); [line 10, column 10]\n  EXIT_SCOPE(n$0,i); [line 10, column 10]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch, while) \n   PRUNE(!(n$0 <= 10), false); [line 10, column 10]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  UnaryOperator \n   n$1=*&i:int [line 11, column 5]\n  *&i:int=(n$1 + 1) [line 11, column 5]\n  EXIT_SCOPE(n$1); [line 11, column 5]\n  APPLY_ABSTRACTION; [line 11, column 5]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  UnaryOperator \n   n$1=*&i:int [line 11, column 5]\n  *&i:int=(n$1 + 1) [line 11, column 5]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 9, column 3]\n  *&i:int=0 [line 9, column 3]\n  APPLY_ABSTRACTION; [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 9, column 3]\n  *&i:int=0 [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

@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 13, column 3]\n  APPLY_ABSTRACTION; [line 13, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 13, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -20,19 +20,19 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch, while) \n   PRUNE(n$0, true); [line 10, column 11]\n  EXIT_SCOPE(n$0); [line 10, column 11]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch, while) \n   PRUNE(n$0, true); [line 10, column 11]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch, while) \n   PRUNE(!n$0, false); [line 10, column 11]\n  NULLIFY(&i); [line 10, column 11]\n  EXIT_SCOPE(n$0,i); [line 10, column 11]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch, while) \n   PRUNE(!n$0, false); [line 10, column 11]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  UnaryOperator \n   n$1=*&i:int [line 11, column 5]\n  *&i:int=(n$1 + 1) [line 11, column 5]\n  NULLIFY(&i); [line 11, column 5]\n  EXIT_SCOPE(n$1,i); [line 11, column 5]\n  APPLY_ABSTRACTION; [line 11, column 5]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  UnaryOperator \n   n$1=*&i:int [line 11, column 5]\n  *&i:int=(n$1 + 1) [line 11, column 5]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 9, column 3]\n  *&i:int=0 [line 9, column 3]\n  NULLIFY(&i); [line 9, column 3]\n  EXIT_SCOPE(i); [line 9, column 3]\n  APPLY_ABSTRACTION; [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 9, column 3]\n  *&i:int=0 [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 17, column 3]\n  APPLY_ABSTRACTION; [line 17, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 17, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -20,15 +20,15 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch, while) \n   PRUNE((n$0 <= 10), true); [line 11, column 10]\n  EXIT_SCOPE(n$0); [line 11, column 10]\n  APPLY_ABSTRACTION; [line 11, column 10]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch, while) \n   PRUNE((n$0 <= 10), true); [line 11, column 10]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch, while) \n   PRUNE(!(n$0 <= 10), false); [line 11, column 10]\n  NULLIFY(&i); [line 11, column 10]\n  NULLIFY(&k); [line 11, column 10]\n  EXIT_SCOPE(n$0,i,k); [line 11, column 10]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch, while) \n   PRUNE(!(n$0 <= 10), false); [line 11, column 10]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  UnaryOperator \n   n$1=*&i:int [line 15, column 5]\n  *&i:int=(n$1 + 1) [line 15, column 5]\n  EXIT_SCOPE(n$1); [line 15, column 5]\n  APPLY_ABSTRACTION; [line 15, column 5]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  UnaryOperator \n   n$1=*&i:int [line 15, column 5]\n  *&i:int=(n$1 + 1) [line 15, column 5]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -41,19 +41,19 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11: Prune (true branch, while) \n   PRUNE((n$2 <= 5), true); [line 12, column 12]\n  EXIT_SCOPE(n$2); [line 12, column 12]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11: Prune (true branch, while) \n   PRUNE((n$2 <= 5), true); [line 12, column 12]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12: Prune (false branch, while) \n   PRUNE(!(n$2 <= 5), false); [line 12, column 12]\n  EXIT_SCOPE(n$2); [line 12, column 12]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12: Prune (false branch, while) \n   PRUNE(!(n$2 <= 5), false); [line 12, column 12]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  UnaryOperator \n   n$3=*&k:int [line 13, column 7]\n  *&k:int=(n$3 + 1) [line 13, column 7]\n  EXIT_SCOPE(n$3); [line 13, column 7]\n  APPLY_ABSTRACTION; [line 13, column 7]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  UnaryOperator \n   n$3=*&k:int [line 13, column 7]\n  *&k:int=(n$3 + 1) [line 13, column 7]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(k:int); [line 10, column 3]\n  *&k:int=0 [line 10, column 3]\n  APPLY_ABSTRACTION; [line 10, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(k:int); [line 10, column 3]\n  *&k:int=0 [line 10, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 11, column 3]\n  APPLY_ABSTRACTION; [line 11, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 11, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -16,7 +16,7 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5: Prune (true branch, while) \n   PRUNE(1, true); [line 9, column 10]\n  APPLY_ABSTRACTION; [line 9, column 10]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5: Prune (true branch, while) \n   PRUNE(1, true); [line 9, column 10]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 21, column 3]\n  APPLY_ABSTRACTION; [line 21, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 21, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -16,11 +16,11 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5: Prune (true branch, while) \n   PRUNE(1, true); [line 10, column 10]\n  APPLY_ABSTRACTION; [line 10, column 10]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5: Prune (true branch, while) \n   PRUNE(1, true); [line 10, column 10]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (false branch, while) \n   PRUNE(!1, false); [line 10, column 10]\n  NULLIFY(&x); [line 10, column 10]\n  EXIT_SCOPE(x); [line 10, column 10]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (false branch, while) \n   PRUNE(!1, false); [line 10, column 10]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
@@ -33,11 +33,11 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (true branch, if) \n   PRUNE((n$0 == 2), true); [line 17, column 9]\n  EXIT_SCOPE(n$0); [line 17, column 9]\n  APPLY_ABSTRACTION; [line 17, column 9]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (true branch, if) \n   PRUNE((n$0 == 2), true); [line 17, column 9]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10: Prune (false branch, if) \n   PRUNE(!(n$0 == 2), false); [line 17, column 9]\n  EXIT_SCOPE(n$0); [line 17, column 9]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10: Prune (false branch, if) \n   PRUNE(!(n$0 == 2), false); [line 17, column 9]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
@@ -50,7 +50,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_18" ;
-"main.fad58de7366495db4650cfefac2fcd61_13" [label="13: Prune (false branch, while) \n   PRUNE(!2, false); [line 11, column 12]\n  APPLY_ABSTRACTION; [line 11, column 12]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_13" [label="13: Prune (false branch, while) \n   PRUNE(!2, false); [line 11, column 12]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
@@ -63,19 +63,19 @@ digraph cfg {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_16" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_17" ;
-"main.fad58de7366495db4650cfefac2fcd61_16" [label="16: Prune (true branch, if) \n   PRUNE((n$4 > 5), true); [line 13, column 11]\n  EXIT_SCOPE(n$4); [line 13, column 11]\n  APPLY_ABSTRACTION; [line 13, column 11]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_16" [label="16: Prune (true branch, if) \n   PRUNE((n$4 > 5), true); [line 13, column 11]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_16" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_17" [label="17: Prune (false branch, if) \n   PRUNE(!(n$4 > 5), false); [line 13, column 11]\n  EXIT_SCOPE(n$4); [line 13, column 11]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_17" [label="17: Prune (false branch, if) \n   PRUNE(!(n$4 > 5), false); [line 13, column 11]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_17" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
-"main.fad58de7366495db4650cfefac2fcd61_18" [label="18:  BinaryOperatorStmt: AddAssign \n   n$8=*&x:int [line 12, column 7]\n  *&x:int=(n$8 + 1) [line 12, column 7]\n  EXIT_SCOPE(n$8); [line 12, column 7]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_18" [label="18:  BinaryOperatorStmt: AddAssign \n   n$8=*&x:int [line 12, column 7]\n  *&x:int=(n$8 + 1) [line 12, column 7]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_18" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
-"main.fad58de7366495db4650cfefac2fcd61_19" [label="19:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 9, column 3]\n  *&x:int=0 [line 9, column 3]\n  APPLY_ABSTRACTION; [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_19" [label="19:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 9, column 3]\n  *&x:int=0 [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_19" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "foo.acbd18db4cc2f85cedef654fccc4a4d8_2" [label="2: Exit foo \n  " color=yellow style=filled]
 	
 
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_3" [label="3:  Return Stmt \n   *&return:int=52 [line 12, column 3]\n  APPLY_ABSTRACTION; [line 12, column 3]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_3" [label="3:  Return Stmt \n   *&return:int=52 [line 12, column 3]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_2" ;
@@ -15,20 +15,20 @@ digraph cfg {
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_4" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_5" [label="5:  BinaryOperatorStmt: Assign \n   n$0=*&p:int* [line 9, column 9]\n  *n$0:int=0 [line 9, column 8]\n  n$1=*n$0:int [line 9, column 8]\n  NULLIFY(&p); [line 9, column 8]\n  EXIT_SCOPE(n$0,p); [line 9, column 8]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_5" [label="5:  BinaryOperatorStmt: Assign \n   n$0=*&p:int* [line 9, column 9]\n  *n$0:int=0 [line 9, column 8]\n  n$1=*n$0:int [line 9, column 8]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_5" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_6" ;
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_5" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_7" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_6" [label="6: Prune (true branch, if) \n   PRUNE(n$1, true); [line 9, column 8]\n  EXIT_SCOPE(n$1); [line 9, column 8]\n " shape="invhouse"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_6" [label="6: Prune (true branch, if) \n   PRUNE(n$1, true); [line 9, column 8]\n " shape="invhouse"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_6" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_8" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_7" [label="7: Prune (false branch, if) \n   PRUNE(!n$1, false); [line 9, column 8]\n  EXIT_SCOPE(n$1); [line 9, column 8]\n " shape="invhouse"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_7" [label="7: Prune (false branch, if) \n   PRUNE(!n$1, false); [line 9, column 8]\n " shape="invhouse"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_7" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_4" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_8" [label="8:  Return Stmt \n   *&return:int=32 [line 10, column 5]\n  APPLY_ABSTRACTION; [line 10, column 5]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_8" [label="8:  Return Stmt \n   *&return:int=32 [line 10, column 5]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_8" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_2" ;

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

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

infer/tests/codetoanalyze/c/frontend/nestedoperators/gnuexpr.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:  Return Stmt \n   *&return:int=0 [line 15, column 3]\n  APPLY_ABSTRACTION; [line 15, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  Fallback node \n   n$0=*&X:int [line 13, column 5]\n  NULLIFY(&X); [line 13, column 5]\n  EXIT_SCOPE(X); [line 13, column 5]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  Fallback node \n   n$0=*&X:int [line 13, column 5]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
@@ -19,11 +19,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   *&y:int=n$0 [line 11, column 3]\n  NULLIFY(&y); [line 11, column 3]\n  EXIT_SCOPE(n$0,y); [line 11, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   *&y:int=n$0 [line 11, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(y:int); [line 9, column 3]\n  *&y:int=3 [line 9, column 3]\n  NULLIFY(&y); [line 9, column 3]\n  EXIT_SCOPE(y); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(y:int); [line 9, column 3]\n  *&y:int=3 [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
@@ -34,7 +34,7 @@ digraph cfg {
 "test.098f6bcd4621d373cade4e832627b4f6_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test.098f6bcd4621d373cade4e832627b4f6_3" [label="3:  BinaryOperatorStmt: Add \n   n$0=*&x:int [line 22, column 5]\n  n$1=*&y:int [line 22, column 9]\n  NULLIFY(&x); [line 22, column 9]\n  NULLIFY(&y); [line 22, column 9]\n  EXIT_SCOPE(x,y); [line 22, column 9]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_3" [label="3:  BinaryOperatorStmt: Add \n   n$0=*&x:int [line 22, column 5]\n  n$1=*&y:int [line 22, column 9]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_3" -> "test.098f6bcd4621d373cade4e832627b4f6_6" ;
@@ -42,11 +42,11 @@ digraph cfg {
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_4" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;
-"test.098f6bcd4621d373cade4e832627b4f6_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 20, column 5]\n  n$2=*&p:int* [line 20, column 14]\n  n$3=*n$2:int [line 20, column 13]\n  *&x:int=n$3 [line 20, column 5]\n  NULLIFY(&p); [line 20, column 5]\n  EXIT_SCOPE(n$2,n$3,p); [line 20, column 5]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 20, column 5]\n  n$2=*&p:int* [line 20, column 14]\n  n$3=*n$2:int [line 20, column 13]\n  *&x:int=n$3 [line 20, column 5]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_5" -> "test.098f6bcd4621d373cade4e832627b4f6_4" ;
-"test.098f6bcd4621d373cade4e832627b4f6_6" [label="6:  Return Stmt \n   *&return:int=(n$0 + n$1) [line 19, column 3]\n  EXIT_SCOPE(n$0,n$1); [line 19, column 3]\n  APPLY_ABSTRACTION; [line 19, column 3]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_6" [label="6:  Return Stmt \n   *&return:int=(n$0 + n$1) [line 19, column 3]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_6" -> "test.098f6bcd4621d373cade4e832627b4f6_2" ;
@@ -61,23 +61,23 @@ digraph cfg {
 	
 
 	 "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_3" -> "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_8" ;
-"with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_4" [label="4: Prune (true branch, boolean exp) \n   n$1=*&p:int* [line 29, column 5]\n  PRUNE(n$1, true); [line 29, column 5]\n  EXIT_SCOPE(n$1); [line 29, column 5]\n " shape="invhouse"]
+"with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_4" [label="4: Prune (true branch, boolean exp) \n   n$1=*&p:int* [line 29, column 5]\n  PRUNE(n$1, true); [line 29, column 5]\n " shape="invhouse"]
 	
 
 	 "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_4" -> "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_6" ;
-"with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_5" [label="5: Prune (false branch, boolean exp) \n   n$1=*&p:int* [line 29, column 5]\n  PRUNE(!n$1, false); [line 29, column 5]\n  NULLIFY(&p); [line 29, column 5]\n  EXIT_SCOPE(n$1,p); [line 29, column 5]\n " shape="invhouse"]
+"with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_5" [label="5: Prune (false branch, boolean exp) \n   n$1=*&p:int* [line 29, column 5]\n  PRUNE(!n$1, false); [line 29, column 5]\n " shape="invhouse"]
 	
 
 	 "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_5" -> "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_7" ;
-"with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_6" [label="6:  ConditionalStmt Branch \n   n$2=*&p:int* [line 29, column 10]\n  n$3=*n$2:int [line 29, column 9]\n  n$4=*&x:int [line 29, column 14]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=(n$3 + n$4) [line 29, column 5]\n  NULLIFY(&x); [line 29, column 5]\n  NULLIFY(&p); [line 29, column 5]\n  EXIT_SCOPE(n$2,n$3,n$4,x,p); [line 29, column 5]\n  APPLY_ABSTRACTION; [line 29, column 5]\n " shape="box"]
+"with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_6" [label="6:  ConditionalStmt Branch \n   n$2=*&p:int* [line 29, column 10]\n  n$3=*n$2:int [line 29, column 9]\n  n$4=*&x:int [line 29, column 14]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=(n$3 + n$4) [line 29, column 5]\n " shape="box"]
 	
 
 	 "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_6" -> "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_3" ;
-"with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_7" [label="7:  ConditionalStmt Branch \n   n$5=*&x:int [line 29, column 18]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$5 [line 29, column 5]\n  NULLIFY(&x); [line 29, column 5]\n  EXIT_SCOPE(n$5,x); [line 29, column 5]\n  APPLY_ABSTRACTION; [line 29, column 5]\n " shape="box"]
+"with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_7" [label="7:  ConditionalStmt Branch \n   n$5=*&x:int [line 29, column 18]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$5 [line 29, column 5]\n " shape="box"]
 	
 
 	 "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_7" -> "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_3" ;
-"with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_8" [label="8:  Fallback node \n   n$6=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 29, column 5]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 29, column 5]\n  EXIT_SCOPE(0$?%__sil_tmpSIL_temp_conditional___n$0); [line 29, column 5]\n " shape="box"]
+"with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_8" [label="8:  Fallback node \n   n$6=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 29, column 5]\n " shape="box"]
 	
 
 	 "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_8" -> "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_10" ;
@@ -86,7 +86,7 @@ digraph cfg {
 
 	 "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_9" -> "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_4" ;
 	 "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_9" -> "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_5" ;
-"with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_10" [label="10:  Return Stmt \n   *&return:int=n$6 [line 27, column 3]\n  EXIT_SCOPE(n$6); [line 27, column 3]\n  APPLY_ABSTRACTION; [line 27, column 3]\n " shape="box"]
+"with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_10" [label="10:  Return Stmt \n   *&return:int=n$6 [line 27, column 3]\n " shape="box"]
 	
 
 	 "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_10" -> "with_conditional.c7f3381cc5bd6cfe19bc60c013ae8f1c_2" ;

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

@@ -7,31 +7,31 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 16, column 3]\n  APPLY_ABSTRACTION; [line 16, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 16, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&t:double [line 15, column 25]\n  n$1=*&s:double [line 15, column 20]\n  *&s:double=(n$1 + n$0) [line 15, column 20]\n  n$2=*&s:double [line 15, column 20]\n  n$3=*&r:double [line 15, column 14]\n  *&r:double=(n$3 + n$2) [line 15, column 14]\n  n$4=*&r:double [line 15, column 14]\n  n$5=*&x:double [line 15, column 8]\n  *&x:double=(n$5 + n$4) [line 15, column 8]\n  n$6=*&x:double [line 15, column 8]\n  *&q:double=n$6 [line 15, column 3]\n  NULLIFY(&s); [line 15, column 3]\n  NULLIFY(&q); [line 15, column 3]\n  NULLIFY(&t); [line 15, column 3]\n  NULLIFY(&x); [line 15, column 3]\n  NULLIFY(&r); [line 15, column 3]\n  EXIT_SCOPE(n$0,n$1,n$2,n$3,n$4,n$5,n$6,s,q,t,x,r); [line 15, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&t:double [line 15, column 25]\n  n$1=*&s:double [line 15, column 20]\n  *&s:double=(n$1 + n$0) [line 15, column 20]\n  n$2=*&s:double [line 15, column 20]\n  n$3=*&r:double [line 15, column 14]\n  *&r:double=(n$3 + n$2) [line 15, column 14]\n  n$4=*&r:double [line 15, column 14]\n  n$5=*&x:double [line 15, column 8]\n  *&x:double=(n$5 + n$4) [line 15, column 8]\n  n$6=*&x:double [line 15, column 8]\n  *&q:double=n$6 [line 15, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$7=*&x:double [line 14, column 8]\n  *&x:double=(n$7 + 1.) [line 14, column 8]\n  n$8=*&x:double [line 14, column 8]\n  *&q:double=n$8 [line 14, column 3]\n  NULLIFY(&q); [line 14, column 3]\n  EXIT_SCOPE(n$7,n$8,q); [line 14, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$7=*&x:double [line 14, column 8]\n  *&x:double=(n$7 + 1.) [line 14, column 8]\n  n$8=*&x:double [line 14, column 8]\n  *&q:double=n$8 [line 14, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: AddAssign \n   n$9=*&x:double [line 13, column 3]\n  *&x:double=(n$9 + 7) [line 13, column 3]\n  EXIT_SCOPE(n$9); [line 13, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: AddAssign \n   n$9=*&x:double [line 13, column 3]\n  *&x:double=(n$9 + 7) [line 13, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   *&x:double=3 [line 12, column 8]\n  n$10=*&x:double [line 12, column 8]\n  *&q:double=n$10 [line 12, column 3]\n  NULLIFY(&q); [line 12, column 3]\n  EXIT_SCOPE(n$10,q); [line 12, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   *&x:double=3 [line 12, column 8]\n  n$10=*&x:double [line 12, column 8]\n  *&q:double=n$10 [line 12, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   n$11=*&s:double [line 11, column 7]\n  *&x:double=n$11 [line 11, column 3]\n  NULLIFY(&x); [line 11, column 3]\n  EXIT_SCOPE(n$11,x); [line 11, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   n$11=*&s:double [line 11, column 7]\n  *&x:double=n$11 [line 11, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(x:double); [line 9, column 3]\n  *&x:double=1. [line 9, column 3]\n  NULLIFY(&x); [line 9, column 3]\n  EXIT_SCOPE(x); [line 9, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(x:double); [line 9, column 3]\n  *&x:double=1. [line 9, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;

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

@@ -7,15 +7,15 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 35, column 3]\n  APPLY_ABSTRACTION; [line 35, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 35, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$x:anonymous_struct_nestedoperators_union.c:10:1* [line 34, column 11]\n  n$1=*n$0.b:int [line 34, column 11]\n  *&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$y.g.w:int=n$1 [line 34, column 3]\n  EXIT_SCOPE(n$0,n$1); [line 34, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$x:anonymous_struct_nestedoperators_union.c:10:1* [line 34, column 11]\n  n$1=*n$0.b:int [line 34, column 11]\n  *&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$y.g.w:int=n$1 [line 34, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=*&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$y.f:int [line 32, column 11]\n  *&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$y.g.u:int=n$2 [line 32, column 3]\n  EXIT_SCOPE(n$2); [line 32, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=*&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$y.f:int [line 32, column 11]\n  *&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$y.g.u:int=n$2 [line 32, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -23,7 +23,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   n$3=*&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$x:anonymous_struct_nestedoperators_union.c:10:1* [line 30, column 3]\n  *n$3.a:int=1 [line 30, column 3]\n  EXIT_SCOPE(n$3); [line 30, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   n$3=*&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$x:anonymous_struct_nestedoperators_union.c:10:1* [line 30, column 3]\n  *n$3.a:int=1 [line 30, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_2" [label="2: Exit test_offsetof_expr \n  " color=yellow style=filled]
 	
 
-"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_3" [label="3:  Return Stmt \n   *&return:int=42 [line 21, column 3]\n  APPLY_ABSTRACTION; [line 21, column 3]\n " shape="box"]
+"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_3" [label="3:  Return Stmt \n   *&return:int=42 [line 21, column 3]\n " shape="box"]
 	
 
 	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_3" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_2" ;
@@ -15,20 +15,20 @@ digraph cfg {
 	
 
 	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_4" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_3" ;
-"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_5" [label="5:  BinaryOperatorStmt: EQ \n   n$0=*&i:int [line 18, column 7]\n  NULLIFY(&i); [line 18, column 7]\n  EXIT_SCOPE(i); [line 18, column 7]\n " shape="box"]
+"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_5" [label="5:  BinaryOperatorStmt: EQ \n   n$0=*&i:int [line 18, column 7]\n " shape="box"]
 	
 
 	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_5" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_6" ;
 	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_5" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_7" ;
-"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_6" [label="6: Prune (true branch, if) \n   PRUNE((n$0 == 2), true); [line 18, column 7]\n  EXIT_SCOPE(n$0); [line 18, column 7]\n " shape="invhouse"]
+"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_6" [label="6: Prune (true branch, if) \n   PRUNE((n$0 == 2), true); [line 18, column 7]\n " shape="invhouse"]
 	
 
 	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_6" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_8" ;
-"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$0 == 2), false); [line 18, column 7]\n  EXIT_SCOPE(n$0); [line 18, column 7]\n " shape="invhouse"]
+"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$0 == 2), false); [line 18, column 7]\n " shape="invhouse"]
 	
 
 	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_7" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_4" ;
-"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_8" [label="8:  Return Stmt \n   *&return:int=(1 / 0) [line 19, column 5]\n  APPLY_ABSTRACTION; [line 19, column 5]\n " shape="box"]
+"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_8" [label="8:  Return Stmt \n   *&return:int=(1 / 0) [line 19, column 5]\n " shape="box"]
 	
 
 	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_8" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_2" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "getValue.faa0c7b1433b0c97fcdc15fa47c8180f_2" [label="2: Exit getValue \n  " color=yellow style=filled]
 	
 
-"getValue.faa0c7b1433b0c97fcdc15fa47c8180f_3" [label="3:  Return Stmt \n   *&return:int=1 [line 134, column 18]\n  APPLY_ABSTRACTION; [line 134, column 18]\n " shape="box"]
+"getValue.faa0c7b1433b0c97fcdc15fa47c8180f_3" [label="3:  Return Stmt \n   *&return:int=1 [line 134, column 18]\n " shape="box"]
 	
 
 	 "getValue.faa0c7b1433b0c97fcdc15fa47c8180f_3" -> "getValue.faa0c7b1433b0c97fcdc15fa47c8180f_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_2" [label="2: Exit switch_gnu_range \n  " color=yellow style=filled]
 	
 
-"switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_3" [label="3:  Return Stmt \n   n$0=*&i:int [line 209, column 10]\n  *&return:int=n$0 [line 209, column 3]\n  NULLIFY(&i); [line 209, column 3]\n  EXIT_SCOPE(n$0,i); [line 209, column 3]\n  APPLY_ABSTRACTION; [line 209, column 3]\n " shape="box"]
+"switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_3" [label="3:  Return Stmt \n   n$0=*&i:int [line 209, column 10]\n  *&return:int=n$0 [line 209, column 3]\n " shape="box"]
 	
 
 	 "switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_3" -> "switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_2" ;
@@ -27,23 +27,23 @@ digraph cfg {
 
 	 "switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_4" -> "switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_9" ;
 	 "switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_4" -> "switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_10" ;
-"switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_5" [label="5:  BinaryOperatorStmt: Assign \n   n$3=*&c:char [line 206, column 16]\n  n$4=_fun_atoi(n$3:int) [line 206, column 11]\n  *&i:int=n$4 [line 206, column 7]\n  NULLIFY(&c); [line 206, column 7]\n  EXIT_SCOPE(n$3,n$4,c); [line 206, column 7]\n  APPLY_ABSTRACTION; [line 206, column 7]\n " shape="box"]
+"switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_5" [label="5:  BinaryOperatorStmt: Assign \n   n$3=*&c:char [line 206, column 16]\n  n$4=_fun_atoi(n$3:int) [line 206, column 11]\n  *&i:int=n$4 [line 206, column 7]\n " shape="box"]
 	
 
 	 "switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_5" -> "switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_3" ;
-"switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_6" [label="6:  Return Stmt \n   *&return:int=0 [line 201, column 7]\n  APPLY_ABSTRACTION; [line 201, column 7]\n " shape="box"]
+"switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_6" [label="6:  Return Stmt \n   *&return:int=0 [line 201, column 7]\n " shape="box"]
 	
 
 	 "switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_6" -> "switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_2" ;
-"switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_7" [label="7: Prune (true branch, switch) \n   PRUNE((n$1 == 48), true); [line 203, column 5]\n  EXIT_SCOPE(n$1); [line 203, column 5]\n " shape="invhouse"]
+"switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_7" [label="7: Prune (true branch, switch) \n   PRUNE((n$1 == 48), true); [line 203, column 5]\n " shape="invhouse"]
 	
 
 	 "switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_7" -> "switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_5" ;
-"switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_8" [label="8: Prune (false branch, switch) \n   PRUNE(!(n$1 == 48), false); [line 203, column 5]\n  EXIT_SCOPE(n$1); [line 203, column 5]\n  APPLY_ABSTRACTION; [line 203, column 5]\n " shape="invhouse"]
+"switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_8" [label="8: Prune (false branch, switch) \n   PRUNE(!(n$1 == 48), false); [line 203, column 5]\n " shape="invhouse"]
 	
 
 	 "switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_8" -> "switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_3" ;
-"switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_9" [label="9: Prune (true branch, switch) \n   PRUNE((n$1 == 97), true); [line 200, column 5]\n  EXIT_SCOPE(n$1); [line 200, column 5]\n " shape="invhouse"]
+"switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_9" [label="9: Prune (true branch, switch) \n   PRUNE((n$1 == 97), true); [line 200, column 5]\n " shape="invhouse"]
 	
 
 	 "switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_9" -> "switch_gnu_range.fe09b2428ff32c71bce6cc22d05f5102_6" ;
@@ -59,7 +59,7 @@ digraph cfg {
 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_2" [label="2: Exit test_switch1 \n  " color=yellow style=filled]
 	
 
-"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_3" [label="3:  Return Stmt \n   *&return:int=0 [line 33, column 3]\n  APPLY_ABSTRACTION; [line 33, column 3]\n " shape="box"]
+"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_3" [label="3:  Return Stmt \n   *&return:int=0 [line 33, column 3]\n " shape="box"]
 	
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_3" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_2" ;
@@ -72,15 +72,15 @@ digraph cfg {
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_5" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_6" ;
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_5" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_7" ;
-"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_6" [label="6: Prune (true branch, while) \n   PRUNE((n$0 < 10), true); [line 13, column 10]\n  EXIT_SCOPE(n$0); [line 13, column 10]\n " shape="invhouse"]
+"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_6" [label="6: Prune (true branch, while) \n   PRUNE((n$0 < 10), true); [line 13, column 10]\n " shape="invhouse"]
 	
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_6" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_9" ;
-"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_7" [label="7: Prune (false branch, while) \n   PRUNE(!(n$0 < 10), false); [line 13, column 10]\n  NULLIFY(&value); [line 13, column 10]\n  EXIT_SCOPE(n$0,value); [line 13, column 10]\n " shape="invhouse"]
+"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_7" [label="7: Prune (false branch, while) \n   PRUNE(!(n$0 < 10), false); [line 13, column 10]\n " shape="invhouse"]
 	
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_7" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_3" ;
-"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_8" [label="8:  Call _fun_printf \n   n$1=_fun_printf(\"(after_switch)HELLO WORLD!\":char*) [line 31, column 5]\n  EXIT_SCOPE(n$1); [line 31, column 5]\n  APPLY_ABSTRACTION; [line 31, column 5]\n " shape="box"]
+"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_8" [label="8:  Call _fun_printf \n   n$1=_fun_printf(\"(after_switch)HELLO WORLD!\":char*) [line 31, column 5]\n " shape="box"]
 	
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_8" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_4" ;
@@ -89,19 +89,19 @@ digraph cfg {
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_9" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_20" ;
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_9" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_21" ;
-"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_10" [label="10:  Call _fun_printf \n   n$4=_fun_printf(\"(2/def)HELLO WORLD!\":char*) [line 28, column 9]\n  EXIT_SCOPE(n$4); [line 28, column 9]\n  APPLY_ABSTRACTION; [line 28, column 9]\n " shape="box"]
+"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_10" [label="10:  Call _fun_printf \n   n$4=_fun_printf(\"(2/def)HELLO WORLD!\":char*) [line 28, column 9]\n " shape="box"]
 	
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_10" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_4" ;
-"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_11" [label="11:  Call _fun_printf \n   n$6=_fun_printf(\"(1)HELLO WORLD!\":char*) [line 24, column 9]\n  EXIT_SCOPE(n$6); [line 24, column 9]\n  APPLY_ABSTRACTION; [line 24, column 9]\n " shape="box"]
+"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_11" [label="11:  Call _fun_printf \n   n$6=_fun_printf(\"(1)HELLO WORLD!\":char*) [line 24, column 9]\n " shape="box"]
 	
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_11" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_4" ;
-"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_12" [label="12:  Call _fun_printf \n   n$8=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 21, column 9]\n  EXIT_SCOPE(n$8); [line 21, column 9]\n " shape="box"]
+"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_12" [label="12:  Call _fun_printf \n   n$8=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 21, column 9]\n " shape="box"]
 	
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_12" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_8" ;
-"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_13" [label="13:  BinaryOperatorStmt: Assign \n   n$9=*&value:int [line 19, column 11]\n  *&x:int=(n$9 + 1) [line 19, column 7]\n  APPLY_ABSTRACTION; [line 19, column 7]\n " shape="box"]
+"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_13" [label="13:  BinaryOperatorStmt: Assign \n   n$9=*&value:int [line 19, column 11]\n  *&x:int=(n$9 + 1) [line 19, column 7]\n " shape="box"]
 	
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_13" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_12" ;
@@ -113,15 +113,15 @@ digraph cfg {
 	
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_15" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_14" ;
-"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_16" [label="16: Prune (true branch, switch) \n   PRUNE((n$2 == 2), true); [line 26, column 7]\n  EXIT_SCOPE(n$2); [line 26, column 7]\n  APPLY_ABSTRACTION; [line 26, column 7]\n " shape="invhouse"]
+"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_16" [label="16: Prune (true branch, switch) \n   PRUNE((n$2 == 2), true); [line 26, column 7]\n " shape="invhouse"]
 	
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_16" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_10" ;
-"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_17" [label="17: Prune (false branch, switch) \n   PRUNE(!(n$2 == 2), false); [line 26, column 7]\n  EXIT_SCOPE(n$2); [line 26, column 7]\n  APPLY_ABSTRACTION; [line 26, column 7]\n " shape="invhouse"]
+"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_17" [label="17: Prune (false branch, switch) \n   PRUNE(!(n$2 == 2), false); [line 26, column 7]\n " shape="invhouse"]
 	
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_17" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_10" ;
-"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_18" [label="18: Prune (true branch, switch) \n   PRUNE((n$2 == 1), true); [line 23, column 7]\n  EXIT_SCOPE(n$2); [line 23, column 7]\n " shape="invhouse"]
+"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_18" [label="18: Prune (true branch, switch) \n   PRUNE((n$2 == 1), true); [line 23, column 7]\n " shape="invhouse"]
 	
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_18" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_11" ;
@@ -130,7 +130,7 @@ digraph cfg {
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_19" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_16" ;
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_19" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_17" ;
-"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_20" [label="20: Prune (true branch, switch) \n   PRUNE((n$2 == 0), true); [line 20, column 7]\n  EXIT_SCOPE(n$2); [line 20, column 7]\n  APPLY_ABSTRACTION; [line 20, column 7]\n " shape="invhouse"]
+"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_20" [label="20: Prune (true branch, switch) \n   PRUNE((n$2 == 0), true); [line 20, column 7]\n " shape="invhouse"]
 	
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_20" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_12" ;
@@ -139,7 +139,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   VARIABLE_DECLARED(value:int); [line 11, column 3]\n  *&value:int=0 [line 11, column 3]\n  APPLY_ABSTRACTION; [line 11, column 3]\n " shape="box"]
+"test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_22" [label="22:  DeclStmt \n   VARIABLE_DECLARED(value:int); [line 11, column 3]\n  *&value:int=0 [line 11, column 3]\n " shape="box"]
 	
 
 	 "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_22" -> "test_switch1.7c92c7e14d1a0ee28a9ab29b22df5d3f_4" ;
@@ -150,15 +150,15 @@ digraph cfg {
 "test_switch10.8a4170d3888102a2491712a5ad55ad8d_2" [label="2: Exit test_switch10 \n  " color=yellow style=filled]
 	
 
-"test_switch10.8a4170d3888102a2491712a5ad55ad8d_3" [label="3:  Return Stmt \n   *&return:int=0 [line 185, column 3]\n  APPLY_ABSTRACTION; [line 185, column 3]\n " shape="box"]
+"test_switch10.8a4170d3888102a2491712a5ad55ad8d_3" [label="3:  Return Stmt \n   *&return:int=0 [line 185, column 3]\n " shape="box"]
 	
 
 	 "test_switch10.8a4170d3888102a2491712a5ad55ad8d_3" -> "test_switch10.8a4170d3888102a2491712a5ad55ad8d_2" ;
-"test_switch10.8a4170d3888102a2491712a5ad55ad8d_4" [label="4:  SwitchStmt \n   *&value:int=7 [line 184, column 11]\n  n$0=*&value:int [line 184, column 11]\n  NULLIFY(&value); [line 184, column 11]\n  EXIT_SCOPE(n$0,value); [line 184, column 11]\n " shape="box"]
+"test_switch10.8a4170d3888102a2491712a5ad55ad8d_4" [label="4:  SwitchStmt \n   *&value:int=7 [line 184, column 11]\n  n$0=*&value:int [line 184, column 11]\n " shape="box"]
 	
 
 	 "test_switch10.8a4170d3888102a2491712a5ad55ad8d_4" -> "test_switch10.8a4170d3888102a2491712a5ad55ad8d_3" ;
-"test_switch10.8a4170d3888102a2491712a5ad55ad8d_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(value:int); [line 183, column 3]\n  *&value:int=0 [line 183, column 3]\n  NULLIFY(&value); [line 183, column 3]\n  EXIT_SCOPE(value); [line 183, column 3]\n " shape="box"]
+"test_switch10.8a4170d3888102a2491712a5ad55ad8d_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(value:int); [line 183, column 3]\n  *&value:int=0 [line 183, column 3]\n " shape="box"]
 	
 
 	 "test_switch10.8a4170d3888102a2491712a5ad55ad8d_5" -> "test_switch10.8a4170d3888102a2491712a5ad55ad8d_4" ;
@@ -169,7 +169,7 @@ digraph cfg {
 "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_2" [label="2: Exit test_switch11 \n  " color=yellow style=filled]
 	
 
-"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_3" [label="3:  Return Stmt \n   *&return:int=0 [line 194, column 3]\n  APPLY_ABSTRACTION; [line 194, column 3]\n " shape="box"]
+"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_3" [label="3:  Return Stmt \n   *&return:int=0 [line 194, column 3]\n " shape="box"]
 	
 
 	 "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_3" -> "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_2" ;
@@ -177,41 +177,41 @@ digraph cfg {
 	
 
 	 "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_4" -> "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_10" ;
-"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_5" [label="5:  BinaryOperatorStmt: EQ \n   n$1=*&value:int [line 190, column 20]\n  NULLIFY(&value); [line 190, column 20]\n  EXIT_SCOPE(value); [line 190, column 20]\n " shape="box"]
+"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_5" [label="5:  BinaryOperatorStmt: EQ \n   n$1=*&value:int [line 190, column 20]\n " shape="box"]
 	
 
 	 "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_5" -> "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_6" ;
 	 "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_5" -> "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_7" ;
-"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_6" [label="6: Prune (true branch, boolean exp) \n   PRUNE((n$1 == 0), true); [line 190, column 20]\n  EXIT_SCOPE(n$1); [line 190, column 20]\n " shape="invhouse"]
+"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_6" [label="6: Prune (true branch, boolean exp) \n   PRUNE((n$1 == 0), true); [line 190, column 20]\n " shape="invhouse"]
 	
 
 	 "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_6" -> "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_8" ;
-"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_7" [label="7: Prune (false branch, boolean exp) \n   PRUNE(!(n$1 == 0), false); [line 190, column 20]\n  EXIT_SCOPE(n$1); [line 190, column 20]\n " shape="invhouse"]
+"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_7" [label="7: Prune (false branch, boolean exp) \n   PRUNE(!(n$1 == 0), false); [line 190, column 20]\n " shape="invhouse"]
 	
 
 	 "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_7" -> "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_9" ;
-"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=7 [line 190, column 20]\n  APPLY_ABSTRACTION; [line 190, column 20]\n " shape="box"]
+"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=7 [line 190, column 20]\n " shape="box"]
 	
 
 	 "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_8" -> "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_4" ;
-"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_9" [label="9:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=9 [line 190, column 20]\n  APPLY_ABSTRACTION; [line 190, column 20]\n " shape="box"]
+"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_9" [label="9:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=9 [line 190, column 20]\n " shape="box"]
 	
 
 	 "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_9" -> "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_4" ;
-"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_10" [label="10:  SwitchStmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 190, column 20]\n  *&value:int=n$2 [line 190, column 11]\n  n$3=*&value:int [line 190, column 11]\n  NULLIFY(&value); [line 190, column 11]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 190, column 11]\n  EXIT_SCOPE(n$2,value,0$?%__sil_tmpSIL_temp_conditional___n$0); [line 190, column 11]\n " shape="box"]
+"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_10" [label="10:  SwitchStmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 190, column 20]\n  *&value:int=n$2 [line 190, column 11]\n  n$3=*&value:int [line 190, column 11]\n " shape="box"]
 	
 
 	 "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_10" -> "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_12" ;
 	 "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_10" -> "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_13" ;
-"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_11" [label="11:  Call _fun_printf \n   n$4=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 192, column 7]\n  EXIT_SCOPE(n$4); [line 192, column 7]\n  APPLY_ABSTRACTION; [line 192, column 7]\n " shape="box"]
+"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_11" [label="11:  Call _fun_printf \n   n$4=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 192, column 7]\n " shape="box"]
 	
 
 	 "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_11" -> "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_3" ;
-"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$3 == 0), true); [line 191, column 5]\n  EXIT_SCOPE(n$3); [line 191, column 5]\n " shape="invhouse"]
+"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$3 == 0), true); [line 191, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_12" -> "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_11" ;
-"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_13" [label="13: Prune (false branch, switch) \n   PRUNE(!(n$3 == 0), false); [line 191, column 5]\n  EXIT_SCOPE(n$3); [line 191, column 5]\n  APPLY_ABSTRACTION; [line 191, column 5]\n " shape="invhouse"]
+"test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_13" [label="13: Prune (false branch, switch) \n   PRUNE(!(n$3 == 0), false); [line 191, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_13" -> "test_switch11.a1a6d859e414d268a57ed2a2bb6f8a8e_3" ;
@@ -226,20 +226,20 @@ digraph cfg {
 "test_switch2.0717c55583f10f472ddb2d73d867e556_2" [label="2: Exit test_switch2 \n  " color=yellow style=filled]
 	
 
-"test_switch2.0717c55583f10f472ddb2d73d867e556_3" [label="3:  Return Stmt \n   *&return:int=0 [line 56, column 3]\n  APPLY_ABSTRACTION; [line 56, column 3]\n " shape="box"]
+"test_switch2.0717c55583f10f472ddb2d73d867e556_3" [label="3:  Return Stmt \n   *&return:int=0 [line 56, column 3]\n " shape="box"]
 	
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_3" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_2" ;
-"test_switch2.0717c55583f10f472ddb2d73d867e556_4" [label="4:  SwitchStmt \n   n$0=*&value:int [line 38, column 11]\n  NULLIFY(&value); [line 38, column 11]\n  EXIT_SCOPE(value); [line 38, column 11]\n " shape="box"]
+"test_switch2.0717c55583f10f472ddb2d73d867e556_4" [label="4:  SwitchStmt \n   n$0=*&value:int [line 38, column 11]\n " shape="box"]
 	
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_4" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_16" ;
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_4" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_17" ;
-"test_switch2.0717c55583f10f472ddb2d73d867e556_5" [label="5:  BinaryOperatorStmt: Assign \n   *&z:int=42 [line 50, column 7]\n  NULLIFY(&z); [line 50, column 7]\n  EXIT_SCOPE(z); [line 50, column 7]\n  APPLY_ABSTRACTION; [line 50, column 7]\n " shape="box"]
+"test_switch2.0717c55583f10f472ddb2d73d867e556_5" [label="5:  BinaryOperatorStmt: Assign \n   *&z:int=42 [line 50, column 7]\n " shape="box"]
 	
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_5" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_3" ;
-"test_switch2.0717c55583f10f472ddb2d73d867e556_6" [label="6:  UnaryOperator \n   n$3=*&something:int [line 48, column 7]\n  *&something:int=(n$3 + 1) [line 48, column 7]\n  NULLIFY(&something); [line 48, column 7]\n  EXIT_SCOPE(n$3,something); [line 48, column 7]\n " shape="box"]
+"test_switch2.0717c55583f10f472ddb2d73d867e556_6" [label="6:  UnaryOperator \n   n$3=*&something:int [line 48, column 7]\n  *&something:int=(n$3 + 1) [line 48, column 7]\n " shape="box"]
 	
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_6" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_5" ;
@@ -247,23 +247,23 @@ digraph cfg {
 	
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_7" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_6" ;
-"test_switch2.0717c55583f10f472ddb2d73d867e556_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(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   VARIABLE_DECLARED(z:int); [line 43, column 7]\n  *&z:int=9 [line 43, column 7]\n " shape="box"]
 	
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_8" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_7" ;
-"test_switch2.0717c55583f10f472ddb2d73d867e556_9" [label="9:  Call _fun_printf \n   n$5=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 41, column 7]\n  EXIT_SCOPE(n$5); [line 41, column 7]\n  APPLY_ABSTRACTION; [line 41, column 7]\n " shape="box"]
+"test_switch2.0717c55583f10f472ddb2d73d867e556_9" [label="9:  Call _fun_printf \n   n$5=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 41, column 7]\n " shape="box"]
 	
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_9" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_3" ;
-"test_switch2.0717c55583f10f472ddb2d73d867e556_10" [label="10: Prune (true branch, switch) \n   PRUNE((n$0 == 3), true); [line 53, column 5]\n  APPLY_ABSTRACTION; [line 53, column 5]\n " shape="invhouse"]
+"test_switch2.0717c55583f10f472ddb2d73d867e556_10" [label="10: Prune (true branch, switch) \n   PRUNE((n$0 == 3), true); [line 53, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_10" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_3" ;
-"test_switch2.0717c55583f10f472ddb2d73d867e556_11" [label="11: Prune (false branch, switch) \n   PRUNE(!(n$0 == 3), false); [line 53, column 5]\n  APPLY_ABSTRACTION; [line 53, column 5]\n " shape="invhouse"]
+"test_switch2.0717c55583f10f472ddb2d73d867e556_11" [label="11: Prune (false branch, switch) \n   PRUNE(!(n$0 == 3), false); [line 53, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_11" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_3" ;
-"test_switch2.0717c55583f10f472ddb2d73d867e556_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$0 == 2), true); [line 52, column 5]\n  APPLY_ABSTRACTION; [line 52, column 5]\n " shape="invhouse"]
+"test_switch2.0717c55583f10f472ddb2d73d867e556_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$0 == 2), true); [line 52, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_12" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_3" ;
@@ -272,7 +272,7 @@ digraph cfg {
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_13" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_10" ;
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_13" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_11" ;
-"test_switch2.0717c55583f10f472ddb2d73d867e556_14" [label="14: Prune (true branch, switch) \n   PRUNE((n$0 == 1), true); [line 46, column 5]\n  APPLY_ABSTRACTION; [line 46, column 5]\n " shape="invhouse"]
+"test_switch2.0717c55583f10f472ddb2d73d867e556_14" [label="14: Prune (true branch, switch) \n   PRUNE((n$0 == 1), true); [line 46, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_14" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_7" ;
@@ -281,11 +281,11 @@ digraph cfg {
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_15" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_12" ;
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_15" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_13" ;
-"test_switch2.0717c55583f10f472ddb2d73d867e556_16" [label="16: Prune (true branch, switch) \n   PRUNE((n$0 == 0), true); [line 40, column 5]\n  EXIT_SCOPE(n$0); [line 40, column 5]\n " shape="invhouse"]
+"test_switch2.0717c55583f10f472ddb2d73d867e556_16" [label="16: Prune (true branch, switch) \n   PRUNE((n$0 == 0), true); [line 40, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_16" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_9" ;
-"test_switch2.0717c55583f10f472ddb2d73d867e556_17" [label="17: Prune (false branch, switch) \n   PRUNE(!(n$0 == 0), false); [line 40, column 5]\n  EXIT_SCOPE(n$0); [line 40, column 5]\n  APPLY_ABSTRACTION; [line 40, column 5]\n " shape="invhouse"]
+"test_switch2.0717c55583f10f472ddb2d73d867e556_17" [label="17: Prune (false branch, switch) \n   PRUNE(!(n$0 == 0), false); [line 40, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch2.0717c55583f10f472ddb2d73d867e556_17" -> "test_switch2.0717c55583f10f472ddb2d73d867e556_7" ;
@@ -300,20 +300,20 @@ digraph cfg {
 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_2" [label="2: Exit test_switch3 \n  " color=yellow style=filled]
 	
 
-"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_3" [label="3:  Return Stmt \n   *&return:int=0 [line 74, column 3]\n  APPLY_ABSTRACTION; [line 74, column 3]\n " shape="box"]
+"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_3" [label="3:  Return Stmt \n   *&return:int=0 [line 74, column 3]\n " shape="box"]
 	
 
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_3" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_2" ;
-"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_4" [label="4:  SwitchStmt \n   n$0=*&value:int [line 61, column 11]\n  NULLIFY(&value); [line 61, column 11]\n  EXIT_SCOPE(value); [line 61, column 11]\n " shape="box"]
+"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_4" [label="4:  SwitchStmt \n   n$0=*&value:int [line 61, column 11]\n " shape="box"]
 	
 
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_4" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_15" ;
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_4" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_16" ;
-"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(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   VARIABLE_DECLARED(z:int); [line 69, column 7]\n  *&z:int=9 [line 69, column 7]\n " shape="box"]
 	
 
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_5" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_3" ;
-"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_6" [label="6:  UnaryOperator \n   n$3=*&something:int [line 67, column 7]\n  *&something:int=(n$3 + 1) [line 67, column 7]\n  NULLIFY(&something); [line 67, column 7]\n  EXIT_SCOPE(n$3,something); [line 67, column 7]\n  APPLY_ABSTRACTION; [line 67, column 7]\n " shape="box"]
+"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_6" [label="6:  UnaryOperator \n   n$3=*&something:int [line 67, column 7]\n  *&something:int=(n$3 + 1) [line 67, column 7]\n " shape="box"]
 	
 
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_6" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_3" ;
@@ -321,19 +321,19 @@ digraph cfg {
 	
 
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_7" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_6" ;
-"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_8" [label="8:  Call _fun_printf \n   n$5=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 63, column 7]\n  EXIT_SCOPE(n$5); [line 63, column 7]\n  APPLY_ABSTRACTION; [line 63, column 7]\n " shape="box"]
+"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_8" [label="8:  Call _fun_printf \n   n$5=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 63, column 7]\n " shape="box"]
 	
 
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_8" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_3" ;
-"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_9" [label="9: Prune (true branch, switch) \n   PRUNE((n$0 == 3), true); [line 71, column 5]\n  EXIT_SCOPE(n$0); [line 71, column 5]\n  APPLY_ABSTRACTION; [line 71, column 5]\n " shape="invhouse"]
+"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_9" [label="9: Prune (true branch, switch) \n   PRUNE((n$0 == 3), true); [line 71, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_9" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_3" ;
-"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_10" [label="10: Prune (false branch, switch) \n   PRUNE(!(n$0 == 3), false); [line 71, column 5]\n  EXIT_SCOPE(n$0); [line 71, column 5]\n  APPLY_ABSTRACTION; [line 71, column 5]\n " shape="invhouse"]
+"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_10" [label="10: Prune (false branch, switch) \n   PRUNE(!(n$0 == 3), false); [line 71, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_10" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_3" ;
-"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_11" [label="11: Prune (true branch, switch) \n   PRUNE((n$0 == 2), true); [line 70, column 5]\n  EXIT_SCOPE(n$0); [line 70, column 5]\n  APPLY_ABSTRACTION; [line 70, column 5]\n " shape="invhouse"]
+"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_11" [label="11: Prune (true branch, switch) \n   PRUNE((n$0 == 2), true); [line 70, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_11" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_3" ;
@@ -342,7 +342,7 @@ digraph cfg {
 
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_12" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_9" ;
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_12" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_10" ;
-"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_13" [label="13: Prune (true branch, switch) \n   PRUNE((n$0 == 1), true); [line 65, column 5]\n  EXIT_SCOPE(n$0); [line 65, column 5]\n " shape="invhouse"]
+"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_13" [label="13: Prune (true branch, switch) \n   PRUNE((n$0 == 1), true); [line 65, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_13" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_7" ;
@@ -351,7 +351,7 @@ digraph cfg {
 
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_14" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_11" ;
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_14" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_12" ;
-"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_15" [label="15: Prune (true branch, switch) \n   PRUNE((n$0 == 0), true); [line 62, column 5]\n  EXIT_SCOPE(n$0); [line 62, column 5]\n " shape="invhouse"]
+"test_switch3.d602e3f7cc0068667fd33a3e54ff193c_15" [label="15: Prune (true branch, switch) \n   PRUNE((n$0 == 0), true); [line 62, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_15" -> "test_switch3.d602e3f7cc0068667fd33a3e54ff193c_8" ;
@@ -371,20 +371,20 @@ digraph cfg {
 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_2" [label="2: Exit test_switch4 \n  " color=yellow style=filled]
 	
 
-"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_3" [label="3:  Return Stmt \n   *&return:int=0 [line 97, column 3]\n  APPLY_ABSTRACTION; [line 97, column 3]\n " shape="box"]
+"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_3" [label="3:  Return Stmt \n   *&return:int=0 [line 97, column 3]\n " shape="box"]
 	
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_3" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_2" ;
-"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_4" [label="4:  SwitchStmt \n   n$0=*&value:int [line 79, column 11]\n  NULLIFY(&value); [line 79, column 11]\n  EXIT_SCOPE(value); [line 79, column 11]\n " shape="box"]
+"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_4" [label="4:  SwitchStmt \n   n$0=*&value:int [line 79, column 11]\n " shape="box"]
 	
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_4" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_16" ;
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_4" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_17" ;
-"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_5" [label="5:  BinaryOperatorStmt: Assign \n   *&z:int=42 [line 91, column 7]\n  NULLIFY(&z); [line 91, column 7]\n  EXIT_SCOPE(z); [line 91, column 7]\n  APPLY_ABSTRACTION; [line 91, column 7]\n " shape="box"]
+"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_5" [label="5:  BinaryOperatorStmt: Assign \n   *&z:int=42 [line 91, column 7]\n " shape="box"]
 	
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_5" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_3" ;
-"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_6" [label="6:  UnaryOperator \n   n$3=*&something:int [line 89, column 7]\n  *&something:int=(n$3 + 1) [line 89, column 7]\n  NULLIFY(&something); [line 89, column 7]\n  EXIT_SCOPE(n$3,something); [line 89, column 7]\n " shape="box"]
+"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_6" [label="6:  UnaryOperator \n   n$3=*&something:int [line 89, column 7]\n  *&something:int=(n$3 + 1) [line 89, column 7]\n " shape="box"]
 	
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_6" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_5" ;
@@ -392,23 +392,23 @@ digraph cfg {
 	
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_7" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_6" ;
-"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(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   VARIABLE_DECLARED(z:int); [line 84, column 7]\n  *&z:int=9 [line 84, column 7]\n " shape="box"]
 	
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_8" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_7" ;
-"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_9" [label="9:  Call _fun_printf \n   n$5=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 82, column 7]\n  EXIT_SCOPE(n$5); [line 82, column 7]\n  APPLY_ABSTRACTION; [line 82, column 7]\n " shape="box"]
+"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_9" [label="9:  Call _fun_printf \n   n$5=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 82, column 7]\n " shape="box"]
 	
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_9" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_3" ;
-"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_10" [label="10: Prune (true branch, switch) \n   PRUNE((n$0 == 3), true); [line 94, column 5]\n  APPLY_ABSTRACTION; [line 94, column 5]\n " shape="invhouse"]
+"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_10" [label="10: Prune (true branch, switch) \n   PRUNE((n$0 == 3), true); [line 94, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_10" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_3" ;
-"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_11" [label="11: Prune (false branch, switch) \n   PRUNE(!(n$0 == 3), false); [line 94, column 5]\n  APPLY_ABSTRACTION; [line 94, column 5]\n " shape="invhouse"]
+"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_11" [label="11: Prune (false branch, switch) \n   PRUNE(!(n$0 == 3), false); [line 94, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_11" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_3" ;
-"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$0 == 2), true); [line 93, column 5]\n  APPLY_ABSTRACTION; [line 93, column 5]\n " shape="invhouse"]
+"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$0 == 2), true); [line 93, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_12" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_3" ;
@@ -417,7 +417,7 @@ digraph cfg {
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_13" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_10" ;
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_13" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_11" ;
-"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_14" [label="14: Prune (true branch, switch) \n   PRUNE((n$0 == 1), true); [line 87, column 5]\n  APPLY_ABSTRACTION; [line 87, column 5]\n " shape="invhouse"]
+"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_14" [label="14: Prune (true branch, switch) \n   PRUNE((n$0 == 1), true); [line 87, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_14" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_7" ;
@@ -426,11 +426,11 @@ digraph cfg {
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_15" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_12" ;
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_15" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_13" ;
-"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_16" [label="16: Prune (true branch, switch) \n   PRUNE((n$0 == 0), true); [line 81, column 5]\n  EXIT_SCOPE(n$0); [line 81, column 5]\n " shape="invhouse"]
+"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_16" [label="16: Prune (true branch, switch) \n   PRUNE((n$0 == 0), true); [line 81, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_16" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_9" ;
-"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_17" [label="17: Prune (false branch, switch) \n   PRUNE(!(n$0 == 0), false); [line 81, column 5]\n  EXIT_SCOPE(n$0); [line 81, column 5]\n  APPLY_ABSTRACTION; [line 81, column 5]\n " shape="invhouse"]
+"test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_17" [label="17: Prune (false branch, switch) \n   PRUNE(!(n$0 == 0), false); [line 81, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_17" -> "test_switch4.70d4e6e8539e8d1ee3505d4562bc236d_7" ;
@@ -445,7 +445,7 @@ digraph cfg {
 "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_2" [label="2: Exit test_switch5 \n  " color=yellow style=filled]
 	
 
-"test_switch5.1d93fcc376cd01517eabe22cb325bcfd_3" [label="3:  Return Stmt \n   *&return:int=0 [line 113, column 3]\n  APPLY_ABSTRACTION; [line 113, column 3]\n " shape="box"]
+"test_switch5.1d93fcc376cd01517eabe22cb325bcfd_3" [label="3:  Return Stmt \n   *&return:int=0 [line 113, column 3]\n " shape="box"]
 	
 
 	 "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_3" -> "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_2" ;
@@ -458,11 +458,11 @@ digraph cfg {
 
 	 "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_5" -> "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_6" ;
 	 "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_5" -> "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_7" ;
-"test_switch5.1d93fcc376cd01517eabe22cb325bcfd_6" [label="6: Prune (true branch, while) \n   PRUNE((n$0 < 10), true); [line 102, column 10]\n  EXIT_SCOPE(n$0); [line 102, column 10]\n " shape="invhouse"]
+"test_switch5.1d93fcc376cd01517eabe22cb325bcfd_6" [label="6: Prune (true branch, while) \n   PRUNE((n$0 < 10), true); [line 102, column 10]\n " shape="invhouse"]
 	
 
 	 "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_6" -> "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_8" ;
-"test_switch5.1d93fcc376cd01517eabe22cb325bcfd_7" [label="7: Prune (false branch, while) \n   PRUNE(!(n$0 < 10), false); [line 102, column 10]\n  NULLIFY(&value); [line 102, column 10]\n  EXIT_SCOPE(n$0,value); [line 102, column 10]\n " shape="invhouse"]
+"test_switch5.1d93fcc376cd01517eabe22cb325bcfd_7" [label="7: Prune (false branch, while) \n   PRUNE(!(n$0 < 10), false); [line 102, column 10]\n " shape="invhouse"]
 	
 
 	 "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_7" -> "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_3" ;
@@ -471,11 +471,11 @@ digraph cfg {
 
 	 "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_8" -> "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_12" ;
 	 "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_8" -> "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_13" ;
-"test_switch5.1d93fcc376cd01517eabe22cb325bcfd_9" [label="9:  Call _fun_printf \n   n$3=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 109, column 9]\n  EXIT_SCOPE(n$3); [line 109, column 9]\n  APPLY_ABSTRACTION; [line 109, column 9]\n " shape="box"]
+"test_switch5.1d93fcc376cd01517eabe22cb325bcfd_9" [label="9:  Call _fun_printf \n   n$3=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 109, column 9]\n " shape="box"]
 	
 
 	 "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_9" -> "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_4" ;
-"test_switch5.1d93fcc376cd01517eabe22cb325bcfd_10" [label="10:  BinaryOperatorStmt: Assign \n   n$5=*&value:int [line 106, column 11]\n  *&x:int=(n$5 + 1) [line 106, column 7]\n  APPLY_ABSTRACTION; [line 106, column 7]\n " shape="box"]
+"test_switch5.1d93fcc376cd01517eabe22cb325bcfd_10" [label="10:  BinaryOperatorStmt: Assign \n   n$5=*&value:int [line 106, column 11]\n  *&x:int=(n$5 + 1) [line 106, column 7]\n " shape="box"]
 	
 
 	 "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_10" -> "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_4" ;
@@ -483,15 +483,15 @@ digraph cfg {
 	
 
 	 "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_11" -> "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_10" ;
-"test_switch5.1d93fcc376cd01517eabe22cb325bcfd_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$1 == 0), true); [line 108, column 7]\n  EXIT_SCOPE(n$1); [line 108, column 7]\n " shape="invhouse"]
+"test_switch5.1d93fcc376cd01517eabe22cb325bcfd_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$1 == 0), true); [line 108, column 7]\n " shape="invhouse"]
 	
 
 	 "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_12" -> "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_9" ;
-"test_switch5.1d93fcc376cd01517eabe22cb325bcfd_13" [label="13: Prune (false branch, switch) \n   PRUNE(!(n$1 == 0), false); [line 108, column 7]\n  EXIT_SCOPE(n$1); [line 108, column 7]\n  APPLY_ABSTRACTION; [line 108, column 7]\n " shape="invhouse"]
+"test_switch5.1d93fcc376cd01517eabe22cb325bcfd_13" [label="13: Prune (false branch, switch) \n   PRUNE(!(n$1 == 0), false); [line 108, column 7]\n " shape="invhouse"]
 	
 
 	 "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_13" -> "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_4" ;
-"test_switch5.1d93fcc376cd01517eabe22cb325bcfd_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(value:int); [line 101, column 3]\n  *&value:int=0 [line 101, column 3]\n  APPLY_ABSTRACTION; [line 101, column 3]\n " shape="box"]
+"test_switch5.1d93fcc376cd01517eabe22cb325bcfd_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(value:int); [line 101, column 3]\n  *&value:int=0 [line 101, column 3]\n " shape="box"]
 	
 
 	 "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_14" -> "test_switch5.1d93fcc376cd01517eabe22cb325bcfd_4" ;
@@ -502,7 +502,7 @@ digraph cfg {
 "test_switch6.a23e54b3840073f4ece330ef3c560915_2" [label="2: Exit test_switch6 \n  " color=yellow style=filled]
 	
 
-"test_switch6.a23e54b3840073f4ece330ef3c560915_3" [label="3:  Return Stmt \n   *&return:int=0 [line 131, column 3]\n  APPLY_ABSTRACTION; [line 131, column 3]\n " shape="box"]
+"test_switch6.a23e54b3840073f4ece330ef3c560915_3" [label="3:  Return Stmt \n   *&return:int=0 [line 131, column 3]\n " shape="box"]
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_3" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_2" ;
@@ -510,37 +510,37 @@ digraph cfg {
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_4" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_10" ;
-"test_switch6.a23e54b3840073f4ece330ef3c560915_5" [label="5:  BinaryOperatorStmt: GT \n   n$1=*&value:int [line 118, column 11]\n  NULLIFY(&value); [line 118, column 11]\n  EXIT_SCOPE(value); [line 118, column 11]\n " shape="box"]
+"test_switch6.a23e54b3840073f4ece330ef3c560915_5" [label="5:  BinaryOperatorStmt: GT \n   n$1=*&value:int [line 118, column 11]\n " shape="box"]
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_5" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_6" ;
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_5" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_7" ;
-"test_switch6.a23e54b3840073f4ece330ef3c560915_6" [label="6: Prune (true branch, boolean exp) \n   PRUNE((n$1 > 0), true); [line 118, column 11]\n  EXIT_SCOPE(n$1); [line 118, column 11]\n " shape="invhouse"]
+"test_switch6.a23e54b3840073f4ece330ef3c560915_6" [label="6: Prune (true branch, boolean exp) \n   PRUNE((n$1 > 0), true); [line 118, column 11]\n " shape="invhouse"]
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_6" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_8" ;
-"test_switch6.a23e54b3840073f4ece330ef3c560915_7" [label="7: Prune (false branch, boolean exp) \n   PRUNE(!(n$1 > 0), false); [line 118, column 11]\n  EXIT_SCOPE(n$1); [line 118, column 11]\n " shape="invhouse"]
+"test_switch6.a23e54b3840073f4ece330ef3c560915_7" [label="7: Prune (false branch, boolean exp) \n   PRUNE(!(n$1 > 0), false); [line 118, column 11]\n " shape="invhouse"]
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_7" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_9" ;
-"test_switch6.a23e54b3840073f4ece330ef3c560915_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 118, column 11]\n  APPLY_ABSTRACTION; [line 118, column 11]\n " shape="box"]
+"test_switch6.a23e54b3840073f4ece330ef3c560915_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 118, column 11]\n " shape="box"]
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_8" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_4" ;
-"test_switch6.a23e54b3840073f4ece330ef3c560915_9" [label="9:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 118, column 11]\n  APPLY_ABSTRACTION; [line 118, column 11]\n " shape="box"]
+"test_switch6.a23e54b3840073f4ece330ef3c560915_9" [label="9:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 118, column 11]\n " shape="box"]
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_9" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_4" ;
-"test_switch6.a23e54b3840073f4ece330ef3c560915_10" [label="10:  SwitchStmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 118, column 11]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 118, column 11]\n  EXIT_SCOPE(0$?%__sil_tmpSIL_temp_conditional___n$0); [line 118, column 11]\n " shape="box"]
+"test_switch6.a23e54b3840073f4ece330ef3c560915_10" [label="10:  SwitchStmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 118, column 11]\n " shape="box"]
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_10" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_21" ;
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_10" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_22" ;
-"test_switch6.a23e54b3840073f4ece330ef3c560915_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(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   VARIABLE_DECLARED(z:int); [line 126, column 7]\n  *&z:int=9 [line 126, column 7]\n " shape="box"]
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_11" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_3" ;
-"test_switch6.a23e54b3840073f4ece330ef3c560915_12" [label="12:  UnaryOperator \n   n$5=*&something:int [line 124, column 7]\n  *&something:int=(n$5 + 1) [line 124, column 7]\n  NULLIFY(&something); [line 124, column 7]\n  EXIT_SCOPE(n$5,something); [line 124, column 7]\n  APPLY_ABSTRACTION; [line 124, column 7]\n " shape="box"]
+"test_switch6.a23e54b3840073f4ece330ef3c560915_12" [label="12:  UnaryOperator \n   n$5=*&something:int [line 124, column 7]\n  *&something:int=(n$5 + 1) [line 124, column 7]\n " shape="box"]
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_12" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_3" ;
@@ -548,19 +548,19 @@ digraph cfg {
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_13" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_12" ;
-"test_switch6.a23e54b3840073f4ece330ef3c560915_14" [label="14:  Call _fun_printf \n   n$7=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 120, column 7]\n  EXIT_SCOPE(n$7); [line 120, column 7]\n  APPLY_ABSTRACTION; [line 120, column 7]\n " shape="box"]
+"test_switch6.a23e54b3840073f4ece330ef3c560915_14" [label="14:  Call _fun_printf \n   n$7=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 120, column 7]\n " shape="box"]
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_14" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_3" ;
-"test_switch6.a23e54b3840073f4ece330ef3c560915_15" [label="15: Prune (true branch, switch) \n   PRUNE((n$2 == 3), true); [line 128, column 5]\n  EXIT_SCOPE(n$2); [line 128, column 5]\n  APPLY_ABSTRACTION; [line 128, column 5]\n " shape="invhouse"]
+"test_switch6.a23e54b3840073f4ece330ef3c560915_15" [label="15: Prune (true branch, switch) \n   PRUNE((n$2 == 3), true); [line 128, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_15" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_3" ;
-"test_switch6.a23e54b3840073f4ece330ef3c560915_16" [label="16: Prune (false branch, switch) \n   PRUNE(!(n$2 == 3), false); [line 128, column 5]\n  EXIT_SCOPE(n$2); [line 128, column 5]\n  APPLY_ABSTRACTION; [line 128, column 5]\n " shape="invhouse"]
+"test_switch6.a23e54b3840073f4ece330ef3c560915_16" [label="16: Prune (false branch, switch) \n   PRUNE(!(n$2 == 3), false); [line 128, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_16" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_3" ;
-"test_switch6.a23e54b3840073f4ece330ef3c560915_17" [label="17: Prune (true branch, switch) \n   PRUNE((n$2 == 2), true); [line 127, column 5]\n  EXIT_SCOPE(n$2); [line 127, column 5]\n  APPLY_ABSTRACTION; [line 127, column 5]\n " shape="invhouse"]
+"test_switch6.a23e54b3840073f4ece330ef3c560915_17" [label="17: Prune (true branch, switch) \n   PRUNE((n$2 == 2), true); [line 127, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_17" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_3" ;
@@ -569,7 +569,7 @@ digraph cfg {
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_18" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_15" ;
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_18" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_16" ;
-"test_switch6.a23e54b3840073f4ece330ef3c560915_19" [label="19: Prune (true branch, switch) \n   PRUNE((n$2 == 1), true); [line 122, column 5]\n  EXIT_SCOPE(n$2); [line 122, column 5]\n " shape="invhouse"]
+"test_switch6.a23e54b3840073f4ece330ef3c560915_19" [label="19: Prune (true branch, switch) \n   PRUNE((n$2 == 1), true); [line 122, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_19" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_13" ;
@@ -578,7 +578,7 @@ digraph cfg {
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_20" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_17" ;
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_20" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_18" ;
-"test_switch6.a23e54b3840073f4ece330ef3c560915_21" [label="21: Prune (true branch, switch) \n   PRUNE((n$2 == 0), true); [line 119, column 5]\n  EXIT_SCOPE(n$2); [line 119, column 5]\n " shape="invhouse"]
+"test_switch6.a23e54b3840073f4ece330ef3c560915_21" [label="21: Prune (true branch, switch) \n   PRUNE((n$2 == 0), true); [line 119, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch6.a23e54b3840073f4ece330ef3c560915_21" -> "test_switch6.a23e54b3840073f4ece330ef3c560915_14" ;
@@ -598,7 +598,7 @@ digraph cfg {
 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_2" [label="2: Exit test_switch7 \n  " color=yellow style=filled]
 	
 
-"test_switch7.8298274f5578f21bdddf71ffa79afcb8_3" [label="3:  Return Stmt \n   *&return:int=0 [line 151, column 3]\n  APPLY_ABSTRACTION; [line 151, column 3]\n " shape="box"]
+"test_switch7.8298274f5578f21bdddf71ffa79afcb8_3" [label="3:  Return Stmt \n   *&return:int=0 [line 151, column 3]\n " shape="box"]
 	
 
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_3" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_2" ;
@@ -607,11 +607,11 @@ 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   VARIABLE_DECLARED(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   VARIABLE_DECLARED(z:int); [line 146, column 7]\n  *&z:int=9 [line 146, column 7]\n " shape="box"]
 	
 
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_5" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_3" ;
-"test_switch7.8298274f5578f21bdddf71ffa79afcb8_6" [label="6:  UnaryOperator \n   n$3=*&something:int [line 144, column 7]\n  *&something:int=(n$3 + 1) [line 144, column 7]\n  NULLIFY(&something); [line 144, column 7]\n  EXIT_SCOPE(n$3,something); [line 144, column 7]\n  APPLY_ABSTRACTION; [line 144, column 7]\n " shape="box"]
+"test_switch7.8298274f5578f21bdddf71ffa79afcb8_6" [label="6:  UnaryOperator \n   n$3=*&something:int [line 144, column 7]\n  *&something:int=(n$3 + 1) [line 144, column 7]\n " shape="box"]
 	
 
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_6" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_3" ;
@@ -619,19 +619,19 @@ digraph cfg {
 	
 
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_7" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_6" ;
-"test_switch7.8298274f5578f21bdddf71ffa79afcb8_8" [label="8:  Call _fun_printf \n   n$5=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 140, column 7]\n  EXIT_SCOPE(n$5); [line 140, column 7]\n  APPLY_ABSTRACTION; [line 140, column 7]\n " shape="box"]
+"test_switch7.8298274f5578f21bdddf71ffa79afcb8_8" [label="8:  Call _fun_printf \n   n$5=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 140, column 7]\n " shape="box"]
 	
 
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_8" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_3" ;
-"test_switch7.8298274f5578f21bdddf71ffa79afcb8_9" [label="9: Prune (true branch, switch) \n   PRUNE((n$0 == 3), true); [line 148, column 5]\n  EXIT_SCOPE(n$0); [line 148, column 5]\n  APPLY_ABSTRACTION; [line 148, column 5]\n " shape="invhouse"]
+"test_switch7.8298274f5578f21bdddf71ffa79afcb8_9" [label="9: Prune (true branch, switch) \n   PRUNE((n$0 == 3), true); [line 148, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_9" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_3" ;
-"test_switch7.8298274f5578f21bdddf71ffa79afcb8_10" [label="10: Prune (false branch, switch) \n   PRUNE(!(n$0 == 3), false); [line 148, column 5]\n  EXIT_SCOPE(n$0); [line 148, column 5]\n  APPLY_ABSTRACTION; [line 148, column 5]\n " shape="invhouse"]
+"test_switch7.8298274f5578f21bdddf71ffa79afcb8_10" [label="10: Prune (false branch, switch) \n   PRUNE(!(n$0 == 3), false); [line 148, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_10" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_3" ;
-"test_switch7.8298274f5578f21bdddf71ffa79afcb8_11" [label="11: Prune (true branch, switch) \n   PRUNE((n$0 == 2), true); [line 147, column 5]\n  EXIT_SCOPE(n$0); [line 147, column 5]\n  APPLY_ABSTRACTION; [line 147, column 5]\n " shape="invhouse"]
+"test_switch7.8298274f5578f21bdddf71ffa79afcb8_11" [label="11: Prune (true branch, switch) \n   PRUNE((n$0 == 2), true); [line 147, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_11" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_3" ;
@@ -640,7 +640,7 @@ digraph cfg {
 
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_12" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_9" ;
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_12" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_10" ;
-"test_switch7.8298274f5578f21bdddf71ffa79afcb8_13" [label="13: Prune (true branch, switch) \n   PRUNE((n$0 == 1), true); [line 142, column 5]\n  EXIT_SCOPE(n$0); [line 142, column 5]\n " shape="invhouse"]
+"test_switch7.8298274f5578f21bdddf71ffa79afcb8_13" [label="13: Prune (true branch, switch) \n   PRUNE((n$0 == 1), true); [line 142, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_13" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_7" ;
@@ -649,7 +649,7 @@ digraph cfg {
 
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_14" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_11" ;
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_14" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_12" ;
-"test_switch7.8298274f5578f21bdddf71ffa79afcb8_15" [label="15: Prune (true branch, switch) \n   PRUNE((n$0 == 0), true); [line 139, column 5]\n  EXIT_SCOPE(n$0); [line 139, column 5]\n " shape="invhouse"]
+"test_switch7.8298274f5578f21bdddf71ffa79afcb8_15" [label="15: Prune (true branch, switch) \n   PRUNE((n$0 == 0), true); [line 139, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_15" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_8" ;
@@ -658,7 +658,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   VARIABLE_DECLARED(value:int); [line 137, column 3]\n  *&value:int=0 [line 137, column 3]\n  NULLIFY(&value); [line 137, column 3]\n  EXIT_SCOPE(value); [line 137, column 3]\n " shape="box"]
+"test_switch7.8298274f5578f21bdddf71ffa79afcb8_17" [label="17:  DeclStmt \n   VARIABLE_DECLARED(value:int); [line 137, column 3]\n  *&value:int=0 [line 137, column 3]\n " shape="box"]
 	
 
 	 "test_switch7.8298274f5578f21bdddf71ffa79afcb8_17" -> "test_switch7.8298274f5578f21bdddf71ffa79afcb8_4" ;
@@ -669,7 +669,7 @@ digraph cfg {
 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_2" [label="2: Exit test_switch8 \n  " color=yellow style=filled]
 	
 
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_3" [label="3:  Return Stmt \n   *&return:int=0 [line 173, column 3]\n  APPLY_ABSTRACTION; [line 173, column 3]\n " shape="box"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_3" [label="3:  Return Stmt \n   *&return:int=0 [line 173, column 3]\n " shape="box"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_3" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_2" ;
@@ -682,15 +682,15 @@ digraph cfg {
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_5" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_6" ;
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_5" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_7" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_6" [label="6: Prune (true branch, while) \n   PRUNE((n$0 < 10), true); [line 156, column 10]\n  EXIT_SCOPE(n$0); [line 156, column 10]\n " shape="invhouse"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_6" [label="6: Prune (true branch, while) \n   PRUNE((n$0 < 10), true); [line 156, column 10]\n " shape="invhouse"]
 	
 
 	 "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  EXIT_SCOPE(n$0,value); [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 " shape="invhouse"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_7" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_3" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 171, column 5]\n  *&a:int=0 [line 171, column 5]\n  NULLIFY(&a); [line 171, column 5]\n  EXIT_SCOPE(a); [line 171, column 5]\n  APPLY_ABSTRACTION; [line 171, column 5]\n " shape="box"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 171, column 5]\n  *&a:int=0 [line 171, column 5]\n " shape="box"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_8" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_4" ;
@@ -703,32 +703,32 @@ digraph cfg {
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_10" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_11" ;
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_10" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_12" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_11" [label="11: Prune (true branch, boolean exp) \n   PRUNE((n$2 == 0), true); [line 157, column 13]\n  EXIT_SCOPE(n$2); [line 157, column 13]\n " shape="invhouse"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_11" [label="11: Prune (true branch, boolean exp) \n   PRUNE((n$2 == 0), true); [line 157, column 13]\n " shape="invhouse"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_11" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_13" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_12" [label="12: Prune (false branch, boolean exp) \n   PRUNE(!(n$2 == 0), false); [line 157, column 13]\n  EXIT_SCOPE(n$2); [line 157, column 13]\n " shape="invhouse"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_12" [label="12: Prune (false branch, boolean exp) \n   PRUNE(!(n$2 == 0), false); [line 157, column 13]\n " shape="invhouse"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_12" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_14" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_13" [label="13:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 157, column 13]\n  APPLY_ABSTRACTION; [line 157, column 13]\n " shape="box"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_13" [label="13:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 157, column 13]\n " shape="box"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_13" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_9" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_14" [label="14:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=2 [line 157, column 13]\n  APPLY_ABSTRACTION; [line 157, column 13]\n " shape="box"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_14" [label="14:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=2 [line 157, column 13]\n " shape="box"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_14" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_9" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_15" [label="15:  SwitchStmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 157, column 13]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 157, column 13]\n  EXIT_SCOPE(0$?%__sil_tmpSIL_temp_conditional___n$1); [line 157, column 13]\n " shape="box"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_15" [label="15:  SwitchStmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 157, column 13]\n " shape="box"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_15" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_27" ;
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_15" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_28" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_16" [label="16:  DeclStmt \n   VARIABLE_DECLARED(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   VARIABLE_DECLARED(z:int); [line 166, column 9]\n  *&z:int=9 [line 166, column 9]\n " shape="box"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_16" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_8" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_17" [label="17:  UnaryOperator \n   n$7=*&something:int [line 163, column 9]\n  *&something:int=(n$7 + 1) [line 163, column 9]\n  NULLIFY(&something); [line 163, column 9]\n  EXIT_SCOPE(n$7,something); [line 163, column 9]\n  APPLY_ABSTRACTION; [line 163, column 9]\n " shape="box"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_17" [label="17:  UnaryOperator \n   n$7=*&something:int [line 163, column 9]\n  *&something:int=(n$7 + 1) [line 163, column 9]\n " shape="box"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_17" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_4" ;
@@ -736,23 +736,23 @@ digraph cfg {
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_18" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_17" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_19" [label="19:  Return Stmt \n   *&return:int=0 [line 160, column 9]\n  APPLY_ABSTRACTION; [line 160, column 9]\n " shape="box"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_19" [label="19:  Return Stmt \n   *&return:int=0 [line 160, column 9]\n " shape="box"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_19" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_2" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_20" [label="20:  Call _fun_printf \n   n$8=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 159, column 9]\n  EXIT_SCOPE(n$8); [line 159, column 9]\n " shape="box"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_20" [label="20:  Call _fun_printf \n   n$8=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 159, column 9]\n " shape="box"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_20" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_19" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_21" [label="21: Prune (true branch, switch) \n   PRUNE((n$3 == 3), true); [line 168, column 7]\n  EXIT_SCOPE(n$3); [line 168, column 7]\n  APPLY_ABSTRACTION; [line 168, column 7]\n " shape="invhouse"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_21" [label="21: Prune (true branch, switch) \n   PRUNE((n$3 == 3), true); [line 168, column 7]\n " shape="invhouse"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_21" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_8" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_22" [label="22: Prune (false branch, switch) \n   PRUNE(!(n$3 == 3), false); [line 168, column 7]\n  EXIT_SCOPE(n$3); [line 168, column 7]\n  APPLY_ABSTRACTION; [line 168, column 7]\n " shape="invhouse"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_22" [label="22: Prune (false branch, switch) \n   PRUNE(!(n$3 == 3), false); [line 168, column 7]\n " shape="invhouse"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_22" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_8" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_23" [label="23: Prune (true branch, switch) \n   PRUNE((n$3 == 2), true); [line 167, column 7]\n  EXIT_SCOPE(n$3); [line 167, column 7]\n  APPLY_ABSTRACTION; [line 167, column 7]\n " shape="invhouse"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_23" [label="23: Prune (true branch, switch) \n   PRUNE((n$3 == 2), true); [line 167, column 7]\n " shape="invhouse"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_23" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_8" ;
@@ -761,7 +761,7 @@ digraph cfg {
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_24" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_21" ;
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_24" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_22" ;
-"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_25" [label="25: Prune (true branch, switch) \n   PRUNE((n$3 == 1), true); [line 161, column 7]\n  EXIT_SCOPE(n$3); [line 161, column 7]\n " shape="invhouse"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_25" [label="25: Prune (true branch, switch) \n   PRUNE((n$3 == 1), true); [line 161, column 7]\n " shape="invhouse"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_25" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_18" ;
@@ -770,7 +770,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$3 == 0), true); [line 158, column 7]\n  NULLIFY(&value); [line 158, column 7]\n  EXIT_SCOPE(n$3,value); [line 158, column 7]\n " shape="invhouse"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_27" [label="27: Prune (true branch, switch) \n   PRUNE((n$3 == 0), true); [line 158, column 7]\n " shape="invhouse"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_27" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_20" ;
@@ -779,7 +779,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   VARIABLE_DECLARED(value:int); [line 155, column 3]\n  *&value:int=0 [line 155, column 3]\n  APPLY_ABSTRACTION; [line 155, column 3]\n " shape="box"]
+"test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_29" [label="29:  DeclStmt \n   VARIABLE_DECLARED(value:int); [line 155, column 3]\n  *&value:int=0 [line 155, column 3]\n " shape="box"]
 	
 
 	 "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_29" -> "test_switch8.6a6653773b94c1bb3f3c90dc1790d1ed_4" ;
@@ -790,11 +790,11 @@ digraph cfg {
 "test_switch9.f4a96f02ca05cf92a483f69cdfe717b1_2" [label="2: Exit test_switch9 \n  " color=yellow style=filled]
 	
 
-"test_switch9.f4a96f02ca05cf92a483f69cdfe717b1_3" [label="3:  Return Stmt \n   *&return:int=0 [line 179, column 3]\n  APPLY_ABSTRACTION; [line 179, column 3]\n " shape="box"]
+"test_switch9.f4a96f02ca05cf92a483f69cdfe717b1_3" [label="3:  Return Stmt \n   *&return:int=0 [line 179, column 3]\n " shape="box"]
 	
 
 	 "test_switch9.f4a96f02ca05cf92a483f69cdfe717b1_3" -> "test_switch9.f4a96f02ca05cf92a483f69cdfe717b1_2" ;
-"test_switch9.f4a96f02ca05cf92a483f69cdfe717b1_4" [label="4:  SwitchStmt \n   n$0=*&value:int [line 178, column 11]\n  NULLIFY(&value); [line 178, column 11]\n  EXIT_SCOPE(n$0,value); [line 178, column 11]\n " shape="box"]
+"test_switch9.f4a96f02ca05cf92a483f69cdfe717b1_4" [label="4:  SwitchStmt \n   n$0=*&value:int [line 178, column 11]\n " shape="box"]
 	
 
 	 "test_switch9.f4a96f02ca05cf92a483f69cdfe717b1_4" -> "test_switch9.f4a96f02ca05cf92a483f69cdfe717b1_3" ;

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

@@ -7,11 +7,11 @@ digraph cfg {
 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_2" [label="2: Exit unroll_loop \n  " color=yellow style=filled]
 	
 
-"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_3" [label="3:  Return Stmt \n   n$0=*&ret:int [line 24, column 10]\n  *&return:int=n$0 [line 24, column 3]\n  NULLIFY(&ret); [line 24, column 3]\n  EXIT_SCOPE(n$0,ret); [line 24, column 3]\n  APPLY_ABSTRACTION; [line 24, column 3]\n " shape="box"]
+"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_3" [label="3:  Return Stmt \n   n$0=*&ret:int [line 24, column 10]\n  *&return:int=n$0 [line 24, column 3]\n " shape="box"]
 	
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_3" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_2" ;
-"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_4" [label="4:  SwitchStmt \n   n$1=*&n:int [line 10, column 11]\n  NULLIFY(&n); [line 10, column 11]\n  EXIT_SCOPE(n); [line 10, column 11]\n " shape="box"]
+"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_4" [label="4:  SwitchStmt \n   n$1=*&n:int [line 10, column 11]\n " shape="box"]
 	
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_4" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_22" ;
@@ -25,15 +25,15 @@ digraph cfg {
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_6" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_7" ;
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_6" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_8" ;
-"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_7" [label="7: Prune (true branch, do while) \n   PRUNE(((n$2 - 1) > 0), true); [line 22, column 16]\n  EXIT_SCOPE(n$2); [line 22, column 16]\n  APPLY_ABSTRACTION; [line 22, column 16]\n " shape="invhouse"]
+"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_7" [label="7: Prune (true branch, do while) \n   PRUNE(((n$2 - 1) > 0), true); [line 22, column 16]\n " shape="invhouse"]
 	
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_7" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_5" ;
-"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_8" [label="8: Prune (false branch, do while) \n   PRUNE(!((n$2 - 1) > 0), false); [line 22, column 16]\n  NULLIFY(&loop); [line 22, column 16]\n  EXIT_SCOPE(n$2,loop); [line 22, column 16]\n  APPLY_ABSTRACTION; [line 22, column 16]\n " shape="invhouse"]
+"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_8" [label="8: Prune (false branch, do while) \n   PRUNE(!((n$2 - 1) > 0), false); [line 22, column 16]\n " shape="invhouse"]
 	
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_8" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_3" ;
-"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_9" [label="9:  UnaryOperator \n   n$3=*&ret:int [line 21, column 11]\n  *&ret:int=(n$3 + 1) [line 21, column 11]\n  EXIT_SCOPE(n$3); [line 21, column 11]\n " shape="box"]
+"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_9" [label="9:  UnaryOperator \n   n$3=*&ret:int [line 21, column 11]\n  *&ret:int=(n$3 + 1) [line 21, column 11]\n " shape="box"]
 	
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_9" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_6" ;
@@ -41,36 +41,36 @@ digraph cfg {
 	
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_10" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_9" ;
-"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_11" [label="11: Prune (true branch, if) \n   PRUNE(1, true); [line 16, column 15]\n  APPLY_ABSTRACTION; [line 16, column 15]\n " shape="invhouse"]
+"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_11" [label="11: Prune (true branch, if) \n   PRUNE(1, true); [line 16, column 15]\n " shape="invhouse"]
 	
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_11" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_13" ;
-"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_12" [label="12: Prune (false branch, if) \n   PRUNE(!1, false); [line 16, column 15]\n  APPLY_ABSTRACTION; [line 16, column 15]\n " shape="invhouse"]
+"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_12" [label="12: Prune (false branch, if) \n   PRUNE(!1, false); [line 16, column 15]\n " shape="invhouse"]
 	
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_12" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_10" ;
-"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_13" [label="13:  UnaryOperator \n   n$4=*&ret:int [line 18, column 15]\n  *&ret:int=(n$4 + 1) [line 18, column 15]\n  EXIT_SCOPE(n$4); [line 18, column 15]\n  APPLY_ABSTRACTION; [line 18, column 15]\n " shape="box"]
+"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_13" [label="13:  UnaryOperator \n   n$4=*&ret:int [line 18, column 15]\n  *&ret:int=(n$4 + 1) [line 18, column 15]\n " shape="box"]
 	
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_13" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_10" ;
-"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_14" [label="14:  UnaryOperator \n   n$7=*&ret:int [line 15, column 11]\n  *&ret:int=(n$7 + 1) [line 15, column 11]\n  EXIT_SCOPE(n$7); [line 15, column 11]\n " shape="box"]
+"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_14" [label="14:  UnaryOperator \n   n$7=*&ret:int [line 15, column 11]\n  *&ret:int=(n$7 + 1) [line 15, column 11]\n " shape="box"]
 	
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_14" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_11" ;
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_14" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_12" ;
-"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_15" [label="15:  UnaryOperator \n   n$8=*&ret:int [line 13, column 9]\n  *&ret:int=(n$8 + 1) [line 13, column 9]\n  EXIT_SCOPE(n$8); [line 13, column 9]\n  APPLY_ABSTRACTION; [line 13, column 9]\n " shape="box"]
+"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_15" [label="15:  UnaryOperator \n   n$8=*&ret:int [line 13, column 9]\n  *&ret:int=(n$8 + 1) [line 13, column 9]\n " shape="box"]
 	
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_15" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_14" ;
-"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_16" [label="16: Prune (true branch, switch) \n   PRUNE(((n$1 % 8) == 1), true); [line 20, column 9]\n  EXIT_SCOPE(n$1); [line 20, column 9]\n  APPLY_ABSTRACTION; [line 20, column 9]\n " shape="invhouse"]
+"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_16" [label="16: Prune (true branch, switch) \n   PRUNE(((n$1 % 8) == 1), true); [line 20, column 9]\n " shape="invhouse"]
 	
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_16" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_9" ;
-"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_17" [label="17: Prune (false branch, switch) \n   PRUNE(!((n$1 % 8) == 1), false); [line 20, column 9]\n  NULLIFY(&loop); [line 20, column 9]\n  EXIT_SCOPE(n$1,loop); [line 20, column 9]\n  APPLY_ABSTRACTION; [line 20, column 9]\n " shape="invhouse"]
+"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_17" [label="17: Prune (false branch, switch) \n   PRUNE(!((n$1 % 8) == 1), false); [line 20, column 9]\n " shape="invhouse"]
 	
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_17" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_3" ;
-"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_18" [label="18: Prune (true branch, switch) \n   PRUNE(((n$1 % 8) == 2), true); [line 17, column 13]\n  EXIT_SCOPE(n$1); [line 17, column 13]\n  APPLY_ABSTRACTION; [line 17, column 13]\n " shape="invhouse"]
+"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_18" [label="18: Prune (true branch, switch) \n   PRUNE(((n$1 % 8) == 2), true); [line 17, column 13]\n " shape="invhouse"]
 	
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_18" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_13" ;
@@ -79,7 +79,7 @@ digraph cfg {
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_19" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_16" ;
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_19" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_17" ;
-"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_20" [label="20: Prune (true branch, switch) \n   PRUNE(((n$1 % 8) == 3), true); [line 14, column 9]\n  EXIT_SCOPE(n$1); [line 14, column 9]\n  APPLY_ABSTRACTION; [line 14, column 9]\n " shape="invhouse"]
+"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_20" [label="20: Prune (true branch, switch) \n   PRUNE(((n$1 % 8) == 3), true); [line 14, column 9]\n " shape="invhouse"]
 	
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_20" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_14" ;
@@ -88,7 +88,7 @@ digraph cfg {
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_21" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_18" ;
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_21" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_19" ;
-"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_22" [label="22: Prune (true branch, switch) \n   PRUNE(((n$1 % 8) == 0), true); [line 11, column 5]\n  EXIT_SCOPE(n$1); [line 11, column 5]\n  APPLY_ABSTRACTION; [line 11, column 5]\n " shape="invhouse"]
+"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_22" [label="22: Prune (true branch, switch) \n   PRUNE(((n$1 % 8) == 0), true); [line 11, column 5]\n " shape="invhouse"]
 	
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_22" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_5" ;
@@ -97,7 +97,7 @@ 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   VARIABLE_DECLARED(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); [line 9, column 3]\n " shape="box"]
+"unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_24" [label="24:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_24" -> "unroll_loop.7d9e50ecf5e5106a8dd5deee005639d6_4" ;

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

@@ -7,36 +7,36 @@ digraph cfg {
 "label_case.83d07a314df100648248d9156212096b_2" [label="2: Exit label_case \n  " color=yellow style=filled]
 	
 
-"label_case.83d07a314df100648248d9156212096b_3" [label="3:  Return Stmt \n   n$0=*&ret:int [line 36, column 10]\n  *&return:int=n$0 [line 36, column 3]\n  NULLIFY(&ret); [line 36, column 3]\n  EXIT_SCOPE(n$0,ret); [line 36, column 3]\n  APPLY_ABSTRACTION; [line 36, column 3]\n " shape="box"]
+"label_case.83d07a314df100648248d9156212096b_3" [label="3:  Return Stmt \n   n$0=*&ret:int [line 36, column 10]\n  *&return:int=n$0 [line 36, column 3]\n " shape="box"]
 	
 
 	 "label_case.83d07a314df100648248d9156212096b_3" -> "label_case.83d07a314df100648248d9156212096b_2" ;
-"label_case.83d07a314df100648248d9156212096b_4" [label="4:  SwitchStmt \n   n$1=*&x:char [line 26, column 11]\n  NULLIFY(&x); [line 26, column 11]\n  EXIT_SCOPE(x); [line 26, column 11]\n " shape="box"]
+"label_case.83d07a314df100648248d9156212096b_4" [label="4:  SwitchStmt \n   n$1=*&x:char [line 26, column 11]\n " shape="box"]
 	
 
 	 "label_case.83d07a314df100648248d9156212096b_4" -> "label_case.83d07a314df100648248d9156212096b_12" ;
 	 "label_case.83d07a314df100648248d9156212096b_4" -> "label_case.83d07a314df100648248d9156212096b_13" ;
-"label_case.83d07a314df100648248d9156212096b_5" [label="5:  UnaryOperator \n   n$3=*&ret:int [line 33, column 7]\n  *&ret:int=(n$3 + 1) [line 33, column 7]\n  EXIT_SCOPE(n$3); [line 33, column 7]\n  APPLY_ABSTRACTION; [line 33, column 7]\n " shape="box"]
+"label_case.83d07a314df100648248d9156212096b_5" [label="5:  UnaryOperator \n   n$3=*&ret:int [line 33, column 7]\n  *&ret:int=(n$3 + 1) [line 33, column 7]\n " shape="box"]
 	
 
 	 "label_case.83d07a314df100648248d9156212096b_5" -> "label_case.83d07a314df100648248d9156212096b_3" ;
-"label_case.83d07a314df100648248d9156212096b_6" [label="6: Skip GotoLabel_l \n   APPLY_ABSTRACTION; [line 30, column 5]\n " color="gray"]
+"label_case.83d07a314df100648248d9156212096b_6" [label="6: Skip GotoLabel_l \n  " color="gray"]
 	
 
 	 "label_case.83d07a314df100648248d9156212096b_6" -> "label_case.83d07a314df100648248d9156212096b_5" ;
-"label_case.83d07a314df100648248d9156212096b_7" [label="7:  UnaryOperator \n   n$6=*&ret:int [line 28, column 7]\n  *&ret:int=(n$6 + 1) [line 28, column 7]\n  EXIT_SCOPE(n$6); [line 28, column 7]\n " shape="box"]
+"label_case.83d07a314df100648248d9156212096b_7" [label="7:  UnaryOperator \n   n$6=*&ret:int [line 28, column 7]\n  *&ret:int=(n$6 + 1) [line 28, column 7]\n " shape="box"]
 	
 
 	 "label_case.83d07a314df100648248d9156212096b_7" -> "label_case.83d07a314df100648248d9156212096b_6" ;
-"label_case.83d07a314df100648248d9156212096b_8" [label="8: Prune (true branch, switch) \n   PRUNE((n$1 == 3), true); [line 32, column 5]\n  EXIT_SCOPE(n$1); [line 32, column 5]\n  APPLY_ABSTRACTION; [line 32, column 5]\n " shape="invhouse"]
+"label_case.83d07a314df100648248d9156212096b_8" [label="8: Prune (true branch, switch) \n   PRUNE((n$1 == 3), true); [line 32, column 5]\n " shape="invhouse"]
 	
 
 	 "label_case.83d07a314df100648248d9156212096b_8" -> "label_case.83d07a314df100648248d9156212096b_5" ;
-"label_case.83d07a314df100648248d9156212096b_9" [label="9: Prune (false branch, switch) \n   PRUNE(!(n$1 == 3), false); [line 32, column 5]\n  EXIT_SCOPE(n$1); [line 32, column 5]\n  APPLY_ABSTRACTION; [line 32, column 5]\n " shape="invhouse"]
+"label_case.83d07a314df100648248d9156212096b_9" [label="9: Prune (false branch, switch) \n   PRUNE(!(n$1 == 3), false); [line 32, column 5]\n " shape="invhouse"]
 	
 
 	 "label_case.83d07a314df100648248d9156212096b_9" -> "label_case.83d07a314df100648248d9156212096b_3" ;
-"label_case.83d07a314df100648248d9156212096b_10" [label="10: Prune (true branch, switch) \n   PRUNE((n$1 == 2), true); [line 31, column 5]\n  EXIT_SCOPE(n$1); [line 31, column 5]\n  APPLY_ABSTRACTION; [line 31, column 5]\n " shape="invhouse"]
+"label_case.83d07a314df100648248d9156212096b_10" [label="10: Prune (true branch, switch) \n   PRUNE((n$1 == 2), true); [line 31, column 5]\n " shape="invhouse"]
 	
 
 	 "label_case.83d07a314df100648248d9156212096b_10" -> "label_case.83d07a314df100648248d9156212096b_5" ;
@@ -45,7 +45,7 @@ digraph cfg {
 
 	 "label_case.83d07a314df100648248d9156212096b_11" -> "label_case.83d07a314df100648248d9156212096b_8" ;
 	 "label_case.83d07a314df100648248d9156212096b_11" -> "label_case.83d07a314df100648248d9156212096b_9" ;
-"label_case.83d07a314df100648248d9156212096b_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$1 == 1), true); [line 27, column 5]\n  EXIT_SCOPE(n$1); [line 27, column 5]\n " shape="invhouse"]
+"label_case.83d07a314df100648248d9156212096b_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$1 == 1), true); [line 27, column 5]\n " shape="invhouse"]
 	
 
 	 "label_case.83d07a314df100648248d9156212096b_12" -> "label_case.83d07a314df100648248d9156212096b_7" ;
@@ -65,40 +65,40 @@ digraph cfg {
 "label_default.f30729864b0243c0a794ef0254fe7d23_2" [label="2: Exit label_default \n  " color=yellow style=filled]
 	
 
-"label_default.f30729864b0243c0a794ef0254fe7d23_3" [label="3:  Return Stmt \n   n$0=*&ret:int [line 21, column 10]\n  *&return:int=n$0 [line 21, column 3]\n  NULLIFY(&ret); [line 21, column 3]\n  EXIT_SCOPE(n$0,ret); [line 21, column 3]\n  APPLY_ABSTRACTION; [line 21, column 3]\n " shape="box"]
+"label_default.f30729864b0243c0a794ef0254fe7d23_3" [label="3:  Return Stmt \n   n$0=*&ret:int [line 21, column 10]\n  *&return:int=n$0 [line 21, column 3]\n " shape="box"]
 	
 
 	 "label_default.f30729864b0243c0a794ef0254fe7d23_3" -> "label_default.f30729864b0243c0a794ef0254fe7d23_2" ;
-"label_default.f30729864b0243c0a794ef0254fe7d23_4" [label="4:  SwitchStmt \n   n$1=*&x:char [line 10, column 11]\n  NULLIFY(&x); [line 10, column 11]\n  EXIT_SCOPE(x); [line 10, column 11]\n " shape="box"]
+"label_default.f30729864b0243c0a794ef0254fe7d23_4" [label="4:  SwitchStmt \n   n$1=*&x:char [line 10, column 11]\n " shape="box"]
 	
 
 	 "label_default.f30729864b0243c0a794ef0254fe7d23_4" -> "label_default.f30729864b0243c0a794ef0254fe7d23_11" ;
 	 "label_default.f30729864b0243c0a794ef0254fe7d23_4" -> "label_default.f30729864b0243c0a794ef0254fe7d23_12" ;
-"label_default.f30729864b0243c0a794ef0254fe7d23_5" [label="5:  UnaryOperator \n   n$2=*&ret:int [line 19, column 7]\n  *&ret:int=(n$2 - 1) [line 19, column 7]\n  EXIT_SCOPE(n$2); [line 19, column 7]\n  APPLY_ABSTRACTION; [line 19, column 7]\n " shape="box"]
+"label_default.f30729864b0243c0a794ef0254fe7d23_5" [label="5:  UnaryOperator \n   n$2=*&ret:int [line 19, column 7]\n  *&ret:int=(n$2 - 1) [line 19, column 7]\n " shape="box"]
 	
 
 	 "label_default.f30729864b0243c0a794ef0254fe7d23_5" -> "label_default.f30729864b0243c0a794ef0254fe7d23_3" ;
-"label_default.f30729864b0243c0a794ef0254fe7d23_6" [label="6: Skip GotoLabel_l \n   APPLY_ABSTRACTION; [line 17, column 5]\n " color="gray"]
+"label_default.f30729864b0243c0a794ef0254fe7d23_6" [label="6: Skip GotoLabel_l \n  " color="gray"]
 	
 
 	 "label_default.f30729864b0243c0a794ef0254fe7d23_6" -> "label_default.f30729864b0243c0a794ef0254fe7d23_5" ;
-"label_default.f30729864b0243c0a794ef0254fe7d23_7" [label="7:  BinaryOperatorStmt: Assign \n   *&ret:int=2 [line 15, column 7]\n  APPLY_ABSTRACTION; [line 15, column 7]\n " shape="box"]
+"label_default.f30729864b0243c0a794ef0254fe7d23_7" [label="7:  BinaryOperatorStmt: Assign \n   *&ret:int=2 [line 15, column 7]\n " shape="box"]
 	
 
 	 "label_default.f30729864b0243c0a794ef0254fe7d23_7" -> "label_default.f30729864b0243c0a794ef0254fe7d23_3" ;
-"label_default.f30729864b0243c0a794ef0254fe7d23_8" [label="8:  UnaryOperator \n   n$6=*&ret:int [line 12, column 7]\n  *&ret:int=(n$6 + 1) [line 12, column 7]\n  EXIT_SCOPE(n$6); [line 12, column 7]\n " shape="box"]
+"label_default.f30729864b0243c0a794ef0254fe7d23_8" [label="8:  UnaryOperator \n   n$6=*&ret:int [line 12, column 7]\n  *&ret:int=(n$6 + 1) [line 12, column 7]\n " shape="box"]
 	
 
 	 "label_default.f30729864b0243c0a794ef0254fe7d23_8" -> "label_default.f30729864b0243c0a794ef0254fe7d23_6" ;
-"label_default.f30729864b0243c0a794ef0254fe7d23_9" [label="9: Prune (true branch, switch) \n   PRUNE((n$1 == 2), true); [line 14, column 5]\n  NULLIFY(&ret); [line 14, column 5]\n  EXIT_SCOPE(n$1,ret); [line 14, column 5]\n " shape="invhouse"]
+"label_default.f30729864b0243c0a794ef0254fe7d23_9" [label="9: Prune (true branch, switch) \n   PRUNE((n$1 == 2), true); [line 14, column 5]\n " shape="invhouse"]
 	
 
 	 "label_default.f30729864b0243c0a794ef0254fe7d23_9" -> "label_default.f30729864b0243c0a794ef0254fe7d23_7" ;
-"label_default.f30729864b0243c0a794ef0254fe7d23_10" [label="10: Prune (false branch, switch) \n   PRUNE(!(n$1 == 2), false); [line 14, column 5]\n  EXIT_SCOPE(n$1); [line 14, column 5]\n  APPLY_ABSTRACTION; [line 14, column 5]\n " shape="invhouse"]
+"label_default.f30729864b0243c0a794ef0254fe7d23_10" [label="10: Prune (false branch, switch) \n   PRUNE(!(n$1 == 2), false); [line 14, column 5]\n " shape="invhouse"]
 	
 
 	 "label_default.f30729864b0243c0a794ef0254fe7d23_10" -> "label_default.f30729864b0243c0a794ef0254fe7d23_5" ;
-"label_default.f30729864b0243c0a794ef0254fe7d23_11" [label="11: Prune (true branch, switch) \n   PRUNE((n$1 == 1), true); [line 11, column 5]\n  EXIT_SCOPE(n$1); [line 11, column 5]\n " shape="invhouse"]
+"label_default.f30729864b0243c0a794ef0254fe7d23_11" [label="11: Prune (true branch, switch) \n   PRUNE((n$1 == 1), true); [line 11, column 5]\n " shape="invhouse"]
 	
 
 	 "label_default.f30729864b0243c0a794ef0254fe7d23_11" -> "label_default.f30729864b0243c0a794ef0254fe7d23_8" ;

infer/tests/codetoanalyze/c/frontend/types/struct.c.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "test.098f6bcd4621d373cade4e832627b4f6_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test.098f6bcd4621d373cade4e832627b4f6_3" [label="3:  BinaryOperatorStmt: Assign \n   *&x.b:int=20 [line 16, column 3]\n  NULLIFY(&x); [line 16, column 3]\n  EXIT_SCOPE(x); [line 16, column 3]\n  APPLY_ABSTRACTION; [line 16, column 3]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_3" [label="3:  BinaryOperatorStmt: Assign \n   *&x.b:int=20 [line 16, column 3]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_3" -> "test.098f6bcd4621d373cade4e832627b4f6_2" ;

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   VARIABLE_DECLARED(z:int); [line 14, column 3]\n  *&z:int=3 [line 14, column 3]\n  NULLIFY(&z); [line 14, column 3]\n  EXIT_SCOPE(z); [line 14, column 3]\n  APPLY_ABSTRACTION; [line 14, column 3]\n " shape="box"]
+"test_typename.b2359812ef4a83b4e2638a11e6c522b3_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(z:int); [line 14, column 3]\n  *&z:int=3 [line 14, column 3]\n " shape="box"]
 	
 
 	 "test_typename.b2359812ef4a83b4e2638a11e6c522b3_3" -> "test_typename.b2359812ef4a83b4e2638a11e6c522b3_2" ;
-"test_typename.b2359812ef4a83b4e2638a11e6c522b3_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 13, column 3]\n  *&x:int=2 [line 13, column 3]\n  NULLIFY(&x); [line 13, column 3]\n  EXIT_SCOPE(x); [line 13, column 3]\n " shape="box"]
+"test_typename.b2359812ef4a83b4e2638a11e6c522b3_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 13, column 3]\n  *&x:int=2 [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

@@ -4,14 +4,14 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n   NULLIFY(&dst); [line 26, column 1]\n " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 25, column 3]\n  APPLY_ABSTRACTION; [line 25, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 25, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  GCCAsmStmt \n   n$0=*&src:int [line 24, column 13]\n  n$1=_fun___infer_skip_gcc_asm_stmt(&dst:int&,n$0:int) [line 21, column 3]\n  NULLIFY(&src); [line 21, column 3]\n  EXIT_SCOPE(n$0,n$1,src,dst); [line 21, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  GCCAsmStmt \n   n$0=*&src:int [line 24, column 13]\n  n$1=_fun___infer_skip_gcc_asm_stmt(&dst:int&,n$0:int) [line 21, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
@@ -23,14 +23,14 @@ digraph cfg {
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_1" -> "test.098f6bcd4621d373cade4e832627b4f6_4" ;
-"test.098f6bcd4621d373cade4e832627b4f6_2" [label="2: Exit test \n   NULLIFY(&x); [line 15, column 1]\n  NULLIFY(&z); [line 15, column 1]\n  NULLIFY(&y); [line 15, column 1]\n  NULLIFY(&h); [line 15, column 1]\n " color=yellow style=filled]
+"test.098f6bcd4621d373cade4e832627b4f6_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test.098f6bcd4621d373cade4e832627b4f6_3" [label="3:  Return Stmt \n   *&return:int=0 [line 14, column 3]\n  APPLY_ABSTRACTION; [line 14, column 3]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_3" [label="3:  Return Stmt \n   *&return:int=0 [line 14, column 3]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_3" -> "test.098f6bcd4621d373cade4e832627b4f6_2" ;
-"test.098f6bcd4621d373cade4e832627b4f6_4" [label="4:  GCCAsmStmt \n   n$0=_fun___infer_skip_gcc_asm_stmt(&x:int&,&y:int&,&z:int&,&h:int&,0:int) [line 13, column 3]\n  EXIT_SCOPE(n$0,h,y,z,x); [line 13, column 3]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_4" [label="4:  GCCAsmStmt \n   n$0=_fun___infer_skip_gcc_asm_stmt(&x:int&,&y:int&,&z:int&,&h:int&,0:int) [line 13, column 3]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_4" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;

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

@@ -4,14 +4,14 @@ digraph cfg {
 	
 
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_1" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_12" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_2" [label="2: Exit vaarg_foo \n   NULLIFY(&valist); [line 22, column 1]\n  NULLIFY(&x); [line 22, column 1]\n " color=yellow style=filled]
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_2" [label="2: Exit vaarg_foo \n  " color=yellow style=filled]
 	
 
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_3" [label="3:  Return Stmt \n   n$0=*&val:int [line 21, column 10]\n  *&return:int=n$0 [line 21, column 3]\n  NULLIFY(&val); [line 21, column 3]\n  EXIT_SCOPE(n$0,val); [line 21, column 3]\n  APPLY_ABSTRACTION; [line 21, column 3]\n " shape="box"]
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_3" [label="3:  Return Stmt \n   n$0=*&val:int [line 21, column 10]\n  *&return:int=n$0 [line 21, column 3]\n " shape="box"]
 	
 
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_3" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_2" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_4" [label="4:  Call _fun___builtin_va_end \n   n$1=_fun___builtin_va_end(&valist:void*) [line 20, column 3]\n  EXIT_SCOPE(n$1,valist); [line 20, column 3]\n " shape="box"]
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_4" [label="4:  Call _fun___builtin_va_end \n   n$1=_fun___builtin_va_end(&valist:void*) [line 20, column 3]\n " shape="box"]
 	
 
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_4" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_3" ;
@@ -19,32 +19,32 @@ digraph cfg {
 	
 
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_5" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_4" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_6" [label="6:  BinaryOperatorStmt: EQ \n   n$2=*&i:int [line 15, column 7]\n  NULLIFY(&i); [line 15, column 7]\n  EXIT_SCOPE(i); [line 15, column 7]\n " shape="box"]
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_6" [label="6:  BinaryOperatorStmt: EQ \n   n$2=*&i:int [line 15, column 7]\n " shape="box"]
 	
 
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_6" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_7" ;
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_6" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_8" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_7" [label="7: Prune (true branch, if) \n   PRUNE((n$2 == 9), true); [line 15, column 7]\n  EXIT_SCOPE(n$2); [line 15, column 7]\n " shape="invhouse"]
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_7" [label="7: Prune (true branch, if) \n   PRUNE((n$2 == 9), true); [line 15, column 7]\n " shape="invhouse"]
 	
 
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_7" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_9" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_8" [label="8: Prune (false branch, if) \n   PRUNE(!(n$2 == 9), false); [line 15, column 7]\n  EXIT_SCOPE(n$2); [line 15, column 7]\n " shape="invhouse"]
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_8" [label="8: Prune (false branch, if) \n   PRUNE(!(n$2 == 9), false); [line 15, column 7]\n " shape="invhouse"]
 	
 
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_8" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_10" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_9" [label="9:  BinaryOperatorStmt: Assign \n   *&val:int=(9 / 0) [line 16, column 5]\n  APPLY_ABSTRACTION; [line 16, column 5]\n " shape="box"]
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_9" [label="9:  BinaryOperatorStmt: Assign \n   *&val:int=(9 / 0) [line 16, column 5]\n " shape="box"]
 	
 
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_9" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_5" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_10" [label="10:  BinaryOperatorStmt: Assign \n   *&val:int=(4 / 0) [line 18, column 5]\n  APPLY_ABSTRACTION; [line 18, column 5]\n " shape="box"]
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_10" [label="10:  BinaryOperatorStmt: Assign \n   *&val:int=(4 / 0) [line 18, column 5]\n " shape="box"]
 	
 
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_10" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_5" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 13, column 3]\n  n$4=_fun___builtin_va_arg(&valist:void*) [line 13, column 11]\n  *&i:int=n$4 [line 13, column 3]\n  EXIT_SCOPE(n$4); [line 13, column 3]\n " shape="box"]
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 13, column 3]\n  n$4=_fun___builtin_va_arg(&valist:void*) [line 13, column 11]\n  *&i:int=n$4 [line 13, column 3]\n " shape="box"]
 	
 
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_11" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_6" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_12" [label="12:  Call _fun___builtin_va_start \n   n$5=_fun___builtin_va_start(&valist:void*,&x:int&) [line 12, column 3]\n  EXIT_SCOPE(n$5,x); [line 12, column 3]\n " shape="box"]
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_12" [label="12:  Call _fun___builtin_va_start \n   n$5=_fun___builtin_va_start(&valist:void*,&x:int&) [line 12, column 3]\n " shape="box"]
 	
 
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_12" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_11" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "h#4941587955358707969.72d1ffab9146aba0866be6bd3e972603_2" [label="2: Exit h \n  " color=yellow style=filled]
 	
 
-"h#4941587955358707969.72d1ffab9146aba0866be6bd3e972603_3" [label="3:  Return Stmt \n   *&return:int=3 [line 8, column 11]\n  APPLY_ABSTRACTION; [line 8, column 11]\n " shape="box"]
+"h#4941587955358707969.72d1ffab9146aba0866be6bd3e972603_3" [label="3:  Return Stmt \n   *&return:int=3 [line 8, column 11]\n " shape="box"]
 	
 
 	 "h#4941587955358707969.72d1ffab9146aba0866be6bd3e972603_3" -> "h#4941587955358707969.72d1ffab9146aba0866be6bd3e972603_2" ;
@@ -18,28 +18,28 @@ digraph cfg {
 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_2" [label="2: Exit switch_with_fallthrough \n  " color=yellow style=filled]
 	
 
-"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_3" [label="3:  Return Stmt \n   n$0=*&res:int [line 22, column 10]\n  *&return:int=n$0 [line 22, column 3]\n  NULLIFY(&res); [line 22, column 3]\n  EXIT_SCOPE(n$0,res); [line 22, column 3]\n  APPLY_ABSTRACTION; [line 22, column 3]\n " shape="box"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_3" [label="3:  Return Stmt \n   n$0=*&res:int [line 22, column 10]\n  *&return:int=n$0 [line 22, column 3]\n " shape="box"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_3" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_2" ;
-"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_4" [label="4:  SwitchStmt \n   n$1=*&n:int [line 12, column 11]\n  NULLIFY(&n); [line 12, column 11]\n  EXIT_SCOPE(n); [line 12, column 11]\n " shape="box"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_4" [label="4:  SwitchStmt \n   n$1=*&n:int [line 12, column 11]\n " shape="box"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_4" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_12" ;
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_4" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_13" ;
-"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_5" [label="5:  BinaryOperatorStmt: Assign \n   n$3=_fun_h() [line 19, column 13]\n  *&res:int=n$3 [line 19, column 7]\n  EXIT_SCOPE(n$3); [line 19, column 7]\n  APPLY_ABSTRACTION; [line 19, column 7]\n " shape="box"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_5" [label="5:  BinaryOperatorStmt: Assign \n   n$3=_fun_h() [line 19, column 13]\n  *&res:int=n$3 [line 19, column 7]\n " shape="box"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_5" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_3" ;
-"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_6" [label="6: Prune (true branch, switch) \n   PRUNE((n$1 == 77), true); [line 18, column 5]\n  NULLIFY(&res); [line 18, column 5]\n  EXIT_SCOPE(n$1,res); [line 18, column 5]\n  APPLY_ABSTRACTION; [line 18, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_6" [label="6: Prune (true branch, switch) \n   PRUNE((n$1 == 77), true); [line 18, column 5]\n " shape="invhouse"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_6" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_5" ;
-"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_7" [label="7: Prune (false branch, switch) \n   PRUNE(!(n$1 == 77), false); [line 18, column 5]\n  EXIT_SCOPE(n$1); [line 18, column 5]\n  APPLY_ABSTRACTION; [line 18, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_7" [label="7: Prune (false branch, switch) \n   PRUNE(!(n$1 == 77), false); [line 18, column 5]\n " shape="invhouse"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_7" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_3" ;
-"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_8" [label="8: Prune (true branch, switch) \n   PRUNE((n$1 == 66), true); [line 16, column 5]\n  NULLIFY(&res); [line 16, column 5]\n  EXIT_SCOPE(n$1,res); [line 16, column 5]\n  APPLY_ABSTRACTION; [line 16, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_8" [label="8: Prune (true branch, switch) \n   PRUNE((n$1 == 66), true); [line 16, column 5]\n " shape="invhouse"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_8" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_5" ;
@@ -48,7 +48,7 @@ digraph cfg {
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_9" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_6" ;
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_9" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_7" ;
-"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_10" [label="10: Prune (true branch, switch) \n   PRUNE((n$1 == 33), true); [line 14, column 5]\n  NULLIFY(&res); [line 14, column 5]\n  EXIT_SCOPE(n$1,res); [line 14, column 5]\n  APPLY_ABSTRACTION; [line 14, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_10" [label="10: Prune (true branch, switch) \n   PRUNE((n$1 == 33), true); [line 14, column 5]\n " shape="invhouse"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_10" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_5" ;
@@ -57,7 +57,7 @@ digraph cfg {
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_11" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_8" ;
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_11" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_9" ;
-"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$1 == 22), true); [line 13, column 5]\n  NULLIFY(&res); [line 13, column 5]\n  EXIT_SCOPE(n$1,res); [line 13, column 5]\n  APPLY_ABSTRACTION; [line 13, column 5]\n " shape="invhouse"]
+"switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$1 == 22), true); [line 13, column 5]\n " shape="invhouse"]
 	
 
 	 "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_12" -> "switch_with_fallthrough#6355028676793350740.9380c19327ea36a0a69b7e115d031492_5" ;
@@ -77,7 +77,7 @@ digraph cfg {
 "test_fallthrough#10031967177420807224.9a3ad886bb67a8e65c703cdc289f5661_2" [label="2: Exit test_fallthrough \n  " color=yellow style=filled]
 	
 
-"test_fallthrough#10031967177420807224.9a3ad886bb67a8e65c703cdc289f5661_3" [label="3:  Return Stmt \n   n$0=_fun_switch_with_fallthrough(66:int) [line 25, column 38]\n  *&return:int=(1 / (n$0 - 3)) [line 25, column 26]\n  EXIT_SCOPE(n$0); [line 25, column 26]\n  APPLY_ABSTRACTION; [line 25, column 26]\n " shape="box"]
+"test_fallthrough#10031967177420807224.9a3ad886bb67a8e65c703cdc289f5661_3" [label="3:  Return Stmt \n   n$0=_fun_switch_with_fallthrough(66:int) [line 25, column 38]\n  *&return:int=(1 / (n$0 - 3)) [line 25, column 26]\n " shape="box"]
 	
 
 	 "test_fallthrough#10031967177420807224.9a3ad886bb67a8e65c703cdc289f5661_3" -> "test_fallthrough#10031967177420807224.9a3ad886bb67a8e65c703cdc289f5661_2" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "operator_new#13351464032276683690.f7532bbe196cdd8520d944e0c3e1f7b4_2" [label="2: Exit operator_new \n  " color=yellow style=filled]
 	
 
-"operator_new#13351464032276683690.f7532bbe196cdd8520d944e0c3e1f7b4_3" [label="3:  Return Stmt \n   n$0=*&ptr2:void* [line 21, column 10]\n  *&return:void*=n$0 [line 21, column 3]\n  NULLIFY(&ptr2); [line 21, column 3]\n  EXIT_SCOPE(n$0,ptr2); [line 21, column 3]\n  APPLY_ABSTRACTION; [line 21, column 3]\n " shape="box"]
+"operator_new#13351464032276683690.f7532bbe196cdd8520d944e0c3e1f7b4_3" [label="3:  Return Stmt \n   n$0=*&ptr2:void* [line 21, column 10]\n  *&return:void*=n$0 [line 21, column 3]\n " shape="box"]
 	
 
 	 "operator_new#13351464032276683690.f7532bbe196cdd8520d944e0c3e1f7b4_3" -> "operator_new#13351464032276683690.f7532bbe196cdd8520d944e0c3e1f7b4_2" ;
@@ -18,19 +18,19 @@ digraph cfg {
 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Call delete \n   n$0=*&i:int* [line 12, column 10]\n  n$1=_fun___delete(n$0:int*) [line 12, column 3]\n  NULLIFY(&i); [line 12, column 3]\n  EXIT_SCOPE(n$0,n$1,i); [line 12, column 3]\n  APPLY_ABSTRACTION; [line 12, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Call delete \n   n$0=*&i:int* [line 12, column 10]\n  n$1=_fun___delete(n$0:int*) [line 12, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  CXXNewExpr \n   n$2=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 11, column 3]\n  EXIT_SCOPE(n$2); [line 11, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  CXXNewExpr \n   n$2=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 11, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(i:int*); [line 10, column 3]\n  n$3=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 10, column 12]\n  *&i:int*=n$3 [line 10, column 3]\n  EXIT_SCOPE(n$3); [line 10, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(i:int*); [line 10, column 3]\n  n$3=_fun___new(sizeof(t=int;nbytes=4):unsigned long) [line 10, column 12]\n  *&i:int*=n$3 [line 10, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 9, column 3]\n  *&x:int=2 [line 9, column 3]\n  NULLIFY(&x); [line 9, column 3]\n  EXIT_SCOPE(x); [line 9, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 9, column 3]\n  *&x:int=2 [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  " color=yellow style=filled]
 	
 
-"test_placement#7589029240520377616.7f92d4e10c030674dddd1682731c0ba3_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(p:A*); [line 24, column 45]\n  n$2=*&ptr:void* [line 24, column 60]\n  n$0=*&ptr2:int* [line 24, column 65]\n  *&ptr2:int*=(n$0 + 1) [line 24, column 65]\n  n$1=*&ptr2:int* [line 24, column 65]\n  n$3=_fun___placement_new(sizeof(t=A):unsigned long,n$2:void*,n$1:void*) [line 24, column 55]\n  n$4=_fun_A::A(n$3:A*) [line 24, column 73]\n  *&p:A*=n$3 [line 24, column 45]\n  NULLIFY(&ptr2); [line 24, column 45]\n  NULLIFY(&ptr); [line 24, column 45]\n  NULLIFY(&p); [line 24, column 45]\n  EXIT_SCOPE(n$0,n$1,n$2,n$3,n$4,ptr2,ptr,p); [line 24, column 45]\n  APPLY_ABSTRACTION; [line 24, column 45]\n " shape="box"]
+"test_placement#7589029240520377616.7f92d4e10c030674dddd1682731c0ba3_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(p:A*); [line 24, column 45]\n  n$2=*&ptr:void* [line 24, column 60]\n  n$0=*&ptr2:int* [line 24, column 65]\n  *&ptr2:int*=(n$0 + 1) [line 24, column 65]\n  n$1=*&ptr2:int* [line 24, column 65]\n  n$3=_fun___placement_new(sizeof(t=A):unsigned long,n$2:void*,n$1:void*) [line 24, column 55]\n  n$4=_fun_A::A(n$3:A*) [line 24, column 73]\n  *&p:A*=n$3 [line 24, column 45]\n " shape="box"]
 	
 
 	 "test_placement#7589029240520377616.7f92d4e10c030674dddd1682731c0ba3_3" -> "test_placement#7589029240520377616.7f92d4e10c030674dddd1682731c0ba3_2" ;

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

@@ -4,10 +4,10 @@ digraph cfg {
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_1" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_16" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_2" [label="2: Exit break_scope::test_do_while \n   NULLIFY(&x3); [line 89, column 1]\n  NULLIFY(&x1); [line 89, column 1]\n  NULLIFY(&x4); [line 89, column 1]\n  NULLIFY(&x2); [line 89, column 1]\n " color=yellow style=filled]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_2" [label="2: Exit break_scope::test_do_while \n  " color=yellow style=filled]
 	
 
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_3" [label="3:  Destruction(Scope) \n   _=*&x1:break_scope::X [line 89, column 1]\n  n$1=_fun_break_scope::X::~X(&x1:break_scope::X*) injected [line 89, column 1]\n  EXIT_SCOPE(_,n$1,x1); [line 89, column 1]\n  APPLY_ABSTRACTION; [line 89, column 1]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_3" [label="3:  Destruction(Scope) \n   _=*&x1:break_scope::X [line 89, column 1]\n  n$1=_fun_break_scope::X::~X(&x1:break_scope::X*) injected [line 89, column 1]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_3" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_2" ;
@@ -15,15 +15,15 @@ digraph cfg {
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_4" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_15" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_5" [label="5: Prune (true branch, do while) \n   n$3=*&a:_Bool [line 88, column 12]\n  PRUNE(n$3, true); [line 88, column 12]\n  EXIT_SCOPE(n$3); [line 88, column 12]\n  APPLY_ABSTRACTION; [line 88, column 12]\n " shape="invhouse"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_5" [label="5: Prune (true branch, do while) \n   n$3=*&a:_Bool [line 88, column 12]\n  PRUNE(n$3, true); [line 88, column 12]\n " shape="invhouse"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_5" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_4" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_6" [label="6: Prune (false branch, do while) \n   n$3=*&a:_Bool [line 88, column 12]\n  PRUNE(!n$3, false); [line 88, column 12]\n  NULLIFY(&a); [line 88, column 12]\n  EXIT_SCOPE(n$3,a); [line 88, column 12]\n  APPLY_ABSTRACTION; [line 88, column 12]\n " shape="invhouse"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_6" [label="6: Prune (false branch, do while) \n   n$3=*&a:_Bool [line 88, column 12]\n  PRUNE(!n$3, false); [line 88, column 12]\n " shape="invhouse"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_6" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_3" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_7" [label="7:  Destruction(Scope) \n   _=*&x2:break_scope::X [line 88, column 3]\n  n$5=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [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" [label="7:  Destruction(Scope) \n   _=*&x2:break_scope::X [line 88, column 3]\n  n$5=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 88, column 3]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_7" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_5" ;
@@ -32,36 +32,36 @@ digraph cfg {
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_8" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_7" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_9" [label="9: Prune (true branch, if) \n   n$7=*&b:_Bool [line 82, column 9]\n  PRUNE(n$7, true); [line 82, column 9]\n  NULLIFY(&b); [line 82, column 9]\n  EXIT_SCOPE(n$7,b); [line 82, column 9]\n " shape="invhouse"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_9" [label="9: Prune (true branch, if) \n   n$7=*&b:_Bool [line 82, column 9]\n  PRUNE(n$7, true); [line 82, column 9]\n " shape="invhouse"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_9" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_12" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_10" [label="10: Prune (false branch, if) \n   n$7=*&b:_Bool [line 82, column 9]\n  PRUNE(!n$7, false); [line 82, column 9]\n  EXIT_SCOPE(n$7); [line 82, column 9]\n " shape="invhouse"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_10" [label="10: Prune (false branch, if) \n   n$7=*&b:_Bool [line 82, column 9]\n  PRUNE(!n$7, false); [line 82, column 9]\n " shape="invhouse"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_10" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_14" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_11" [label="11:  Destruction(break) \n   _=*&x3:break_scope::X [line 84, column 7]\n  n$9=_fun_break_scope::X::~X(&x3:break_scope::X*) injected [line 84, column 7]\n  _=*&x2:break_scope::X [line 84, column 7]\n  n$11=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 84, column 7]\n  EXIT_SCOPE(_,_,n$9,n$11,x2,x3); [line 84, column 7]\n  APPLY_ABSTRACTION; [line 84, column 7]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_11" [label="11:  Destruction(break) \n   _=*&x3:break_scope::X [line 84, column 7]\n  n$9=_fun_break_scope::X::~X(&x3:break_scope::X*) injected [line 84, column 7]\n  _=*&x2:break_scope::X [line 84, column 7]\n  n$11=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 84, column 7]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_11" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_3" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x3:break_scope::X); [line 83, column 7]\n  n$13=_fun_break_scope::X::X(&x3:break_scope::X*) [line 83, column 9]\n  EXIT_SCOPE(n$13); [line 83, column 9]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x3:break_scope::X); [line 83, column 7]\n  n$13=_fun_break_scope::X::X(&x3:break_scope::X*) [line 83, column 9]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_12" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_11" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_13" [label="13:  Destruction(Scope) \n   _=*&x4:break_scope::X [line 87, column 5]\n  n$15=_fun_break_scope::X::~X(&x4:break_scope::X*) injected [line 87, column 5]\n  EXIT_SCOPE(_,n$15,x4); [line 87, column 5]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_13" [label="13:  Destruction(Scope) \n   _=*&x4:break_scope::X [line 87, column 5]\n  n$15=_fun_break_scope::X::~X(&x4:break_scope::X*) injected [line 87, column 5]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_13" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_8" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x4:break_scope::X); [line 86, column 7]\n  n$17=_fun_break_scope::X::X(&x4:break_scope::X*) [line 86, column 9]\n  EXIT_SCOPE(n$17); [line 86, column 9]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x4:break_scope::X); [line 86, column 7]\n  n$17=_fun_break_scope::X::X(&x4:break_scope::X*) [line 86, column 9]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_14" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_13" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_15" [label="15:  DeclStmt \n   VARIABLE_DECLARED(x2:break_scope::X); [line 81, column 5]\n  n$19=_fun_break_scope::X::X(&x2:break_scope::X*) [line 81, column 7]\n  EXIT_SCOPE(n$19); [line 81, column 7]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_15" [label="15:  DeclStmt \n   VARIABLE_DECLARED(x2:break_scope::X); [line 81, column 5]\n  n$19=_fun_break_scope::X::X(&x2:break_scope::X*) [line 81, column 7]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_15" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_9" ;
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_15" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_10" ;
-"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_16" [label="16:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 79, column 3]\n  n$21=_fun_break_scope::X::X(&x1:break_scope::X*) [line 79, column 5]\n  EXIT_SCOPE(n$21); [line 79, column 5]\n  APPLY_ABSTRACTION; [line 79, column 5]\n " shape="box"]
+"test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_16" [label="16:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 79, column 3]\n  n$21=_fun_break_scope::X::X(&x1:break_scope::X*) [line 79, column 5]\n " shape="box"]
 	
 
 	 "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_16" -> "test_do_while#break_scope#1068194121698893969.72aceeae2a95e32b3efdbdc08d127420_4" ;
@@ -69,18 +69,18 @@ digraph cfg {
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_1" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_17" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_2" [label="2: Exit break_scope::test_for \n   NULLIFY(&0$?%__sil_tmp__temp_return_n$19); [line 64, column 1]\n  NULLIFY(&x2); [line 64, column 1]\n  NULLIFY(&x1); [line 64, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$9); [line 64, column 1]\n  NULLIFY(&it); [line 64, column 1]\n  NULLIFY(&vector); [line 64, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$22); [line 64, column 1]\n " color=yellow style=filled]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_2" [label="2: Exit break_scope::test_for \n  " color=yellow style=filled]
 	
 
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_3" [label="3:  Destruction(Scope) \n   _=*&x2:break_scope::X [line 64, column 1]\n  n$1=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 64, column 1]\n  _=*&vector:break_scope::vec [line 64, column 1]\n  n$3=_fun_break_scope::vec::~vec(&vector:break_scope::vec*) injected [line 64, column 1]\n  EXIT_SCOPE(_,_,n$1,n$3,vector,x2); [line 64, column 1]\n  APPLY_ABSTRACTION; [line 64, column 1]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_3" [label="3:  Destruction(Scope) \n   _=*&x2:break_scope::X [line 64, column 1]\n  n$1=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 64, column 1]\n  _=*&vector:break_scope::vec [line 64, column 1]\n  n$3=_fun_break_scope::vec::~vec(&vector:break_scope::vec*) injected [line 64, column 1]\n " shape="box"]
 	
 
 	 "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   VARIABLE_DECLARED(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); [line 63, column 5]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_4" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_3" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_5" [label="5:  Destruction(Scope) \n   _=*&it:break_scope::iterator [line 62, column 3]\n  n$7=_fun_break_scope::iterator::~iterator(&it:break_scope::iterator*) injected [line 62, column 3]\n  EXIT_SCOPE(_,n$7,it); [line 62, column 3]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_5" [label="5:  Destruction(Scope) \n   _=*&it:break_scope::iterator [line 62, column 3]\n  n$7=_fun_break_scope::iterator::~iterator(&it:break_scope::iterator*) injected [line 62, column 3]\n " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_5" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_4" ;
@@ -88,25 +88,25 @@ digraph cfg {
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_6" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_9" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(it:break_scope::iterator); [line 57, column 8]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$9:break_scope::iterator); [line 57, column 22]\n  _=*&vector:break_scope::vec [line 57, column 22]\n  n$15=_fun_break_scope::vec::begin(&vector:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$9:break_scope::iterator*) assign_last [line 57, column 22]\n  n$16=_fun_break_scope::iterator::iterator(&it:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$9:break_scope::iterator&) [line 57, column 22]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$9:break_scope::iterator [line 57, column 35]\n  n$11=_fun_break_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$9:break_scope::iterator*) injected [line 57, column 35]\n  EXIT_SCOPE(_,_,n$11,n$15,n$16,0$?%__sil_tmpSIL_materialize_temp__n$9); [line 57, column 35]\n  APPLY_ABSTRACTION; [line 57, column 35]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(it:break_scope::iterator); [line 57, column 8]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$9:break_scope::iterator); [line 57, column 22]\n  _=*&vector:break_scope::vec [line 57, column 22]\n  n$15=_fun_break_scope::vec::begin(&vector:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$9:break_scope::iterator*) assign_last [line 57, column 22]\n  n$16=_fun_break_scope::iterator::iterator(&it:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$9:break_scope::iterator&) [line 57, column 22]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$9:break_scope::iterator [line 57, column 35]\n  n$11=_fun_break_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$9:break_scope::iterator*) injected [line 57, column 35]\n " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_7" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_6" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_8" [label="8:  Call _fun_break_scope::iterator::operator++ \n   n$20=_fun_break_scope::iterator::operator++(&it:break_scope::iterator&,&0$?%__sil_tmp__temp_return_n$19:break_scope::iterator*) assign_last [line 57, column 58]\n  EXIT_SCOPE(n$20,0$?%__sil_tmp__temp_return_n$19); [line 57, column 58]\n  APPLY_ABSTRACTION; [line 57, column 58]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_8" [label="8:  Call _fun_break_scope::iterator::operator++ \n   n$20=_fun_break_scope::iterator::operator++(&it:break_scope::iterator&,&0$?%__sil_tmp__temp_return_n$19:break_scope::iterator*) assign_last [line 57, column 58]\n " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_8" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_6" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_9" [label="9:  Call _fun_break_scope::iterator::operator!= \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$22:break_scope::iterator const ); [line 57, column 44]\n  _=*&vector:break_scope::vec [line 57, column 44]\n  n$25=_fun_break_scope::vec::end(&vector:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$22:break_scope::iterator*) assign_last [line 57, column 44]\n  n$26=_fun_break_scope::iterator::operator!=(&it:break_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$22:break_scope::iterator const &) [line 57, column 38]\n  EXIT_SCOPE(_,n$25,0$?%__sil_tmpSIL_materialize_temp__n$22); [line 57, column 38]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_9" [label="9:  Call _fun_break_scope::iterator::operator!= \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$22:break_scope::iterator const ); [line 57, column 44]\n  _=*&vector:break_scope::vec [line 57, column 44]\n  n$25=_fun_break_scope::vec::end(&vector:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$22:break_scope::iterator*) assign_last [line 57, column 44]\n  n$26=_fun_break_scope::iterator::operator!=(&it:break_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$22:break_scope::iterator const &) [line 57, column 38]\n " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_9" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_10" ;
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_9" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_11" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_10" [label="10: Prune (true branch, for loop) \n   PRUNE(n$26, true); [line 57, column 38]\n  EXIT_SCOPE(n$26); [line 57, column 38]\n " shape="invhouse"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_10" [label="10: Prune (true branch, for loop) \n   PRUNE(n$26, true); [line 57, column 38]\n " shape="invhouse"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_10" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_13" ;
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_10" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_14" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_11" [label="11: Prune (false branch, for loop) \n   PRUNE(!n$26, false); [line 57, column 38]\n  EXIT_SCOPE(n$26); [line 57, column 38]\n  APPLY_ABSTRACTION; [line 57, column 38]\n " shape="invhouse"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_11" [label="11: Prune (false branch, for loop) \n   PRUNE(!n$26, false); [line 57, column 38]\n " shape="invhouse"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_11" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_5" ;
@@ -114,23 +114,23 @@ digraph cfg {
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_12" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_8" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_13" [label="13: Prune (true branch, if) \n   n$27=*&b:_Bool [line 58, column 9]\n  PRUNE(n$27, true); [line 58, column 9]\n  NULLIFY(&b); [line 58, column 9]\n  EXIT_SCOPE(n$27,b); [line 58, column 9]\n " shape="invhouse"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_13" [label="13: Prune (true branch, if) \n   n$27=*&b:_Bool [line 58, column 9]\n  PRUNE(n$27, true); [line 58, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_13" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_16" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_14" [label="14: Prune (false branch, if) \n   n$27=*&b:_Bool [line 58, column 9]\n  PRUNE(!n$27, false); [line 58, column 9]\n  EXIT_SCOPE(n$27); [line 58, column 9]\n " shape="invhouse"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_14" [label="14: Prune (false branch, if) \n   n$27=*&b:_Bool [line 58, column 9]\n  PRUNE(!n$27, false); [line 58, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_14" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_12" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_15" [label="15:  Destruction(break) \n   _=*&x1:break_scope::X [line 60, column 7]\n  n$29=_fun_break_scope::X::~X(&x1:break_scope::X*) injected [line 60, column 7]\n  EXIT_SCOPE(_,n$29,x1); [line 60, column 7]\n  APPLY_ABSTRACTION; [line 60, column 7]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_15" [label="15:  Destruction(break) \n   _=*&x1:break_scope::X [line 60, column 7]\n  n$29=_fun_break_scope::X::~X(&x1:break_scope::X*) injected [line 60, column 7]\n " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_15" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_5" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_16" [label="16:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 59, column 7]\n  n$31=_fun_break_scope::X::X(&x1:break_scope::X*) [line 59, column 9]\n  EXIT_SCOPE(n$31); [line 59, column 9]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_16" [label="16:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 59, column 7]\n  n$31=_fun_break_scope::X::X(&x1:break_scope::X*) [line 59, column 9]\n " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_16" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_15" ;
-"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_17" [label="17:  DeclStmt \n   VARIABLE_DECLARED(vector:break_scope::vec); [line 56, column 3]\n  n$35=_fun_break_scope::vec::vec(&vector:break_scope::vec*) [line 56, column 7]\n  EXIT_SCOPE(n$35); [line 56, column 7]\n " shape="box"]
+"test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_17" [label="17:  DeclStmt \n   VARIABLE_DECLARED(vector:break_scope::vec); [line 56, column 3]\n  n$35=_fun_break_scope::vec::vec(&vector:break_scope::vec*) [line 56, column 7]\n " shape="box"]
 	
 
 	 "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_17" -> "test_for#break_scope#12580813866832058675.4c62e98ea10322d216af5dcd2cfbde37_7" ;
@@ -138,14 +138,14 @@ digraph cfg {
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_1" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_20" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_2" [label="2: Exit break_scope::test_for_range \n   NULLIFY(&vector); [line 53, column 1]\n  NULLIFY(&__begin1); [line 53, column 1]\n  NULLIFY(&__end1); [line 53, column 1]\n  NULLIFY(&x2); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_return_n$30); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$19); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$10); [line 53, column 1]\n  NULLIFY(&x1); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$43); [line 53, column 1]\n  NULLIFY(&x); [line 53, column 1]\n " color=yellow style=filled]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_2" [label="2: Exit break_scope::test_for_range \n  " color=yellow style=filled]
 	
 
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_3" [label="3:  Destruction(Scope) \n   _=*&x1:break_scope::X [line 53, column 1]\n  n$1=_fun_break_scope::X::~X(&x1:break_scope::X*) injected [line 53, column 1]\n  _=*&vector:break_scope::vec [line 53, column 1]\n  n$3=_fun_break_scope::vec::~vec(&vector:break_scope::vec*) injected [line 53, column 1]\n  EXIT_SCOPE(_,_,n$1,n$3,x1,vector); [line 53, column 1]\n  APPLY_ABSTRACTION; [line 53, column 1]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_3" [label="3:  Destruction(Scope) \n   _=*&x1:break_scope::X [line 53, column 1]\n  n$1=_fun_break_scope::X::~X(&x1:break_scope::X*) injected [line 53, column 1]\n  _=*&vector:break_scope::vec [line 53, column 1]\n  n$3=_fun_break_scope::vec::~vec(&vector:break_scope::vec*) injected [line 53, column 1]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_3" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_2" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_4" [label="4:  Destruction(Scope) \n   _=*&__end1:break_scope::iterator [line 52, column 3]\n  n$6=_fun_break_scope::iterator::~iterator(&__end1:break_scope::iterator*) injected [line 52, column 3]\n  _=*&__begin1:break_scope::iterator [line 52, column 3]\n  n$8=_fun_break_scope::iterator::~iterator(&__begin1:break_scope::iterator*) injected [line 52, column 3]\n  EXIT_SCOPE(_,_,n$6,n$8,__end1,__begin1); [line 52, column 3]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_4" [label="4:  Destruction(Scope) \n   _=*&__end1:break_scope::iterator [line 52, column 3]\n  n$6=_fun_break_scope::iterator::~iterator(&__end1:break_scope::iterator*) injected [line 52, column 3]\n  _=*&__begin1:break_scope::iterator [line 52, column 3]\n  n$8=_fun_break_scope::iterator::~iterator(&__begin1:break_scope::iterator*) injected [line 52, column 3]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_4" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_3" ;
@@ -153,15 +153,15 @@ digraph cfg {
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_5" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_9" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(__end1:break_scope::iterator); [line 47, column 12]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$10:break_scope::iterator); [line 47, column 12]\n  n$14=*&__range1:break_scope::vec& [line 47, column 12]\n  _=*n$14:break_scope::vec [line 47, column 12]\n  n$17=_fun_break_scope::vec::end(n$14:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$10:break_scope::iterator*) assign_last [line 47, column 12]\n  n$18=_fun_break_scope::iterator::iterator(&__end1:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$10:break_scope::iterator&) [line 47, column 12]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$10:break_scope::iterator [line 47, column 12]\n  n$12=_fun_break_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$10:break_scope::iterator*) injected [line 47, column 12]\n  NULLIFY(&__range1); [line 47, column 12]\n  EXIT_SCOPE(_,_,n$12,n$14,n$17,n$18,__range1,0$?%__sil_tmpSIL_materialize_temp__n$10); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, column 12]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(__end1:break_scope::iterator); [line 47, column 12]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$10:break_scope::iterator); [line 47, column 12]\n  n$14=*&__range1:break_scope::vec& [line 47, column 12]\n  _=*n$14:break_scope::vec [line 47, column 12]\n  n$17=_fun_break_scope::vec::end(n$14:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$10:break_scope::iterator*) assign_last [line 47, column 12]\n  n$18=_fun_break_scope::iterator::iterator(&__end1:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$10:break_scope::iterator&) [line 47, column 12]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$10:break_scope::iterator [line 47, column 12]\n  n$12=_fun_break_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$10:break_scope::iterator*) injected [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:  DeclStmt \n   VARIABLE_DECLARED(__begin1:break_scope::iterator); [line 47, column 12]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$19:break_scope::iterator); [line 47, column 12]\n  n$23=*&__range1:break_scope::vec& [line 47, column 12]\n  _=*n$23:break_scope::vec [line 47, column 12]\n  n$26=_fun_break_scope::vec::begin(n$23:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$19:break_scope::iterator*) assign_last [line 47, column 12]\n  n$27=_fun_break_scope::iterator::iterator(&__begin1:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$19:break_scope::iterator&) [line 47, column 12]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$19:break_scope::iterator [line 47, column 12]\n  n$21=_fun_break_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$19:break_scope::iterator*) injected [line 47, column 12]\n  EXIT_SCOPE(_,_,n$21,n$23,n$26,n$27,0$?%__sil_tmpSIL_materialize_temp__n$19); [line 47, column 12]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(__begin1:break_scope::iterator); [line 47, column 12]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$19:break_scope::iterator); [line 47, column 12]\n  n$23=*&__range1:break_scope::vec& [line 47, column 12]\n  _=*n$23:break_scope::vec [line 47, column 12]\n  n$26=_fun_break_scope::vec::begin(n$23:break_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$19:break_scope::iterator*) assign_last [line 47, column 12]\n  n$27=_fun_break_scope::iterator::iterator(&__begin1:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$19:break_scope::iterator&) [line 47, column 12]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$19:break_scope::iterator [line 47, column 12]\n  n$21=_fun_break_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$19:break_scope::iterator*) injected [line 47, column 12]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_7" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_6" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_8" [label="8:  Call _fun_break_scope::iterator::operator++ \n   n$31=_fun_break_scope::iterator::operator++(&__begin1:break_scope::iterator&,&0$?%__sil_tmp__temp_return_n$30:break_scope::iterator*) assign_last [line 47, column 12]\n  EXIT_SCOPE(n$31,0$?%__sil_tmp__temp_return_n$30); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, column 12]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_8" [label="8:  Call _fun_break_scope::iterator::operator++ \n   n$31=_fun_break_scope::iterator::operator++(&__begin1:break_scope::iterator&,&0$?%__sil_tmp__temp_return_n$30:break_scope::iterator*) assign_last [line 47, column 12]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_8" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_5" ;
@@ -170,11 +170,11 @@ digraph cfg {
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_9" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_10" ;
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_9" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_11" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_10" [label="10: Prune (true branch, for loop) \n   PRUNE(n$33, true); [line 47, column 12]\n  EXIT_SCOPE(n$33); [line 47, column 12]\n " shape="invhouse"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_10" [label="10: Prune (true branch, for loop) \n   PRUNE(n$33, true); [line 47, column 12]\n " shape="invhouse"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_10" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_17" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_11" [label="11: Prune (false branch, for loop) \n   PRUNE(!n$33, false); [line 47, column 12]\n  EXIT_SCOPE(n$33); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, column 12]\n " shape="invhouse"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_11" [label="11: Prune (false branch, for loop) \n   PRUNE(!n$33, false); [line 47, column 12]\n " shape="invhouse"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_11" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_4" ;
@@ -182,23 +182,23 @@ digraph cfg {
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_12" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_8" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_13" [label="13: Prune (true branch, if) \n   n$34=*&b:_Bool [line 48, column 9]\n  PRUNE(n$34, true); [line 48, column 9]\n  NULLIFY(&b); [line 48, column 9]\n  EXIT_SCOPE(n$34,b); [line 48, column 9]\n " shape="invhouse"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_13" [label="13: Prune (true branch, if) \n   n$34=*&b:_Bool [line 48, column 9]\n  PRUNE(n$34, true); [line 48, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_13" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_16" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_14" [label="14: Prune (false branch, if) \n   n$34=*&b:_Bool [line 48, column 9]\n  PRUNE(!n$34, false); [line 48, column 9]\n  EXIT_SCOPE(n$34,x); [line 48, column 9]\n " shape="invhouse"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_14" [label="14: Prune (false branch, if) \n   n$34=*&b:_Bool [line 48, column 9]\n  PRUNE(!n$34, false); [line 48, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_14" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_12" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_15" [label="15:  Destruction(break) \n   _=*&x2:break_scope::X [line 50, column 7]\n  n$36=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 50, column 7]\n  _=*&x:break_scope::X [line 50, column 7]\n  n$38=_fun_break_scope::X::~X(&x:break_scope::X*) injected [line 50, column 7]\n  EXIT_SCOPE(_,_,n$36,n$38,x,x2); [line 50, column 7]\n  APPLY_ABSTRACTION; [line 50, column 7]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_15" [label="15:  Destruction(break) \n   _=*&x2:break_scope::X [line 50, column 7]\n  n$36=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 50, column 7]\n  _=*&x:break_scope::X [line 50, column 7]\n  n$38=_fun_break_scope::X::~X(&x:break_scope::X*) injected [line 50, column 7]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_15" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_4" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_16" [label="16:  DeclStmt \n   VARIABLE_DECLARED(x2:break_scope::X); [line 49, column 7]\n  n$40=_fun_break_scope::X::X(&x2:break_scope::X*,&x:break_scope::X&) [line 49, column 14]\n  EXIT_SCOPE(n$40); [line 49, column 14]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_16" [label="16:  DeclStmt \n   VARIABLE_DECLARED(x2:break_scope::X); [line 49, column 7]\n  n$40=_fun_break_scope::X::X(&x2:break_scope::X*,&x:break_scope::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   VARIABLE_DECLARED(x:break_scope::X); [line 47, column 8]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$43:break_scope::X const ); [line 47, column 12]\n  n$49=_fun_break_scope::iterator::operator*(&__begin1:break_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$43:break_scope::X*) assign_last [line 47, column 12]\n  n$50=_fun_break_scope::X::X(&x:break_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$43:break_scope::X const &) [line 47, column 12]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$43:break_scope::X const  [line 47, column 12]\n  n$45=_fun_break_scope::X::~X(&0$?%__sil_tmpSIL_materialize_temp__n$43:break_scope::X const *) injected [line 47, column 12]\n  EXIT_SCOPE(_,n$45,n$49,n$50,0$?%__sil_tmpSIL_materialize_temp__n$43); [line 47, column 12]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_17" [label="17:  DeclStmt \n   VARIABLE_DECLARED(x:break_scope::X); [line 47, column 8]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$43:break_scope::X const ); [line 47, column 12]\n  n$49=_fun_break_scope::iterator::operator*(&__begin1:break_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$43:break_scope::X*) assign_last [line 47, column 12]\n  n$50=_fun_break_scope::X::X(&x:break_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$43:break_scope::X const &) [line 47, column 12]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$43:break_scope::X const  [line 47, column 12]\n  n$45=_fun_break_scope::X::~X(&0$?%__sil_tmpSIL_materialize_temp__n$43:break_scope::X const *) injected [line 47, column 12]\n " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_17" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_13" ;
@@ -207,11 +207,11 @@ digraph cfg {
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_18" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_7" ;
-"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_19" [label="19:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 46, column 3]\n  n$52=_fun_break_scope::X::X(&x1:break_scope::X*) [line 46, column 5]\n  EXIT_SCOPE(n$52); [line 46, column 5]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_19" [label="19:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 46, column 3]\n  n$52=_fun_break_scope::X::X(&x1:break_scope::X*) [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   VARIABLE_DECLARED(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); [line 45, column 7]\n " shape="box"]
+"test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_20" [label="20:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_20" -> "test_for_range#break_scope#2115859683356214080.ad34c277f8d086eb0a22c75fc80fb235_19" ;
@@ -219,55 +219,55 @@ digraph cfg {
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_1" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_18" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_2" [label="2: Exit break_scope::test_switch \n   NULLIFY(&x4); [line 128, column 1]\n  NULLIFY(&x5); [line 128, column 1]\n  NULLIFY(&x1); [line 128, column 1]\n  NULLIFY(&x3); [line 128, column 1]\n  NULLIFY(&x2); [line 128, column 1]\n " color=yellow style=filled]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_2" [label="2: Exit break_scope::test_switch \n  " color=yellow style=filled]
 	
 
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_3" [label="3:  Destruction(Scope) \n   _=*&x5:break_scope::X [line 128, column 1]\n  n$1=_fun_break_scope::X::~X(&x5:break_scope::X*) injected [line 128, column 1]\n  _=*&x1:break_scope::X [line 128, column 1]\n  n$3=_fun_break_scope::X::~X(&x1:break_scope::X*) injected [line 128, column 1]\n  EXIT_SCOPE(_,_,n$1,n$3,x1,x5); [line 128, column 1]\n  APPLY_ABSTRACTION; [line 128, column 1]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_3" [label="3:  Destruction(Scope) \n   _=*&x5:break_scope::X [line 128, column 1]\n  n$1=_fun_break_scope::X::~X(&x5:break_scope::X*) injected [line 128, column 1]\n  _=*&x1:break_scope::X [line 128, column 1]\n  n$3=_fun_break_scope::X::~X(&x1:break_scope::X*) injected [line 128, column 1]\n " shape="box"]
 	
 
 	 "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   VARIABLE_DECLARED(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); [line 127, column 5]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_4" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_3" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_5" [label="5:  SwitchStmt \n   n$6=*&n:int [line 115, column 11]\n  NULLIFY(&n); [line 115, column 11]\n  EXIT_SCOPE(n); [line 115, column 11]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_5" [label="5:  SwitchStmt \n   n$6=*&n:int [line 115, column 11]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_5" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_16" ;
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_5" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_17" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_6" [label="6:  Destruction(Scope) \n   _=*&x4:break_scope::X [line 125, column 5]\n  n$8=_fun_break_scope::X::~X(&x4:break_scope::X*) injected [line 125, column 5]\n  EXIT_SCOPE(_,n$8,x4); [line 125, column 5]\n  APPLY_ABSTRACTION; [line 125, column 5]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_6" [label="6:  Destruction(Scope) \n   _=*&x4:break_scope::X [line 125, column 5]\n  n$8=_fun_break_scope::X::~X(&x4:break_scope::X*) injected [line 125, column 5]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_6" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_4" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(x4:break_scope::X); [line 124, column 7]\n  n$10=_fun_break_scope::X::X(&x4:break_scope::X*) [line 124, column 9]\n  EXIT_SCOPE(n$10); [line 124, column 9]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(x4:break_scope::X); [line 124, column 7]\n  n$10=_fun_break_scope::X::X(&x4:break_scope::X*) [line 124, column 9]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_7" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_6" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_8" [label="8:  Destruction(break) \n   _=*&x3:break_scope::X [line 121, column 7]\n  n$12=_fun_break_scope::X::~X(&x3:break_scope::X*) injected [line 121, column 7]\n  EXIT_SCOPE(_,n$12,x3); [line 121, column 7]\n  APPLY_ABSTRACTION; [line 121, column 7]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_8" [label="8:  Destruction(break) \n   _=*&x3:break_scope::X [line 121, column 7]\n  n$12=_fun_break_scope::X::~X(&x3:break_scope::X*) injected [line 121, column 7]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_8" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_4" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(x3:break_scope::X); [line 120, column 7]\n  n$14=_fun_break_scope::X::X(&x3:break_scope::X*) [line 120, column 9]\n  EXIT_SCOPE(n$14); [line 120, column 9]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(x3:break_scope::X); [line 120, column 7]\n  n$14=_fun_break_scope::X::X(&x3:break_scope::X*) [line 120, column 9]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_9" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_8" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_10" [label="10:  Destruction(Scope) \n   _=*&x2:break_scope::X [line 118, column 5]\n  n$16=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 118, column 5]\n  EXIT_SCOPE(_,n$16,x2); [line 118, column 5]\n  APPLY_ABSTRACTION; [line 118, column 5]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_10" [label="10:  Destruction(Scope) \n   _=*&x2:break_scope::X [line 118, column 5]\n  n$16=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 118, column 5]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_10" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_9" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(x2:break_scope::X); [line 117, column 7]\n  n$18=_fun_break_scope::X::X(&x2:break_scope::X*) [line 117, column 9]\n  EXIT_SCOPE(n$18); [line 117, column 9]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(x2:break_scope::X); [line 117, column 7]\n  n$18=_fun_break_scope::X::X(&x2:break_scope::X*) [line 117, column 9]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_11" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_10" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$6 == 3), true); [line 123, column 5]\n  EXIT_SCOPE(n$6); [line 123, column 5]\n " shape="invhouse"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_12" [label="12: Prune (true branch, switch) \n   PRUNE((n$6 == 3), true); [line 123, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_12" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_7" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_13" [label="13: Prune (false branch, switch) \n   PRUNE(!(n$6 == 3), false); [line 123, column 5]\n  EXIT_SCOPE(n$6); [line 123, column 5]\n  APPLY_ABSTRACTION; [line 123, column 5]\n " shape="invhouse"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_13" [label="13: Prune (false branch, switch) \n   PRUNE(!(n$6 == 3), false); [line 123, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_13" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_4" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_14" [label="14: Prune (true branch, switch) \n   PRUNE((n$6 == 2), true); [line 119, column 5]\n  EXIT_SCOPE(n$6); [line 119, column 5]\n  APPLY_ABSTRACTION; [line 119, column 5]\n " shape="invhouse"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_14" [label="14: Prune (true branch, switch) \n   PRUNE((n$6 == 2), true); [line 119, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_14" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_9" ;
@@ -276,7 +276,7 @@ digraph cfg {
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_15" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_12" ;
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_15" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_13" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_16" [label="16: Prune (true branch, switch) \n   PRUNE((n$6 == 1), true); [line 116, column 5]\n  EXIT_SCOPE(n$6); [line 116, column 5]\n " shape="invhouse"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_16" [label="16: Prune (true branch, switch) \n   PRUNE((n$6 == 1), true); [line 116, column 5]\n " shape="invhouse"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_16" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_11" ;
@@ -285,7 +285,7 @@ digraph cfg {
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_17" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_14" ;
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_17" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_15" ;
-"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_18" [label="18:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 114, column 3]\n  n$20=_fun_break_scope::X::X(&x1:break_scope::X*) [line 114, column 5]\n  EXIT_SCOPE(n$20); [line 114, column 5]\n " shape="box"]
+"test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_18" [label="18:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 114, column 3]\n  n$20=_fun_break_scope::X::X(&x1:break_scope::X*) [line 114, column 5]\n " shape="box"]
 	
 
 	 "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_18" -> "test_switch#break_scope#5012999682930893305.43ca855443a5fa68fa701447a90f7a1f_5" ;
@@ -293,10 +293,10 @@ digraph cfg {
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_1" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_14" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_2" [label="2: Exit break_scope::test_while1 \n   NULLIFY(&x2); [line 76, column 1]\n  NULLIFY(&x1); [line 76, column 1]\n  NULLIFY(&x4); [line 76, column 1]\n " color=yellow style=filled]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_2" [label="2: Exit break_scope::test_while1 \n  " color=yellow style=filled]
 	
 
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_3" [label="3:  Destruction(Scope) \n   _=*&x1:break_scope::X [line 76, column 1]\n  n$1=_fun_break_scope::X::~X(&x1:break_scope::X*) injected [line 76, column 1]\n  EXIT_SCOPE(_,n$1,x1); [line 76, column 1]\n  APPLY_ABSTRACTION; [line 76, column 1]\n " shape="box"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_3" [label="3:  Destruction(Scope) \n   _=*&x1:break_scope::X [line 76, column 1]\n  n$1=_fun_break_scope::X::~X(&x1:break_scope::X*) injected [line 76, column 1]\n " shape="box"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_3" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_2" ;
@@ -305,12 +305,12 @@ digraph cfg {
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_4" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_5" ;
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_4" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_6" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_5" [label="5: Prune (true branch, while) \n   n$3=*&a:_Bool [line 68, column 10]\n  PRUNE(n$3, true); [line 68, column 10]\n  EXIT_SCOPE(n$3); [line 68, column 10]\n " shape="invhouse"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_5" [label="5: Prune (true branch, while) \n   n$3=*&a:_Bool [line 68, column 10]\n  PRUNE(n$3, true); [line 68, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_5" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_8" ;
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_5" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_9" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_6" [label="6: Prune (false branch, while) \n   n$3=*&a:_Bool [line 68, column 10]\n  PRUNE(!n$3, false); [line 68, column 10]\n  NULLIFY(&a); [line 68, column 10]\n  EXIT_SCOPE(n$3,a); [line 68, column 10]\n  APPLY_ABSTRACTION; [line 68, column 10]\n " shape="invhouse"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_6" [label="6: Prune (false branch, while) \n   n$3=*&a:_Bool [line 68, column 10]\n  PRUNE(!n$3, false); [line 68, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_6" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_3" ;
@@ -318,31 +318,31 @@ digraph cfg {
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_7" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_4" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_8" [label="8: Prune (true branch, if) \n   n$4=*&b:_Bool [line 69, column 9]\n  PRUNE(n$4, true); [line 69, column 9]\n  NULLIFY(&b); [line 69, column 9]\n  EXIT_SCOPE(n$4,b); [line 69, column 9]\n " shape="invhouse"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_8" [label="8: Prune (true branch, if) \n   n$4=*&b:_Bool [line 69, column 9]\n  PRUNE(n$4, true); [line 69, column 9]\n " shape="invhouse"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_8" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_11" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_9" [label="9: Prune (false branch, if) \n   n$4=*&b:_Bool [line 69, column 9]\n  PRUNE(!n$4, false); [line 69, column 9]\n  EXIT_SCOPE(n$4); [line 69, column 9]\n " shape="invhouse"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_9" [label="9: Prune (false branch, if) \n   n$4=*&b:_Bool [line 69, column 9]\n  PRUNE(!n$4, false); [line 69, column 9]\n " shape="invhouse"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_9" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_13" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_10" [label="10:  Destruction(break) \n   _=*&x2:break_scope::X [line 71, column 7]\n  n$6=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 71, column 7]\n  EXIT_SCOPE(_,n$6,x2); [line 71, column 7]\n  APPLY_ABSTRACTION; [line 71, column 7]\n " shape="box"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_10" [label="10:  Destruction(break) \n   _=*&x2:break_scope::X [line 71, column 7]\n  n$6=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 71, column 7]\n " shape="box"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_10" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_3" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(x2:break_scope::X); [line 70, column 7]\n  n$8=_fun_break_scope::X::X(&x2:break_scope::X*) [line 70, column 9]\n  EXIT_SCOPE(n$8); [line 70, column 9]\n " shape="box"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(x2:break_scope::X); [line 70, column 7]\n  n$8=_fun_break_scope::X::X(&x2:break_scope::X*) [line 70, column 9]\n " shape="box"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_11" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_10" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_12" [label="12:  Destruction(Scope) \n   _=*&x4:break_scope::X [line 74, column 5]\n  n$10=_fun_break_scope::X::~X(&x4:break_scope::X*) injected [line 74, column 5]\n  EXIT_SCOPE(_,n$10,x4); [line 74, column 5]\n " shape="box"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_12" [label="12:  Destruction(Scope) \n   _=*&x4:break_scope::X [line 74, column 5]\n  n$10=_fun_break_scope::X::~X(&x4:break_scope::X*) injected [line 74, column 5]\n " shape="box"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_12" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_7" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x4:break_scope::X); [line 73, column 7]\n  n$12=_fun_break_scope::X::X(&x4:break_scope::X*) [line 73, column 9]\n  EXIT_SCOPE(n$12); [line 73, column 9]\n " shape="box"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x4:break_scope::X); [line 73, column 7]\n  n$12=_fun_break_scope::X::X(&x4:break_scope::X*) [line 73, column 9]\n " shape="box"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_13" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_12" ;
-"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 67, column 3]\n  n$15=_fun_break_scope::X::X(&x1:break_scope::X*) [line 67, column 5]\n  EXIT_SCOPE(n$15); [line 67, column 5]\n  APPLY_ABSTRACTION; [line 67, column 5]\n " shape="box"]
+"test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 67, column 3]\n  n$15=_fun_break_scope::X::X(&x1:break_scope::X*) [line 67, column 5]\n " shape="box"]
 	
 
 	 "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_14" -> "test_while1#break_scope#17740518799763849642.b3409b963f3ece06bd5b04dd968e5c61_4" ;
@@ -350,10 +350,10 @@ digraph cfg {
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_1" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_14" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_2" [label="2: Exit break_scope::test_while2 \n   NULLIFY(&x2); [line 100, column 1]\n  NULLIFY(&x1); [line 100, column 1]\n  NULLIFY(&x3); [line 100, column 1]\n " color=yellow style=filled]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_2" [label="2: Exit break_scope::test_while2 \n  " color=yellow style=filled]
 	
 
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_3" [label="3:  Destruction(Scope) \n   _=*&x1:break_scope::X [line 100, column 1]\n  n$1=_fun_break_scope::X::~X(&x1:break_scope::X*) injected [line 100, column 1]\n  EXIT_SCOPE(_,n$1,x1); [line 100, column 1]\n  APPLY_ABSTRACTION; [line 100, column 1]\n " shape="box"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_3" [label="3:  Destruction(Scope) \n   _=*&x1:break_scope::X [line 100, column 1]\n  n$1=_fun_break_scope::X::~X(&x1:break_scope::X*) injected [line 100, column 1]\n " shape="box"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_3" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_2" ;
@@ -362,15 +362,15 @@ digraph cfg {
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_4" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_5" ;
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_4" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_6" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_5" [label="5: Prune (true branch, while) \n   n$3=*&a:_Bool [line 93, column 10]\n  PRUNE(n$3, true); [line 93, column 10]\n  EXIT_SCOPE(n$3); [line 93, column 10]\n " shape="invhouse"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_5" [label="5: Prune (true branch, while) \n   n$3=*&a:_Bool [line 93, column 10]\n  PRUNE(n$3, true); [line 93, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_5" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_13" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_6" [label="6: Prune (false branch, while) \n   n$3=*&a:_Bool [line 93, column 10]\n  PRUNE(!n$3, false); [line 93, column 10]\n  NULLIFY(&a); [line 93, column 10]\n  EXIT_SCOPE(n$3,a); [line 93, column 10]\n " shape="invhouse"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_6" [label="6: Prune (false branch, while) \n   n$3=*&a:_Bool [line 93, column 10]\n  PRUNE(!n$3, false); [line 93, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_6" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_3" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_7" [label="7:  Destruction(Scope) \n   _=*&x2:break_scope::X [line 99, column 3]\n  n$5=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [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" [label="7:  Destruction(Scope) \n   _=*&x2:break_scope::X [line 99, column 3]\n  n$5=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 99, column 3]\n " shape="box"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_7" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_4" ;
@@ -379,27 +379,27 @@ digraph cfg {
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_8" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_9" ;
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_8" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_10" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_9" [label="9: Prune (true branch, while) \n   n$7=*&b:_Bool [line 95, column 12]\n  PRUNE(n$7, true); [line 95, column 12]\n  EXIT_SCOPE(n$7); [line 95, column 12]\n " shape="invhouse"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_9" [label="9: Prune (true branch, while) \n   n$7=*&b:_Bool [line 95, column 12]\n  PRUNE(n$7, true); [line 95, column 12]\n " shape="invhouse"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_9" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_12" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_10" [label="10: Prune (false branch, while) \n   n$7=*&b:_Bool [line 95, column 12]\n  PRUNE(!n$7, false); [line 95, column 12]\n  EXIT_SCOPE(n$7); [line 95, column 12]\n  APPLY_ABSTRACTION; [line 95, column 12]\n " shape="invhouse"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_10" [label="10: Prune (false branch, while) \n   n$7=*&b:_Bool [line 95, column 12]\n  PRUNE(!n$7, false); [line 95, column 12]\n " shape="invhouse"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_10" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_7" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_11" [label="11:  Destruction(break) \n   _=*&x3:break_scope::X [line 97, column 7]\n  n$9=_fun_break_scope::X::~X(&x3:break_scope::X*) injected [line 97, column 7]\n  EXIT_SCOPE(_,n$9,x3); [line 97, column 7]\n  APPLY_ABSTRACTION; [line 97, column 7]\n " shape="box"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_11" [label="11:  Destruction(break) \n   _=*&x3:break_scope::X [line 97, column 7]\n  n$9=_fun_break_scope::X::~X(&x3:break_scope::X*) injected [line 97, column 7]\n " shape="box"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_11" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_7" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x3:break_scope::X); [line 96, column 7]\n  n$11=_fun_break_scope::X::X(&x3:break_scope::X*) [line 96, column 9]\n  EXIT_SCOPE(n$11); [line 96, column 9]\n " shape="box"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x3:break_scope::X); [line 96, column 7]\n  n$11=_fun_break_scope::X::X(&x3:break_scope::X*) [line 96, column 9]\n " shape="box"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_12" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_11" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x2:break_scope::X); [line 94, column 5]\n  n$13=_fun_break_scope::X::X(&x2:break_scope::X*) [line 94, column 7]\n  EXIT_SCOPE(n$13); [line 94, column 7]\n " shape="box"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x2:break_scope::X); [line 94, column 5]\n  n$13=_fun_break_scope::X::X(&x2:break_scope::X*) [line 94, column 7]\n " shape="box"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_13" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_8" ;
-"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 92, column 3]\n  n$15=_fun_break_scope::X::X(&x1:break_scope::X*) [line 92, column 5]\n  EXIT_SCOPE(n$15); [line 92, column 5]\n  APPLY_ABSTRACTION; [line 92, column 5]\n " shape="box"]
+"test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 92, column 3]\n  n$15=_fun_break_scope::X::X(&x1:break_scope::X*) [line 92, column 5]\n " shape="box"]
 	
 
 	 "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_14" -> "test_while2#break_scope#17250772168162981325.38013d039ed950814e06274bca56c75d_4" ;
@@ -407,14 +407,14 @@ digraph cfg {
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_1" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_13" ;
-"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_2" [label="2: Exit break_scope::test_while3 \n   NULLIFY(&x1); [line 111, column 1]\n  NULLIFY(&x2); [line 111, column 1]\n  NULLIFY(&x3); [line 111, column 1]\n " color=yellow style=filled]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_2" [label="2: Exit break_scope::test_while3 \n  " color=yellow style=filled]
 	
 
-"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_3" [label="3:  Destruction(Scope) \n   _=*&x3:break_scope::X [line 111, column 1]\n  n$1=_fun_break_scope::X::~X(&x3:break_scope::X*) injected [line 111, column 1]\n  _=*&x1:break_scope::X [line 111, column 1]\n  n$3=_fun_break_scope::X::~X(&x1:break_scope::X*) injected [line 111, column 1]\n  EXIT_SCOPE(_,_,n$1,n$3,x3,x1); [line 111, column 1]\n  APPLY_ABSTRACTION; [line 111, column 1]\n " shape="box"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_3" [label="3:  Destruction(Scope) \n   _=*&x3:break_scope::X [line 111, column 1]\n  n$1=_fun_break_scope::X::~X(&x3:break_scope::X*) injected [line 111, column 1]\n  _=*&x1:break_scope::X [line 111, column 1]\n  n$3=_fun_break_scope::X::~X(&x1:break_scope::X*) injected [line 111, column 1]\n " shape="box"]
 	
 
 	 "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   VARIABLE_DECLARED(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); [line 110, column 5]\n " shape="box"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_4" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_3" ;
@@ -423,15 +423,15 @@ digraph cfg {
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_5" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_6" ;
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_5" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_7" ;
-"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_6" [label="6: Prune (true branch, while) \n   n$6=*&a:_Bool [line 104, column 10]\n  PRUNE(n$6, true); [line 104, column 10]\n  EXIT_SCOPE(n$6); [line 104, column 10]\n " shape="invhouse"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_6" [label="6: Prune (true branch, while) \n   n$6=*&a:_Bool [line 104, column 10]\n  PRUNE(n$6, true); [line 104, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_6" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_12" ;
-"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_7" [label="7: Prune (false branch, while) \n   n$6=*&a:_Bool [line 104, column 10]\n  PRUNE(!n$6, false); [line 104, column 10]\n  NULLIFY(&a); [line 104, column 10]\n  EXIT_SCOPE(n$6,a); [line 104, column 10]\n " shape="invhouse"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_7" [label="7: Prune (false branch, while) \n   n$6=*&a:_Bool [line 104, column 10]\n  PRUNE(!n$6, false); [line 104, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_7" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_4" ;
-"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_8" [label="8:  Destruction(Scope) \n   _=*&x2:break_scope::X [line 109, column 3]\n  n$8=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 109, column 3]\n  EXIT_SCOPE(_,n$8,x2); [line 109, column 3]\n  APPLY_ABSTRACTION; [line 109, column 3]\n " shape="box"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_8" [label="8:  Destruction(Scope) \n   _=*&x2:break_scope::X [line 109, column 3]\n  n$8=_fun_break_scope::X::~X(&x2:break_scope::X*) injected [line 109, column 3]\n " shape="box"]
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_8" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_5" ;
@@ -440,19 +440,19 @@ digraph cfg {
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_9" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_10" ;
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_9" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_11" ;
-"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_10" [label="10: Prune (true branch, while) \n   n$10=*&b:_Bool [line 106, column 12]\n  PRUNE(n$10, true); [line 106, column 12]\n  EXIT_SCOPE(n$10); [line 106, column 12]\n  APPLY_ABSTRACTION; [line 106, column 12]\n " shape="invhouse"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_10" [label="10: Prune (true branch, while) \n   n$10=*&b:_Bool [line 106, column 12]\n  PRUNE(n$10, true); [line 106, column 12]\n " shape="invhouse"]
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_10" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_8" ;
-"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_11" [label="11: Prune (false branch, while) \n   n$10=*&b:_Bool [line 106, column 12]\n  PRUNE(!n$10, false); [line 106, column 12]\n  EXIT_SCOPE(n$10); [line 106, column 12]\n  APPLY_ABSTRACTION; [line 106, column 12]\n " shape="invhouse"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_11" [label="11: Prune (false branch, while) \n   n$10=*&b:_Bool [line 106, column 12]\n  PRUNE(!n$10, false); [line 106, column 12]\n " shape="invhouse"]
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_11" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_8" ;
-"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x2:break_scope::X); [line 105, column 5]\n  n$13=_fun_break_scope::X::X(&x2:break_scope::X*) [line 105, column 7]\n  EXIT_SCOPE(n$13); [line 105, column 7]\n " shape="box"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x2:break_scope::X); [line 105, column 5]\n  n$13=_fun_break_scope::X::X(&x2:break_scope::X*) [line 105, column 7]\n " shape="box"]
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_12" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_9" ;
-"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 103, column 3]\n  n$15=_fun_break_scope::X::X(&x1:break_scope::X*) [line 103, column 5]\n  EXIT_SCOPE(n$15); [line 103, column 5]\n  APPLY_ABSTRACTION; [line 103, column 5]\n " shape="box"]
+"test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x1:break_scope::X); [line 103, column 3]\n  n$15=_fun_break_scope::X::X(&x1:break_scope::X*) [line 103, column 5]\n " shape="box"]
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_13" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_5" ;
@@ -484,7 +484,7 @@ digraph cfg {
 "~X#X#break_scope#(321850372193847154).bb0579f8004d4fbf59537d5d55a8dfe9_2" [label="2: Exit break_scope::X::~X \n  " color=yellow style=filled]
 	
 
-"~X#X#break_scope#(321850372193847154).bb0579f8004d4fbf59537d5d55a8dfe9_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:break_scope::X* [line 10, column 9]\n  _=*n$0:break_scope::X [line 10, column 9]\n  n$2=_fun_break_scope::X::__infer_inner_destructor_~X(n$0:break_scope::X*) injected [line 10, column 9]\n  NULLIFY(&this); [line 10, column 9]\n  EXIT_SCOPE(_,n$0,n$2,this); [line 10, column 9]\n  APPLY_ABSTRACTION; [line 10, column 9]\n " shape="box"]
+"~X#X#break_scope#(321850372193847154).bb0579f8004d4fbf59537d5d55a8dfe9_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:break_scope::X* [line 10, column 9]\n  _=*n$0:break_scope::X [line 10, column 9]\n  n$2=_fun_break_scope::X::__infer_inner_destructor_~X(n$0:break_scope::X*) injected [line 10, column 9]\n " shape="box"]
 	
 
 	 "~X#X#break_scope#(321850372193847154).bb0579f8004d4fbf59537d5d55a8dfe9_3" -> "~X#X#break_scope#(321850372193847154).bb0579f8004d4fbf59537d5d55a8dfe9_2" ;
@@ -499,28 +499,28 @@ digraph cfg {
 	
 
 	 "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_3" -> "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_9" ;
-"operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_4" [label="4:  BinaryOperatorStmt: NE \n   n$1=*&this:break_scope::iterator* [line 27, column 48]\n  n$2=*n$1.position:int [line 27, column 48]\n  n$3=*&i2:break_scope::iterator const & [line 27, column 60]\n  n$4=*n$3.position:int [line 27, column 60]\n  NULLIFY(&this); [line 27, column 60]\n  NULLIFY(&i2); [line 27, column 60]\n  EXIT_SCOPE(n$1,n$3,this,i2); [line 27, column 60]\n " shape="box"]
+"operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_4" [label="4:  BinaryOperatorStmt: NE \n   n$1=*&this:break_scope::iterator* [line 27, column 48]\n  n$2=*n$1.position:int [line 27, column 48]\n  n$3=*&i2:break_scope::iterator const & [line 27, column 60]\n  n$4=*n$3.position:int [line 27, column 60]\n " shape="box"]
 	
 
 	 "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_4" -> "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_5" ;
 	 "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_4" -> "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_6" ;
-"operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_5" [label="5: Prune (true branch, boolean exp) \n   PRUNE((n$2 != n$4), true); [line 27, column 48]\n  EXIT_SCOPE(n$2,n$4); [line 27, column 48]\n " shape="invhouse"]
+"operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_5" [label="5: Prune (true branch, boolean exp) \n   PRUNE((n$2 != n$4), true); [line 27, column 48]\n " shape="invhouse"]
 	
 
 	 "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_5" -> "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_7" ;
-"operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_6" [label="6: Prune (false branch, boolean exp) \n   PRUNE(!(n$2 != n$4), false); [line 27, column 48]\n  EXIT_SCOPE(n$2,n$4); [line 27, column 48]\n " shape="invhouse"]
+"operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_6" [label="6: Prune (false branch, boolean exp) \n   PRUNE(!(n$2 != n$4), false); [line 27, column 48]\n " shape="invhouse"]
 	
 
 	 "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_6" -> "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_8" ;
-"operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=1 [line 27, column 48]\n  APPLY_ABSTRACTION; [line 27, column 48]\n " shape="box"]
+"operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=1 [line 27, column 48]\n " shape="box"]
 	
 
 	 "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_7" -> "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_3" ;
-"operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=0 [line 27, column 48]\n  APPLY_ABSTRACTION; [line 27, column 48]\n " shape="box"]
+"operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=0 [line 27, column 48]\n " shape="box"]
 	
 
 	 "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_8" -> "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_3" ;
-"operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_9" [label="9:  Return Stmt \n   n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool [line 27, column 48]\n  *&return:_Bool=n$5 [line 27, column 41]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 27, column 41]\n  EXIT_SCOPE(n$5,0$?%__sil_tmpSIL_temp_conditional___n$0); [line 27, column 41]\n  APPLY_ABSTRACTION; [line 27, column 41]\n " shape="box"]
+"operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_9" [label="9:  Return Stmt \n   n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool [line 27, column 48]\n  *&return:_Bool=n$5 [line 27, column 41]\n " shape="box"]
 	
 
 	 "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_9" -> "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_2" ;
@@ -531,11 +531,11 @@ digraph cfg {
 "operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_2" [label="2: Exit break_scope::iterator::operator++ \n  " color=yellow style=filled]
 	
 
-"operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::iterator* [line 24, column 5]\n  n$1=*&this:break_scope::iterator* [line 24, column 13]\n  n$2=_fun_break_scope::iterator::iterator(n$0:break_scope::iterator*,n$1:break_scope::iterator&) [line 24, column 12]\n  NULLIFY(&__return_param); [line 24, column 12]\n  NULLIFY(&this); [line 24, column 12]\n  EXIT_SCOPE(n$0,n$1,n$2,__return_param,this); [line 24, column 12]\n  APPLY_ABSTRACTION; [line 24, column 12]\n " shape="box"]
+"operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::iterator* [line 24, column 5]\n  n$1=*&this:break_scope::iterator* [line 24, column 13]\n  n$2=_fun_break_scope::iterator::iterator(n$0:break_scope::iterator*,n$1:break_scope::iterator&) [line 24, column 12]\n " shape="box"]
 	
 
 	 "operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_3" -> "operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_2" ;
-"operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_4" [label="4:  UnaryOperator \n   n$3=*&this:break_scope::iterator* [line 23, column 5]\n  n$4=*n$3.position:int [line 23, column 5]\n  *n$3.position:int=(n$4 + 1) [line 23, column 5]\n  EXIT_SCOPE(n$3,n$4); [line 23, column 5]\n " shape="box"]
+"operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_4" [label="4:  UnaryOperator \n   n$3=*&this:break_scope::iterator* [line 23, column 5]\n  n$4=*n$3.position:int [line 23, column 5]\n  *n$3.position:int=(n$4 + 1) [line 23, column 5]\n " shape="box"]
 	
 
 	 "operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_4" -> "operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_3" ;
@@ -543,10 +543,10 @@ digraph cfg {
 	
 
 	 "operator*#iterator#break_scope(class break_scope::X)#(4328339407583570703).89adb890a0c29514eda31053987e2050_1" -> "operator*#iterator#break_scope(class break_scope::X)#(4328339407583570703).89adb890a0c29514eda31053987e2050_3" ;
-"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_2" [label="2: Exit break_scope::iterator::operator* \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  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X const ); [line 42, column 40]\n  n$5=*&this:break_scope::iterator const * [line 42, column 40]\n  n$6=*n$5.vector:break_scope::vec const * [line 42, column 40]\n  _=*n$6:break_scope::vec const  [line 42, column 40]\n  n$8=*&this:break_scope::iterator const * [line 42, column 52]\n  n$9=*n$8.position:int [line 42, column 52]\n  n$11=_fun_break_scope::vec::get(n$6:break_scope::vec const *,n$9:int,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X*) assign_last [line 42, column 40]\n  n$12=_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  _=*&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X const  [line 42, column 60]\n  n$3=_fun_break_scope::X::~X(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X const *) injected [line 42, column 60]\n  NULLIFY(&__return_param); [line 42, column 60]\n  NULLIFY(&this); [line 42, column 60]\n  EXIT_SCOPE(_,_,n$0,n$3,n$5,n$6,n$8,n$9,n$11,n$12,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 42, column 60]\n  APPLY_ABSTRACTION; [line 42, column 60]\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  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X const ); [line 42, column 40]\n  n$5=*&this:break_scope::iterator const * [line 42, column 40]\n  n$6=*n$5.vector:break_scope::vec const * [line 42, column 40]\n  _=*n$6:break_scope::vec const  [line 42, column 40]\n  n$8=*&this:break_scope::iterator const * [line 42, column 52]\n  n$9=*n$8.position:int [line 42, column 52]\n  n$11=_fun_break_scope::vec::get(n$6:break_scope::vec const *,n$9:int,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X*) assign_last [line 42, column 40]\n  n$12=_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  _=*&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X const  [line 42, column 60]\n  n$3=_fun_break_scope::X::~X(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X const *) injected [line 42, column 60]\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" ;
@@ -557,11 +557,11 @@ digraph cfg {
 "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_2" [label="2: Exit break_scope::iterator::iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::iterator* [line 16, column 8]\n  n$2=*&__param_0:break_scope::iterator const & [line 16, column 8]\n  n$3=*n$2.vector:break_scope::vec const * [line 16, column 8]\n  *n$1.vector:break_scope::vec const *=n$3 [line 16, column 8]\n  NULLIFY(&this); [line 16, column 8]\n  NULLIFY(&__param_0); [line 16, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 16, column 8]\n  APPLY_ABSTRACTION; [line 16, column 8]\n " shape="box"]
+"iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::iterator* [line 16, column 8]\n  n$2=*&__param_0:break_scope::iterator const & [line 16, column 8]\n  n$3=*n$2.vector:break_scope::vec const * [line 16, column 8]\n  *n$1.vector:break_scope::vec const *=n$3 [line 16, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_3" -> "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_2" ;
-"iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_4" [label="4:  Constructor Init \n   n$4=*&this:break_scope::iterator* [line 16, column 8]\n  n$5=*&__param_0:break_scope::iterator const & [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n  EXIT_SCOPE(n$4,n$5,n$6); [line 16, column 8]\n " shape="box"]
+"iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_4" [label="4:  Constructor Init \n   n$4=*&this:break_scope::iterator* [line 16, column 8]\n  n$5=*&__param_0:break_scope::iterator const & [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_4" -> "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_3" ;
@@ -572,11 +572,11 @@ digraph cfg {
 "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_2" [label="2: Exit break_scope::iterator::iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::iterator* [line 20, column 52]\n  n$2=*&v:break_scope::vec const * [line 20, column 59]\n  *n$1.vector:break_scope::vec const *=n$2 [line 20, column 52]\n  NULLIFY(&v); [line 20, column 52]\n  NULLIFY(&this); [line 20, column 52]\n  EXIT_SCOPE(n$1,n$2,v,this); [line 20, column 52]\n  APPLY_ABSTRACTION; [line 20, column 52]\n " shape="box"]
+"iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::iterator* [line 20, column 52]\n  n$2=*&v:break_scope::vec const * [line 20, column 59]\n  *n$1.vector:break_scope::vec const *=n$2 [line 20, column 52]\n " shape="box"]
 	
 
 	 "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_3" -> "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_2" ;
-"iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_4" [label="4:  Constructor Init \n   n$3=*&this:break_scope::iterator* [line 20, column 37]\n  n$4=*&pos:int [line 20, column 46]\n  *n$3.position:int=n$4 [line 20, column 37]\n  NULLIFY(&pos); [line 20, column 37]\n  EXIT_SCOPE(n$3,n$4,pos); [line 20, column 37]\n " shape="box"]
+"iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_4" [label="4:  Constructor Init \n   n$3=*&this:break_scope::iterator* [line 20, column 37]\n  n$4=*&pos:int [line 20, column 46]\n  *n$3.position:int=n$4 [line 20, column 37]\n " shape="box"]
 	
 
 	 "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_4" -> "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_3" ;
@@ -587,11 +587,11 @@ digraph cfg {
 "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_2" [label="2: Exit break_scope::iterator::iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::iterator* [line 16, column 8]\n  n$2=*&__param_0:break_scope::iterator& [line 16, column 8]\n  n$3=*n$2.vector:break_scope::vec const * [line 16, column 8]\n  *n$1.vector:break_scope::vec const *=n$3 [line 16, column 8]\n  NULLIFY(&this); [line 16, column 8]\n  NULLIFY(&__param_0); [line 16, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 16, column 8]\n  APPLY_ABSTRACTION; [line 16, column 8]\n " shape="box"]
+"iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::iterator* [line 16, column 8]\n  n$2=*&__param_0:break_scope::iterator& [line 16, column 8]\n  n$3=*n$2.vector:break_scope::vec const * [line 16, column 8]\n  *n$1.vector:break_scope::vec const *=n$3 [line 16, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_3" -> "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_2" ;
-"iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_4" [label="4:  Constructor Init \n   n$4=*&this:break_scope::iterator* [line 16, column 8]\n  n$5=*&__param_0:break_scope::iterator& [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n  EXIT_SCOPE(n$4,n$5,n$6); [line 16, column 8]\n " shape="box"]
+"iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_4" [label="4:  Constructor Init \n   n$4=*&this:break_scope::iterator* [line 16, column 8]\n  n$5=*&__param_0:break_scope::iterator& [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_4" -> "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_3" ;
@@ -602,7 +602,7 @@ digraph cfg {
 "get#vec#break_scope(class break_scope::X)#(1283787980840570343).f29590f18442006705e4b1df63322511_2" [label="2: Exit break_scope::vec::get \n  " color=yellow style=filled]
 	
 
-"get#vec#break_scope(class break_scope::X)#(1283787980840570343).f29590f18442006705e4b1df63322511_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::X* [line 37, column 26]\n  n$1=*&this:break_scope::vec const * [line 37, column 33]\n  n$2=*&pos:int [line 37, column 39]\n  n$3=_fun_break_scope::X::X(n$0:break_scope::X*,n$1._data[n$2]:break_scope::X const &) [line 37, column 33]\n  NULLIFY(&__return_param); [line 37, column 33]\n  NULLIFY(&pos); [line 37, column 33]\n  NULLIFY(&this); [line 37, column 33]\n  EXIT_SCOPE(n$0,n$1,n$2,n$3,__return_param,pos,this); [line 37, column 33]\n  APPLY_ABSTRACTION; [line 37, column 33]\n " shape="box"]
+"get#vec#break_scope(class break_scope::X)#(1283787980840570343).f29590f18442006705e4b1df63322511_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::X* [line 37, column 26]\n  n$1=*&this:break_scope::vec const * [line 37, column 33]\n  n$2=*&pos:int [line 37, column 39]\n  n$3=_fun_break_scope::X::X(n$0:break_scope::X*,n$1._data[n$2]:break_scope::X const &) [line 37, column 33]\n " shape="box"]
 	
 
 	 "get#vec#break_scope(class break_scope::X)#(1283787980840570343).f29590f18442006705e4b1df63322511_3" -> "get#vec#break_scope(class break_scope::X)#(1283787980840570343).f29590f18442006705e4b1df63322511_2" ;
@@ -610,10 +610,10 @@ digraph cfg {
 	
 
 	 "end#vec#break_scope(class break_scope::iterator)#(4427317924121915380).28b4ffbb5a64aa367cc424acb2a0de9b_1" -> "end#vec#break_scope(class break_scope::iterator)#(4427317924121915380).28b4ffbb5a64aa367cc424acb2a0de9b_3" ;
-"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_2" [label="2: Exit break_scope::vec::end \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  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator); [line 35, column 27]\n  n$5=*&this:break_scope::vec* [line 35, column 36]\n  n$6=_fun_break_scope::iterator::iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator*,n$5:break_scope::vec*,10:int) [line 35, column 27]\n  n$7=_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  _=*&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator [line 35, column 44]\n  n$3=_fun_break_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator*) injected [line 35, column 44]\n  NULLIFY(&__return_param); [line 35, column 44]\n  NULLIFY(&this); [line 35, column 44]\n  EXIT_SCOPE(_,n$0,n$3,n$5,n$6,n$7,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 35, column 44]\n  APPLY_ABSTRACTION; [line 35, column 44]\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  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator); [line 35, column 27]\n  n$5=*&this:break_scope::vec* [line 35, column 36]\n  n$6=_fun_break_scope::iterator::iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator*,n$5:break_scope::vec*,10:int) [line 35, column 27]\n  n$7=_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  _=*&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator [line 35, column 44]\n  n$3=_fun_break_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator*) injected [line 35, column 44]\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" ;
@@ -621,10 +621,10 @@ digraph cfg {
 	
 
 	 "begin#vec#break_scope(class break_scope::iterator)#(5557509884489875894).5dac1fcfbf012c7c4e9ccd6f67cbd1ce_1" -> "begin#vec#break_scope(class break_scope::iterator)#(5557509884489875894).5dac1fcfbf012c7c4e9ccd6f67cbd1ce_3" ;
-"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_2" [label="2: Exit break_scope::vec::begin \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  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator); [line 34, column 29]\n  n$5=*&this:break_scope::vec* [line 34, column 38]\n  n$6=_fun_break_scope::iterator::iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator*,n$5:break_scope::vec*,0:int) [line 34, column 29]\n  n$7=_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  _=*&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator [line 34, column 45]\n  n$3=_fun_break_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator*) injected [line 34, column 45]\n  NULLIFY(&__return_param); [line 34, column 45]\n  NULLIFY(&this); [line 34, column 45]\n  EXIT_SCOPE(_,n$0,n$3,n$5,n$6,n$7,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 34, column 45]\n  APPLY_ABSTRACTION; [line 34, column 45]\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  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator); [line 34, column 29]\n  n$5=*&this:break_scope::vec* [line 34, column 38]\n  n$6=_fun_break_scope::iterator::iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator*,n$5:break_scope::vec*,0:int) [line 34, column 29]\n  n$7=_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  _=*&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator [line 34, column 45]\n  n$3=_fun_break_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator*) injected [line 34, column 45]\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" ;
@@ -635,7 +635,7 @@ digraph cfg {
 "vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_2" [label="2: Exit break_scope::vec::vec \n  " color=yellow style=filled]
 	
 
-"vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::vec* [line 33, column 3]\n  n$2=_fun_break_scope::X::X(n$1._data:break_scope::X[10*1](*)) [line 33, column 3]\n  NULLIFY(&this); [line 33, column 3]\n  EXIT_SCOPE(n$1,n$2,this); [line 33, column 3]\n  APPLY_ABSTRACTION; [line 33, column 3]\n " shape="box"]
+"vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::vec* [line 33, column 3]\n  n$2=_fun_break_scope::X::X(n$1._data:break_scope::X[10*1](*)) [line 33, column 3]\n " shape="box"]
 	
 
 	 "vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_3" -> "vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_2" ;
@@ -653,7 +653,7 @@ digraph cfg {
 "~vec#vec#break_scope#(2726327876410250530).6af158139cecaa31993b3ce213ac0fe6_2" [label="2: Exit break_scope::vec::~vec \n  " color=yellow style=filled]
 	
 
-"~vec#vec#break_scope#(2726327876410250530).6af158139cecaa31993b3ce213ac0fe6_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:break_scope::vec* [line 32, column 8]\n  _=*n$0:break_scope::vec [line 32, column 8]\n  n$2=_fun_break_scope::vec::__infer_inner_destructor_~vec(n$0:break_scope::vec*) injected [line 32, column 8]\n  NULLIFY(&this); [line 32, column 8]\n  EXIT_SCOPE(_,n$0,n$2,this); [line 32, column 8]\n  APPLY_ABSTRACTION; [line 32, column 8]\n " shape="box"]
+"~vec#vec#break_scope#(2726327876410250530).6af158139cecaa31993b3ce213ac0fe6_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:break_scope::vec* [line 32, column 8]\n  _=*n$0:break_scope::vec [line 32, column 8]\n  n$2=_fun_break_scope::vec::__infer_inner_destructor_~vec(n$0:break_scope::vec*) injected [line 32, column 8]\n " shape="box"]
 	
 
 	 "~vec#vec#break_scope#(2726327876410250530).6af158139cecaa31993b3ce213ac0fe6_3" -> "~vec#vec#break_scope#(2726327876410250530).6af158139cecaa31993b3ce213ac0fe6_2" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "f(class Person)#3072121847520995784.d15d531febb371128c8a5206341d5cb9_2" [label="2: Exit f \n  " color=yellow style=filled]
 	
 
-"f(class Person)#3072121847520995784.d15d531febb371128c8a5206341d5cb9_3" [label="3:  Call _fun_Person::~Person \n   n$0=*&p:Person* [line 13, column 21]\n  _=*n$0:Person [line 13, column 21]\n  n$2=_fun_Person::~Person(n$0:Person*) [line 13, column 21]\n  NULLIFY(&p); [line 13, column 21]\n  EXIT_SCOPE(_,n$0,n$2,p); [line 13, column 21]\n  APPLY_ABSTRACTION; [line 13, column 21]\n " shape="box"]
+"f(class Person)#3072121847520995784.d15d531febb371128c8a5206341d5cb9_3" [label="3:  Call _fun_Person::~Person \n   n$0=*&p:Person* [line 13, column 21]\n  _=*n$0:Person [line 13, column 21]\n  n$2=_fun_Person::~Person(n$0:Person*) [line 13, column 21]\n " shape="box"]
 	
 
 	 "f(class Person)#3072121847520995784.d15d531febb371128c8a5206341d5cb9_3" -> "f(class Person)#3072121847520995784.d15d531febb371128c8a5206341d5cb9_2" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "deleteInt#11507157942721721842.63c462d9916f225a70cc32ed39aaaf5f_2" [label="2: Exit deleteInt \n  " color=yellow style=filled]
 	
 
-"deleteInt#11507157942721721842.63c462d9916f225a70cc32ed39aaaf5f_3" [label="3:  Call delete \n   n$0=*&x:int* [line 14, column 33]\n  n$1=_fun___delete(n$0:int*) [line 14, column 26]\n  NULLIFY(&x); [line 14, column 26]\n  EXIT_SCOPE(n$0,n$1,x); [line 14, column 26]\n  APPLY_ABSTRACTION; [line 14, column 26]\n " shape="box"]
+"deleteInt#11507157942721721842.63c462d9916f225a70cc32ed39aaaf5f_3" [label="3:  Call delete \n   n$0=*&x:int* [line 14, column 33]\n  n$1=_fun___delete(n$0:int*) [line 14, column 26]\n " shape="box"]
 	
 
 	 "deleteInt#11507157942721721842.63c462d9916f225a70cc32ed39aaaf5f_3" -> "deleteInt#11507157942721721842.63c462d9916f225a70cc32ed39aaaf5f_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "deleteX(class X)#8359832236310221055.de7d98d32d68fd20c6aec48045fd1c8e_2" [label="2: Exit deleteX \n  " color=yellow style=filled]
 	
 
-"deleteX(class X)#8359832236310221055.de7d98d32d68fd20c6aec48045fd1c8e_3" [label="3:  Call delete \n   n$0=*&x:X* [line 12, column 29]\n  n$1=_fun___delete(n$0:X*) [line 12, column 22]\n  NULLIFY(&x); [line 12, column 22]\n  EXIT_SCOPE(n$0,n$1,x); [line 12, column 22]\n  APPLY_ABSTRACTION; [line 12, column 22]\n " shape="box"]
+"deleteX(class X)#8359832236310221055.de7d98d32d68fd20c6aec48045fd1c8e_3" [label="3:  Call delete \n   n$0=*&x:X* [line 12, column 29]\n  n$1=_fun___delete(n$0:X*) [line 12, column 22]\n " shape="box"]
 	
 
 	 "deleteX(class X)#8359832236310221055.de7d98d32d68fd20c6aec48045fd1c8e_3" -> "deleteX(class X)#8359832236310221055.de7d98d32d68fd20c6aec48045fd1c8e_2" ;
@@ -36,7 +36,7 @@ digraph cfg {
 "~X#X#(9850251229546392500).92228f0925803df4b24e5d788ad29673_2" [label="2: Exit X::~X \n  " color=yellow style=filled]
 	
 
-"~X#X#(9850251229546392500).92228f0925803df4b24e5d788ad29673_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:X* [line 9, column 9]\n  _=*n$0:X [line 9, column 9]\n  n$2=_fun_X::__infer_inner_destructor_~X(n$0:X*) injected [line 9, column 9]\n  NULLIFY(&this); [line 9, column 9]\n  EXIT_SCOPE(_,n$0,n$2,this); [line 9, column 9]\n  APPLY_ABSTRACTION; [line 9, column 9]\n " shape="box"]
+"~X#X#(9850251229546392500).92228f0925803df4b24e5d788ad29673_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:X* [line 9, column 9]\n  _=*n$0:X [line 9, column 9]\n  n$2=_fun_X::__infer_inner_destructor_~X(n$0:X*) injected [line 9, column 9]\n " shape="box"]
 	
 
 	 "~X#X#(9850251229546392500).92228f0925803df4b24e5d788ad29673_3" -> "~X#X#(9850251229546392500).92228f0925803df4b24e5d788ad29673_2" ;

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

@@ -4,10 +4,10 @@ digraph cfg {
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_1" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_16" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_2" [label="2: Exit continue_scope::test_do_while \n   NULLIFY(&x3); [line 89, column 1]\n  NULLIFY(&x1); [line 89, column 1]\n  NULLIFY(&x4); [line 89, column 1]\n  NULLIFY(&x2); [line 89, column 1]\n " color=yellow style=filled]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_2" [label="2: Exit continue_scope::test_do_while \n  " color=yellow style=filled]
 	
 
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_3" [label="3:  Destruction(Scope) \n   _=*&x1:continue_scope::X [line 89, column 1]\n  n$1=_fun_continue_scope::X::~X(&x1:continue_scope::X*) injected [line 89, column 1]\n  EXIT_SCOPE(_,n$1,x1); [line 89, column 1]\n  APPLY_ABSTRACTION; [line 89, column 1]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_3" [label="3:  Destruction(Scope) \n   _=*&x1:continue_scope::X [line 89, column 1]\n  n$1=_fun_continue_scope::X::~X(&x1:continue_scope::X*) injected [line 89, column 1]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_3" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_2" ;
@@ -15,15 +15,15 @@ digraph cfg {
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_4" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_15" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_5" [label="5: Prune (true branch, do while) \n   n$3=*&a:_Bool [line 88, column 12]\n  PRUNE(n$3, true); [line 88, column 12]\n  EXIT_SCOPE(n$3); [line 88, column 12]\n  APPLY_ABSTRACTION; [line 88, column 12]\n " shape="invhouse"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_5" [label="5: Prune (true branch, do while) \n   n$3=*&a:_Bool [line 88, column 12]\n  PRUNE(n$3, true); [line 88, column 12]\n " shape="invhouse"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_5" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_4" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_6" [label="6: Prune (false branch, do while) \n   n$3=*&a:_Bool [line 88, column 12]\n  PRUNE(!n$3, false); [line 88, column 12]\n  NULLIFY(&a); [line 88, column 12]\n  EXIT_SCOPE(n$3,a); [line 88, column 12]\n " shape="invhouse"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_6" [label="6: Prune (false branch, do while) \n   n$3=*&a:_Bool [line 88, column 12]\n  PRUNE(!n$3, false); [line 88, column 12]\n " shape="invhouse"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_6" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_3" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_7" [label="7:  Destruction(Scope) \n   _=*&x2:continue_scope::X [line 88, column 3]\n  n$5=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [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" [label="7:  Destruction(Scope) \n   _=*&x2:continue_scope::X [line 88, column 3]\n  n$5=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 88, column 3]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_7" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_5" ;
@@ -32,37 +32,37 @@ digraph cfg {
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_8" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_7" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_9" [label="9: Prune (true branch, if) \n   n$7=*&b:_Bool [line 82, column 9]\n  PRUNE(n$7, true); [line 82, column 9]\n  EXIT_SCOPE(n$7); [line 82, column 9]\n " shape="invhouse"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_9" [label="9: Prune (true branch, if) \n   n$7=*&b:_Bool [line 82, column 9]\n  PRUNE(n$7, true); [line 82, column 9]\n " shape="invhouse"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_9" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_12" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_10" [label="10: Prune (false branch, if) \n   n$7=*&b:_Bool [line 82, column 9]\n  PRUNE(!n$7, false); [line 82, column 9]\n  EXIT_SCOPE(n$7); [line 82, column 9]\n " shape="invhouse"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_10" [label="10: Prune (false branch, if) \n   n$7=*&b:_Bool [line 82, column 9]\n  PRUNE(!n$7, false); [line 82, column 9]\n " shape="invhouse"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_10" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_14" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_11" [label="11:  Destruction(continue) \n   _=*&x3:continue_scope::X [line 84, column 7]\n  n$9=_fun_continue_scope::X::~X(&x3:continue_scope::X*) injected [line 84, column 7]\n  _=*&x2:continue_scope::X [line 84, column 7]\n  n$11=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 84, column 7]\n  EXIT_SCOPE(_,_,n$9,n$11,x2,x3); [line 84, column 7]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_11" [label="11:  Destruction(continue) \n   _=*&x3:continue_scope::X [line 84, column 7]\n  n$9=_fun_continue_scope::X::~X(&x3:continue_scope::X*) injected [line 84, column 7]\n  _=*&x2:continue_scope::X [line 84, column 7]\n  n$11=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 84, column 7]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_11" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_5" ;
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_11" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_6" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x3:continue_scope::X); [line 83, column 7]\n  n$13=_fun_continue_scope::X::X(&x3:continue_scope::X*) [line 83, column 9]\n  EXIT_SCOPE(n$13); [line 83, column 9]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x3:continue_scope::X); [line 83, column 7]\n  n$13=_fun_continue_scope::X::X(&x3:continue_scope::X*) [line 83, column 9]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_12" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_11" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_13" [label="13:  Destruction(Scope) \n   _=*&x4:continue_scope::X [line 87, column 5]\n  n$15=_fun_continue_scope::X::~X(&x4:continue_scope::X*) injected [line 87, column 5]\n  EXIT_SCOPE(_,n$15,x4); [line 87, column 5]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_13" [label="13:  Destruction(Scope) \n   _=*&x4:continue_scope::X [line 87, column 5]\n  n$15=_fun_continue_scope::X::~X(&x4:continue_scope::X*) injected [line 87, column 5]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_13" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_8" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x4:continue_scope::X); [line 86, column 7]\n  n$17=_fun_continue_scope::X::X(&x4:continue_scope::X*) [line 86, column 9]\n  EXIT_SCOPE(n$17); [line 86, column 9]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x4:continue_scope::X); [line 86, column 7]\n  n$17=_fun_continue_scope::X::X(&x4:continue_scope::X*) [line 86, column 9]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_14" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_13" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_15" [label="15:  DeclStmt \n   VARIABLE_DECLARED(x2:continue_scope::X); [line 81, column 5]\n  n$19=_fun_continue_scope::X::X(&x2:continue_scope::X*) [line 81, column 7]\n  EXIT_SCOPE(n$19); [line 81, column 7]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_15" [label="15:  DeclStmt \n   VARIABLE_DECLARED(x2:continue_scope::X); [line 81, column 5]\n  n$19=_fun_continue_scope::X::X(&x2:continue_scope::X*) [line 81, column 7]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_15" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_9" ;
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_15" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_10" ;
-"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_16" [label="16:  DeclStmt \n   VARIABLE_DECLARED(x1:continue_scope::X); [line 79, column 3]\n  n$21=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 79, column 5]\n  EXIT_SCOPE(n$21); [line 79, column 5]\n  APPLY_ABSTRACTION; [line 79, column 5]\n " shape="box"]
+"test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_16" [label="16:  DeclStmt \n   VARIABLE_DECLARED(x1:continue_scope::X); [line 79, column 3]\n  n$21=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 79, column 5]\n " shape="box"]
 	
 
 	 "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_16" -> "test_do_while#continue_scope#8999676231552324448.9fe455097ef7e757730530e9e7c09864_4" ;
@@ -70,18 +70,18 @@ digraph cfg {
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_1" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_17" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_2" [label="2: Exit continue_scope::test_for \n   NULLIFY(&0$?%__sil_tmp__temp_return_n$19); [line 64, column 1]\n  NULLIFY(&x2); [line 64, column 1]\n  NULLIFY(&x1); [line 64, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$9); [line 64, column 1]\n  NULLIFY(&it); [line 64, column 1]\n  NULLIFY(&vector); [line 64, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$22); [line 64, column 1]\n " color=yellow style=filled]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_2" [label="2: Exit continue_scope::test_for \n  " color=yellow style=filled]
 	
 
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_3" [label="3:  Destruction(Scope) \n   _=*&x2:continue_scope::X [line 64, column 1]\n  n$1=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 64, column 1]\n  _=*&vector:continue_scope::vec [line 64, column 1]\n  n$3=_fun_continue_scope::vec::~vec(&vector:continue_scope::vec*) injected [line 64, column 1]\n  EXIT_SCOPE(_,_,n$1,n$3,vector,x2); [line 64, column 1]\n  APPLY_ABSTRACTION; [line 64, column 1]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_3" [label="3:  Destruction(Scope) \n   _=*&x2:continue_scope::X [line 64, column 1]\n  n$1=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 64, column 1]\n  _=*&vector:continue_scope::vec [line 64, column 1]\n  n$3=_fun_continue_scope::vec::~vec(&vector:continue_scope::vec*) injected [line 64, column 1]\n " shape="box"]
 	
 
 	 "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   VARIABLE_DECLARED(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); [line 63, column 5]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_4" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_3" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_5" [label="5:  Destruction(Scope) \n   _=*&it:continue_scope::iterator [line 62, column 3]\n  n$7=_fun_continue_scope::iterator::~iterator(&it:continue_scope::iterator*) injected [line 62, column 3]\n  EXIT_SCOPE(_,n$7,it); [line 62, column 3]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_5" [label="5:  Destruction(Scope) \n   _=*&it:continue_scope::iterator [line 62, column 3]\n  n$7=_fun_continue_scope::iterator::~iterator(&it:continue_scope::iterator*) injected [line 62, column 3]\n " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_5" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_4" ;
@@ -89,25 +89,25 @@ digraph cfg {
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_6" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_9" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(it:continue_scope::iterator); [line 57, column 8]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$9:continue_scope::iterator); [line 57, column 22]\n  _=*&vector:continue_scope::vec [line 57, column 22]\n  n$15=_fun_continue_scope::vec::begin(&vector:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$9:continue_scope::iterator*) assign_last [line 57, column 22]\n  n$16=_fun_continue_scope::iterator::iterator(&it:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$9:continue_scope::iterator&) [line 57, column 22]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$9:continue_scope::iterator [line 57, column 35]\n  n$11=_fun_continue_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$9:continue_scope::iterator*) injected [line 57, column 35]\n  EXIT_SCOPE(_,_,n$11,n$15,n$16,0$?%__sil_tmpSIL_materialize_temp__n$9); [line 57, column 35]\n  APPLY_ABSTRACTION; [line 57, column 35]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(it:continue_scope::iterator); [line 57, column 8]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$9:continue_scope::iterator); [line 57, column 22]\n  _=*&vector:continue_scope::vec [line 57, column 22]\n  n$15=_fun_continue_scope::vec::begin(&vector:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$9:continue_scope::iterator*) assign_last [line 57, column 22]\n  n$16=_fun_continue_scope::iterator::iterator(&it:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$9:continue_scope::iterator&) [line 57, column 22]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$9:continue_scope::iterator [line 57, column 35]\n  n$11=_fun_continue_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$9:continue_scope::iterator*) injected [line 57, column 35]\n " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_7" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_6" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_8" [label="8:  Call _fun_continue_scope::iterator::operator++ \n   n$20=_fun_continue_scope::iterator::operator++(&it:continue_scope::iterator&,&0$?%__sil_tmp__temp_return_n$19:continue_scope::iterator*) assign_last [line 57, column 58]\n  EXIT_SCOPE(n$20,0$?%__sil_tmp__temp_return_n$19); [line 57, column 58]\n  APPLY_ABSTRACTION; [line 57, column 58]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_8" [label="8:  Call _fun_continue_scope::iterator::operator++ \n   n$20=_fun_continue_scope::iterator::operator++(&it:continue_scope::iterator&,&0$?%__sil_tmp__temp_return_n$19:continue_scope::iterator*) assign_last [line 57, column 58]\n " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_8" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_6" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_9" [label="9:  Call _fun_continue_scope::iterator::operator!= \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$22:continue_scope::iterator const ); [line 57, column 44]\n  _=*&vector:continue_scope::vec [line 57, column 44]\n  n$25=_fun_continue_scope::vec::end(&vector:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$22:continue_scope::iterator*) assign_last [line 57, column 44]\n  n$26=_fun_continue_scope::iterator::operator!=(&it:continue_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$22:continue_scope::iterator const &) [line 57, column 38]\n  EXIT_SCOPE(_,n$25,0$?%__sil_tmpSIL_materialize_temp__n$22); [line 57, column 38]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_9" [label="9:  Call _fun_continue_scope::iterator::operator!= \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$22:continue_scope::iterator const ); [line 57, column 44]\n  _=*&vector:continue_scope::vec [line 57, column 44]\n  n$25=_fun_continue_scope::vec::end(&vector:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$22:continue_scope::iterator*) assign_last [line 57, column 44]\n  n$26=_fun_continue_scope::iterator::operator!=(&it:continue_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$22:continue_scope::iterator const &) [line 57, column 38]\n " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_9" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_10" ;
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_9" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_11" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_10" [label="10: Prune (true branch, for loop) \n   PRUNE(n$26, true); [line 57, column 38]\n  EXIT_SCOPE(n$26); [line 57, column 38]\n " shape="invhouse"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_10" [label="10: Prune (true branch, for loop) \n   PRUNE(n$26, true); [line 57, column 38]\n " shape="invhouse"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_10" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_13" ;
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_10" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_14" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_11" [label="11: Prune (false branch, for loop) \n   PRUNE(!n$26, false); [line 57, column 38]\n  EXIT_SCOPE(n$26); [line 57, column 38]\n " shape="invhouse"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_11" [label="11: Prune (false branch, for loop) \n   PRUNE(!n$26, false); [line 57, column 38]\n " shape="invhouse"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_11" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_5" ;
@@ -115,23 +115,23 @@ digraph cfg {
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_12" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_8" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_13" [label="13: Prune (true branch, if) \n   n$27=*&b:_Bool [line 58, column 9]\n  PRUNE(n$27, true); [line 58, column 9]\n  EXIT_SCOPE(n$27); [line 58, column 9]\n " shape="invhouse"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_13" [label="13: Prune (true branch, if) \n   n$27=*&b:_Bool [line 58, column 9]\n  PRUNE(n$27, true); [line 58, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_13" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_16" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_14" [label="14: Prune (false branch, if) \n   n$27=*&b:_Bool [line 58, column 9]\n  PRUNE(!n$27, false); [line 58, column 9]\n  EXIT_SCOPE(n$27); [line 58, column 9]\n " shape="invhouse"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_14" [label="14: Prune (false branch, if) \n   n$27=*&b:_Bool [line 58, column 9]\n  PRUNE(!n$27, false); [line 58, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_14" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_12" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_15" [label="15:  Destruction(continue) \n   _=*&x1:continue_scope::X [line 60, column 7]\n  n$29=_fun_continue_scope::X::~X(&x1:continue_scope::X*) injected [line 60, column 7]\n  EXIT_SCOPE(_,n$29,x1); [line 60, column 7]\n  APPLY_ABSTRACTION; [line 60, column 7]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_15" [label="15:  Destruction(continue) \n   _=*&x1:continue_scope::X [line 60, column 7]\n  n$29=_fun_continue_scope::X::~X(&x1:continue_scope::X*) injected [line 60, column 7]\n " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_15" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_8" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_16" [label="16:  DeclStmt \n   VARIABLE_DECLARED(x1:continue_scope::X); [line 59, column 7]\n  n$31=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 59, column 9]\n  EXIT_SCOPE(n$31); [line 59, column 9]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_16" [label="16:  DeclStmt \n   VARIABLE_DECLARED(x1:continue_scope::X); [line 59, column 7]\n  n$31=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 59, column 9]\n " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_16" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_15" ;
-"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_17" [label="17:  DeclStmt \n   VARIABLE_DECLARED(vector:continue_scope::vec); [line 56, column 3]\n  n$35=_fun_continue_scope::vec::vec(&vector:continue_scope::vec*) [line 56, column 7]\n  EXIT_SCOPE(n$35); [line 56, column 7]\n " shape="box"]
+"test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_17" [label="17:  DeclStmt \n   VARIABLE_DECLARED(vector:continue_scope::vec); [line 56, column 3]\n  n$35=_fun_continue_scope::vec::vec(&vector:continue_scope::vec*) [line 56, column 7]\n " shape="box"]
 	
 
 	 "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_17" -> "test_for#continue_scope#10203739842900202560.4cb2db668430574619fdf529fdd4af8c_7" ;
@@ -139,14 +139,14 @@ digraph cfg {
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_1" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_20" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_2" [label="2: Exit continue_scope::test_for_range \n   NULLIFY(&vector); [line 53, column 1]\n  NULLIFY(&__begin1); [line 53, column 1]\n  NULLIFY(&__end1); [line 53, column 1]\n  NULLIFY(&x2); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_return_n$30); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$19); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$10); [line 53, column 1]\n  NULLIFY(&x1); [line 53, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$43); [line 53, column 1]\n  NULLIFY(&x); [line 53, column 1]\n " color=yellow style=filled]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_2" [label="2: Exit continue_scope::test_for_range \n  " color=yellow style=filled]
 	
 
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_3" [label="3:  Destruction(Scope) \n   _=*&x1:continue_scope::X [line 53, column 1]\n  n$1=_fun_continue_scope::X::~X(&x1:continue_scope::X*) injected [line 53, column 1]\n  _=*&vector:continue_scope::vec [line 53, column 1]\n  n$3=_fun_continue_scope::vec::~vec(&vector:continue_scope::vec*) injected [line 53, column 1]\n  EXIT_SCOPE(_,_,n$1,n$3,x1,vector); [line 53, column 1]\n  APPLY_ABSTRACTION; [line 53, column 1]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_3" [label="3:  Destruction(Scope) \n   _=*&x1:continue_scope::X [line 53, column 1]\n  n$1=_fun_continue_scope::X::~X(&x1:continue_scope::X*) injected [line 53, column 1]\n  _=*&vector:continue_scope::vec [line 53, column 1]\n  n$3=_fun_continue_scope::vec::~vec(&vector:continue_scope::vec*) injected [line 53, column 1]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_3" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_2" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_4" [label="4:  Destruction(Scope) \n   _=*&__end1:continue_scope::iterator [line 52, column 3]\n  n$6=_fun_continue_scope::iterator::~iterator(&__end1:continue_scope::iterator*) injected [line 52, column 3]\n  _=*&__begin1:continue_scope::iterator [line 52, column 3]\n  n$8=_fun_continue_scope::iterator::~iterator(&__begin1:continue_scope::iterator*) injected [line 52, column 3]\n  EXIT_SCOPE(_,_,n$6,n$8,__end1,__begin1); [line 52, column 3]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_4" [label="4:  Destruction(Scope) \n   _=*&__end1:continue_scope::iterator [line 52, column 3]\n  n$6=_fun_continue_scope::iterator::~iterator(&__end1:continue_scope::iterator*) injected [line 52, column 3]\n  _=*&__begin1:continue_scope::iterator [line 52, column 3]\n  n$8=_fun_continue_scope::iterator::~iterator(&__begin1:continue_scope::iterator*) injected [line 52, column 3]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_4" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_3" ;
@@ -154,15 +154,15 @@ digraph cfg {
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_5" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_9" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(__end1:continue_scope::iterator); [line 47, column 12]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$10:continue_scope::iterator); [line 47, column 12]\n  n$14=*&__range1:continue_scope::vec& [line 47, column 12]\n  _=*n$14:continue_scope::vec [line 47, column 12]\n  n$17=_fun_continue_scope::vec::end(n$14:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$10:continue_scope::iterator*) assign_last [line 47, column 12]\n  n$18=_fun_continue_scope::iterator::iterator(&__end1:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$10:continue_scope::iterator&) [line 47, column 12]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$10:continue_scope::iterator [line 47, column 12]\n  n$12=_fun_continue_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$10:continue_scope::iterator*) injected [line 47, column 12]\n  NULLIFY(&__range1); [line 47, column 12]\n  EXIT_SCOPE(_,_,n$12,n$14,n$17,n$18,__range1,0$?%__sil_tmpSIL_materialize_temp__n$10); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, column 12]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(__end1:continue_scope::iterator); [line 47, column 12]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$10:continue_scope::iterator); [line 47, column 12]\n  n$14=*&__range1:continue_scope::vec& [line 47, column 12]\n  _=*n$14:continue_scope::vec [line 47, column 12]\n  n$17=_fun_continue_scope::vec::end(n$14:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$10:continue_scope::iterator*) assign_last [line 47, column 12]\n  n$18=_fun_continue_scope::iterator::iterator(&__end1:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$10:continue_scope::iterator&) [line 47, column 12]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$10:continue_scope::iterator [line 47, column 12]\n  n$12=_fun_continue_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$10:continue_scope::iterator*) injected [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:  DeclStmt \n   VARIABLE_DECLARED(__begin1:continue_scope::iterator); [line 47, column 12]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$19:continue_scope::iterator); [line 47, column 12]\n  n$23=*&__range1:continue_scope::vec& [line 47, column 12]\n  _=*n$23:continue_scope::vec [line 47, column 12]\n  n$26=_fun_continue_scope::vec::begin(n$23:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$19:continue_scope::iterator*) assign_last [line 47, column 12]\n  n$27=_fun_continue_scope::iterator::iterator(&__begin1:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$19:continue_scope::iterator&) [line 47, column 12]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$19:continue_scope::iterator [line 47, column 12]\n  n$21=_fun_continue_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$19:continue_scope::iterator*) injected [line 47, column 12]\n  EXIT_SCOPE(_,_,n$21,n$23,n$26,n$27,0$?%__sil_tmpSIL_materialize_temp__n$19); [line 47, column 12]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(__begin1:continue_scope::iterator); [line 47, column 12]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$19:continue_scope::iterator); [line 47, column 12]\n  n$23=*&__range1:continue_scope::vec& [line 47, column 12]\n  _=*n$23:continue_scope::vec [line 47, column 12]\n  n$26=_fun_continue_scope::vec::begin(n$23:continue_scope::vec&,&0$?%__sil_tmpSIL_materialize_temp__n$19:continue_scope::iterator*) assign_last [line 47, column 12]\n  n$27=_fun_continue_scope::iterator::iterator(&__begin1:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$19:continue_scope::iterator&) [line 47, column 12]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$19:continue_scope::iterator [line 47, column 12]\n  n$21=_fun_continue_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$19:continue_scope::iterator*) injected [line 47, column 12]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_7" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_6" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_8" [label="8:  Call _fun_continue_scope::iterator::operator++ \n   n$31=_fun_continue_scope::iterator::operator++(&__begin1:continue_scope::iterator&,&0$?%__sil_tmp__temp_return_n$30:continue_scope::iterator*) assign_last [line 47, column 12]\n  EXIT_SCOPE(n$31,0$?%__sil_tmp__temp_return_n$30); [line 47, column 12]\n  APPLY_ABSTRACTION; [line 47, column 12]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_8" [label="8:  Call _fun_continue_scope::iterator::operator++ \n   n$31=_fun_continue_scope::iterator::operator++(&__begin1:continue_scope::iterator&,&0$?%__sil_tmp__temp_return_n$30:continue_scope::iterator*) assign_last [line 47, column 12]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_8" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_5" ;
@@ -171,11 +171,11 @@ digraph cfg {
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_9" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_10" ;
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_9" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_11" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_10" [label="10: Prune (true branch, for loop) \n   PRUNE(n$33, true); [line 47, column 12]\n  EXIT_SCOPE(n$33); [line 47, column 12]\n " shape="invhouse"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_10" [label="10: Prune (true branch, for loop) \n   PRUNE(n$33, true); [line 47, column 12]\n " shape="invhouse"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_10" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_17" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_11" [label="11: Prune (false branch, for loop) \n   PRUNE(!n$33, false); [line 47, column 12]\n  EXIT_SCOPE(n$33); [line 47, column 12]\n " shape="invhouse"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_11" [label="11: Prune (false branch, for loop) \n   PRUNE(!n$33, false); [line 47, column 12]\n " shape="invhouse"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_11" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_4" ;
@@ -183,23 +183,23 @@ digraph cfg {
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_12" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_8" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_13" [label="13: Prune (true branch, if) \n   n$34=*&b:_Bool [line 48, column 9]\n  PRUNE(n$34, true); [line 48, column 9]\n  EXIT_SCOPE(n$34); [line 48, column 9]\n " shape="invhouse"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_13" [label="13: Prune (true branch, if) \n   n$34=*&b:_Bool [line 48, column 9]\n  PRUNE(n$34, true); [line 48, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_13" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_16" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_14" [label="14: Prune (false branch, if) \n   n$34=*&b:_Bool [line 48, column 9]\n  PRUNE(!n$34, false); [line 48, column 9]\n  EXIT_SCOPE(n$34,x); [line 48, column 9]\n " shape="invhouse"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_14" [label="14: Prune (false branch, if) \n   n$34=*&b:_Bool [line 48, column 9]\n  PRUNE(!n$34, false); [line 48, column 9]\n " shape="invhouse"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_14" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_12" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_15" [label="15:  Destruction(continue) \n   _=*&x2:continue_scope::X [line 50, column 7]\n  n$36=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 50, column 7]\n  _=*&x:continue_scope::X [line 50, column 7]\n  n$38=_fun_continue_scope::X::~X(&x:continue_scope::X*) injected [line 50, column 7]\n  EXIT_SCOPE(_,_,n$36,n$38,x,x2); [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(continue) \n   _=*&x2:continue_scope::X [line 50, column 7]\n  n$36=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 50, column 7]\n  _=*&x:continue_scope::X [line 50, column 7]\n  n$38=_fun_continue_scope::X::~X(&x:continue_scope::X*) injected [line 50, column 7]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_15" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_8" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_16" [label="16:  DeclStmt \n   VARIABLE_DECLARED(x2:continue_scope::X); [line 49, column 7]\n  n$40=_fun_continue_scope::X::X(&x2:continue_scope::X*,&x:continue_scope::X&) [line 49, column 14]\n  EXIT_SCOPE(n$40); [line 49, column 14]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_16" [label="16:  DeclStmt \n   VARIABLE_DECLARED(x2:continue_scope::X); [line 49, column 7]\n  n$40=_fun_continue_scope::X::X(&x2:continue_scope::X*,&x:continue_scope::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   VARIABLE_DECLARED(x:continue_scope::X); [line 47, column 8]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$43:continue_scope::X const ); [line 47, column 12]\n  n$49=_fun_continue_scope::iterator::operator*(&__begin1:continue_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$43:continue_scope::X*) assign_last [line 47, column 12]\n  n$50=_fun_continue_scope::X::X(&x:continue_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$43:continue_scope::X const &) [line 47, column 12]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$43:continue_scope::X const  [line 47, column 12]\n  n$45=_fun_continue_scope::X::~X(&0$?%__sil_tmpSIL_materialize_temp__n$43:continue_scope::X const *) injected [line 47, column 12]\n  EXIT_SCOPE(_,n$45,n$49,n$50,0$?%__sil_tmpSIL_materialize_temp__n$43); [line 47, column 12]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_17" [label="17:  DeclStmt \n   VARIABLE_DECLARED(x:continue_scope::X); [line 47, column 8]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$43:continue_scope::X const ); [line 47, column 12]\n  n$49=_fun_continue_scope::iterator::operator*(&__begin1:continue_scope::iterator&,&0$?%__sil_tmpSIL_materialize_temp__n$43:continue_scope::X*) assign_last [line 47, column 12]\n  n$50=_fun_continue_scope::X::X(&x:continue_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$43:continue_scope::X const &) [line 47, column 12]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$43:continue_scope::X const  [line 47, column 12]\n  n$45=_fun_continue_scope::X::~X(&0$?%__sil_tmpSIL_materialize_temp__n$43:continue_scope::X const *) injected [line 47, column 12]\n " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_17" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_13" ;
@@ -208,11 +208,11 @@ digraph cfg {
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_18" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_7" ;
-"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_19" [label="19:  DeclStmt \n   VARIABLE_DECLARED(x1:continue_scope::X); [line 46, column 3]\n  n$52=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 46, column 5]\n  EXIT_SCOPE(n$52); [line 46, column 5]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_19" [label="19:  DeclStmt \n   VARIABLE_DECLARED(x1:continue_scope::X); [line 46, column 3]\n  n$52=_fun_continue_scope::X::X(&x1:continue_scope::X*) [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   VARIABLE_DECLARED(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); [line 45, column 7]\n " shape="box"]
+"test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_20" [label="20:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_20" -> "test_for_range#continue_scope#9937708960633325401.fa75d7368d8f711ae7e040a8b2ae1442_19" ;
@@ -220,10 +220,10 @@ digraph cfg {
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_1" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_14" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_2" [label="2: Exit continue_scope::test_while1 \n   NULLIFY(&x2); [line 76, column 1]\n  NULLIFY(&x1); [line 76, column 1]\n  NULLIFY(&x4); [line 76, column 1]\n " color=yellow style=filled]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_2" [label="2: Exit continue_scope::test_while1 \n  " color=yellow style=filled]
 	
 
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_3" [label="3:  Destruction(Scope) \n   _=*&x1:continue_scope::X [line 76, column 1]\n  n$1=_fun_continue_scope::X::~X(&x1:continue_scope::X*) injected [line 76, column 1]\n  EXIT_SCOPE(_,n$1,x1); [line 76, column 1]\n  APPLY_ABSTRACTION; [line 76, column 1]\n " shape="box"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_3" [label="3:  Destruction(Scope) \n   _=*&x1:continue_scope::X [line 76, column 1]\n  n$1=_fun_continue_scope::X::~X(&x1:continue_scope::X*) injected [line 76, column 1]\n " shape="box"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_3" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_2" ;
@@ -232,12 +232,12 @@ digraph cfg {
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_4" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_5" ;
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_4" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_6" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_5" [label="5: Prune (true branch, while) \n   n$3=*&a:_Bool [line 68, column 10]\n  PRUNE(n$3, true); [line 68, column 10]\n  EXIT_SCOPE(n$3); [line 68, column 10]\n " shape="invhouse"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_5" [label="5: Prune (true branch, while) \n   n$3=*&a:_Bool [line 68, column 10]\n  PRUNE(n$3, true); [line 68, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_5" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_8" ;
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_5" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_9" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_6" [label="6: Prune (false branch, while) \n   n$3=*&a:_Bool [line 68, column 10]\n  PRUNE(!n$3, false); [line 68, column 10]\n  NULLIFY(&a); [line 68, column 10]\n  EXIT_SCOPE(n$3,a); [line 68, column 10]\n " shape="invhouse"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_6" [label="6: Prune (false branch, while) \n   n$3=*&a:_Bool [line 68, column 10]\n  PRUNE(!n$3, false); [line 68, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_6" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_3" ;
@@ -245,31 +245,31 @@ digraph cfg {
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_7" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_4" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_8" [label="8: Prune (true branch, if) \n   n$4=*&b:_Bool [line 69, column 9]\n  PRUNE(n$4, true); [line 69, column 9]\n  EXIT_SCOPE(n$4); [line 69, column 9]\n " shape="invhouse"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_8" [label="8: Prune (true branch, if) \n   n$4=*&b:_Bool [line 69, column 9]\n  PRUNE(n$4, true); [line 69, column 9]\n " shape="invhouse"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_8" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_11" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_9" [label="9: Prune (false branch, if) \n   n$4=*&b:_Bool [line 69, column 9]\n  PRUNE(!n$4, false); [line 69, column 9]\n  EXIT_SCOPE(n$4); [line 69, column 9]\n " shape="invhouse"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_9" [label="9: Prune (false branch, if) \n   n$4=*&b:_Bool [line 69, column 9]\n  PRUNE(!n$4, false); [line 69, column 9]\n " shape="invhouse"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_9" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_13" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_10" [label="10:  Destruction(continue) \n   _=*&x2:continue_scope::X [line 71, column 7]\n  n$6=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 71, column 7]\n  EXIT_SCOPE(_,n$6,x2); [line 71, column 7]\n  APPLY_ABSTRACTION; [line 71, column 7]\n " shape="box"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_10" [label="10:  Destruction(continue) \n   _=*&x2:continue_scope::X [line 71, column 7]\n  n$6=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 71, column 7]\n " shape="box"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_10" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_4" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(x2:continue_scope::X); [line 70, column 7]\n  n$8=_fun_continue_scope::X::X(&x2:continue_scope::X*) [line 70, column 9]\n  EXIT_SCOPE(n$8); [line 70, column 9]\n " shape="box"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(x2:continue_scope::X); [line 70, column 7]\n  n$8=_fun_continue_scope::X::X(&x2:continue_scope::X*) [line 70, column 9]\n " shape="box"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_11" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_10" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_12" [label="12:  Destruction(Scope) \n   _=*&x4:continue_scope::X [line 74, column 5]\n  n$10=_fun_continue_scope::X::~X(&x4:continue_scope::X*) injected [line 74, column 5]\n  EXIT_SCOPE(_,n$10,x4); [line 74, column 5]\n " shape="box"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_12" [label="12:  Destruction(Scope) \n   _=*&x4:continue_scope::X [line 74, column 5]\n  n$10=_fun_continue_scope::X::~X(&x4:continue_scope::X*) injected [line 74, column 5]\n " shape="box"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_12" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_7" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x4:continue_scope::X); [line 73, column 7]\n  n$12=_fun_continue_scope::X::X(&x4:continue_scope::X*) [line 73, column 9]\n  EXIT_SCOPE(n$12); [line 73, column 9]\n " shape="box"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x4:continue_scope::X); [line 73, column 7]\n  n$12=_fun_continue_scope::X::X(&x4:continue_scope::X*) [line 73, column 9]\n " shape="box"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_13" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_12" ;
-"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x1:continue_scope::X); [line 67, column 3]\n  n$15=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 67, column 5]\n  EXIT_SCOPE(n$15); [line 67, column 5]\n  APPLY_ABSTRACTION; [line 67, column 5]\n " shape="box"]
+"test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x1:continue_scope::X); [line 67, column 3]\n  n$15=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 67, column 5]\n " shape="box"]
 	
 
 	 "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_14" -> "test_while1#continue_scope#7540876780991944911.b81085ce953e1cd4f035dc0322ac5331_4" ;
@@ -277,10 +277,10 @@ digraph cfg {
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_1" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_14" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_2" [label="2: Exit continue_scope::test_while2 \n   NULLIFY(&x2); [line 100, column 1]\n  NULLIFY(&x1); [line 100, column 1]\n  NULLIFY(&x3); [line 100, column 1]\n " color=yellow style=filled]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_2" [label="2: Exit continue_scope::test_while2 \n  " color=yellow style=filled]
 	
 
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_3" [label="3:  Destruction(Scope) \n   _=*&x1:continue_scope::X [line 100, column 1]\n  n$1=_fun_continue_scope::X::~X(&x1:continue_scope::X*) injected [line 100, column 1]\n  EXIT_SCOPE(_,n$1,x1); [line 100, column 1]\n  APPLY_ABSTRACTION; [line 100, column 1]\n " shape="box"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_3" [label="3:  Destruction(Scope) \n   _=*&x1:continue_scope::X [line 100, column 1]\n  n$1=_fun_continue_scope::X::~X(&x1:continue_scope::X*) injected [line 100, column 1]\n " shape="box"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_3" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_2" ;
@@ -289,15 +289,15 @@ digraph cfg {
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_4" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_5" ;
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_4" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_6" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_5" [label="5: Prune (true branch, while) \n   n$3=*&a:_Bool [line 93, column 10]\n  PRUNE(n$3, true); [line 93, column 10]\n  EXIT_SCOPE(n$3); [line 93, column 10]\n " shape="invhouse"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_5" [label="5: Prune (true branch, while) \n   n$3=*&a:_Bool [line 93, column 10]\n  PRUNE(n$3, true); [line 93, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_5" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_13" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_6" [label="6: Prune (false branch, while) \n   n$3=*&a:_Bool [line 93, column 10]\n  PRUNE(!n$3, false); [line 93, column 10]\n  NULLIFY(&a); [line 93, column 10]\n  EXIT_SCOPE(n$3,a); [line 93, column 10]\n " shape="invhouse"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_6" [label="6: Prune (false branch, while) \n   n$3=*&a:_Bool [line 93, column 10]\n  PRUNE(!n$3, false); [line 93, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_6" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_3" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_7" [label="7:  Destruction(Scope) \n   _=*&x2:continue_scope::X [line 99, column 3]\n  n$5=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [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" [label="7:  Destruction(Scope) \n   _=*&x2:continue_scope::X [line 99, column 3]\n  n$5=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 99, column 3]\n " shape="box"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_7" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_4" ;
@@ -306,27 +306,27 @@ digraph cfg {
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_8" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_9" ;
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_8" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_10" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_9" [label="9: Prune (true branch, while) \n   n$7=*&b:_Bool [line 95, column 12]\n  PRUNE(n$7, true); [line 95, column 12]\n  EXIT_SCOPE(n$7); [line 95, column 12]\n " shape="invhouse"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_9" [label="9: Prune (true branch, while) \n   n$7=*&b:_Bool [line 95, column 12]\n  PRUNE(n$7, true); [line 95, column 12]\n " shape="invhouse"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_9" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_12" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_10" [label="10: Prune (false branch, while) \n   n$7=*&b:_Bool [line 95, column 12]\n  PRUNE(!n$7, false); [line 95, column 12]\n  EXIT_SCOPE(n$7); [line 95, column 12]\n " shape="invhouse"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_10" [label="10: Prune (false branch, while) \n   n$7=*&b:_Bool [line 95, column 12]\n  PRUNE(!n$7, false); [line 95, column 12]\n " shape="invhouse"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_10" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_7" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_11" [label="11:  Destruction(continue) \n   _=*&x3:continue_scope::X [line 97, column 7]\n  n$9=_fun_continue_scope::X::~X(&x3:continue_scope::X*) injected [line 97, column 7]\n  EXIT_SCOPE(_,n$9,x3); [line 97, column 7]\n  APPLY_ABSTRACTION; [line 97, column 7]\n " shape="box"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_11" [label="11:  Destruction(continue) \n   _=*&x3:continue_scope::X [line 97, column 7]\n  n$9=_fun_continue_scope::X::~X(&x3:continue_scope::X*) injected [line 97, column 7]\n " shape="box"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_11" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_8" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x3:continue_scope::X); [line 96, column 7]\n  n$11=_fun_continue_scope::X::X(&x3:continue_scope::X*) [line 96, column 9]\n  EXIT_SCOPE(n$11); [line 96, column 9]\n " shape="box"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x3:continue_scope::X); [line 96, column 7]\n  n$11=_fun_continue_scope::X::X(&x3:continue_scope::X*) [line 96, column 9]\n " shape="box"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_12" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_11" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x2:continue_scope::X); [line 94, column 5]\n  n$13=_fun_continue_scope::X::X(&x2:continue_scope::X*) [line 94, column 7]\n  EXIT_SCOPE(n$13); [line 94, column 7]\n  APPLY_ABSTRACTION; [line 94, column 7]\n " shape="box"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x2:continue_scope::X); [line 94, column 5]\n  n$13=_fun_continue_scope::X::X(&x2:continue_scope::X*) [line 94, column 7]\n " shape="box"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_13" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_8" ;
-"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x1:continue_scope::X); [line 92, column 3]\n  n$15=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 92, column 5]\n  EXIT_SCOPE(n$15); [line 92, column 5]\n  APPLY_ABSTRACTION; [line 92, column 5]\n " shape="box"]
+"test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x1:continue_scope::X); [line 92, column 3]\n  n$15=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 92, column 5]\n " shape="box"]
 	
 
 	 "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_14" -> "test_while2#continue_scope#4169552136172626704.fb057544ed7a6c8312596f53be6b62dc_4" ;
@@ -334,14 +334,14 @@ digraph cfg {
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_1" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_13" ;
-"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_2" [label="2: Exit continue_scope::test_while3 \n   NULLIFY(&x1); [line 111, column 1]\n  NULLIFY(&x2); [line 111, column 1]\n  NULLIFY(&x3); [line 111, column 1]\n " color=yellow style=filled]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_2" [label="2: Exit continue_scope::test_while3 \n  " color=yellow style=filled]
 	
 
-"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_3" [label="3:  Destruction(Scope) \n   _=*&x3:continue_scope::X [line 111, column 1]\n  n$1=_fun_continue_scope::X::~X(&x3:continue_scope::X*) injected [line 111, column 1]\n  _=*&x1:continue_scope::X [line 111, column 1]\n  n$3=_fun_continue_scope::X::~X(&x1:continue_scope::X*) injected [line 111, column 1]\n  EXIT_SCOPE(_,_,n$1,n$3,x3,x1); [line 111, column 1]\n  APPLY_ABSTRACTION; [line 111, column 1]\n " shape="box"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_3" [label="3:  Destruction(Scope) \n   _=*&x3:continue_scope::X [line 111, column 1]\n  n$1=_fun_continue_scope::X::~X(&x3:continue_scope::X*) injected [line 111, column 1]\n  _=*&x1:continue_scope::X [line 111, column 1]\n  n$3=_fun_continue_scope::X::~X(&x1:continue_scope::X*) injected [line 111, column 1]\n " shape="box"]
 	
 
 	 "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   VARIABLE_DECLARED(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); [line 110, column 5]\n " shape="box"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_4" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_3" ;
@@ -350,15 +350,15 @@ digraph cfg {
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_5" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_6" ;
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_5" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_7" ;
-"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_6" [label="6: Prune (true branch, while) \n   n$6=*&a:_Bool [line 104, column 10]\n  PRUNE(n$6, true); [line 104, column 10]\n  EXIT_SCOPE(n$6); [line 104, column 10]\n " shape="invhouse"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_6" [label="6: Prune (true branch, while) \n   n$6=*&a:_Bool [line 104, column 10]\n  PRUNE(n$6, true); [line 104, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_6" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_12" ;
-"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_7" [label="7: Prune (false branch, while) \n   n$6=*&a:_Bool [line 104, column 10]\n  PRUNE(!n$6, false); [line 104, column 10]\n  NULLIFY(&a); [line 104, column 10]\n  EXIT_SCOPE(n$6,a); [line 104, column 10]\n " shape="invhouse"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_7" [label="7: Prune (false branch, while) \n   n$6=*&a:_Bool [line 104, column 10]\n  PRUNE(!n$6, false); [line 104, column 10]\n " shape="invhouse"]
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_7" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_4" ;
-"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_8" [label="8:  Destruction(Scope) \n   _=*&x2:continue_scope::X [line 109, column 3]\n  n$8=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 109, column 3]\n  EXIT_SCOPE(_,n$8,x2); [line 109, column 3]\n  APPLY_ABSTRACTION; [line 109, column 3]\n " shape="box"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_8" [label="8:  Destruction(Scope) \n   _=*&x2:continue_scope::X [line 109, column 3]\n  n$8=_fun_continue_scope::X::~X(&x2:continue_scope::X*) injected [line 109, column 3]\n " shape="box"]
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_8" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_5" ;
@@ -367,19 +367,19 @@ digraph cfg {
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_9" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_10" ;
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_9" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_11" ;
-"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_10" [label="10: Prune (true branch, while) \n   n$10=*&b:_Bool [line 106, column 12]\n  PRUNE(n$10, true); [line 106, column 12]\n  EXIT_SCOPE(n$10); [line 106, column 12]\n  APPLY_ABSTRACTION; [line 106, column 12]\n " shape="invhouse"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_10" [label="10: Prune (true branch, while) \n   n$10=*&b:_Bool [line 106, column 12]\n  PRUNE(n$10, true); [line 106, column 12]\n " shape="invhouse"]
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_10" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_9" ;
-"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_11" [label="11: Prune (false branch, while) \n   n$10=*&b:_Bool [line 106, column 12]\n  PRUNE(!n$10, false); [line 106, column 12]\n  EXIT_SCOPE(n$10); [line 106, column 12]\n " shape="invhouse"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_11" [label="11: Prune (false branch, while) \n   n$10=*&b:_Bool [line 106, column 12]\n  PRUNE(!n$10, false); [line 106, column 12]\n " shape="invhouse"]
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_11" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_8" ;
-"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x2:continue_scope::X); [line 105, column 5]\n  n$13=_fun_continue_scope::X::X(&x2:continue_scope::X*) [line 105, column 7]\n  EXIT_SCOPE(n$13); [line 105, column 7]\n  APPLY_ABSTRACTION; [line 105, column 7]\n " shape="box"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(x2:continue_scope::X); [line 105, column 5]\n  n$13=_fun_continue_scope::X::X(&x2:continue_scope::X*) [line 105, column 7]\n " shape="box"]
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_12" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_9" ;
-"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x1:continue_scope::X); [line 103, column 3]\n  n$15=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 103, column 5]\n  EXIT_SCOPE(n$15); [line 103, column 5]\n  APPLY_ABSTRACTION; [line 103, column 5]\n " shape="box"]
+"test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x1:continue_scope::X); [line 103, column 3]\n  n$15=_fun_continue_scope::X::X(&x1:continue_scope::X*) [line 103, column 5]\n " shape="box"]
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_13" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_5" ;
@@ -411,7 +411,7 @@ digraph cfg {
 "~X#X#continue_scope#(14106261246415748043).bee8da02915b57fe8c8e01c9b731311d_2" [label="2: Exit continue_scope::X::~X \n  " color=yellow style=filled]
 	
 
-"~X#X#continue_scope#(14106261246415748043).bee8da02915b57fe8c8e01c9b731311d_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:continue_scope::X* [line 10, column 9]\n  _=*n$0:continue_scope::X [line 10, column 9]\n  n$2=_fun_continue_scope::X::__infer_inner_destructor_~X(n$0:continue_scope::X*) injected [line 10, column 9]\n  NULLIFY(&this); [line 10, column 9]\n  EXIT_SCOPE(_,n$0,n$2,this); [line 10, column 9]\n  APPLY_ABSTRACTION; [line 10, column 9]\n " shape="box"]
+"~X#X#continue_scope#(14106261246415748043).bee8da02915b57fe8c8e01c9b731311d_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:continue_scope::X* [line 10, column 9]\n  _=*n$0:continue_scope::X [line 10, column 9]\n  n$2=_fun_continue_scope::X::__infer_inner_destructor_~X(n$0:continue_scope::X*) injected [line 10, column 9]\n " shape="box"]
 	
 
 	 "~X#X#continue_scope#(14106261246415748043).bee8da02915b57fe8c8e01c9b731311d_3" -> "~X#X#continue_scope#(14106261246415748043).bee8da02915b57fe8c8e01c9b731311d_2" ;
@@ -419,10 +419,10 @@ digraph cfg {
 	
 
 	 "operator*#iterator#continue_scope(class continue_scope::X)#(10976315504449545146).6f0a140275409bbf42ae1dbc8842f6af_1" -> "operator*#iterator#continue_scope(class continue_scope::X)#(10976315504449545146).6f0a140275409bbf42ae1dbc8842f6af_3" ;
-"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_2" [label="2: Exit continue_scope::iterator::operator* \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  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X const ); [line 42, column 40]\n  n$5=*&this:continue_scope::iterator const * [line 42, column 40]\n  n$6=*n$5.vector:continue_scope::vec const * [line 42, column 40]\n  _=*n$6:continue_scope::vec const  [line 42, column 40]\n  n$8=*&this:continue_scope::iterator const * [line 42, column 52]\n  n$9=*n$8.position:int [line 42, column 52]\n  n$11=_fun_continue_scope::vec::get(n$6:continue_scope::vec const *,n$9:int,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X*) assign_last [line 42, column 40]\n  n$12=_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  _=*&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X const  [line 42, column 60]\n  n$3=_fun_continue_scope::X::~X(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X const *) injected [line 42, column 60]\n  NULLIFY(&__return_param); [line 42, column 60]\n  NULLIFY(&this); [line 42, column 60]\n  EXIT_SCOPE(_,_,n$0,n$3,n$5,n$6,n$8,n$9,n$11,n$12,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 42, column 60]\n  APPLY_ABSTRACTION; [line 42, column 60]\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  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X const ); [line 42, column 40]\n  n$5=*&this:continue_scope::iterator const * [line 42, column 40]\n  n$6=*n$5.vector:continue_scope::vec const * [line 42, column 40]\n  _=*n$6:continue_scope::vec const  [line 42, column 40]\n  n$8=*&this:continue_scope::iterator const * [line 42, column 52]\n  n$9=*n$8.position:int [line 42, column 52]\n  n$11=_fun_continue_scope::vec::get(n$6:continue_scope::vec const *,n$9:int,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X*) assign_last [line 42, column 40]\n  n$12=_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  _=*&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X const  [line 42, column 60]\n  n$3=_fun_continue_scope::X::~X(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X const *) injected [line 42, column 60]\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" ;
@@ -437,28 +437,28 @@ digraph cfg {
 	
 
 	 "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_3" -> "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_9" ;
-"operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_4" [label="4:  BinaryOperatorStmt: NE \n   n$1=*&this:continue_scope::iterator* [line 27, column 48]\n  n$2=*n$1.position:int [line 27, column 48]\n  n$3=*&i2:continue_scope::iterator const & [line 27, column 60]\n  n$4=*n$3.position:int [line 27, column 60]\n  NULLIFY(&this); [line 27, column 60]\n  NULLIFY(&i2); [line 27, column 60]\n  EXIT_SCOPE(n$1,n$3,this,i2); [line 27, column 60]\n " shape="box"]
+"operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_4" [label="4:  BinaryOperatorStmt: NE \n   n$1=*&this:continue_scope::iterator* [line 27, column 48]\n  n$2=*n$1.position:int [line 27, column 48]\n  n$3=*&i2:continue_scope::iterator const & [line 27, column 60]\n  n$4=*n$3.position:int [line 27, column 60]\n " shape="box"]
 	
 
 	 "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_4" -> "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_5" ;
 	 "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_4" -> "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_6" ;
-"operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_5" [label="5: Prune (true branch, boolean exp) \n   PRUNE((n$2 != n$4), true); [line 27, column 48]\n  EXIT_SCOPE(n$2,n$4); [line 27, column 48]\n " shape="invhouse"]
+"operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_5" [label="5: Prune (true branch, boolean exp) \n   PRUNE((n$2 != n$4), true); [line 27, column 48]\n " shape="invhouse"]
 	
 
 	 "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_5" -> "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_7" ;
-"operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_6" [label="6: Prune (false branch, boolean exp) \n   PRUNE(!(n$2 != n$4), false); [line 27, column 48]\n  EXIT_SCOPE(n$2,n$4); [line 27, column 48]\n " shape="invhouse"]
+"operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_6" [label="6: Prune (false branch, boolean exp) \n   PRUNE(!(n$2 != n$4), false); [line 27, column 48]\n " shape="invhouse"]
 	
 
 	 "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_6" -> "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_8" ;
-"operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=1 [line 27, column 48]\n  APPLY_ABSTRACTION; [line 27, column 48]\n " shape="box"]
+"operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=1 [line 27, column 48]\n " shape="box"]
 	
 
 	 "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_7" -> "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_3" ;
-"operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=0 [line 27, column 48]\n  APPLY_ABSTRACTION; [line 27, column 48]\n " shape="box"]
+"operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=0 [line 27, column 48]\n " shape="box"]
 	
 
 	 "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_8" -> "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_3" ;
-"operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_9" [label="9:  Return Stmt \n   n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool [line 27, column 48]\n  *&return:_Bool=n$5 [line 27, column 41]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 27, column 41]\n  EXIT_SCOPE(n$5,0$?%__sil_tmpSIL_temp_conditional___n$0); [line 27, column 41]\n  APPLY_ABSTRACTION; [line 27, column 41]\n " shape="box"]
+"operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_9" [label="9:  Return Stmt \n   n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool [line 27, column 48]\n  *&return:_Bool=n$5 [line 27, column 41]\n " shape="box"]
 	
 
 	 "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_9" -> "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_2" ;
@@ -469,11 +469,11 @@ digraph cfg {
 "operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_2" [label="2: Exit continue_scope::iterator::operator++ \n  " color=yellow style=filled]
 	
 
-"operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::iterator* [line 24, column 5]\n  n$1=*&this:continue_scope::iterator* [line 24, column 13]\n  n$2=_fun_continue_scope::iterator::iterator(n$0:continue_scope::iterator*,n$1:continue_scope::iterator&) [line 24, column 12]\n  NULLIFY(&__return_param); [line 24, column 12]\n  NULLIFY(&this); [line 24, column 12]\n  EXIT_SCOPE(n$0,n$1,n$2,__return_param,this); [line 24, column 12]\n  APPLY_ABSTRACTION; [line 24, column 12]\n " shape="box"]
+"operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::iterator* [line 24, column 5]\n  n$1=*&this:continue_scope::iterator* [line 24, column 13]\n  n$2=_fun_continue_scope::iterator::iterator(n$0:continue_scope::iterator*,n$1:continue_scope::iterator&) [line 24, column 12]\n " shape="box"]
 	
 
 	 "operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_3" -> "operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_2" ;
-"operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_4" [label="4:  UnaryOperator \n   n$3=*&this:continue_scope::iterator* [line 23, column 5]\n  n$4=*n$3.position:int [line 23, column 5]\n  *n$3.position:int=(n$4 + 1) [line 23, column 5]\n  EXIT_SCOPE(n$3,n$4); [line 23, column 5]\n " shape="box"]
+"operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_4" [label="4:  UnaryOperator \n   n$3=*&this:continue_scope::iterator* [line 23, column 5]\n  n$4=*n$3.position:int [line 23, column 5]\n  *n$3.position:int=(n$4 + 1) [line 23, column 5]\n " shape="box"]
 	
 
 	 "operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_4" -> "operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_3" ;
@@ -484,11 +484,11 @@ digraph cfg {
 "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_2" [label="2: Exit continue_scope::iterator::iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::iterator* [line 16, column 8]\n  n$2=*&__param_0:continue_scope::iterator& [line 16, column 8]\n  n$3=*n$2.vector:continue_scope::vec const * [line 16, column 8]\n  *n$1.vector:continue_scope::vec const *=n$3 [line 16, column 8]\n  NULLIFY(&this); [line 16, column 8]\n  NULLIFY(&__param_0); [line 16, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 16, column 8]\n  APPLY_ABSTRACTION; [line 16, column 8]\n " shape="box"]
+"iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::iterator* [line 16, column 8]\n  n$2=*&__param_0:continue_scope::iterator& [line 16, column 8]\n  n$3=*n$2.vector:continue_scope::vec const * [line 16, column 8]\n  *n$1.vector:continue_scope::vec const *=n$3 [line 16, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_3" -> "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_2" ;
-"iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_4" [label="4:  Constructor Init \n   n$4=*&this:continue_scope::iterator* [line 16, column 8]\n  n$5=*&__param_0:continue_scope::iterator& [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n  EXIT_SCOPE(n$4,n$5,n$6); [line 16, column 8]\n " shape="box"]
+"iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_4" [label="4:  Constructor Init \n   n$4=*&this:continue_scope::iterator* [line 16, column 8]\n  n$5=*&__param_0:continue_scope::iterator& [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_4" -> "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_3" ;
@@ -499,11 +499,11 @@ digraph cfg {
 "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_2" [label="2: Exit continue_scope::iterator::iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::iterator* [line 20, column 52]\n  n$2=*&v:continue_scope::vec const * [line 20, column 59]\n  *n$1.vector:continue_scope::vec const *=n$2 [line 20, column 52]\n  NULLIFY(&v); [line 20, column 52]\n  NULLIFY(&this); [line 20, column 52]\n  EXIT_SCOPE(n$1,n$2,v,this); [line 20, column 52]\n  APPLY_ABSTRACTION; [line 20, column 52]\n " shape="box"]
+"iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::iterator* [line 20, column 52]\n  n$2=*&v:continue_scope::vec const * [line 20, column 59]\n  *n$1.vector:continue_scope::vec const *=n$2 [line 20, column 52]\n " shape="box"]
 	
 
 	 "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_3" -> "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_2" ;
-"iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_4" [label="4:  Constructor Init \n   n$3=*&this:continue_scope::iterator* [line 20, column 37]\n  n$4=*&pos:int [line 20, column 46]\n  *n$3.position:int=n$4 [line 20, column 37]\n  NULLIFY(&pos); [line 20, column 37]\n  EXIT_SCOPE(n$3,n$4,pos); [line 20, column 37]\n " shape="box"]
+"iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_4" [label="4:  Constructor Init \n   n$3=*&this:continue_scope::iterator* [line 20, column 37]\n  n$4=*&pos:int [line 20, column 46]\n  *n$3.position:int=n$4 [line 20, column 37]\n " shape="box"]
 	
 
 	 "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_4" -> "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_3" ;
@@ -514,11 +514,11 @@ digraph cfg {
 "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_2" [label="2: Exit continue_scope::iterator::iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::iterator* [line 16, column 8]\n  n$2=*&__param_0:continue_scope::iterator const & [line 16, column 8]\n  n$3=*n$2.vector:continue_scope::vec const * [line 16, column 8]\n  *n$1.vector:continue_scope::vec const *=n$3 [line 16, column 8]\n  NULLIFY(&this); [line 16, column 8]\n  NULLIFY(&__param_0); [line 16, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 16, column 8]\n  APPLY_ABSTRACTION; [line 16, column 8]\n " shape="box"]
+"iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::iterator* [line 16, column 8]\n  n$2=*&__param_0:continue_scope::iterator const & [line 16, column 8]\n  n$3=*n$2.vector:continue_scope::vec const * [line 16, column 8]\n  *n$1.vector:continue_scope::vec const *=n$3 [line 16, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_3" -> "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_2" ;
-"iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_4" [label="4:  Constructor Init \n   n$4=*&this:continue_scope::iterator* [line 16, column 8]\n  n$5=*&__param_0:continue_scope::iterator const & [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n  EXIT_SCOPE(n$4,n$5,n$6); [line 16, column 8]\n " shape="box"]
+"iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_4" [label="4:  Constructor Init \n   n$4=*&this:continue_scope::iterator* [line 16, column 8]\n  n$5=*&__param_0:continue_scope::iterator const & [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_4" -> "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_3" ;
@@ -526,10 +526,10 @@ digraph cfg {
 	
 
 	 "begin#vec#continue_scope(class continue_scope::iterator)#(10867355481694456603).8c0551e386b9f2c25bf3629672b303c4_1" -> "begin#vec#continue_scope(class continue_scope::iterator)#(10867355481694456603).8c0551e386b9f2c25bf3629672b303c4_3" ;
-"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_2" [label="2: Exit continue_scope::vec::begin \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  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator); [line 34, column 29]\n  n$5=*&this:continue_scope::vec* [line 34, column 38]\n  n$6=_fun_continue_scope::iterator::iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator*,n$5:continue_scope::vec*,0:int) [line 34, column 29]\n  n$7=_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  _=*&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator [line 34, column 45]\n  n$3=_fun_continue_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator*) injected [line 34, column 45]\n  NULLIFY(&__return_param); [line 34, column 45]\n  NULLIFY(&this); [line 34, column 45]\n  EXIT_SCOPE(_,n$0,n$3,n$5,n$6,n$7,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 34, column 45]\n  APPLY_ABSTRACTION; [line 34, column 45]\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  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator); [line 34, column 29]\n  n$5=*&this:continue_scope::vec* [line 34, column 38]\n  n$6=_fun_continue_scope::iterator::iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator*,n$5:continue_scope::vec*,0:int) [line 34, column 29]\n  n$7=_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  _=*&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator [line 34, column 45]\n  n$3=_fun_continue_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator*) injected [line 34, column 45]\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" ;
@@ -540,7 +540,7 @@ digraph cfg {
 "get#vec#continue_scope(class continue_scope::X)#(13898317495016814620).3829388c237a09b0f1feeaf1c583e486_2" [label="2: Exit continue_scope::vec::get \n  " color=yellow style=filled]
 	
 
-"get#vec#continue_scope(class continue_scope::X)#(13898317495016814620).3829388c237a09b0f1feeaf1c583e486_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::X* [line 37, column 26]\n  n$1=*&this:continue_scope::vec const * [line 37, column 33]\n  n$2=*&pos:int [line 37, column 39]\n  n$3=_fun_continue_scope::X::X(n$0:continue_scope::X*,n$1._data[n$2]:continue_scope::X const &) [line 37, column 33]\n  NULLIFY(&__return_param); [line 37, column 33]\n  NULLIFY(&pos); [line 37, column 33]\n  NULLIFY(&this); [line 37, column 33]\n  EXIT_SCOPE(n$0,n$1,n$2,n$3,__return_param,pos,this); [line 37, column 33]\n  APPLY_ABSTRACTION; [line 37, column 33]\n " shape="box"]
+"get#vec#continue_scope(class continue_scope::X)#(13898317495016814620).3829388c237a09b0f1feeaf1c583e486_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::X* [line 37, column 26]\n  n$1=*&this:continue_scope::vec const * [line 37, column 33]\n  n$2=*&pos:int [line 37, column 39]\n  n$3=_fun_continue_scope::X::X(n$0:continue_scope::X*,n$1._data[n$2]:continue_scope::X const &) [line 37, column 33]\n " shape="box"]
 	
 
 	 "get#vec#continue_scope(class continue_scope::X)#(13898317495016814620).3829388c237a09b0f1feeaf1c583e486_3" -> "get#vec#continue_scope(class continue_scope::X)#(13898317495016814620).3829388c237a09b0f1feeaf1c583e486_2" ;
@@ -548,10 +548,10 @@ digraph cfg {
 	
 
 	 "end#vec#continue_scope(class continue_scope::iterator)#(4225103001970544933).15b63d21cc3cccf91200fcac42652775_1" -> "end#vec#continue_scope(class continue_scope::iterator)#(4225103001970544933).15b63d21cc3cccf91200fcac42652775_3" ;
-"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_2" [label="2: Exit continue_scope::vec::end \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  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator); [line 35, column 27]\n  n$5=*&this:continue_scope::vec* [line 35, column 36]\n  n$6=_fun_continue_scope::iterator::iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator*,n$5:continue_scope::vec*,10:int) [line 35, column 27]\n  n$7=_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  _=*&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator [line 35, column 44]\n  n$3=_fun_continue_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator*) injected [line 35, column 44]\n  NULLIFY(&__return_param); [line 35, column 44]\n  NULLIFY(&this); [line 35, column 44]\n  EXIT_SCOPE(_,n$0,n$3,n$5,n$6,n$7,__return_param,0$?%__sil_tmpSIL_materialize_temp__n$1,this); [line 35, column 44]\n  APPLY_ABSTRACTION; [line 35, column 44]\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  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator); [line 35, column 27]\n  n$5=*&this:continue_scope::vec* [line 35, column 36]\n  n$6=_fun_continue_scope::iterator::iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator*,n$5:continue_scope::vec*,10:int) [line 35, column 27]\n  n$7=_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  _=*&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator [line 35, column 44]\n  n$3=_fun_continue_scope::iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator*) injected [line 35, column 44]\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" ;
@@ -562,7 +562,7 @@ digraph cfg {
 "vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_2" [label="2: Exit continue_scope::vec::vec \n  " color=yellow style=filled]
 	
 
-"vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::vec* [line 33, column 3]\n  n$2=_fun_continue_scope::X::X(n$1._data:continue_scope::X[10*1](*)) [line 33, column 3]\n  NULLIFY(&this); [line 33, column 3]\n  EXIT_SCOPE(n$1,n$2,this); [line 33, column 3]\n  APPLY_ABSTRACTION; [line 33, column 3]\n " shape="box"]
+"vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::vec* [line 33, column 3]\n  n$2=_fun_continue_scope::X::X(n$1._data:continue_scope::X[10*1](*)) [line 33, column 3]\n " shape="box"]
 	
 
 	 "vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_3" -> "vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_2" ;
@@ -580,7 +580,7 @@ digraph cfg {
 "~vec#vec#continue_scope#(10360929843329979119).4ca99321ca697a550551ca058254a138_2" [label="2: Exit continue_scope::vec::~vec \n  " color=yellow style=filled]
 	
 
-"~vec#vec#continue_scope#(10360929843329979119).4ca99321ca697a550551ca058254a138_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:continue_scope::vec* [line 32, column 8]\n  _=*n$0:continue_scope::vec [line 32, column 8]\n  n$2=_fun_continue_scope::vec::__infer_inner_destructor_~vec(n$0:continue_scope::vec*) injected [line 32, column 8]\n  NULLIFY(&this); [line 32, column 8]\n  EXIT_SCOPE(_,n$0,n$2,this); [line 32, column 8]\n  APPLY_ABSTRACTION; [line 32, column 8]\n " shape="box"]
+"~vec#vec#continue_scope#(10360929843329979119).4ca99321ca697a550551ca058254a138_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:continue_scope::vec* [line 32, column 8]\n  _=*n$0:continue_scope::vec [line 32, column 8]\n  n$2=_fun_continue_scope::vec::__infer_inner_destructor_~vec(n$0:continue_scope::vec*) injected [line 32, column 8]\n " shape="box"]
 	
 
 	 "~vec#vec#continue_scope#(10360929843329979119).4ca99321ca697a550551ca058254a138_3" -> "~vec#vec#continue_scope#(10360929843329979119).4ca99321ca697a550551ca058254a138_2" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_2" [label="2: Exit A::A \n  " color=yellow style=filled]
 	
 
-"A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_3" [label="3:  Constructor Init \n   n$1=*&this:A* [line 14, column 7]\n  n$2=_fun_T::T(n$1:A*) [line 14, column 3]\n  NULLIFY(&this); [line 14, column 3]\n  EXIT_SCOPE(n$1,n$2,this); [line 14, column 3]\n  APPLY_ABSTRACTION; [line 14, column 3]\n " shape="box"]
+"A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_3" [label="3:  Constructor Init \n   n$1=*&this:A* [line 14, column 7]\n  n$2=_fun_T::T(n$1:A*) [line 14, column 3]\n " shape="box"]
 	
 
 	 "A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_3" -> "A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_2" ;
@@ -25,7 +25,7 @@ digraph cfg {
 "~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_2" [label="2: Exit A::~A \n  " color=yellow style=filled]
 	
 
-"~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:A* [line 15, column 8]\n  _=*n$0:A [line 15, column 8]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:A*) injected [line 15, column 8]\n  _=*n$0:A [line 15, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:A*) injected [line 15, column 8]\n  NULLIFY(&this); [line 15, column 8]\n  EXIT_SCOPE(_,_,n$0,n$2,n$4,this); [line 15, column 8]\n  APPLY_ABSTRACTION; [line 15, column 8]\n " shape="box"]
+"~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:A* [line 15, column 8]\n  _=*n$0:A [line 15, column 8]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:A*) injected [line 15, column 8]\n  _=*n$0:A [line 15, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:A*) injected [line 15, column 8]\n " shape="box"]
 	
 
 	 "~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_3" -> "~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_2" ;
@@ -36,11 +36,11 @@ digraph cfg {
 "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_2" [label="2: Exit B::B \n  " color=yellow style=filled]
 	
 
-"B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_3" [label="3:  Constructor Init \n   n$1=*&this:B* [line 19, column 3]\n  n$2=_fun_A::A(n$1:B*) [line 19, column 3]\n  NULLIFY(&this); [line 19, column 3]\n  EXIT_SCOPE(n$1,n$2,this); [line 19, column 3]\n  APPLY_ABSTRACTION; [line 19, column 3]\n " shape="box"]
+"B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_3" [label="3:  Constructor Init \n   n$1=*&this:B* [line 19, column 3]\n  n$2=_fun_A::A(n$1:B*) [line 19, column 3]\n " shape="box"]
 	
 
 	 "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_3" -> "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_2" ;
-"B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_4" [label="4:  Constructor Init \n   n$3=*&this:B* [line 19, column 7]\n  n$4=_fun_T::T(n$3:B*) [line 19, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 19, column 3]\n " shape="box"]
+"B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_4" [label="4:  Constructor Init \n   n$3=*&this:B* [line 19, column 7]\n  n$4=_fun_T::T(n$3:B*) [line 19, column 3]\n " shape="box"]
 	
 
 	 "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_4" -> "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_3" ;
@@ -58,7 +58,7 @@ digraph cfg {
 "~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_2" [label="2: Exit B::~B \n  " color=yellow style=filled]
 	
 
-"~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:B* [line 20, column 8]\n  _=*n$0:B [line 20, column 8]\n  n$6=_fun_B::__infer_inner_destructor_~B(n$0:B*) injected [line 20, column 8]\n  _=*n$0:B [line 20, column 8]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:B*) injected [line 20, column 8]\n  _=*n$0:B [line 20, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:B*) injected [line 20, column 8]\n  NULLIFY(&this); [line 20, column 8]\n  EXIT_SCOPE(_,_,_,n$0,n$2,n$4,n$6,this); [line 20, column 8]\n  APPLY_ABSTRACTION; [line 20, column 8]\n " shape="box"]
+"~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:B* [line 20, column 8]\n  _=*n$0:B [line 20, column 8]\n  n$6=_fun_B::__infer_inner_destructor_~B(n$0:B*) injected [line 20, column 8]\n  _=*n$0:B [line 20, column 8]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:B*) injected [line 20, column 8]\n  _=*n$0:B [line 20, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:B*) injected [line 20, column 8]\n " shape="box"]
 	
 
 	 "~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_3" -> "~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_2" ;
@@ -83,7 +83,7 @@ digraph cfg {
 "~C#C#(8663121109475859597).c4887e86b7c3519c4397dd483476d5d2_2" [label="2: Exit C::~C \n  " color=yellow style=filled]
 	
 
-"~C#C#(8663121109475859597).c4887e86b7c3519c4397dd483476d5d2_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:C* [line 25, column 8]\n  _=*n$0:C [line 25, column 8]\n  n$2=_fun_C::__infer_inner_destructor_~C(n$0:C*) injected [line 25, column 8]\n  NULLIFY(&this); [line 25, column 8]\n  EXIT_SCOPE(_,n$0,n$2,this); [line 25, column 8]\n  APPLY_ABSTRACTION; [line 25, column 8]\n " shape="box"]
+"~C#C#(8663121109475859597).c4887e86b7c3519c4397dd483476d5d2_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:C* [line 25, column 8]\n  _=*n$0:C [line 25, column 8]\n  n$2=_fun_C::__infer_inner_destructor_~C(n$0:C*) injected [line 25, column 8]\n " shape="box"]
 	
 
 	 "~C#C#(8663121109475859597).c4887e86b7c3519c4397dd483476d5d2_3" -> "~C#C#(8663121109475859597).c4887e86b7c3519c4397dd483476d5d2_2" ;
@@ -94,19 +94,19 @@ digraph cfg {
 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_2" [label="2: Exit D::D \n  " color=yellow style=filled]
 	
 
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_3" [label="3:  Constructor Init \n   n$1=*&this:D* [line 30, column 3]\n  n$2=_fun_B::B(n$1.b:B*) [line 30, column 3]\n  NULLIFY(&this); [line 30, column 3]\n  EXIT_SCOPE(n$1,n$2,this); [line 30, column 3]\n  APPLY_ABSTRACTION; [line 30, column 3]\n " shape="box"]
+"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_3" [label="3:  Constructor Init \n   n$1=*&this:D* [line 30, column 3]\n  n$2=_fun_B::B(n$1.b:B*) [line 30, column 3]\n " shape="box"]
 	
 
 	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_3" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_2" ;
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_4" [label="4:  Constructor Init \n   n$3=*&this:D* [line 30, column 3]\n  n$4=_fun_C::C(n$3:D*) [line 30, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 30, column 3]\n " shape="box"]
+"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_4" [label="4:  Constructor Init \n   n$3=*&this:D* [line 30, column 3]\n  n$4=_fun_C::C(n$3:D*) [line 30, column 3]\n " shape="box"]
 	
 
 	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_4" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_3" ;
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_5" [label="5:  Constructor Init \n   n$5=*&this:D* [line 30, column 3]\n  n$6=_fun_A::A(n$5:D*) [line 30, column 3]\n  EXIT_SCOPE(n$5,n$6); [line 30, column 3]\n " shape="box"]
+"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_5" [label="5:  Constructor Init \n   n$5=*&this:D* [line 30, column 3]\n  n$6=_fun_A::A(n$5:D*) [line 30, column 3]\n " shape="box"]
 	
 
 	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_5" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_4" ;
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_6" [label="6:  Constructor Init \n   n$7=*&this:D* [line 30, column 7]\n  n$8=_fun_T::T(n$7:D*) [line 30, column 3]\n  EXIT_SCOPE(n$7,n$8); [line 30, column 3]\n " shape="box"]
+"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_6" [label="6:  Constructor Init \n   n$7=*&this:D* [line 30, column 7]\n  n$8=_fun_T::T(n$7:D*) [line 30, column 3]\n " shape="box"]
 	
 
 	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_6" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_5" ;
@@ -114,18 +114,18 @@ digraph cfg {
 	
 
 	 "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_1" -> "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_5" ;
-"__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_2" [label="2: Exit D::__infer_inner_destructor_~D \n   NULLIFY(&a); [line 31, column 15]\n " color=yellow style=filled]
+"__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_2" [label="2: Exit D::__infer_inner_destructor_~D \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_3" [label="3:  Destruction(fields) \n   n$0=*&this:D* [line 31, column 15]\n  _=*n$0.b:B [line 31, column 15]\n  n$2=_fun_B::~B(n$0.b:B*) injected [line 31, column 15]\n  _=*n$0:D [line 31, column 15]\n  n$6=_fun_C::__infer_inner_destructor_~C(n$0:D*) injected [line 31, column 15]\n  _=*n$0:D [line 31, column 15]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:D*) injected [line 31, column 15]\n  NULLIFY(&this); [line 31, column 15]\n  EXIT_SCOPE(_,_,_,n$0,n$2,n$4,n$6,this); [line 31, column 15]\n  APPLY_ABSTRACTION; [line 31, column 15]\n " shape="box"]
+"__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_3" [label="3:  Destruction(fields) \n   n$0=*&this:D* [line 31, column 15]\n  _=*n$0.b:B [line 31, column 15]\n  n$2=_fun_B::~B(n$0.b:B*) injected [line 31, column 15]\n  _=*n$0:D [line 31, column 15]\n  n$6=_fun_C::__infer_inner_destructor_~C(n$0:D*) injected [line 31, column 15]\n  _=*n$0:D [line 31, column 15]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:D*) injected [line 31, column 15]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_3" -> "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_2" ;
-"__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_4" [label="4:  Destruction(Scope) \n   _=*&a:A [line 31, column 15]\n  n$9=_fun_A::~A(&a:A*) injected [line 31, column 15]\n  EXIT_SCOPE(_,n$9,a); [line 31, column 15]\n " shape="box"]
+"__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_4" [label="4:  Destruction(Scope) \n   _=*&a:A [line 31, column 15]\n  n$9=_fun_A::~A(&a:A*) injected [line 31, column 15]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_4" -> "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_3" ;
-"__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(a:A); [line 31, column 10]\n  n$11=_fun_A::A(&a:A*) [line 31, column 12]\n  EXIT_SCOPE(n$11); [line 31, column 12]\n " shape="box"]
+"__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(a:A); [line 31, column 10]\n  n$11=_fun_A::A(&a:A*) [line 31, column 12]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_5" -> "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_4" ;
@@ -136,7 +136,7 @@ digraph cfg {
 "~D#D#(5618221758133596168).bd1f40c4fa1d5ed90c732a34d33e4d7c_2" [label="2: Exit D::~D \n  " color=yellow style=filled]
 	
 
-"~D#D#(5618221758133596168).bd1f40c4fa1d5ed90c732a34d33e4d7c_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:D* [line 31, column 15]\n  _=*n$0:D [line 31, column 15]\n  n$4=_fun_D::__infer_inner_destructor_~D(n$0:D*) injected [line 31, column 15]\n  _=*n$0:D [line 31, column 15]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:D*) injected [line 31, column 15]\n  NULLIFY(&this); [line 31, column 15]\n  EXIT_SCOPE(_,_,n$0,n$2,n$4,this); [line 31, column 15]\n  APPLY_ABSTRACTION; [line 31, column 15]\n " shape="box"]
+"~D#D#(5618221758133596168).bd1f40c4fa1d5ed90c732a34d33e4d7c_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:D* [line 31, column 15]\n  _=*n$0:D [line 31, column 15]\n  n$4=_fun_D::__infer_inner_destructor_~D(n$0:D*) injected [line 31, column 15]\n  _=*n$0:D [line 31, column 15]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:D*) injected [line 31, column 15]\n " shape="box"]
 	
 
 	 "~D#D#(5618221758133596168).bd1f40c4fa1d5ed90c732a34d33e4d7c_3" -> "~D#D#(5618221758133596168).bd1f40c4fa1d5ed90c732a34d33e4d7c_2" ;
@@ -147,23 +147,23 @@ digraph cfg {
 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_2" [label="2: Exit E::E \n  " color=yellow style=filled]
 	
 
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_3" [label="3:  Constructor Init \n   n$1=*&this:E* [line 35, column 3]\n  n$2=_fun_D::D(n$1:E*) [line 35, column 3]\n  NULLIFY(&this); [line 35, column 3]\n  EXIT_SCOPE(n$1,n$2,this); [line 35, column 3]\n  APPLY_ABSTRACTION; [line 35, column 3]\n " shape="box"]
+"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_3" [label="3:  Constructor Init \n   n$1=*&this:E* [line 35, column 3]\n  n$2=_fun_D::D(n$1:E*) [line 35, column 3]\n " shape="box"]
 	
 
 	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_3" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_2" ;
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_4" [label="4:  Constructor Init \n   n$3=*&this:E* [line 35, column 3]\n  n$4=_fun_C::C(n$3:E*) [line 35, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 35, column 3]\n " shape="box"]
+"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_4" [label="4:  Constructor Init \n   n$3=*&this:E* [line 35, column 3]\n  n$4=_fun_C::C(n$3:E*) [line 35, column 3]\n " shape="box"]
 	
 
 	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_4" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_3" ;
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_5" [label="5:  Constructor Init \n   n$5=*&this:E* [line 35, column 3]\n  n$6=_fun_B::B(n$5:E*) [line 35, column 3]\n  EXIT_SCOPE(n$5,n$6); [line 35, column 3]\n " shape="box"]
+"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_5" [label="5:  Constructor Init \n   n$5=*&this:E* [line 35, column 3]\n  n$6=_fun_B::B(n$5:E*) [line 35, column 3]\n " shape="box"]
 	
 
 	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_5" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_4" ;
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_6" [label="6:  Constructor Init \n   n$7=*&this:E* [line 35, column 3]\n  n$8=_fun_A::A(n$7:E*) [line 35, column 3]\n  EXIT_SCOPE(n$7,n$8); [line 35, column 3]\n " shape="box"]
+"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_6" [label="6:  Constructor Init \n   n$7=*&this:E* [line 35, column 3]\n  n$8=_fun_A::A(n$7:E*) [line 35, column 3]\n " shape="box"]
 	
 
 	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_6" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_5" ;
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_7" [label="7:  Constructor Init \n   n$9=*&this:E* [line 35, column 7]\n  n$10=_fun_T::T(n$9:E*) [line 35, column 3]\n  EXIT_SCOPE(n$9,n$10); [line 35, column 3]\n " shape="box"]
+"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_7" [label="7:  Constructor Init \n   n$9=*&this:E* [line 35, column 7]\n  n$10=_fun_T::T(n$9:E*) [line 35, column 3]\n " shape="box"]
 	
 
 	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_7" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_6" ;
@@ -174,7 +174,7 @@ digraph cfg {
 "__infer_inner_destructor_~E#E#(2987579715549688623).0c2beae2fa1834341749df3ec1f5ac22_2" [label="2: Exit E::__infer_inner_destructor_~E \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~E#E#(2987579715549688623).0c2beae2fa1834341749df3ec1f5ac22_3" [label="3:  Destruction(fields) \n   n$0=*&this:E* [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$6=_fun_D::__infer_inner_destructor_~D(n$0:E*) injected [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$4=_fun_C::__infer_inner_destructor_~C(n$0:E*) injected [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$2=_fun_B::__infer_inner_destructor_~B(n$0:E*) injected [line 36, column 8]\n  NULLIFY(&this); [line 36, column 8]\n  EXIT_SCOPE(_,_,_,n$0,n$2,n$4,n$6,this); [line 36, column 8]\n  APPLY_ABSTRACTION; [line 36, column 8]\n " shape="box"]
+"__infer_inner_destructor_~E#E#(2987579715549688623).0c2beae2fa1834341749df3ec1f5ac22_3" [label="3:  Destruction(fields) \n   n$0=*&this:E* [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$6=_fun_D::__infer_inner_destructor_~D(n$0:E*) injected [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$4=_fun_C::__infer_inner_destructor_~C(n$0:E*) injected [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$2=_fun_B::__infer_inner_destructor_~B(n$0:E*) injected [line 36, column 8]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~E#E#(2987579715549688623).0c2beae2fa1834341749df3ec1f5ac22_3" -> "__infer_inner_destructor_~E#E#(2987579715549688623).0c2beae2fa1834341749df3ec1f5ac22_2" ;
@@ -185,7 +185,7 @@ digraph cfg {
 "~E#E#(2987579715549688623).452c4ab608cbb84e7144bf65a39276d9_2" [label="2: Exit E::~E \n  " color=yellow style=filled]
 	
 
-"~E#E#(2987579715549688623).452c4ab608cbb84e7144bf65a39276d9_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:E* [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$6=_fun_E::__infer_inner_destructor_~E(n$0:E*) injected [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:E*) injected [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:E*) injected [line 36, column 8]\n  NULLIFY(&this); [line 36, column 8]\n  EXIT_SCOPE(_,_,_,n$0,n$2,n$4,n$6,this); [line 36, column 8]\n  APPLY_ABSTRACTION; [line 36, column 8]\n " shape="box"]
+"~E#E#(2987579715549688623).452c4ab608cbb84e7144bf65a39276d9_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:E* [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$6=_fun_E::__infer_inner_destructor_~E(n$0:E*) injected [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:E*) injected [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:E*) injected [line 36, column 8]\n " shape="box"]
 	
 
 	 "~E#E#(2987579715549688623).452c4ab608cbb84e7144bf65a39276d9_3" -> "~E#E#(2987579715549688623).452c4ab608cbb84e7144bf65a39276d9_2" ;
@@ -196,23 +196,23 @@ digraph cfg {
 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_2" [label="2: Exit F::F \n  " color=yellow style=filled]
 	
 
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_3" [label="3:  Constructor Init \n   n$1=*&this:F* [line 40, column 3]\n  n$2=_fun_D::D(n$1:F*) [line 40, column 3]\n  NULLIFY(&this); [line 40, column 3]\n  EXIT_SCOPE(n$1,n$2,this); [line 40, column 3]\n  APPLY_ABSTRACTION; [line 40, column 3]\n " shape="box"]
+"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_3" [label="3:  Constructor Init \n   n$1=*&this:F* [line 40, column 3]\n  n$2=_fun_D::D(n$1:F*) [line 40, column 3]\n " shape="box"]
 	
 
 	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_3" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_2" ;
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_4" [label="4:  Constructor Init \n   n$3=*&this:F* [line 40, column 3]\n  n$4=_fun_B::B(n$3:F*) [line 40, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 40, column 3]\n " shape="box"]
+"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_4" [label="4:  Constructor Init \n   n$3=*&this:F* [line 40, column 3]\n  n$4=_fun_B::B(n$3:F*) [line 40, column 3]\n " shape="box"]
 	
 
 	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_4" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_3" ;
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_5" [label="5:  Constructor Init \n   n$5=*&this:F* [line 40, column 3]\n  n$6=_fun_C::C(n$5:F*) [line 40, column 3]\n  EXIT_SCOPE(n$5,n$6); [line 40, column 3]\n " shape="box"]
+"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_5" [label="5:  Constructor Init \n   n$5=*&this:F* [line 40, column 3]\n  n$6=_fun_C::C(n$5:F*) [line 40, column 3]\n " shape="box"]
 	
 
 	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_5" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_4" ;
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_6" [label="6:  Constructor Init \n   n$7=*&this:F* [line 40, column 3]\n  n$8=_fun_A::A(n$7:F*) [line 40, column 3]\n  EXIT_SCOPE(n$7,n$8); [line 40, column 3]\n " shape="box"]
+"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_6" [label="6:  Constructor Init \n   n$7=*&this:F* [line 40, column 3]\n  n$8=_fun_A::A(n$7:F*) [line 40, column 3]\n " shape="box"]
 	
 
 	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_6" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_5" ;
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_7" [label="7:  Constructor Init \n   n$9=*&this:F* [line 40, column 7]\n  n$10=_fun_T::T(n$9:F*) [line 40, column 3]\n  EXIT_SCOPE(n$9,n$10); [line 40, column 3]\n " shape="box"]
+"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_7" [label="7:  Constructor Init \n   n$9=*&this:F* [line 40, column 7]\n  n$10=_fun_T::T(n$9:F*) [line 40, column 3]\n " shape="box"]
 	
 
 	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_7" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_6" ;
@@ -223,7 +223,7 @@ digraph cfg {
 "__infer_inner_destructor_~F#F#(5727529154579633650).20752c7323d15bc6d30fac190df5baf8_2" [label="2: Exit F::__infer_inner_destructor_~F \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~F#F#(5727529154579633650).20752c7323d15bc6d30fac190df5baf8_3" [label="3:  Destruction(fields) \n   n$0=*&this:F* [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$4=_fun_D::__infer_inner_destructor_~D(n$0:F*) injected [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$2=_fun_B::__infer_inner_destructor_~B(n$0:F*) injected [line 41, column 8]\n  NULLIFY(&this); [line 41, column 8]\n  EXIT_SCOPE(_,_,n$0,n$2,n$4,this); [line 41, column 8]\n  APPLY_ABSTRACTION; [line 41, column 8]\n " shape="box"]
+"__infer_inner_destructor_~F#F#(5727529154579633650).20752c7323d15bc6d30fac190df5baf8_3" [label="3:  Destruction(fields) \n   n$0=*&this:F* [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$4=_fun_D::__infer_inner_destructor_~D(n$0:F*) injected [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$2=_fun_B::__infer_inner_destructor_~B(n$0:F*) injected [line 41, column 8]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~F#F#(5727529154579633650).20752c7323d15bc6d30fac190df5baf8_3" -> "__infer_inner_destructor_~F#F#(5727529154579633650).20752c7323d15bc6d30fac190df5baf8_2" ;
@@ -234,7 +234,7 @@ digraph cfg {
 "~F#F#(5727529154579633650).f1ad6d785ba06c47f402bc76b9b85f73_2" [label="2: Exit F::~F \n  " color=yellow style=filled]
 	
 
-"~F#F#(5727529154579633650).f1ad6d785ba06c47f402bc76b9b85f73_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:F* [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$8=_fun_F::__infer_inner_destructor_~F(n$0:F*) injected [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$6=_fun_C::__infer_inner_destructor_~C(n$0:F*) injected [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:F*) injected [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:F*) injected [line 41, column 8]\n  NULLIFY(&this); [line 41, column 8]\n  EXIT_SCOPE(_,_,_,_,n$0,n$2,n$4,n$6,n$8,this); [line 41, column 8]\n  APPLY_ABSTRACTION; [line 41, column 8]\n " shape="box"]
+"~F#F#(5727529154579633650).f1ad6d785ba06c47f402bc76b9b85f73_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:F* [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$8=_fun_F::__infer_inner_destructor_~F(n$0:F*) injected [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$6=_fun_C::__infer_inner_destructor_~C(n$0:F*) injected [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:F*) injected [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:F*) injected [line 41, column 8]\n " shape="box"]
 	
 
 	 "~F#F#(5727529154579633650).f1ad6d785ba06c47f402bc76b9b85f73_3" -> "~F#F#(5727529154579633650).f1ad6d785ba06c47f402bc76b9b85f73_2" ;
@@ -259,7 +259,7 @@ digraph cfg {
 "~T#T#(198129514833990712).9a1fb2f2d427aff6059a6de0c57b5949_2" [label="2: Exit T::~T \n  " color=yellow style=filled]
 	
 
-"~T#T#(198129514833990712).9a1fb2f2d427aff6059a6de0c57b5949_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:T* [line 10, column 8]\n  _=*n$0:T [line 10, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:T*) injected [line 10, column 8]\n  NULLIFY(&this); [line 10, column 8]\n  EXIT_SCOPE(_,n$0,n$2,this); [line 10, column 8]\n  APPLY_ABSTRACTION; [line 10, column 8]\n " shape="box"]
+"~T#T#(198129514833990712).9a1fb2f2d427aff6059a6de0c57b5949_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:T* [line 10, column 8]\n  _=*n$0:T [line 10, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:T*) injected [line 10, column 8]\n " shape="box"]
 	
 
 	 "~T#T#(198129514833990712).9a1fb2f2d427aff6059a6de0c57b5949_3" -> "~T#T#(198129514833990712).9a1fb2f2d427aff6059a6de0c57b5949_2" ;

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

@@ -7,11 +7,11 @@ digraph cfg {
 "destroy<int_*>#14082686937760238422.8268959c48dc929d419568bc99a6b97b_2" [label="2: Exit destroy<int_*> \n  " color=yellow style=filled]
 	
 
-"destroy<int_*>#14082686937760238422.8268959c48dc929d419568bc99a6b97b_3" [label="3:  Return Stmt \n   *&return:int=0 [line 18, column 3]\n  APPLY_ABSTRACTION; [line 18, column 3]\n " shape="box"]
+"destroy<int_*>#14082686937760238422.8268959c48dc929d419568bc99a6b97b_3" [label="3:  Return Stmt \n   *&return:int=0 [line 18, column 3]\n " shape="box"]
 	
 
 	 "destroy<int_*>#14082686937760238422.8268959c48dc929d419568bc99a6b97b_3" -> "destroy<int_*>#14082686937760238422.8268959c48dc929d419568bc99a6b97b_2" ;
-"destroy<int_*>#14082686937760238422.8268959c48dc929d419568bc99a6b97b_4" [label="4:  Call _fun___infer_skip_function \n   n$0=_fun___infer_skip_function() [line 17, column 3]\n  EXIT_SCOPE(n$0); [line 17, column 3]\n " shape="box"]
+"destroy<int_*>#14082686937760238422.8268959c48dc929d419568bc99a6b97b_4" [label="4:  Call _fun___infer_skip_function \n   n$0=_fun___infer_skip_function() [line 17, column 3]\n " shape="box"]
 	
 
 	 "destroy<int_*>#14082686937760238422.8268959c48dc929d419568bc99a6b97b_4" -> "destroy<int_*>#14082686937760238422.8268959c48dc929d419568bc99a6b97b_3" ;
@@ -22,15 +22,15 @@ digraph cfg {
 "f#10188173399311638112.8cffce40f5525757e791edeba0985326_2" [label="2: Exit f \n  " color=yellow style=filled]
 	
 
-"f#10188173399311638112.8cffce40f5525757e791edeba0985326_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 12, column 10]\n  *&return:int=n$0 [line 12, column 3]\n  NULLIFY(&x); [line 12, column 3]\n  EXIT_SCOPE(n$0,x); [line 12, column 3]\n  APPLY_ABSTRACTION; [line 12, column 3]\n " shape="box"]
+"f#10188173399311638112.8cffce40f5525757e791edeba0985326_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 12, column 10]\n  *&return:int=n$0 [line 12, column 3]\n " shape="box"]
 	
 
 	 "f#10188173399311638112.8cffce40f5525757e791edeba0985326_3" -> "f#10188173399311638112.8cffce40f5525757e791edeba0985326_2" ;
-"f#10188173399311638112.8cffce40f5525757e791edeba0985326_4" [label="4:  Call _fun___infer_skip_function \n   n$1=_fun___infer_skip_function() [line 11, column 3]\n  EXIT_SCOPE(n$1); [line 11, column 3]\n " shape="box"]
+"f#10188173399311638112.8cffce40f5525757e791edeba0985326_4" [label="4:  Call _fun___infer_skip_function \n   n$1=_fun___infer_skip_function() [line 11, column 3]\n " shape="box"]
 	
 
 	 "f#10188173399311638112.8cffce40f5525757e791edeba0985326_4" -> "f#10188173399311638112.8cffce40f5525757e791edeba0985326_3" ;
-"f#10188173399311638112.8cffce40f5525757e791edeba0985326_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 10, column 3]\n  n$2=*&p:int* [line 10, column 12]\n  n$3=*n$2:int [line 10, column 11]\n  *&x:int=n$3 [line 10, column 3]\n  NULLIFY(&p); [line 10, column 3]\n  EXIT_SCOPE(n$2,n$3,p); [line 10, column 3]\n " shape="box"]
+"f#10188173399311638112.8cffce40f5525757e791edeba0985326_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 10, column 3]\n  n$2=*&p:int* [line 10, column 12]\n  n$3=*n$2:int [line 10, column 11]\n  *&x:int=n$3 [line 10, column 3]\n " shape="box"]
 	
 
 	 "f#10188173399311638112.8cffce40f5525757e791edeba0985326_5" -> "f#10188173399311638112.8cffce40f5525757e791edeba0985326_4" ;
@@ -38,10 +38,10 @@ digraph cfg {
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_1" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n   NULLIFY(&t); [line 24, column 1]\n " color=yellow style=filled]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Call _fun_destroy<int_*> \n   n$0=_fun_destroy<int_*>(&t:int**) [line 23, column 3]\n  EXIT_SCOPE(n$0,t); [line 23, column 3]\n  APPLY_ABSTRACTION; [line 23, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Call _fun_destroy<int_*> \n   n$0=_fun_destroy<int_*>(&t:int**) [line 23, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;

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

@@ -4,10 +4,10 @@ digraph cfg {
 	
 
 	 "callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_1" -> "callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_3" ;
-"callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_2" [label="2: Exit destructor_scope::callgetZ \n   NULLIFY(&0$?%__sil_tmp__temp_return_n$1); [line 82, column 27]\n " color=yellow style=filled]
+"callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_2" [label="2: Exit destructor_scope::callgetZ \n  " color=yellow style=filled]
 	
 
-"callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_3" [label="3:  Call _fun_destructor_scope::getZ \n   n$2=_fun_destructor_scope::getZ(&0$?%__sil_tmp__temp_return_n$1:destructor_scope::Z*) assign_last [line 82, column 19]\n  EXIT_SCOPE(n$2,0$?%__sil_tmp__temp_return_n$1); [line 82, column 19]\n  APPLY_ABSTRACTION; [line 82, column 19]\n " shape="box"]
+"callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_3" [label="3:  Call _fun_destructor_scope::getZ \n   n$2=_fun_destructor_scope::getZ(&0$?%__sil_tmp__temp_return_n$1:destructor_scope::Z*) assign_last [line 82, column 19]\n " shape="box"]
 	
 
 	 "callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_3" -> "callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_2" ;
@@ -15,14 +15,14 @@ digraph cfg {
 	
 
 	 "getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_1" -> "getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_4" ;
-"getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_2" [label="2: Exit destructor_scope::getX \n   NULLIFY(&x); [line 71, column 1]\n " color=yellow style=filled]
+"getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_2" [label="2: Exit destructor_scope::getX \n  " color=yellow style=filled]
 	
 
-"getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_3" [label="3:  Return Stmt \n   n$0=*&__return_param:destructor_scope::X* [line 70, column 3]\n  n$1=_fun_destructor_scope::X::X(n$0:destructor_scope::X*,&x:destructor_scope::X&) [line 70, column 10]\n  _=*&x:destructor_scope::X [line 70, column 10]\n  n$3=_fun_destructor_scope::X::~X(&x:destructor_scope::X*) injected [line 70, column 10]\n  NULLIFY(&__return_param); [line 70, column 10]\n  EXIT_SCOPE(_,n$0,n$1,n$3,__return_param,x); [line 70, column 10]\n  APPLY_ABSTRACTION; [line 70, column 10]\n " shape="box"]
+"getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_3" [label="3:  Return Stmt \n   n$0=*&__return_param:destructor_scope::X* [line 70, column 3]\n  n$1=_fun_destructor_scope::X::X(n$0:destructor_scope::X*,&x:destructor_scope::X&) [line 70, column 10]\n  _=*&x:destructor_scope::X [line 70, column 10]\n  n$3=_fun_destructor_scope::X::~X(&x:destructor_scope::X*) injected [line 70, column 10]\n " shape="box"]
 	
 
 	 "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   VARIABLE_DECLARED(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); [line 69, column 5]\n " shape="box"]
+"getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_4" -> "getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_3" ;
@@ -30,14 +30,14 @@ digraph cfg {
 	
 
 	 "getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_1" -> "getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_4" ;
-"getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_2" [label="2: Exit destructor_scope::getZ \n   NULLIFY(&z); [line 76, column 1]\n " color=yellow style=filled]
+"getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_2" [label="2: Exit destructor_scope::getZ \n  " color=yellow style=filled]
 	
 
-"getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_3" [label="3:  Return Stmt \n   n$0=*&__return_param:destructor_scope::Z* [line 75, column 3]\n  n$1=_fun_destructor_scope::Z::Z(n$0:destructor_scope::Z*,&z:destructor_scope::Z&) [line 75, column 10]\n  _=*&z:destructor_scope::Z [line 75, column 10]\n  n$3=_fun_destructor_scope::Z::~Z(&z:destructor_scope::Z*) injected [line 75, column 10]\n  NULLIFY(&__return_param); [line 75, column 10]\n  EXIT_SCOPE(_,n$0,n$1,n$3,__return_param,z); [line 75, column 10]\n  APPLY_ABSTRACTION; [line 75, column 10]\n " shape="box"]
+"getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_3" [label="3:  Return Stmt \n   n$0=*&__return_param:destructor_scope::Z* [line 75, column 3]\n  n$1=_fun_destructor_scope::Z::Z(n$0:destructor_scope::Z*,&z:destructor_scope::Z&) [line 75, column 10]\n  _=*&z:destructor_scope::Z [line 75, column 10]\n  n$3=_fun_destructor_scope::Z::~Z(&z:destructor_scope::Z*) injected [line 75, column 10]\n " shape="box"]
 	
 
 	 "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   VARIABLE_DECLARED(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); [line 74, column 5]\n " shape="box"]
+"getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_4" -> "getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_3" ;
@@ -45,30 +45,30 @@ digraph cfg {
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_1" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_21" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_2" [label="2: Exit destructor_scope::test1 \n   NULLIFY(&x3); [line 55, column 1]\n  NULLIFY(&y2); [line 55, column 1]\n  NULLIFY(&s); [line 55, column 1]\n  NULLIFY(&y1); [line 55, column 1]\n  NULLIFY(&y3); [line 55, column 1]\n  NULLIFY(&x2); [line 55, column 1]\n  NULLIFY(&x1); [line 55, column 1]\n " color=yellow style=filled]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_2" [label="2: Exit destructor_scope::test1 \n  " color=yellow style=filled]
 	
 
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_3" [label="3:  Destruction(Scope) \n   _=*&y1:destructor_scope::Y [line 55, column 1]\n  n$1=_fun_destructor_scope::Y::~Y(&y1:destructor_scope::Y*) injected [line 55, column 1]\n  _=*&s:destructor_scope::S [line 55, column 1]\n  n$3=_fun_destructor_scope::S::~S(&s:destructor_scope::S*) injected [line 55, column 1]\n  _=*&x1:destructor_scope::X [line 55, column 1]\n  n$5=_fun_destructor_scope::X::~X(&x1:destructor_scope::X*) injected [line 55, column 1]\n  EXIT_SCOPE(_,_,_,n$1,n$3,n$5,x1,y1,s); [line 55, column 1]\n  APPLY_ABSTRACTION; [line 55, column 1]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_3" [label="3:  Destruction(Scope) \n   _=*&y1:destructor_scope::Y [line 55, column 1]\n  n$1=_fun_destructor_scope::Y::~Y(&y1:destructor_scope::Y*) injected [line 55, column 1]\n  _=*&s:destructor_scope::S [line 55, column 1]\n  n$3=_fun_destructor_scope::S::~S(&s:destructor_scope::S*) injected [line 55, column 1]\n  _=*&x1:destructor_scope::X [line 55, column 1]\n  n$5=_fun_destructor_scope::X::~X(&x1:destructor_scope::X*) injected [line 55, column 1]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_3" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_2" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_4" [label="4:  Destruction(Scope) \n   _=*&y3:destructor_scope::Y [line 54, column 11]\n  n$8=_fun_destructor_scope::Y::~Y(&y3:destructor_scope::Y*) injected [line 54, column 11]\n  EXIT_SCOPE(_,n$8,y3); [line 54, column 11]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_4" [label="4:  Destruction(Scope) \n   _=*&y3:destructor_scope::Y [line 54, column 11]\n  n$8=_fun_destructor_scope::Y::~Y(&y3:destructor_scope::Y*) injected [line 54, column 11]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_4" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_3" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(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); [line 54, column 7]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_5" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_4" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(y1:destructor_scope::Y); [line 53, column 3]\n  n$11=_fun_destructor_scope::Y::Y(&y1:destructor_scope::Y*) [line 53, column 5]\n  EXIT_SCOPE(n$11); [line 53, column 5]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(y1:destructor_scope::Y); [line 53, column 3]\n  n$11=_fun_destructor_scope::Y::Y(&y1:destructor_scope::Y*) [line 53, column 5]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_6" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_5" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_7" [label="7:  Destruction(Scope) \n   _=*&y2:destructor_scope::Y [line 52, column 3]\n  n$13=_fun_destructor_scope::Y::~Y(&y2:destructor_scope::Y*) injected [line 52, column 3]\n  _=*&x2:destructor_scope::X [line 52, column 3]\n  n$15=_fun_destructor_scope::X::~X(&x2:destructor_scope::X*) injected [line 52, column 3]\n  EXIT_SCOPE(_,_,n$13,n$15,x2,y2); [line 52, column 3]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_7" [label="7:  Destruction(Scope) \n   _=*&y2:destructor_scope::Y [line 52, column 3]\n  n$13=_fun_destructor_scope::Y::~Y(&y2:destructor_scope::Y*) injected [line 52, column 3]\n  _=*&x2:destructor_scope::X [line 52, column 3]\n  n$15=_fun_destructor_scope::X::~X(&x2:destructor_scope::X*) injected [line 52, column 3]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_7" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_6" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_8" [label="8:  Destruction(Scope) \n   _=*&x3:destructor_scope::X [line 51, column 5]\n  n$18=_fun_destructor_scope::X::~X(&x3:destructor_scope::X*) injected [line 51, column 5]\n  EXIT_SCOPE(_,n$18,x3); [line 51, column 5]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_8" [label="8:  Destruction(Scope) \n   _=*&x3:destructor_scope::X [line 51, column 5]\n  n$18=_fun_destructor_scope::X::~X(&x3:destructor_scope::X*) injected [line 51, column 5]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_8" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_7" ;
@@ -76,19 +76,19 @@ digraph cfg {
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_9" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_8" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_10" [label="10: Prune (true branch, if) \n   n$20=*&b:_Bool [line 48, column 11]\n  PRUNE(n$20, true); [line 48, column 11]\n  NULLIFY(&b); [line 48, column 11]\n  EXIT_SCOPE(n$20,b); [line 48, column 11]\n " shape="invhouse"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_10" [label="10: Prune (true branch, if) \n   n$20=*&b:_Bool [line 48, column 11]\n  PRUNE(n$20, true); [line 48, column 11]\n " shape="invhouse"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_10" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_12" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_11" [label="11: Prune (false branch, if) \n   n$20=*&b:_Bool [line 48, column 11]\n  PRUNE(!n$20, false); [line 48, column 11]\n  NULLIFY(&b); [line 48, column 11]\n  EXIT_SCOPE(n$20,b); [line 48, column 11]\n " shape="invhouse"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_11" [label="11: Prune (false branch, if) \n   n$20=*&b:_Bool [line 48, column 11]\n  PRUNE(!n$20, false); [line 48, column 11]\n " shape="invhouse"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_11" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_9" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_12" [label="12:  Return Stmt \n   _=*&x3:destructor_scope::X [line 49, column 9]\n  n$22=_fun_destructor_scope::X::~X(&x3:destructor_scope::X*) injected [line 49, column 9]\n  _=*&y2:destructor_scope::Y [line 49, column 9]\n  n$24=_fun_destructor_scope::Y::~Y(&y2:destructor_scope::Y*) injected [line 49, column 9]\n  _=*&x2:destructor_scope::X [line 49, column 9]\n  n$26=_fun_destructor_scope::X::~X(&x2:destructor_scope::X*) injected [line 49, column 9]\n  _=*&s:destructor_scope::S [line 49, column 9]\n  n$28=_fun_destructor_scope::S::~S(&s:destructor_scope::S*) injected [line 49, column 9]\n  _=*&x1:destructor_scope::X [line 49, column 9]\n  n$30=_fun_destructor_scope::X::~X(&x1:destructor_scope::X*) injected [line 49, column 9]\n  EXIT_SCOPE(_,_,_,_,_,n$22,n$24,n$26,n$28,n$30,x1,x2,s,y2,x3); [line 49, column 9]\n  APPLY_ABSTRACTION; [line 49, column 9]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_12" [label="12:  Return Stmt \n   _=*&x3:destructor_scope::X [line 49, column 9]\n  n$22=_fun_destructor_scope::X::~X(&x3:destructor_scope::X*) injected [line 49, column 9]\n  _=*&y2:destructor_scope::Y [line 49, column 9]\n  n$24=_fun_destructor_scope::Y::~Y(&y2:destructor_scope::Y*) injected [line 49, column 9]\n  _=*&x2:destructor_scope::X [line 49, column 9]\n  n$26=_fun_destructor_scope::X::~X(&x2:destructor_scope::X*) injected [line 49, column 9]\n  _=*&s:destructor_scope::S [line 49, column 9]\n  n$28=_fun_destructor_scope::S::~S(&s:destructor_scope::S*) injected [line 49, column 9]\n  _=*&x1:destructor_scope::X [line 49, column 9]\n  n$30=_fun_destructor_scope::X::~X(&x1:destructor_scope::X*) injected [line 49, column 9]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_12" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_2" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x3:destructor_scope::X); [line 47, column 7]\n  n$35=_fun_destructor_scope::X::X(&x3:destructor_scope::X*) [line 47, column 9]\n  EXIT_SCOPE(n$35); [line 47, column 9]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(x3:destructor_scope::X); [line 47, column 7]\n  n$35=_fun_destructor_scope::X::X(&x3:destructor_scope::X*) [line 47, column 9]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_13" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_10" ;
@@ -97,32 +97,32 @@ digraph cfg {
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_14" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_13" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_15" [label="15: Prune (true branch, if) \n   n$36=*&a:_Bool [line 43, column 9]\n  PRUNE(n$36, true); [line 43, column 9]\n  NULLIFY(&a); [line 43, column 9]\n  EXIT_SCOPE(n$36,a); [line 43, column 9]\n " shape="invhouse"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_15" [label="15: Prune (true branch, if) \n   n$36=*&a:_Bool [line 43, column 9]\n  PRUNE(n$36, true); [line 43, column 9]\n " shape="invhouse"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_15" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_17" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_16" [label="16: Prune (false branch, if) \n   n$36=*&a:_Bool [line 43, column 9]\n  PRUNE(!n$36, false); [line 43, column 9]\n  NULLIFY(&a); [line 43, column 9]\n  EXIT_SCOPE(n$36,a); [line 43, column 9]\n " shape="invhouse"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_16" [label="16: Prune (false branch, if) \n   n$36=*&a:_Bool [line 43, column 9]\n  PRUNE(!n$36, false); [line 43, column 9]\n " shape="invhouse"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_16" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_14" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_17" [label="17:  Return Stmt \n   _=*&y2:destructor_scope::Y [line 44, column 7]\n  n$38=_fun_destructor_scope::Y::~Y(&y2:destructor_scope::Y*) injected [line 44, column 7]\n  _=*&x2:destructor_scope::X [line 44, column 7]\n  n$40=_fun_destructor_scope::X::~X(&x2:destructor_scope::X*) injected [line 44, column 7]\n  _=*&s:destructor_scope::S [line 44, column 7]\n  n$42=_fun_destructor_scope::S::~S(&s:destructor_scope::S*) injected [line 44, column 7]\n  _=*&x1:destructor_scope::X [line 44, column 7]\n  n$44=_fun_destructor_scope::X::~X(&x1:destructor_scope::X*) injected [line 44, column 7]\n  EXIT_SCOPE(_,_,_,_,n$38,n$40,n$42,n$44,x1,x2,s,y2); [line 44, column 7]\n  APPLY_ABSTRACTION; [line 44, column 7]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_17" [label="17:  Return Stmt \n   _=*&y2:destructor_scope::Y [line 44, column 7]\n  n$38=_fun_destructor_scope::Y::~Y(&y2:destructor_scope::Y*) injected [line 44, column 7]\n  _=*&x2:destructor_scope::X [line 44, column 7]\n  n$40=_fun_destructor_scope::X::~X(&x2:destructor_scope::X*) injected [line 44, column 7]\n  _=*&s:destructor_scope::S [line 44, column 7]\n  n$42=_fun_destructor_scope::S::~S(&s:destructor_scope::S*) injected [line 44, column 7]\n  _=*&x1:destructor_scope::X [line 44, column 7]\n  n$44=_fun_destructor_scope::X::~X(&x1:destructor_scope::X*) injected [line 44, column 7]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_17" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_2" ;
-"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_18" [label="18:  DeclStmt \n   VARIABLE_DECLARED(y2:destructor_scope::Y); [line 42, column 5]\n  n$49=_fun_destructor_scope::Y::Y(&y2:destructor_scope::Y*) [line 42, column 7]\n  EXIT_SCOPE(n$49); [line 42, column 7]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_18" [label="18:  DeclStmt \n   VARIABLE_DECLARED(y2:destructor_scope::Y); [line 42, column 5]\n  n$49=_fun_destructor_scope::Y::Y(&y2:destructor_scope::Y*) [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   VARIABLE_DECLARED(x2:destructor_scope::X); [line 41, column 5]\n  n$50=_fun_destructor_scope::X::X(&x2:destructor_scope::X*) [line 41, column 7]\n  EXIT_SCOPE(n$50); [line 41, column 7]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_19" [label="19:  DeclStmt \n   VARIABLE_DECLARED(x2:destructor_scope::X); [line 41, column 5]\n  n$50=_fun_destructor_scope::X::X(&x2:destructor_scope::X*) [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   VARIABLE_DECLARED(s:destructor_scope::S); [line 39, column 3]\n  n$51=_fun_destructor_scope::S::S(&s:destructor_scope::S*) [line 39, column 5]\n  EXIT_SCOPE(n$51); [line 39, column 5]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_20" [label="20:  DeclStmt \n   VARIABLE_DECLARED(s:destructor_scope::S); [line 39, column 3]\n  n$51=_fun_destructor_scope::S::S(&s:destructor_scope::S*) [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   VARIABLE_DECLARED(x1:destructor_scope::X); [line 38, column 3]\n  n$52=_fun_destructor_scope::X::X(&x1:destructor_scope::X*) [line 38, column 5]\n  EXIT_SCOPE(n$52); [line 38, column 5]\n " shape="box"]
+"test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_21" [label="21:  DeclStmt \n   VARIABLE_DECLARED(x1:destructor_scope::X); [line 38, column 3]\n  n$52=_fun_destructor_scope::X::X(&x1:destructor_scope::X*) [line 38, column 5]\n " shape="box"]
 	
 
 	 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_21" -> "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_20" ;
@@ -130,10 +130,10 @@ digraph cfg {
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_1" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_11" ;
-"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_2" [label="2: Exit destructor_scope::test2 \n   NULLIFY(&x1); [line 66, column 1]\n  NULLIFY(&x3); [line 66, column 1]\n  NULLIFY(&x2); [line 66, column 1]\n " color=yellow style=filled]
+"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_2" [label="2: Exit destructor_scope::test2 \n  " color=yellow style=filled]
 	
 
-"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_3" [label="3:  Destruction(Scope) \n   _=*&x1:destructor_scope::X [line 66, column 1]\n  n$1=_fun_destructor_scope::X::~X(&x1:destructor_scope::X*) injected [line 66, column 1]\n  APPLY_ABSTRACTION; [line 66, column 1]\n " shape="box"]
+"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_3" [label="3:  Destruction(Scope) \n   _=*&x1:destructor_scope::X [line 66, column 1]\n  n$1=_fun_destructor_scope::X::~X(&x1:destructor_scope::X*) injected [line 66, column 1]\n " shape="box"]
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_3" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_2" ;
@@ -141,31 +141,31 @@ digraph cfg {
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_4" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_3" ;
-"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_5" [label="5: Prune (true branch, if) \n   n$3=*&a:_Bool [line 59, column 7]\n  PRUNE(n$3, true); [line 59, column 7]\n  NULLIFY(&a); [line 59, column 7]\n  EXIT_SCOPE(n$3,a); [line 59, column 7]\n " shape="invhouse"]
+"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_5" [label="5: Prune (true branch, if) \n   n$3=*&a:_Bool [line 59, column 7]\n  PRUNE(n$3, true); [line 59, column 7]\n " shape="invhouse"]
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_5" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_8" ;
-"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_6" [label="6: Prune (false branch, if) \n   n$3=*&a:_Bool [line 59, column 7]\n  PRUNE(!n$3, false); [line 59, column 7]\n  NULLIFY(&a); [line 59, column 7]\n  EXIT_SCOPE(n$3,a); [line 59, column 7]\n " shape="invhouse"]
+"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_6" [label="6: Prune (false branch, if) \n   n$3=*&a:_Bool [line 59, column 7]\n  PRUNE(!n$3, false); [line 59, column 7]\n " shape="invhouse"]
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_6" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_10" ;
-"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_7" [label="7:  Return Stmt \n   *&return:int=1 [line 61, column 5]\n  _=*&x2:destructor_scope::X [line 61, column 12]\n  n$5=_fun_destructor_scope::X::~X(&x2:destructor_scope::X*) injected [line 61, column 12]\n  _=*&x1:destructor_scope::X [line 61, column 12]\n  n$7=_fun_destructor_scope::X::~X(&x1:destructor_scope::X*) injected [line 61, column 12]\n  EXIT_SCOPE(_,_,n$5,n$7,x2,x1); [line 61, column 12]\n  APPLY_ABSTRACTION; [line 61, column 12]\n " shape="box"]
+"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_7" [label="7:  Return Stmt \n   *&return:int=1 [line 61, column 5]\n  _=*&x2:destructor_scope::X [line 61, column 12]\n  n$5=_fun_destructor_scope::X::~X(&x2:destructor_scope::X*) injected [line 61, column 12]\n  _=*&x1:destructor_scope::X [line 61, column 12]\n  n$7=_fun_destructor_scope::X::~X(&x1:destructor_scope::X*) injected [line 61, column 12]\n " shape="box"]
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_7" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_2" ;
-"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(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); [line 60, column 7]\n " shape="box"]
+"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_8" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_7" ;
-"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_9" [label="9:  Return Stmt \n   *&return:int=2 [line 64, column 5]\n  _=*&x3:destructor_scope::X [line 64, column 12]\n  n$11=_fun_destructor_scope::X::~X(&x3:destructor_scope::X*) injected [line 64, column 12]\n  _=*&x1:destructor_scope::X [line 64, column 12]\n  n$13=_fun_destructor_scope::X::~X(&x1:destructor_scope::X*) injected [line 64, column 12]\n  EXIT_SCOPE(_,_,n$11,n$13,x3,x1); [line 64, column 12]\n  APPLY_ABSTRACTION; [line 64, column 12]\n " shape="box"]
+"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_9" [label="9:  Return Stmt \n   *&return:int=2 [line 64, column 5]\n  _=*&x3:destructor_scope::X [line 64, column 12]\n  n$11=_fun_destructor_scope::X::~X(&x3:destructor_scope::X*) injected [line 64, column 12]\n  _=*&x1:destructor_scope::X [line 64, column 12]\n  n$13=_fun_destructor_scope::X::~X(&x1:destructor_scope::X*) injected [line 64, column 12]\n " shape="box"]
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_9" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_2" ;
-"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(x3:destructor_scope::X); [line 63, column 5]\n  n$15=_fun_destructor_scope::X::X(&x3:destructor_scope::X*) [line 63, column 7]\n  EXIT_SCOPE(n$15); [line 63, column 7]\n " shape="box"]
+"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(x3:destructor_scope::X); [line 63, column 5]\n  n$15=_fun_destructor_scope::X::X(&x3:destructor_scope::X*) [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   VARIABLE_DECLARED(x1:destructor_scope::X); [line 58, column 3]\n  n$17=_fun_destructor_scope::X::X(&x1:destructor_scope::X*) [line 58, column 5]\n  EXIT_SCOPE(n$17); [line 58, column 5]\n " shape="box"]
+"test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(x1:destructor_scope::X); [line 58, column 3]\n  n$17=_fun_destructor_scope::X::X(&x1:destructor_scope::X*) [line 58, column 5]\n " shape="box"]
 	
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_11" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_5" ;
@@ -177,7 +177,7 @@ digraph cfg {
 "S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_2" [label="2: Exit destructor_scope::S::S \n  " color=yellow style=filled]
 	
 
-"S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_3" [label="3:  Constructor Init \n   n$1=*&this:destructor_scope::S* [line 19, column 8]\n  n$2=_fun_destructor_scope::X::X(n$1.x1:destructor_scope::X*) [line 19, column 8]\n  NULLIFY(&this); [line 19, column 8]\n  EXIT_SCOPE(n$1,n$2,this); [line 19, column 8]\n  APPLY_ABSTRACTION; [line 19, column 8]\n " shape="box"]
+"S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_3" [label="3:  Constructor Init \n   n$1=*&this:destructor_scope::S* [line 19, column 8]\n  n$2=_fun_destructor_scope::X::X(n$1.x1:destructor_scope::X*) [line 19, column 8]\n " shape="box"]
 	
 
 	 "S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_3" -> "S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_2" ;
@@ -188,7 +188,7 @@ digraph cfg {
 "__infer_inner_destructor_~S#S#destructor_scope#(9287491061312513566).4ef80b764b293fdc4260c9ce06a110d3_2" [label="2: Exit destructor_scope::S::__infer_inner_destructor_~S \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~S#S#destructor_scope#(9287491061312513566).4ef80b764b293fdc4260c9ce06a110d3_3" [label="3:  Destruction(fields) \n   n$0=*&this:destructor_scope::S* [line 19, column 8]\n  _=*n$0.x1:destructor_scope::X [line 19, column 8]\n  n$2=_fun_destructor_scope::X::~X(n$0.x1:destructor_scope::X*) injected [line 19, column 8]\n  NULLIFY(&this); [line 19, column 8]\n  EXIT_SCOPE(_,n$0,n$2,this); [line 19, column 8]\n  APPLY_ABSTRACTION; [line 19, column 8]\n " shape="box"]
+"__infer_inner_destructor_~S#S#destructor_scope#(9287491061312513566).4ef80b764b293fdc4260c9ce06a110d3_3" [label="3:  Destruction(fields) \n   n$0=*&this:destructor_scope::S* [line 19, column 8]\n  _=*n$0.x1:destructor_scope::X [line 19, column 8]\n  n$2=_fun_destructor_scope::X::~X(n$0.x1:destructor_scope::X*) injected [line 19, column 8]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~S#S#destructor_scope#(9287491061312513566).4ef80b764b293fdc4260c9ce06a110d3_3" -> "__infer_inner_destructor_~S#S#destructor_scope#(9287491061312513566).4ef80b764b293fdc4260c9ce06a110d3_2" ;
@@ -199,7 +199,7 @@ digraph cfg {
 "~S#S#destructor_scope#(9287491061312513566).aca6b266020a04cd52a80258435bda76_2" [label="2: Exit destructor_scope::S::~S \n  " color=yellow style=filled]
 	
 
-"~S#S#destructor_scope#(9287491061312513566).aca6b266020a04cd52a80258435bda76_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:destructor_scope::S* [line 19, column 8]\n  _=*n$0:destructor_scope::S [line 19, column 8]\n  n$2=_fun_destructor_scope::S::__infer_inner_destructor_~S(n$0:destructor_scope::S*) injected [line 19, column 8]\n  NULLIFY(&this); [line 19, column 8]\n  EXIT_SCOPE(_,n$0,n$2,this); [line 19, column 8]\n  APPLY_ABSTRACTION; [line 19, column 8]\n " shape="box"]
+"~S#S#destructor_scope#(9287491061312513566).aca6b266020a04cd52a80258435bda76_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:destructor_scope::S* [line 19, column 8]\n  _=*n$0:destructor_scope::S [line 19, column 8]\n  n$2=_fun_destructor_scope::S::__infer_inner_destructor_~S(n$0:destructor_scope::S*) injected [line 19, column 8]\n " shape="box"]
 	
 
 	 "~S#S#destructor_scope#(9287491061312513566).aca6b266020a04cd52a80258435bda76_3" -> "~S#S#destructor_scope#(9287491061312513566).aca6b266020a04cd52a80258435bda76_2" ;
@@ -207,18 +207,18 @@ digraph cfg {
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_1" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_10" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_2" [label="2: Exit destructor_scope::W::__infer_inner_destructor_~W \n   NULLIFY(&x); [line 34, column 3]\n  NULLIFY(&y); [line 34, column 3]\n " color=yellow style=filled]
+"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_2" [label="2: Exit destructor_scope::W::__infer_inner_destructor_~W \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_3" [label="3:  Destruction(fields) \n   n$0=*&this:destructor_scope::W* [line 34, column 3]\n  _=*n$0.s:destructor_scope::S [line 34, column 3]\n  n$6=_fun_destructor_scope::S::~S(n$0.s:destructor_scope::S*) injected [line 34, column 3]\n  _=*n$0.y:destructor_scope::Y [line 34, column 3]\n  n$4=_fun_destructor_scope::Y::~Y(n$0.y:destructor_scope::Y*) injected [line 34, column 3]\n  _=*n$0.x:destructor_scope::X [line 34, column 3]\n  n$2=_fun_destructor_scope::X::~X(n$0.x:destructor_scope::X*) injected [line 34, column 3]\n  NULLIFY(&this); [line 34, column 3]\n  EXIT_SCOPE(_,_,_,n$0,n$2,n$4,n$6,this); [line 34, column 3]\n  APPLY_ABSTRACTION; [line 34, column 3]\n " shape="box"]
+"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_3" [label="3:  Destruction(fields) \n   n$0=*&this:destructor_scope::W* [line 34, column 3]\n  _=*n$0.s:destructor_scope::S [line 34, column 3]\n  n$6=_fun_destructor_scope::S::~S(n$0.s:destructor_scope::S*) injected [line 34, column 3]\n  _=*n$0.y:destructor_scope::Y [line 34, column 3]\n  n$4=_fun_destructor_scope::Y::~Y(n$0.y:destructor_scope::Y*) injected [line 34, column 3]\n  _=*n$0.x:destructor_scope::X [line 34, column 3]\n  n$2=_fun_destructor_scope::X::~X(n$0.x:destructor_scope::X*) injected [line 34, column 3]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_3" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_2" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_4" [label="4:  Destruction(Scope) \n   _=*&y:destructor_scope::Y [line 34, column 3]\n  n$9=_fun_destructor_scope::Y::~Y(&y:destructor_scope::Y*) injected [line 34, column 3]\n  _=*&x:destructor_scope::X [line 34, column 3]\n  n$11=_fun_destructor_scope::X::~X(&x:destructor_scope::X*) injected [line 34, column 3]\n  EXIT_SCOPE(_,_,n$9,n$11,y,x); [line 34, column 3]\n " shape="box"]
+"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_4" [label="4:  Destruction(Scope) \n   _=*&y:destructor_scope::Y [line 34, column 3]\n  n$9=_fun_destructor_scope::Y::~Y(&y:destructor_scope::Y*) injected [line 34, column 3]\n  _=*&x:destructor_scope::X [line 34, column 3]\n  n$11=_fun_destructor_scope::X::~X(&x:destructor_scope::X*) injected [line 34, column 3]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_4" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_3" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(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); [line 33, column 7]\n " shape="box"]
+"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_5" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_4" ;
@@ -226,19 +226,19 @@ digraph cfg {
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_6" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_5" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_7" [label="7: Prune (true branch, if) \n   n$14=*&this:destructor_scope::W* [line 31, column 9]\n  n$15=*n$14.b:_Bool [line 31, column 9]\n  PRUNE(n$15, true); [line 31, column 9]\n  EXIT_SCOPE(n$14,n$15); [line 31, column 9]\n " shape="invhouse"]
+"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_7" [label="7: Prune (true branch, if) \n   n$14=*&this:destructor_scope::W* [line 31, column 9]\n  n$15=*n$14.b:_Bool [line 31, column 9]\n  PRUNE(n$15, true); [line 31, column 9]\n " shape="invhouse"]
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_7" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_9" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_8" [label="8: Prune (false branch, if) \n   n$14=*&this:destructor_scope::W* [line 31, column 9]\n  n$15=*n$14.b:_Bool [line 31, column 9]\n  PRUNE(!n$15, false); [line 31, column 9]\n  EXIT_SCOPE(n$14,n$15); [line 31, column 9]\n " shape="invhouse"]
+"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_8" [label="8: Prune (false branch, if) \n   n$14=*&this:destructor_scope::W* [line 31, column 9]\n  n$15=*n$14.b:_Bool [line 31, column 9]\n  PRUNE(!n$15, false); [line 31, column 9]\n " shape="invhouse"]
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_8" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_6" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_9" [label="9:  Return Stmt \n   _=*&x:destructor_scope::X [line 32, column 7]\n  n$17=_fun_destructor_scope::X::~X(&x:destructor_scope::X*) injected [line 32, column 7]\n  n$19=*&this:destructor_scope::W* [line 32, column 7]\n  _=*n$19.s:destructor_scope::S [line 32, column 7]\n  n$25=_fun_destructor_scope::S::~S(n$19.s:destructor_scope::S*) injected [line 32, column 7]\n  _=*n$19.y:destructor_scope::Y [line 32, column 7]\n  n$23=_fun_destructor_scope::Y::~Y(n$19.y:destructor_scope::Y*) injected [line 32, column 7]\n  _=*n$19.x:destructor_scope::X [line 32, column 7]\n  n$21=_fun_destructor_scope::X::~X(n$19.x:destructor_scope::X*) injected [line 32, column 7]\n  NULLIFY(&this); [line 32, column 7]\n  EXIT_SCOPE(_,_,_,_,n$17,n$19,n$21,n$23,n$25,x,this); [line 32, column 7]\n  APPLY_ABSTRACTION; [line 32, column 7]\n " shape="box"]
+"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_9" [label="9:  Return Stmt \n   _=*&x:destructor_scope::X [line 32, column 7]\n  n$17=_fun_destructor_scope::X::~X(&x:destructor_scope::X*) injected [line 32, column 7]\n  n$19=*&this:destructor_scope::W* [line 32, column 7]\n  _=*n$19.s:destructor_scope::S [line 32, column 7]\n  n$25=_fun_destructor_scope::S::~S(n$19.s:destructor_scope::S*) injected [line 32, column 7]\n  _=*n$19.y:destructor_scope::Y [line 32, column 7]\n  n$23=_fun_destructor_scope::Y::~Y(n$19.y:destructor_scope::Y*) injected [line 32, column 7]\n  _=*n$19.x:destructor_scope::X [line 32, column 7]\n  n$21=_fun_destructor_scope::X::~X(n$19.x:destructor_scope::X*) injected [line 32, column 7]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_9" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_2" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(x:destructor_scope::X); [line 30, column 5]\n  n$30=_fun_destructor_scope::X::X(&x:destructor_scope::X*) [line 30, column 7]\n  EXIT_SCOPE(n$30); [line 30, column 7]\n " shape="box"]
+"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(x:destructor_scope::X); [line 30, column 5]\n  n$30=_fun_destructor_scope::X::X(&x:destructor_scope::X*) [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" ;
@@ -250,7 +250,7 @@ digraph cfg {
 "~W#W#destructor_scope#(7330614824551855498).f9ed98feeae8b94c6906cf3cd29688b3_2" [label="2: Exit destructor_scope::W::~W \n  " color=yellow style=filled]
 	
 
-"~W#W#destructor_scope#(7330614824551855498).f9ed98feeae8b94c6906cf3cd29688b3_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:destructor_scope::W* [line 34, column 3]\n  _=*n$0:destructor_scope::W [line 34, column 3]\n  n$2=_fun_destructor_scope::W::__infer_inner_destructor_~W(n$0:destructor_scope::W*) injected [line 34, column 3]\n  NULLIFY(&this); [line 34, column 3]\n  EXIT_SCOPE(_,n$0,n$2,this); [line 34, column 3]\n  APPLY_ABSTRACTION; [line 34, column 3]\n " shape="box"]
+"~W#W#destructor_scope#(7330614824551855498).f9ed98feeae8b94c6906cf3cd29688b3_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:destructor_scope::W* [line 34, column 3]\n  _=*n$0:destructor_scope::W [line 34, column 3]\n  n$2=_fun_destructor_scope::W::__infer_inner_destructor_~W(n$0:destructor_scope::W*) injected [line 34, column 3]\n " shape="box"]
 	
 
 	 "~W#W#destructor_scope#(7330614824551855498).f9ed98feeae8b94c6906cf3cd29688b3_3" -> "~W#W#destructor_scope#(7330614824551855498).f9ed98feeae8b94c6906cf3cd29688b3_2" ;
@@ -282,7 +282,7 @@ digraph cfg {
 "~X#X#destructor_scope#(17752465063768331075).e9440dc26d00e6a493a0ae5908b3f399_2" [label="2: Exit destructor_scope::X::~X \n  " color=yellow style=filled]
 	
 
-"~X#X#destructor_scope#(17752465063768331075).e9440dc26d00e6a493a0ae5908b3f399_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:destructor_scope::X* [line 10, column 9]\n  _=*n$0:destructor_scope::X [line 10, column 9]\n  n$2=_fun_destructor_scope::X::__infer_inner_destructor_~X(n$0:destructor_scope::X*) injected [line 10, column 9]\n  NULLIFY(&this); [line 10, column 9]\n  EXIT_SCOPE(_,n$0,n$2,this); [line 10, column 9]\n  APPLY_ABSTRACTION; [line 10, column 9]\n " shape="box"]
+"~X#X#destructor_scope#(17752465063768331075).e9440dc26d00e6a493a0ae5908b3f399_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:destructor_scope::X* [line 10, column 9]\n  _=*n$0:destructor_scope::X [line 10, column 9]\n  n$2=_fun_destructor_scope::X::__infer_inner_destructor_~X(n$0:destructor_scope::X*) injected [line 10, column 9]\n " shape="box"]
 	
 
 	 "~X#X#destructor_scope#(17752465063768331075).e9440dc26d00e6a493a0ae5908b3f399_3" -> "~X#X#destructor_scope#(17752465063768331075).e9440dc26d00e6a493a0ae5908b3f399_2" ;
@@ -307,7 +307,7 @@ digraph cfg {
 "~Y#Y#destructor_scope#(1552422738585060844).f631a64648f2fd67ee421a0da2149c2a_2" [label="2: Exit destructor_scope::Y::~Y \n  " color=yellow style=filled]
 	
 
-"~Y#Y#destructor_scope#(1552422738585060844).f631a64648f2fd67ee421a0da2149c2a_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:destructor_scope::Y* [line 14, column 9]\n  _=*n$0:destructor_scope::Y [line 14, column 9]\n  n$2=_fun_destructor_scope::Y::__infer_inner_destructor_~Y(n$0:destructor_scope::Y*) injected [line 14, column 9]\n  NULLIFY(&this); [line 14, column 9]\n  EXIT_SCOPE(_,n$0,n$2,this); [line 14, column 9]\n  APPLY_ABSTRACTION; [line 14, column 9]\n " shape="box"]
+"~Y#Y#destructor_scope#(1552422738585060844).f631a64648f2fd67ee421a0da2149c2a_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:destructor_scope::Y* [line 14, column 9]\n  _=*n$0:destructor_scope::Y [line 14, column 9]\n  n$2=_fun_destructor_scope::Y::__infer_inner_destructor_~Y(n$0:destructor_scope::Y*) injected [line 14, column 9]\n " shape="box"]
 	
 
 	 "~Y#Y#destructor_scope#(1552422738585060844).f631a64648f2fd67ee421a0da2149c2a_3" -> "~Y#Y#destructor_scope#(1552422738585060844).f631a64648f2fd67ee421a0da2149c2a_2" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_2" [label="2: Exit A::__infer_inner_destructor_~A \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_3" [label="3:  BinaryOperatorStmt: Assign \n   n$2=*&this:A* [line 10, column 10]\n  *n$2.f:int=0 [line 10, column 10]\n  NULLIFY(&this); [line 10, column 10]\n  EXIT_SCOPE(n$2,this); [line 10, column 10]\n  APPLY_ABSTRACTION; [line 10, column 10]\n " shape="box"]
+"__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_3" [label="3:  BinaryOperatorStmt: Assign \n   n$2=*&this:A* [line 10, column 10]\n  *n$2.f:int=0 [line 10, column 10]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_3" -> "__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_2" [label="2: Exit A::~A \n  " color=yellow style=filled]
 	
 
-"~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:A* [line 10, column 17]\n  _=*n$0:A [line 10, column 17]\n  n$2=_fun_A::__infer_inner_destructor_~A(n$0:A*) injected [line 10, column 17]\n  NULLIFY(&this); [line 10, column 17]\n  EXIT_SCOPE(_,n$0,n$2,this); [line 10, column 17]\n  APPLY_ABSTRACTION; [line 10, column 17]\n " shape="box"]
+"~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:A* [line 10, column 17]\n  _=*n$0:A [line 10, column 17]\n  n$2=_fun_A::__infer_inner_destructor_~A(n$0:A*) injected [line 10, column 17]\n " shape="box"]
 	
 
 	 "~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_3" -> "~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_2" ;
@@ -29,7 +29,7 @@ digraph cfg {
 "__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_2" [label="2: Exit B::__infer_inner_destructor_~B \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_3" [label="3:  BinaryOperatorStmt: Assign \n   n$2=*&this:B* [line 18, column 11]\n  *n$2.f:int=1 [line 18, column 11]\n  NULLIFY(&this); [line 18, column 11]\n  EXIT_SCOPE(n$2,this); [line 18, column 11]\n  APPLY_ABSTRACTION; [line 18, column 11]\n " shape="box"]
+"__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_3" [label="3:  BinaryOperatorStmt: Assign \n   n$2=*&this:B* [line 18, column 11]\n  *n$2.f:int=1 [line 18, column 11]\n " shape="box"]
 	
 
 	 "__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_3" -> "__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_2" ;
@@ -40,7 +40,7 @@ digraph cfg {
 "~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_2" [label="2: Exit B::~B \n  " color=yellow style=filled]
 	
 
-"~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:B* [line 18, column 18]\n  _=*n$0:B [line 18, column 18]\n  n$2=_fun_B::__infer_inner_destructor_~B(n$0:B*) injected [line 18, column 18]\n  NULLIFY(&this); [line 18, column 18]\n  EXIT_SCOPE(_,n$0,n$2,this); [line 18, column 18]\n  APPLY_ABSTRACTION; [line 18, column 18]\n " shape="box"]
+"~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:B* [line 18, column 18]\n  _=*n$0:B [line 18, column 18]\n  n$2=_fun_B::__infer_inner_destructor_~B(n$0:B*) injected [line 18, column 18]\n " shape="box"]
 	
 
 	 "~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_3" -> "~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_2" ;

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   VARIABLE_DECLARED(#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); [line 11, column 9]\n  APPLY_ABSTRACTION; [line 11, column 9]\n " shape="box"]
+"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(#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 " 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   VARIABLE_DECLARED(#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  APPLY_ABSTRACTION; [line 15, column 1]\n " shape="box"]
+"__infer_globals_initializer_v#708fabe5dc8ff523caaa5f44184921e8.588095fa475e4a9e8c83f50f26a48ea9_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(#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 " shape="box"]
 	
 
 	 "__infer_globals_initializer_v#708fabe5dc8ff523caaa5f44184921e8.588095fa475e4a9e8c83f50f26a48ea9_3" -> "__infer_globals_initializer_v#708fabe5dc8ff523caaa5f44184921e8.588095fa475e4a9e8c83f50f26a48ea9_2" ;
@@ -29,7 +29,7 @@ digraph cfg {
 "test(class X)#18241244337164948030.76ba1cf61f22b6e7f39fb9940d283ba3_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test(class X)#18241244337164948030.76ba1cf61f22b6e7f39fb9940d283ba3_3" [label="3:  Return Stmt \n   n$0=*&__return_param:X* [line 13, column 12]\n  n$1=_fun_X::X(n$0:X*,&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|!pod>$global:X const &) [line 13, column 19]\n  NULLIFY(&__return_param); [line 13, column 19]\n  EXIT_SCOPE(n$0,n$1,__return_param); [line 13, column 19]\n  APPLY_ABSTRACTION; [line 13, column 19]\n " shape="box"]
+"test(class X)#18241244337164948030.76ba1cf61f22b6e7f39fb9940d283ba3_3" [label="3:  Return Stmt \n   n$0=*&__return_param:X* [line 13, column 12]\n  n$1=_fun_X::X(n$0:X*,&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|!pod>$global:X const &) [line 13, column 19]\n " shape="box"]
 	
 
 	 "test(class X)#18241244337164948030.76ba1cf61f22b6e7f39fb9940d283ba3_3" -> "test(class X)#18241244337164948030.76ba1cf61f22b6e7f39fb9940d283ba3_2" ;
@@ -40,11 +40,11 @@ digraph cfg {
 "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_2" [label="2: Exit test2 \n  " color=yellow style=filled]
 	
 
-"test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_3" [label="3:  Return Stmt \n   n$0=*&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|ice>$v:int [line 19, column 10]\n  *&return:int=n$0 [line 19, column 3]\n  EXIT_SCOPE(n$0); [line 19, column 3]\n  APPLY_ABSTRACTION; [line 19, column 3]\n " shape="box"]
+"test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_3" [label="3:  Return Stmt \n   n$0=*&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|ice>$v:int [line 19, column 10]\n  *&return:int=n$0 [line 19, column 3]\n " shape="box"]
 	
 
 	 "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_3" -> "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_2" ;
-"test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(local:int); [line 18, column 3]\n  n$1=*&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|ice>$v:int [line 18, column 15]\n  *&local:int=n$1 [line 18, column 3]\n  NULLIFY(&local); [line 18, column 3]\n  EXIT_SCOPE(n$1,local); [line 18, column 3]\n " shape="box"]
+"test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(local:int); [line 18, column 3]\n  n$1=*&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|ice>$v:int [line 18, column 15]\n  *&local:int=n$1 [line 18, column 3]\n " shape="box"]
 	
 
 	 "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_4" -> "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_3" ;

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

@@ -20,15 +20,15 @@ digraph cfg {
 	
 
 	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_5" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_7" ;
-"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=2 [line 8, column 20]\n  APPLY_ABSTRACTION; [line 8, column 20]\n " shape="box"]
+"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_6" [label="6:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=2 [line 8, column 20]\n " shape="box"]
 	
 
 	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_6" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" ;
-"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=3 [line 8, column 20]\n  APPLY_ABSTRACTION; [line 8, column 20]\n " shape="box"]
+"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=3 [line 8, column 20]\n " shape="box"]
 	
 
 	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_7" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" ;
-"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(#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,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   VARIABLE_DECLARED(#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 " shape="box"]
 	
 
 	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_8" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_2" ;
@@ -39,7 +39,7 @@ digraph cfg {
 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Return Stmt \n   n$0=*&#GB<codetoanalyze/cpp/frontend/globals/global_const2.cpp|ice>$global:int [line 9, column 21]\n  *&return:int=n$0 [line 9, column 14]\n  EXIT_SCOPE(n$0); [line 9, column 14]\n  APPLY_ABSTRACTION; [line 9, column 14]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Return Stmt \n   n$0=*&#GB<codetoanalyze/cpp/frontend/globals/global_const2.cpp|ice>$global:int [line 9, column 21]\n  *&return:int=n$0 [line 9, column 14]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_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   VARIABLE_DECLARED(#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); [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   VARIABLE_DECLARED(#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 " 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   VARIABLE_DECLARED(#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); [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   VARIABLE_DECLARED(#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 " shape="box"]
 	
 
 	 "__infer_globals_initializer_y#346c89dda90b0be6289346ddbf0528bc.e7d659d11156f551397be6d5db27f31c_3" -> "__infer_globals_initializer_y#346c89dda90b0be6289346ddbf0528bc.e7d659d11156f551397be6d5db27f31c_2" ;

infer/tests/codetoanalyze/cpp/frontend/if.cpp.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_2" [label="2: Exit if_then \n  " color=yellow style=filled]
 	
 
-"if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_3" [label="3:  BinaryOperatorStmt: Assign \n   *&y:int=111 [line 20, column 3]\n  NULLIFY(&y); [line 20, column 3]\n  EXIT_SCOPE(y); [line 20, column 3]\n  APPLY_ABSTRACTION; [line 20, column 3]\n " shape="box"]
+"if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_3" [label="3:  BinaryOperatorStmt: Assign \n   *&y:int=111 [line 20, column 3]\n " shape="box"]
 	
 
 	 "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_3" -> "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_2" ;
@@ -20,19 +20,19 @@ digraph cfg {
 
 	 "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_5" -> "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_6" ;
 	 "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_5" -> "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_7" ;
-"if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_6" [label="6: Prune (true branch, if) \n   PRUNE((n$0 == 1234), true); [line 17, column 7]\n  EXIT_SCOPE(n$0); [line 17, column 7]\n " shape="invhouse"]
+"if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_6" [label="6: Prune (true branch, if) \n   PRUNE((n$0 == 1234), true); [line 17, column 7]\n " shape="invhouse"]
 	
 
 	 "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_6" -> "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_8" ;
-"if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$0 == 1234), false); [line 17, column 7]\n  EXIT_SCOPE(n$0); [line 17, column 7]\n  APPLY_ABSTRACTION; [line 17, column 7]\n " shape="invhouse"]
+"if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$0 == 1234), false); [line 17, column 7]\n " shape="invhouse"]
 	
 
 	 "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_7" -> "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_4" ;
-"if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_8" [label="8:  BinaryOperatorStmt: Assign \n   n$1=*&x:int [line 18, column 9]\n  *&y:int=n$1 [line 18, column 5]\n  NULLIFY(&y); [line 18, column 5]\n  NULLIFY(&x); [line 18, column 5]\n  EXIT_SCOPE(n$1,y,x); [line 18, column 5]\n  APPLY_ABSTRACTION; [line 18, column 5]\n " shape="box"]
+"if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_8" [label="8:  BinaryOperatorStmt: Assign \n   n$1=*&x:int [line 18, column 9]\n  *&y:int=n$1 [line 18, column 5]\n " shape="box"]
 	
 
 	 "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_8" -> "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_4" ;
-"if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(y:int); [line 16, column 3]\n  *&y:int=0 [line 16, column 3]\n  NULLIFY(&y); [line 16, column 3]\n  EXIT_SCOPE(y); [line 16, column 3]\n " shape="box"]
+"if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(y:int); [line 16, column 3]\n  *&y:int=0 [line 16, column 3]\n " shape="box"]
 	
 
 	 "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_9" -> "if_then#3243301102387331199.d347686d1797cf6cf5f5b9b986a1e67d_5" ;
@@ -43,7 +43,7 @@ digraph cfg {
 "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_2" [label="2: Exit if_then_cond_var \n  " color=yellow style=filled]
 	
 
-"if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_3" [label="3:  BinaryOperatorStmt: Assign \n   *&y:int=111 [line 47, column 3]\n  NULLIFY(&y); [line 47, column 3]\n  EXIT_SCOPE(y); [line 47, column 3]\n  APPLY_ABSTRACTION; [line 47, column 3]\n " shape="box"]
+"if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_3" [label="3:  BinaryOperatorStmt: Assign \n   *&y:int=111 [line 47, column 3]\n " shape="box"]
 	
 
 	 "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_3" -> "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_2" ;
@@ -51,11 +51,11 @@ digraph cfg {
 	
 
 	 "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_4" -> "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_3" ;
-"if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_5" [label="5: Prune (true branch, if) \n   n$0=*&x:int [line 44, column 11]\n  PRUNE(n$0, true); [line 44, column 11]\n  EXIT_SCOPE(n$0); [line 44, column 11]\n " shape="invhouse"]
+"if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_5" [label="5: Prune (true branch, if) \n   n$0=*&x:int [line 44, column 11]\n  PRUNE(n$0, true); [line 44, column 11]\n " shape="invhouse"]
 	
 
 	 "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_5" -> "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_8" ;
-"if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_6" [label="6: Prune (false branch, if) \n   n$0=*&x:int [line 44, column 11]\n  PRUNE(!n$0, false); [line 44, column 11]\n  NULLIFY(&x); [line 44, column 11]\n  EXIT_SCOPE(n$0,x); [line 44, column 11]\n  APPLY_ABSTRACTION; [line 44, column 11]\n " shape="invhouse"]
+"if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_6" [label="6: Prune (false branch, if) \n   n$0=*&x:int [line 44, column 11]\n  PRUNE(!n$0, false); [line 44, column 11]\n " shape="invhouse"]
 	
 
 	 "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_6" -> "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_4" ;
@@ -64,11 +64,11 @@ digraph cfg {
 
 	 "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_7" -> "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_5" ;
 	 "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_7" -> "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_6" ;
-"if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_8" [label="8:  BinaryOperatorStmt: Assign \n   n$1=*&x:int [line 45, column 9]\n  *&y:int=n$1 [line 45, column 5]\n  NULLIFY(&x); [line 45, column 5]\n  NULLIFY(&y); [line 45, column 5]\n  EXIT_SCOPE(n$1,x,y); [line 45, column 5]\n  APPLY_ABSTRACTION; [line 45, column 5]\n " shape="box"]
+"if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_8" [label="8:  BinaryOperatorStmt: Assign \n   n$1=*&x:int [line 45, column 9]\n  *&y:int=n$1 [line 45, column 5]\n " shape="box"]
 	
 
 	 "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_8" -> "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_4" ;
-"if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(y:int); [line 43, column 3]\n  *&y:int=0 [line 43, column 3]\n  NULLIFY(&y); [line 43, column 3]\n  EXIT_SCOPE(y); [line 43, column 3]\n " shape="box"]
+"if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(y:int); [line 43, column 3]\n  *&y:int=0 [line 43, column 3]\n " shape="box"]
 	
 
 	 "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_9" -> "if_then_cond_var#9765064652804376901.7ddd70d5a9df7af72d704522a5beba46_7" ;
@@ -79,7 +79,7 @@ digraph cfg {
 "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_2" [label="2: Exit if_then_else \n  " color=yellow style=filled]
 	
 
-"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_3" [label="3:  BinaryOperatorStmt: Assign \n   *&y:int=333 [line 39, column 3]\n  NULLIFY(&y); [line 39, column 3]\n  EXIT_SCOPE(y); [line 39, column 3]\n  APPLY_ABSTRACTION; [line 39, column 3]\n " shape="box"]
+"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_3" [label="3:  BinaryOperatorStmt: Assign \n   *&y:int=333 [line 39, column 3]\n " shape="box"]
 	
 
 	 "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_3" -> "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_2" ;
@@ -87,28 +87,28 @@ digraph cfg {
 	
 
 	 "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_4" -> "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_3" ;
-"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_5" [label="5:  BinaryOperatorStmt: EQ \n   n$0=*&x:int [line 34, column 7]\n  NULLIFY(&x); [line 34, column 7]\n  EXIT_SCOPE(x); [line 34, column 7]\n " shape="box"]
+"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_5" [label="5:  BinaryOperatorStmt: EQ \n   n$0=*&x:int [line 34, column 7]\n " shape="box"]
 	
 
 	 "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_5" -> "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_6" ;
 	 "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_5" -> "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_7" ;
-"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_6" [label="6: Prune (true branch, if) \n   PRUNE((n$0 == 1234), true); [line 34, column 7]\n  EXIT_SCOPE(n$0); [line 34, column 7]\n " shape="invhouse"]
+"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_6" [label="6: Prune (true branch, if) \n   PRUNE((n$0 == 1234), true); [line 34, column 7]\n " shape="invhouse"]
 	
 
 	 "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_6" -> "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_8" ;
-"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$0 == 1234), false); [line 34, column 7]\n  EXIT_SCOPE(n$0); [line 34, column 7]\n " shape="invhouse"]
+"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$0 == 1234), false); [line 34, column 7]\n " shape="invhouse"]
 	
 
 	 "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_7" -> "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_9" ;
-"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_8" [label="8:  BinaryOperatorStmt: Assign \n   *&y:int=111 [line 35, column 5]\n  NULLIFY(&y); [line 35, column 5]\n  EXIT_SCOPE(y); [line 35, column 5]\n  APPLY_ABSTRACTION; [line 35, column 5]\n " shape="box"]
+"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_8" [label="8:  BinaryOperatorStmt: Assign \n   *&y:int=111 [line 35, column 5]\n " shape="box"]
 	
 
 	 "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_8" -> "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_4" ;
-"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_9" [label="9:  BinaryOperatorStmt: Assign \n   *&y:int=222 [line 37, column 5]\n  NULLIFY(&y); [line 37, column 5]\n  EXIT_SCOPE(y); [line 37, column 5]\n  APPLY_ABSTRACTION; [line 37, column 5]\n " shape="box"]
+"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_9" [label="9:  BinaryOperatorStmt: Assign \n   *&y:int=222 [line 37, column 5]\n " shape="box"]
 	
 
 	 "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_9" -> "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_4" ;
-"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(y:int); [line 33, column 3]\n  *&y:int=0 [line 33, column 3]\n  NULLIFY(&y); [line 33, column 3]\n  EXIT_SCOPE(y); [line 33, column 3]\n " shape="box"]
+"if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(y:int); [line 33, column 3]\n  *&y:int=0 [line 33, column 3]\n " shape="box"]
 	
 
 	 "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_10" -> "if_then_else#3656205175867614205.85ec2e9f625ee4f71821f6eee2969089_5" ;
@@ -119,7 +119,7 @@ digraph cfg {
 "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_2" [label="2: Exit if_then_else_cond_var \n  " color=yellow style=filled]
 	
 
-"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_3" [label="3:  BinaryOperatorStmt: Assign \n   *&y:int=111 [line 57, column 3]\n  NULLIFY(&y); [line 57, column 3]\n  EXIT_SCOPE(y); [line 57, column 3]\n  APPLY_ABSTRACTION; [line 57, column 3]\n " shape="box"]
+"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_3" [label="3:  BinaryOperatorStmt: Assign \n   *&y:int=111 [line 57, column 3]\n " shape="box"]
 	
 
 	 "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_3" -> "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_2" ;
@@ -127,11 +127,11 @@ digraph cfg {
 	
 
 	 "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_4" -> "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_3" ;
-"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_5" [label="5: Prune (true branch, if) \n   n$0=*&x:int [line 52, column 11]\n  PRUNE(n$0, true); [line 52, column 11]\n  EXIT_SCOPE(n$0); [line 52, column 11]\n " shape="invhouse"]
+"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_5" [label="5: Prune (true branch, if) \n   n$0=*&x:int [line 52, column 11]\n  PRUNE(n$0, true); [line 52, column 11]\n " shape="invhouse"]
 	
 
 	 "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_5" -> "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_8" ;
-"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_6" [label="6: Prune (false branch, if) \n   n$0=*&x:int [line 52, column 11]\n  PRUNE(!n$0, false); [line 52, column 11]\n  EXIT_SCOPE(n$0); [line 52, column 11]\n " shape="invhouse"]
+"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_6" [label="6: Prune (false branch, if) \n   n$0=*&x:int [line 52, column 11]\n  PRUNE(!n$0, false); [line 52, column 11]\n " shape="invhouse"]
 	
 
 	 "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_6" -> "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_9" ;
@@ -140,15 +140,15 @@ digraph cfg {
 
 	 "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_7" -> "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_5" ;
 	 "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_7" -> "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_6" ;
-"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_8" [label="8:  BinaryOperatorStmt: Assign \n   n$1=*&x:int [line 53, column 9]\n  *&y:int=n$1 [line 53, column 5]\n  NULLIFY(&x); [line 53, column 5]\n  NULLIFY(&y); [line 53, column 5]\n  EXIT_SCOPE(n$1,x,y); [line 53, column 5]\n  APPLY_ABSTRACTION; [line 53, column 5]\n " shape="box"]
+"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_8" [label="8:  BinaryOperatorStmt: Assign \n   n$1=*&x:int [line 53, column 9]\n  *&y:int=n$1 [line 53, column 5]\n " shape="box"]
 	
 
 	 "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_8" -> "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_4" ;
-"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_9" [label="9:  BinaryOperatorStmt: Assign \n   n$2=*&x:int [line 55, column 9]\n  *&y:int=(n$2 * 2) [line 55, column 5]\n  NULLIFY(&x); [line 55, column 5]\n  NULLIFY(&y); [line 55, column 5]\n  EXIT_SCOPE(n$2,x,y); [line 55, column 5]\n  APPLY_ABSTRACTION; [line 55, column 5]\n " shape="box"]
+"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_9" [label="9:  BinaryOperatorStmt: Assign \n   n$2=*&x:int [line 55, column 9]\n  *&y:int=(n$2 * 2) [line 55, column 5]\n " shape="box"]
 	
 
 	 "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_9" -> "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_4" ;
-"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(y:int); [line 51, column 3]\n  *&y:int=0 [line 51, column 3]\n  NULLIFY(&y); [line 51, column 3]\n  EXIT_SCOPE(y); [line 51, column 3]\n " shape="box"]
+"if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(y:int); [line 51, column 3]\n  *&y:int=0 [line 51, column 3]\n " shape="box"]
 	
 
 	 "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_10" -> "if_then_else_cond_var#2787713781872682235.ef4601af9985bcc4fc7e24bbd9a44d0f_7" ;
@@ -163,32 +163,32 @@ digraph cfg {
 	
 
 	 "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_3" -> "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_4" ;
-"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_4" [label="4:  between_join_and_exit \n   APPLY_ABSTRACTION; [line 25, column 3]\n " shape="box"]
+"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
 	 "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_4" -> "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_2" ;
-"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_5" [label="5:  BinaryOperatorStmt: EQ \n   n$0=*&x:int [line 25, column 7]\n  NULLIFY(&x); [line 25, column 7]\n  EXIT_SCOPE(x); [line 25, column 7]\n " shape="box"]
+"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_5" [label="5:  BinaryOperatorStmt: EQ \n   n$0=*&x:int [line 25, column 7]\n " shape="box"]
 	
 
 	 "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_5" -> "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_6" ;
 	 "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_5" -> "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_7" ;
-"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_6" [label="6: Prune (true branch, if) \n   PRUNE((n$0 == 1234), true); [line 25, column 7]\n  EXIT_SCOPE(n$0); [line 25, column 7]\n " shape="invhouse"]
+"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_6" [label="6: Prune (true branch, if) \n   PRUNE((n$0 == 1234), true); [line 25, column 7]\n " shape="invhouse"]
 	
 
 	 "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_6" -> "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_8" ;
-"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$0 == 1234), false); [line 25, column 7]\n  EXIT_SCOPE(n$0); [line 25, column 7]\n " shape="invhouse"]
+"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$0 == 1234), false); [line 25, column 7]\n " shape="invhouse"]
 	
 
 	 "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_7" -> "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_9" ;
-"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_8" [label="8:  BinaryOperatorStmt: Assign \n   *&y:int=111 [line 26, column 5]\n  NULLIFY(&y); [line 26, column 5]\n  EXIT_SCOPE(y); [line 26, column 5]\n  APPLY_ABSTRACTION; [line 26, column 5]\n " shape="box"]
+"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_8" [label="8:  BinaryOperatorStmt: Assign \n   *&y:int=111 [line 26, column 5]\n " shape="box"]
 	
 
 	 "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_8" -> "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_3" ;
-"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_9" [label="9:  BinaryOperatorStmt: Assign \n   *&y:int=222 [line 28, column 5]\n  NULLIFY(&y); [line 28, column 5]\n  EXIT_SCOPE(y); [line 28, column 5]\n  APPLY_ABSTRACTION; [line 28, column 5]\n " shape="box"]
+"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_9" [label="9:  BinaryOperatorStmt: Assign \n   *&y:int=222 [line 28, column 5]\n " shape="box"]
 	
 
 	 "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_9" -> "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_3" ;
-"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(y:int); [line 24, column 3]\n  *&y:int=0 [line 24, column 3]\n  NULLIFY(&y); [line 24, column 3]\n  EXIT_SCOPE(y); [line 24, column 3]\n " shape="box"]
+"if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(y:int); [line 24, column 3]\n  *&y:int=0 [line 24, column 3]\n " shape="box"]
 	
 
 	 "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_10" -> "if_then_else_return#4431567770337235941.d66facc967fa3d7bd91a335f2fa44d33_5" ;
@@ -203,7 +203,7 @@ digraph cfg {
 	
 
 	 "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_3" -> "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_4" ;
-"if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_4" [label="4:  between_join_and_exit \n   APPLY_ABSTRACTION; [line 62, column 3]\n " shape="box"]
+"if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
 	 "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_4" -> "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_2" ;
@@ -212,15 +212,15 @@ digraph cfg {
 
 	 "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_5" -> "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_6" ;
 	 "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_5" -> "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_7" ;
-"if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_6" [label="6: Prune (true branch, if) \n   PRUNE((n$0 == 4), true); [line 62, column 18]\n  EXIT_SCOPE(n$0); [line 62, column 18]\n " shape="invhouse"]
+"if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_6" [label="6: Prune (true branch, if) \n   PRUNE((n$0 == 4), true); [line 62, column 18]\n " shape="invhouse"]
 	
 
 	 "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_6" -> "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_8" ;
-"if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$0 == 4), false); [line 62, column 18]\n  NULLIFY(&x); [line 62, column 18]\n  EXIT_SCOPE(n$0,x); [line 62, column 18]\n  APPLY_ABSTRACTION; [line 62, column 18]\n " shape="invhouse"]
+"if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$0 == 4), false); [line 62, column 18]\n " shape="invhouse"]
 	
 
 	 "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_7" -> "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_3" ;
-"if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_8" [label="8:  BinaryOperatorStmt: Assign \n   n$1=*&x:int [line 63, column 9]\n  *&y:int=n$1 [line 63, column 5]\n  NULLIFY(&x); [line 63, column 5]\n  NULLIFY(&y); [line 63, column 5]\n  EXIT_SCOPE(n$1,x,y); [line 63, column 5]\n  APPLY_ABSTRACTION; [line 63, column 5]\n " shape="box"]
+"if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_8" [label="8:  BinaryOperatorStmt: Assign \n   n$1=*&x:int [line 63, column 9]\n  *&y:int=n$1 [line 63, column 5]\n " shape="box"]
 	
 
 	 "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_8" -> "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_3" ;
@@ -228,7 +228,7 @@ digraph cfg {
 	
 
 	 "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_9" -> "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_5" ;
-"if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(y:int); [line 61, column 3]\n  *&y:int=0 [line 61, column 3]\n  NULLIFY(&y); [line 61, column 3]\n  EXIT_SCOPE(y); [line 61, column 3]\n " shape="box"]
+"if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(y:int); [line 61, column 3]\n  *&y:int=0 [line 61, column 3]\n " shape="box"]
 	
 
 	 "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_10" -> "if_then_init#11608825163312327704.a731baaac66bccf9a8e7312d2dc99b5f_9" ;
@@ -243,7 +243,7 @@ digraph cfg {
 	
 
 	 "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_3" -> "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_4" ;
-"if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_4" [label="4:  between_join_and_exit \n   APPLY_ABSTRACTION; [line 10, column 3]\n " shape="box"]
+"if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
 	 "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_4" -> "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_2" ;
@@ -252,19 +252,19 @@ digraph cfg {
 
 	 "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_5" -> "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_6" ;
 	 "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_5" -> "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_7" ;
-"if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_6" [label="6: Prune (true branch, if) \n   PRUNE((n$0 == 1234), true); [line 10, column 7]\n  EXIT_SCOPE(n$0); [line 10, column 7]\n " shape="invhouse"]
+"if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_6" [label="6: Prune (true branch, if) \n   PRUNE((n$0 == 1234), true); [line 10, column 7]\n " shape="invhouse"]
 	
 
 	 "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_6" -> "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_8" ;
-"if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$0 == 1234), false); [line 10, column 7]\n  EXIT_SCOPE(n$0); [line 10, column 7]\n  APPLY_ABSTRACTION; [line 10, column 7]\n " shape="invhouse"]
+"if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$0 == 1234), false); [line 10, column 7]\n " shape="invhouse"]
 	
 
 	 "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_7" -> "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_3" ;
-"if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_8" [label="8:  BinaryOperatorStmt: Assign \n   n$1=*&x:int [line 11, column 9]\n  *&y:int=n$1 [line 11, column 5]\n  NULLIFY(&y); [line 11, column 5]\n  NULLIFY(&x); [line 11, column 5]\n  EXIT_SCOPE(n$1,y,x); [line 11, column 5]\n  APPLY_ABSTRACTION; [line 11, column 5]\n " shape="box"]
+"if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_8" [label="8:  BinaryOperatorStmt: Assign \n   n$1=*&x:int [line 11, column 9]\n  *&y:int=n$1 [line 11, column 5]\n " shape="box"]
 	
 
 	 "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_8" -> "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_3" ;
-"if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(y:int); [line 9, column 3]\n  *&y:int=0 [line 9, column 3]\n  NULLIFY(&y); [line 9, column 3]\n  EXIT_SCOPE(y); [line 9, column 3]\n " shape="box"]
+"if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_9" [label="9:  DeclStmt \n   VARIABLE_DECLARED(y:int); [line 9, column 3]\n  *&y:int=0 [line 9, column 3]\n " shape="box"]
 	
 
 	 "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_9" -> "if_then_return#7560400730320632534.710a386e6459fee25726e9e12804127e_5" ;

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

@@ -4,14 +4,14 @@ digraph cfg {
 	
 
 	 "div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_1" -> "div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_4" ;
-"div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_2" [label="2: Exit div0_B_A \n   NULLIFY(&b); [line 19, column 1]\n " color=yellow style=filled]
+"div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_2" [label="2: Exit div0_B_A \n  " color=yellow style=filled]
 	
 
-"div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_3" [label="3:  Call _fun_B<A>::div0 \n   _=*&b:B<A> [line 18, column 3]\n  n$1=_fun_B<A>::div0(&b:B<A>&) [line 18, column 3]\n  EXIT_SCOPE(_,n$1,b); [line 18, column 3]\n  APPLY_ABSTRACTION; [line 18, column 3]\n " shape="box"]
+"div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_3" [label="3:  Call _fun_B<A>::div0 \n   _=*&b:B<A> [line 18, column 3]\n  n$1=_fun_B<A>::div0(&b:B<A>&) [line 18, column 3]\n " shape="box"]
 	
 
 	 "div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_3" -> "div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_2" ;
-"div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(b:B<A>); [line 17, column 3]\n  n$2=_fun_B<A>::B(&b:B<A>*) [line 17, column 8]\n  EXIT_SCOPE(n$2); [line 17, column 8]\n " shape="box"]
+"div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(b:B<A>); [line 17, column 3]\n  n$2=_fun_B<A>::B(&b:B<A>*) [line 17, column 8]\n " shape="box"]
 	
 
 	 "div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_4" -> "div0_B_A#16868528730428357658.9b8f4e2ce0bf464a2adbe53fb7a34f64_3" ;
@@ -19,14 +19,14 @@ digraph cfg {
 	
 
 	 "div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_1" -> "div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_4" ;
-"div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_2" [label="2: Exit div0_B_int \n   NULLIFY(&b); [line 14, column 1]\n " color=yellow style=filled]
+"div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_2" [label="2: Exit div0_B_int \n  " color=yellow style=filled]
 	
 
-"div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_3" [label="3:  Call _fun_B<int>::div0 \n   _=*&b:B<int> [line 13, column 3]\n  n$1=_fun_B<int>::div0(&b:B<int>&) [line 13, column 3]\n  EXIT_SCOPE(_,n$1,b); [line 13, column 3]\n  APPLY_ABSTRACTION; [line 13, column 3]\n " shape="box"]
+"div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_3" [label="3:  Call _fun_B<int>::div0 \n   _=*&b:B<int> [line 13, column 3]\n  n$1=_fun_B<int>::div0(&b:B<int>&) [line 13, column 3]\n " shape="box"]
 	
 
 	 "div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_3" -> "div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_2" ;
-"div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(b:B<int>); [line 12, column 3]\n  n$2=_fun_B<int>::B(&b:B<int>*) [line 12, column 10]\n  EXIT_SCOPE(n$2); [line 12, column 10]\n " shape="box"]
+"div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(b:B<int>); [line 12, column 3]\n  n$2=_fun_B<int>::B(&b:B<int>*) [line 12, column 10]\n " shape="box"]
 	
 
 	 "div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_4" -> "div0_B_int#1022620961131326491.1d61c8d3035b9223f336f2b0e83b1cd8_3" ;
@@ -37,7 +37,7 @@ digraph cfg {
 "div0_templ<A>#3392200936327226954.953c7991c92a71a697b380b40ee16cec_2" [label="2: Exit div0_templ<A> \n  " color=yellow style=filled]
 	
 
-"div0_templ<A>#3392200936327226954.953c7991c92a71a697b380b40ee16cec_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 21, column 3]\n  APPLY_ABSTRACTION; [line 21, column 3]\n " shape="box"]
+"div0_templ<A>#3392200936327226954.953c7991c92a71a697b380b40ee16cec_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 21, column 3]\n " shape="box"]
 	
 
 	 "div0_templ<A>#3392200936327226954.953c7991c92a71a697b380b40ee16cec_3" -> "div0_templ<A>#3392200936327226954.953c7991c92a71a697b380b40ee16cec_2" ;
@@ -48,7 +48,7 @@ digraph cfg {
 "div0_templ<int>#7407833322787370357.019ce5e1d40ea68361ad0caeb08c53f0_2" [label="2: Exit div0_templ<int> \n  " color=yellow style=filled]
 	
 
-"div0_templ<int>#7407833322787370357.019ce5e1d40ea68361ad0caeb08c53f0_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 21, column 3]\n  APPLY_ABSTRACTION; [line 21, column 3]\n " shape="box"]
+"div0_templ<int>#7407833322787370357.019ce5e1d40ea68361ad0caeb08c53f0_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 21, column 3]\n " shape="box"]
 	
 
 	 "div0_templ<int>#7407833322787370357.019ce5e1d40ea68361ad0caeb08c53f0_3" -> "div0_templ<int>#7407833322787370357.019ce5e1d40ea68361ad0caeb08c53f0_2" ;
@@ -59,7 +59,7 @@ digraph cfg {
 "div0_templ_A#15777392272986999827.c3e6f124c5921f718c539c423038b21a_2" [label="2: Exit div0_templ_A \n  " color=yellow style=filled]
 	
 
-"div0_templ_A#15777392272986999827.c3e6f124c5921f718c539c423038b21a_3" [label="3:  Call _fun_div0_templ<A> \n   n$0=_fun_div0_templ<A>() [line 23, column 22]\n  EXIT_SCOPE(n$0); [line 23, column 22]\n  APPLY_ABSTRACTION; [line 23, column 22]\n " shape="box"]
+"div0_templ_A#15777392272986999827.c3e6f124c5921f718c539c423038b21a_3" [label="3:  Call _fun_div0_templ<A> \n   n$0=_fun_div0_templ<A>() [line 23, column 22]\n " shape="box"]
 	
 
 	 "div0_templ_A#15777392272986999827.c3e6f124c5921f718c539c423038b21a_3" -> "div0_templ_A#15777392272986999827.c3e6f124c5921f718c539c423038b21a_2" ;
@@ -70,7 +70,7 @@ digraph cfg {
 "div0_templ_int#6723189882400805523.156da066b41947aa58ec7afb9551dc47_2" [label="2: Exit div0_templ_int \n  " color=yellow style=filled]
 	
 
-"div0_templ_int#6723189882400805523.156da066b41947aa58ec7afb9551dc47_3" [label="3:  Call _fun_div0_templ<int> \n   n$0=_fun_div0_templ<int>() [line 21, column 25]\n  EXIT_SCOPE(n$0); [line 21, column 25]\n  APPLY_ABSTRACTION; [line 21, column 25]\n " shape="box"]
+"div0_templ_int#6723189882400805523.156da066b41947aa58ec7afb9551dc47_3" [label="3:  Call _fun_div0_templ<int> \n   n$0=_fun_div0_templ<int>() [line 21, column 25]\n " shape="box"]
 	
 
 	 "div0_templ_int#6723189882400805523.156da066b41947aa58ec7afb9551dc47_3" -> "div0_templ_int#6723189882400805523.156da066b41947aa58ec7afb9551dc47_2" ;
@@ -81,7 +81,7 @@ digraph cfg {
 "div0#B<int>#(9546261644456360892).132a3992ba75c40ad8966e1504521d7d_2" [label="2: Exit B<int>::div0 \n  " color=yellow style=filled]
 	
 
-"div0#B<int>#(9546261644456360892).132a3992ba75c40ad8966e1504521d7d_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 14, column 16]\n  APPLY_ABSTRACTION; [line 14, column 16]\n " shape="box"]
+"div0#B<int>#(9546261644456360892).132a3992ba75c40ad8966e1504521d7d_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 14, column 16]\n " shape="box"]
 	
 
 	 "div0#B<int>#(9546261644456360892).132a3992ba75c40ad8966e1504521d7d_3" -> "div0#B<int>#(9546261644456360892).132a3992ba75c40ad8966e1504521d7d_2" ;
@@ -99,7 +99,7 @@ digraph cfg {
 "div0#B<A>#(10848361513712066289).6e41f7aae5452f098d414bfe7ad8cf85_2" [label="2: Exit B<A>::div0 \n  " color=yellow style=filled]
 	
 
-"div0#B<A>#(10848361513712066289).6e41f7aae5452f098d414bfe7ad8cf85_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 14, column 16]\n  APPLY_ABSTRACTION; [line 14, column 16]\n " shape="box"]
+"div0#B<A>#(10848361513712066289).6e41f7aae5452f098d414bfe7ad8cf85_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 14, column 16]\n " shape="box"]
 	
 
 	 "div0#B<A>#(10848361513712066289).6e41f7aae5452f098d414bfe7ad8cf85_3" -> "div0#B<A>#(10848361513712066289).6e41f7aae5452f098d414bfe7ad8cf85_2" ;

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

@@ -4,10 +4,10 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n   NULLIFY(&b); [line 16, column 22]\n " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(b:B); [line 16, column 14]\n  n$0=_fun_B::A(&b:B*,5:int) [line 16, column 16]\n  EXIT_SCOPE(n$0,b); [line 16, column 16]\n  APPLY_ABSTRACTION; [line 16, column 16]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(b:B); [line 16, column 14]\n  n$0=_fun_B::A(&b:B*,5:int) [line 16, column 16]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -32,7 +32,7 @@ digraph cfg {
 "A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_2" [label="2: Exit B::A \n  " color=yellow style=filled]
 	
 
-"A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_3" [label="3:  Constructor Init \n   n$1=*&this:B* [line 13, column 12]\n  n$3=*&__param_0:int [line 13, column 12]\n  n$2=_fun_A::A(n$1:B*,n$3:int) [line 13, column 12]\n  NULLIFY(&this); [line 13, column 12]\n  NULLIFY(&__param_0); [line 13, column 12]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 13, column 12]\n  APPLY_ABSTRACTION; [line 13, column 12]\n " shape="box"]
+"A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_3" [label="3:  Constructor Init \n   n$1=*&this:B* [line 13, column 12]\n  n$3=*&__param_0:int [line 13, column 12]\n  n$2=_fun_A::A(n$1:B*,n$3:int) [line 13, column 12]\n " shape="box"]
 	
 
 	 "A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_3" -> "A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_2" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "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$0=*&x:int [line 51, column 34]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_init_list__n$1:int); [line 51, column 42]\n  *&0$?%__sil_tmpSIL_init_list__n$1:int=0 [line 51, column 42]\n  *&x:int=(-n$0 & ~&0$?%__sil_tmpSIL_init_list__n$1) [line 51, column 29]\n  NULLIFY(&0$?%__sil_tmpSIL_init_list__n$1); [line 51, column 29]\n  NULLIFY(&x); [line 51, column 29]\n  EXIT_SCOPE(n$0,0$?%__sil_tmpSIL_init_list__n$1,x); [line 51, column 29]\n  APPLY_ABSTRACTION; [line 51, column 29]\n " shape="box"]
+"init_in_binop#init_list#8348250075128359911.7adaa67964536570064366a92056cf46_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&x:int [line 51, column 34]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_init_list__n$1:int); [line 51, column 42]\n  *&0$?%__sil_tmpSIL_init_list__n$1:int=0 [line 51, column 42]\n  *&x:int=(-n$0 & ~&0$?%__sil_tmpSIL_init_list__n$1) [line 51, column 29]\n " shape="box"]
 	
 
 	 "init_in_binop#init_list#8348250075128359911.7adaa67964536570064366a92056cf46_3" -> "init_in_binop#init_list#8348250075128359911.7adaa67964536570064366a92056cf46_2" ;
@@ -15,10 +15,10 @@ digraph cfg {
 	
 
 	 "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_1" -> "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_6" ;
-"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_2" [label="2: Exit init_list::list_init \n   NULLIFY(&y); [line 49, column 1]\n  NULLIFY(&ty); [line 49, column 1]\n " color=yellow style=filled]
+"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_2" [label="2: Exit init_list::list_init \n  " color=yellow style=filled]
 	
 
-"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(ty:init_list::Y[3*24]); [line 48, column 3]\n  *&ty[0].z:int=1 [line 48, column 14]\n  *&ty[0].x.a:int=2 [line 48, column 18]\n  *&ty[0].x.p:int*=null [line 48, column 18]\n  n$0=_fun_init_list::Y::Y(&ty[1]:init_list::Y*,&y:init_list::Y&) [line 48, column 33]\n  n$1=*&yref:init_list::Y& [line 48, column 36]\n  n$2=_fun_init_list::Y::Y(&ty[2]:init_list::Y*,n$1:init_list::Y&) [line 48, column 36]\n  NULLIFY(&yref); [line 48, column 36]\n  EXIT_SCOPE(n$0,n$1,n$2,ty,y,yref); [line 48, column 36]\n  APPLY_ABSTRACTION; [line 48, column 36]\n " shape="box"]
+"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(ty:init_list::Y[3*24]); [line 48, column 3]\n  *&ty[0].z:int=1 [line 48, column 14]\n  *&ty[0].x.a:int=2 [line 48, column 18]\n  *&ty[0].x.p:int*=null [line 48, column 18]\n  n$0=_fun_init_list::Y::Y(&ty[1]:init_list::Y*,&y:init_list::Y&) [line 48, column 33]\n  n$1=*&yref:init_list::Y& [line 48, column 36]\n  n$2=_fun_init_list::Y::Y(&ty[2]:init_list::Y*,n$1:init_list::Y&) [line 48, column 36]\n " shape="box"]
 	
 
 	 "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_3" -> "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_2" ;
@@ -26,11 +26,11 @@ digraph cfg {
 	
 
 	 "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_4" -> "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_3" ;
-"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(y:init_list::Y); [line 46, column 3]\n  n$3=_fun_init_list::Y::Y(&y:init_list::Y*) [line 46, column 5]\n  EXIT_SCOPE(n$3); [line 46, column 5]\n " shape="box"]
+"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(y:init_list::Y); [line 46, column 3]\n  n$3=_fun_init_list::Y::Y(&y:init_list::Y*) [line 46, column 5]\n " 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   VARIABLE_DECLARED(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(ti); [line 45, column 15]\n " shape="box"]
+"list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_6" -> "list_init#init_list#18348854466346904105.0126b9f1f80f91b73d5fbdbf2bc60754_5" ;
@@ -38,22 +38,22 @@ digraph cfg {
 	
 
 	 "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_1" -> "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_7" ;
-"record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_2" [label="2: Exit init_list::record_init \n   NULLIFY(&c); [line 42, column 1]\n  NULLIFY(&y1); [line 42, column 1]\n  NULLIFY(&x); [line 42, column 1]\n " color=yellow style=filled]
+"record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_2" [label="2: Exit init_list::record_init \n  " color=yellow style=filled]
 	
 
-"record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_3" [label="3:  Destruction(Scope) \n   _=*&c:init_list::C [line 42, column 1]\n  n$1=_fun_init_list::C::~C(&c:init_list::C*) injected [line 42, column 1]\n  _=*&x:init_list::X [line 42, column 1]\n  n$3=_fun_init_list::X::~X(&x:init_list::X*) injected [line 42, column 1]\n  EXIT_SCOPE(_,_,n$1,n$3,x,c); [line 42, column 1]\n  APPLY_ABSTRACTION; [line 42, column 1]\n " shape="box"]
+"record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_3" [label="3:  Destruction(Scope) \n   _=*&c:init_list::C [line 42, column 1]\n  n$1=_fun_init_list::C::~C(&c:init_list::C*) injected [line 42, column 1]\n  _=*&x:init_list::X [line 42, column 1]\n  n$3=_fun_init_list::X::~X(&x:init_list::X*) injected [line 42, column 1]\n " shape="box"]
 	
 
 	 "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   VARIABLE_DECLARED(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); [line 41, column 5]\n " shape="box"]
+"record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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 " 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   VARIABLE_DECLARED(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(y2); [line 39, column 11]\n " shape="box"]
+"record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(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 " 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   VARIABLE_DECLARED(y1:init_list::Y); [line 38, column 3]\n  *&y1.z:int=1 [line 38, column 7]\n  n$6=_fun_init_list::X::X(&y1.x:init_list::X*,&x:init_list::X&) [line 38, column 11]\n  EXIT_SCOPE(n$6,y1); [line 38, column 11]\n " shape="box"]
+"record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(y1:init_list::Y); [line 38, column 3]\n  *&y1.z:int=1 [line 38, column 7]\n  n$6=_fun_init_list::X::X(&y1.x:init_list::X*,&x:init_list::X&) [line 38, column 11]\n " shape="box"]
 	
 
 	 "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_6" -> "record_init#init_list#9390182661430352809.a0bac2a3cf71c0b7c450ce49d030845f_5" ;
@@ -68,15 +68,15 @@ digraph cfg {
 "zero_init_primitive#init_list#3465759276925732066.1d03db1e38d38f4b345f33049176e92c_2" [label="2: Exit init_list::zero_init_primitive \n  " color=yellow style=filled]
 	
 
-"zero_init_primitive#init_list#3465759276925732066.1d03db1e38d38f4b345f33049176e92c_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(f:float); [line 28, column 3]\n  *&f:float=0. [line 28, column 3]\n  NULLIFY(&f); [line 28, column 3]\n  EXIT_SCOPE(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   VARIABLE_DECLARED(f:float); [line 28, column 3]\n  *&f:float=0. [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   VARIABLE_DECLARED(p:int*); [line 27, column 3]\n  *&p:int*=null [line 27, column 3]\n  NULLIFY(&p); [line 27, column 3]\n  EXIT_SCOPE(p); [line 27, column 3]\n " shape="box"]
+"zero_init_primitive#init_list#3465759276925732066.1d03db1e38d38f4b345f33049176e92c_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(p:int*); [line 27, column 3]\n  *&p:int*=null [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   VARIABLE_DECLARED(i:int); [line 26, column 3]\n  *&i:int=0 [line 26, column 3]\n  NULLIFY(&i); [line 26, column 3]\n  EXIT_SCOPE(i); [line 26, column 3]\n " shape="box"]
+"zero_init_primitive#init_list#3465759276925732066.1d03db1e38d38f4b345f33049176e92c_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 26, column 3]\n  *&i:int=0 [line 26, column 3]\n " shape="box"]
 	
 
 	 "zero_init_primitive#init_list#3465759276925732066.1d03db1e38d38f4b345f33049176e92c_5" -> "zero_init_primitive#init_list#3465759276925732066.1d03db1e38d38f4b345f33049176e92c_4" ;
@@ -84,18 +84,18 @@ digraph cfg {
 	
 
 	 "zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_1" -> "zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_5" ;
-"zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_2" [label="2: Exit init_list::zero_init_record \n   NULLIFY(&c); [line 34, column 1]\n " color=yellow style=filled]
+"zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_2" [label="2: Exit init_list::zero_init_record \n  " color=yellow style=filled]
 	
 
-"zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_3" [label="3:  Destruction(Scope) \n   _=*&c:init_list::C [line 34, column 1]\n  n$1=_fun_init_list::C::~C(&c:init_list::C*) injected [line 34, column 1]\n  EXIT_SCOPE(_,n$1,c); [line 34, column 1]\n  APPLY_ABSTRACTION; [line 34, column 1]\n " shape="box"]
+"zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_3" [label="3:  Destruction(Scope) \n   _=*&c:init_list::C [line 34, column 1]\n  n$1=_fun_init_list::C::~C(&c:init_list::C*) injected [line 34, column 1]\n " shape="box"]
 	
 
 	 "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   VARIABLE_DECLARED(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); [line 33, column 5]\n " shape="box"]
+"zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(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 " 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   VARIABLE_DECLARED(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(y); [line 32, column 7]\n " shape="box"]
+"zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(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 " shape="box"]
 	
 
 	 "zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_5" -> "zero_init_record#init_list#7364160241041626579.8baaea62666796dca7b4a7b11bf4f2bb_4" ;
@@ -113,11 +113,11 @@ digraph cfg {
 "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_2" [label="2: Exit init_list::C::C \n  " color=yellow style=filled]
 	
 
-"C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::C* [line 22, column 43]\n  n$2=*&x:init_list::X const & [line 22, column 45]\n  n$3=_fun_init_list::X::X(n$1.x:init_list::X*,n$2:init_list::X const &) [line 22, column 43]\n  NULLIFY(&x); [line 22, column 43]\n  NULLIFY(&this); [line 22, column 43]\n  EXIT_SCOPE(n$1,n$2,n$3,x,this); [line 22, column 43]\n  APPLY_ABSTRACTION; [line 22, column 43]\n " shape="box"]
+"C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::C* [line 22, column 43]\n  n$2=*&x:init_list::X const & [line 22, column 45]\n  n$3=_fun_init_list::X::X(n$1.x:init_list::X*,n$2:init_list::X const &) [line 22, column 43]\n " shape="box"]
 	
 
 	 "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_3" -> "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_2" ;
-"C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_4" [label="4:  Constructor Init \n   n$4=*&this:init_list::C* [line 22, column 33]\n  n$5=*&a:int [line 22, column 35]\n  n$6=*&b:int [line 22, column 39]\n  *n$4.z:int=(n$5 + n$6) [line 22, column 33]\n  NULLIFY(&a); [line 22, column 33]\n  NULLIFY(&b); [line 22, column 33]\n  EXIT_SCOPE(n$4,n$5,n$6,a,b); [line 22, column 33]\n " shape="box"]
+"C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_4" [label="4:  Constructor Init \n   n$4=*&this:init_list::C* [line 22, column 33]\n  n$5=*&a:int [line 22, column 35]\n  n$6=*&b:int [line 22, column 39]\n  *n$4.z:int=(n$5 + n$6) [line 22, column 33]\n " shape="box"]
 	
 
 	 "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_4" -> "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_3" ;
@@ -128,7 +128,7 @@ digraph cfg {
 "C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_2" [label="2: Exit init_list::C::C \n  " color=yellow style=filled]
 	
 
-"C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::C* [line 19, column 6]\n  *n$1.x.a:int=0 [line 19, column 7]\n  *n$1.x.p:int*=null [line 19, column 7]\n  NULLIFY(&this); [line 19, column 7]\n  EXIT_SCOPE(n$1,this); [line 19, column 7]\n  APPLY_ABSTRACTION; [line 19, column 7]\n " shape="box"]
+"C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::C* [line 19, column 6]\n  *n$1.x.a:int=0 [line 19, column 7]\n  *n$1.x.p:int*=null [line 19, column 7]\n " shape="box"]
 	
 
 	 "C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_3" -> "C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_2" ;
@@ -139,11 +139,11 @@ digraph cfg {
 "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_2" [label="2: Exit init_list::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::X* [line 8, column 8]\n  n$2=*&__param_0:init_list::X const & [line 8, column 8]\n  n$3=*n$2.p:int* [line 8, column 8]\n  *n$1.p:int*=n$3 [line 8, column 8]\n  NULLIFY(&this); [line 8, column 8]\n  NULLIFY(&__param_0); [line 8, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 8, column 8]\n  APPLY_ABSTRACTION; [line 8, column 8]\n " shape="box"]
+"X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::X* [line 8, column 8]\n  n$2=*&__param_0:init_list::X const & [line 8, column 8]\n  n$3=*n$2.p:int* [line 8, column 8]\n  *n$1.p:int*=n$3 [line 8, column 8]\n " shape="box"]
 	
 
 	 "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_3" -> "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_2" ;
-"X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_4" [label="4:  Constructor Init \n   n$4=*&this:init_list::X* [line 8, column 8]\n  n$5=*&__param_0:init_list::X const & [line 8, column 8]\n  n$6=*n$5.a:int [line 8, column 8]\n  *n$4.a:int=n$6 [line 8, column 8]\n  EXIT_SCOPE(n$4,n$5,n$6); [line 8, column 8]\n " shape="box"]
+"X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_4" [label="4:  Constructor Init \n   n$4=*&this:init_list::X* [line 8, column 8]\n  n$5=*&__param_0:init_list::X const & [line 8, column 8]\n  n$6=*n$5.a:int [line 8, column 8]\n  *n$4.a:int=n$6 [line 8, column 8]\n " shape="box"]
 	
 
 	 "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_4" -> "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_3" ;
@@ -161,11 +161,11 @@ digraph cfg {
 "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_2" [label="2: Exit init_list::Y::Y \n  " color=yellow style=filled]
 	
 
-"Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::Y* [line 12, column 8]\n  n$2=*&__param_0:init_list::Y const & [line 12, column 8]\n  n$3=_fun_init_list::X::X(n$1.x:init_list::X*,n$2.x:init_list::X&) [line 12, column 8]\n  NULLIFY(&this); [line 12, column 8]\n  NULLIFY(&__param_0); [line 12, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 12, column 8]\n  APPLY_ABSTRACTION; [line 12, column 8]\n " shape="box"]
+"Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::Y* [line 12, column 8]\n  n$2=*&__param_0:init_list::Y const & [line 12, column 8]\n  n$3=_fun_init_list::X::X(n$1.x:init_list::X*,n$2.x:init_list::X&) [line 12, column 8]\n " shape="box"]
 	
 
 	 "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_3" -> "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_2" ;
-"Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_4" [label="4:  Constructor Init \n   n$4=*&this:init_list::Y* [line 12, column 8]\n  n$5=*&__param_0:init_list::Y const & [line 12, column 8]\n  n$6=*n$5.z:int [line 12, column 8]\n  *n$4.z:int=n$6 [line 12, column 8]\n  EXIT_SCOPE(n$4,n$5,n$6); [line 12, column 8]\n " shape="box"]
+"Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_4" [label="4:  Constructor Init \n   n$4=*&this:init_list::Y* [line 12, column 8]\n  n$5=*&__param_0:init_list::Y const & [line 12, column 8]\n  n$6=*n$5.z:int [line 12, column 8]\n  *n$4.z:int=n$6 [line 12, column 8]\n " shape="box"]
 	
 
 	 "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_4" -> "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_3" ;
@@ -176,7 +176,7 @@ digraph cfg {
 "Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_2" [label="2: Exit init_list::Y::Y \n  " color=yellow style=filled]
 	
 
-"Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::Y* [line 12, column 8]\n  n$2=_fun_init_list::X::X(n$1.x:init_list::X*) [line 12, column 8]\n  NULLIFY(&this); [line 12, column 8]\n  EXIT_SCOPE(n$1,n$2,this); [line 12, column 8]\n  APPLY_ABSTRACTION; [line 12, column 8]\n " shape="box"]
+"Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::Y* [line 12, column 8]\n  n$2=_fun_init_list::X::X(n$1.x:init_list::X*) [line 12, column 8]\n " shape="box"]
 	
 
 	 "Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_3" -> "Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_2" ;

infer/tests/codetoanalyze/cpp/frontend/keywords/self_parameter.cpp.dot

@@ -7,7 +7,7 @@ digraph cfg {
 "fun_with_self#17802276037376540432.4639f371cac8e491a6b8c0363a0bc168_2" [label="2: Exit fun_with_self \n  " color=yellow style=filled]
 	
 
-"fun_with_self#17802276037376540432.4639f371cac8e491a6b8c0363a0bc168_3" [label="3:  Return Stmt \n   n$0=*&self:int [line 13, column 38]\n  *&return:int=n$0 [line 13, column 31]\n  NULLIFY(&self); [line 13, column 31]\n  EXIT_SCOPE(n$0,self); [line 13, column 31]\n  APPLY_ABSTRACTION; [line 13, column 31]\n " shape="box"]
+"fun_with_self#17802276037376540432.4639f371cac8e491a6b8c0363a0bc168_3" [label="3:  Return Stmt \n   n$0=*&self:int [line 13, column 38]\n  *&return:int=n$0 [line 13, column 31]\n " shape="box"]
 	
 
 	 "fun_with_self#17802276037376540432.4639f371cac8e491a6b8c0363a0bc168_3" -> "fun_with_self#17802276037376540432.4639f371cac8e491a6b8c0363a0bc168_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_3" [label="3:  Return Stmt \n   n$0=*&a:A* [line 15, column 25]\n  _=*n$0:A [line 15, column 25]\n  n$2=_fun_A::meth_with_self(n$0:A*,1:int,2:int) [line 15, column 25]\n  n$3=_fun_fun_with_self(10:int) [line 15, column 51]\n  *&return:int=(n$2 + n$3) [line 15, column 18]\n  NULLIFY(&a); [line 15, column 18]\n  EXIT_SCOPE(_,n$0,n$2,n$3,a); [line 15, column 18]\n  APPLY_ABSTRACTION; [line 15, column 18]\n " shape="box"]
+"test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_3" [label="3:  Return Stmt \n   n$0=*&a:A* [line 15, column 25]\n  _=*n$0:A [line 15, column 25]\n  n$2=_fun_A::meth_with_self(n$0:A*,1:int,2:int) [line 15, column 25]\n  n$3=_fun_fun_with_self(10:int) [line 15, column 51]\n  *&return:int=(n$2 + n$3) [line 15, column 18]\n " shape="box"]
 	
 
 	 "test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_3" -> "test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_2" ;
@@ -29,7 +29,7 @@ digraph cfg {
 "meth_with_self#A#(5126246555081316972).087223c2fe95da4de39ef1116c167075_2" [label="2: Exit A::meth_with_self \n  " color=yellow style=filled]
 	
 
-"meth_with_self#A#(5126246555081316972).087223c2fe95da4de39ef1116c167075_3" [label="3:  Return Stmt \n   n$0=*&self:int [line 10, column 48]\n  n$1=*&b:int [line 10, column 55]\n  *&return:int=(n$0 + n$1) [line 10, column 41]\n  NULLIFY(&b); [line 10, column 41]\n  NULLIFY(&self); [line 10, column 41]\n  EXIT_SCOPE(n$0,n$1,b,self); [line 10, column 41]\n  APPLY_ABSTRACTION; [line 10, column 41]\n " shape="box"]
+"meth_with_self#A#(5126246555081316972).087223c2fe95da4de39ef1116c167075_3" [label="3:  Return Stmt \n   n$0=*&self:int [line 10, column 48]\n  n$1=*&b:int [line 10, column 55]\n  *&return:int=(n$0 + n$1) [line 10, column 41]\n " shape="box"]
 	
 
 	 "meth_with_self#A#(5126246555081316972).087223c2fe95da4de39ef1116c167075_3" -> "meth_with_self#A#(5126246555081316972).087223c2fe95da4de39ef1116c167075_2" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "getPtr#4816258365355431750.3065f9a978ec924d84739cae55c710c4_2" [label="2: Exit getPtr \n  " color=yellow style=filled]
 	
 
-"getPtr#4816258365355431750.3065f9a978ec924d84739cae55c710c4_3" [label="3:  Return Stmt \n   *&return:int*=null [line 8, column 17]\n  APPLY_ABSTRACTION; [line 8, column 17]\n " shape="box"]
+"getPtr#4816258365355431750.3065f9a978ec924d84739cae55c710c4_3" [label="3:  Return Stmt \n   *&return:int*=null [line 8, column 17]\n " shape="box"]
 	
 
 	 "getPtr#4816258365355431750.3065f9a978ec924d84739cae55c710c4_3" -> "getPtr#4816258365355431750.3065f9a978ec924d84739cae55c710c4_2" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "get<ENUM>#8194971217283422499.150bc0995c110083a73c0ededcfe6d76_2" [label="2: Exit get<ENUM> \n  " color=yellow style=filled]
 	
 
-"get<ENUM>#8194971217283422499.150bc0995c110083a73c0ededcfe6d76_3" [label="3:  Return Stmt \n   *&return:int=0 [line 12, column 3]\n  APPLY_ABSTRACTION; [line 12, column 3]\n " shape="box"]
+"get<ENUM>#8194971217283422499.150bc0995c110083a73c0ededcfe6d76_3" [label="3:  Return Stmt \n   *&return:int=0 [line 12, column 3]\n " shape="box"]
 	
 
 	 "get<ENUM>#8194971217283422499.150bc0995c110083a73c0ededcfe6d76_3" -> "get<ENUM>#8194971217283422499.150bc0995c110083a73c0ededcfe6d76_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "get<float>#13747618516057362976.2fec1fe1de6ac1c3fae6ec84a1ffd2b5_2" [label="2: Exit get<float> \n  " color=yellow style=filled]
 	
 
-"get<float>#13747618516057362976.2fec1fe1de6ac1c3fae6ec84a1ffd2b5_3" [label="3:  Return Stmt \n   *&return:float=0. [line 12, column 3]\n  APPLY_ABSTRACTION; [line 12, column 3]\n " shape="box"]
+"get<float>#13747618516057362976.2fec1fe1de6ac1c3fae6ec84a1ffd2b5_3" [label="3:  Return Stmt \n   *&return:float=0. [line 12, column 3]\n " shape="box"]
 	
 
 	 "get<float>#13747618516057362976.2fec1fe1de6ac1c3fae6ec84a1ffd2b5_3" -> "get<float>#13747618516057362976.2fec1fe1de6ac1c3fae6ec84a1ffd2b5_2" ;
@@ -29,7 +29,7 @@ digraph cfg {
 "get<float_*>#2842478093973053540.94b60b146800ad29688a426dfa5aaafe_2" [label="2: Exit get<float_*> \n  " color=yellow style=filled]
 	
 
-"get<float_*>#2842478093973053540.94b60b146800ad29688a426dfa5aaafe_3" [label="3:  Return Stmt \n   *&return:float*=null [line 12, column 3]\n  APPLY_ABSTRACTION; [line 12, column 3]\n " shape="box"]
+"get<float_*>#2842478093973053540.94b60b146800ad29688a426dfa5aaafe_3" [label="3:  Return Stmt \n   *&return:float*=null [line 12, column 3]\n " shape="box"]
 	
 
 	 "get<float_*>#2842478093973053540.94b60b146800ad29688a426dfa5aaafe_3" -> "get<float_*>#2842478093973053540.94b60b146800ad29688a426dfa5aaafe_2" ;
@@ -40,7 +40,7 @@ digraph cfg {
 "get<int>#2877167444606952489.51207fd4e308b488877945d48484f2bc_2" [label="2: Exit get<int> \n  " color=yellow style=filled]
 	
 
-"get<int>#2877167444606952489.51207fd4e308b488877945d48484f2bc_3" [label="3:  Return Stmt \n   *&return:int=0 [line 12, column 3]\n  APPLY_ABSTRACTION; [line 12, column 3]\n " shape="box"]
+"get<int>#2877167444606952489.51207fd4e308b488877945d48484f2bc_3" [label="3:  Return Stmt \n   *&return:int=0 [line 12, column 3]\n " shape="box"]
 	
 
 	 "get<int>#2877167444606952489.51207fd4e308b488877945d48484f2bc_3" -> "get<int>#2877167444606952489.51207fd4e308b488877945d48484f2bc_2" ;
@@ -51,7 +51,7 @@ digraph cfg {
 "get<void>#8296845500290212976.bb4a1c12bef114b00039399debc79878_2" [label="2: Exit get<void> \n  " color=yellow style=filled]
 	
 
-"get<void>#8296845500290212976.bb4a1c12bef114b00039399debc79878_3" [label="3:  Return Stmt \n   *&return:void=0 [line 12, column 3]\n  APPLY_ABSTRACTION; [line 12, column 3]\n " shape="box"]
+"get<void>#8296845500290212976.bb4a1c12bef114b00039399debc79878_3" [label="3:  Return Stmt \n   *&return:void=0 [line 12, column 3]\n " shape="box"]
 	
 
 	 "get<void>#8296845500290212976.bb4a1c12bef114b00039399debc79878_3" -> "get<void>#8296845500290212976.bb4a1c12bef114b00039399debc79878_2" ;
@@ -62,27 +62,27 @@ digraph cfg {
 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(f2:float); [line 21, column 3]\n  *&f2:float=0. [line 21, column 3]\n  NULLIFY(&f2); [line 21, column 3]\n  EXIT_SCOPE(f2); [line 21, column 3]\n  APPLY_ABSTRACTION; [line 21, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(f2:float); [line 21, column 3]\n  *&f2:float=0. [line 21, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 20, column 3]\n  n$0=_fun_get<ENUM>() [line 20, column 12]\n  *&x:int=n$0 [line 20, column 3]\n  NULLIFY(&x); [line 20, column 3]\n  EXIT_SCOPE(n$0,x); [line 20, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 20, column 3]\n  n$0=_fun_get<ENUM>() [line 20, column 12]\n  *&x:int=n$0 [line 20, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  Call _fun_get<void> \n   n$1=_fun_get<void>() [line 19, column 3]\n  EXIT_SCOPE(n$1); [line 19, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  Call _fun_get<void> \n   n$1=_fun_get<void>() [line 19, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(fp:float*); [line 18, column 3]\n  n$2=_fun_get<float_*>() [line 18, column 15]\n  *&fp:float*=n$2 [line 18, column 3]\n  NULLIFY(&fp); [line 18, column 3]\n  EXIT_SCOPE(n$2,fp); [line 18, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(fp:float*); [line 18, column 3]\n  n$2=_fun_get<float_*>() [line 18, column 15]\n  *&fp:float*=n$2 [line 18, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(f:float); [line 17, column 3]\n  n$3=_fun_get<float>() [line 17, column 13]\n  *&f:float=n$3 [line 17, column 3]\n  NULLIFY(&f); [line 17, column 3]\n  EXIT_SCOPE(n$3,f); [line 17, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" [label="7:  DeclStmt \n   VARIABLE_DECLARED(f:float); [line 17, column 3]\n  n$3=_fun_get<float>() [line 17, column 13]\n  *&f:float=n$3 [line 17, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 16, column 3]\n  n$4=_fun_get<int>() [line 16, column 11]\n  *&i:int=n$4 [line 16, column 3]\n  NULLIFY(&i); [line 16, column 3]\n  EXIT_SCOPE(n$4,i); [line 16, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" [label="8:  DeclStmt \n   VARIABLE_DECLARED(i:int); [line 16, column 3]\n  n$4=_fun_get<int>() [line 16, column 11]\n  *&i:int=n$4 [line 16, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_2" [label="2: Exit foo \n  " color=yellow style=filled]
 	
 
-"foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_3" [label="3:  Return Stmt \n   n$0=_fun_operator\"\"_literal(0:unsigned long long) [line 10, column 20]\n  *&return:int=n$0 [line 10, column 13]\n  EXIT_SCOPE(n$0); [line 10, column 13]\n  APPLY_ABSTRACTION; [line 10, column 13]\n " shape="box"]
+"foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_3" [label="3:  Return Stmt \n   n$0=_fun_operator\"\"_literal(0:unsigned long long) [line 10, column 20]\n  *&return:int=n$0 [line 10, column 13]\n " shape="box"]
 	
 
 	 "foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_3" -> "foo#972162870672026475.86d7db357d6a36081d09067fb38ce85e_2" ;
@@ -18,7 +18,7 @@ digraph cfg {
 "operator\"\"_literal#10799417371478119160.892e3238d686eb1d16193b2534a5f062_2" [label="2: Exit operator\"\"_literal \n  " color=yellow style=filled]
 	
 
-"operator\"\"_literal#10799417371478119160.892e3238d686eb1d16193b2534a5f062_3" [label="3:  Return Stmt \n   n$0=*&i:unsigned long long [line 8, column 56]\n  *&return:int=n$0 [line 8, column 49]\n  NULLIFY(&i); [line 8, column 49]\n  EXIT_SCOPE(n$0,i); [line 8, column 49]\n  APPLY_ABSTRACTION; [line 8, column 49]\n " shape="box"]
+"operator\"\"_literal#10799417371478119160.892e3238d686eb1d16193b2534a5f062_3" [label="3:  Return Stmt \n   n$0=*&i:unsigned long long [line 8, column 56]\n  *&return:int=n$0 [line 8, column 49]\n " shape="box"]
 	
 
 	 "operator\"\"_literal#10799417371478119160.892e3238d686eb1d16193b2534a5f062_3" -> "operator\"\"_literal#10799417371478119160.892e3238d686eb1d16193b2534a5f062_2" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_2" [label="2: Exit test1 \n  " color=yellow style=filled]
 	
 
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 20, column 10]\n  *&return:int=n$0 [line 20, column 3]\n  NULLIFY(&x); [line 20, column 3]\n  EXIT_SCOPE(n$0,x); [line 20, column 3]\n  APPLY_ABSTRACTION; [line 20, column 3]\n " shape="box"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 20, column 10]\n  *&return:int=n$0 [line 20, column 3]\n " shape="box"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_3" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_2" ;
@@ -15,15 +15,15 @@ digraph cfg {
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_4" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_13" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_5" [label="5: Prune (true branch, do while) \n   n$1=*&b:_Bool [line 19, column 12]\n  PRUNE(n$1, true); [line 19, column 12]\n  EXIT_SCOPE(n$1); [line 19, column 12]\n  APPLY_ABSTRACTION; [line 19, column 12]\n " shape="invhouse"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_5" [label="5: Prune (true branch, do while) \n   n$1=*&b:_Bool [line 19, column 12]\n  PRUNE(n$1, true); [line 19, column 12]\n " shape="invhouse"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_5" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_4" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_6" [label="6: Prune (false branch, do while) \n   n$1=*&b:_Bool [line 19, column 12]\n  PRUNE(!n$1, false); [line 19, column 12]\n  NULLIFY(&b); [line 19, column 12]\n  EXIT_SCOPE(n$1,b); [line 19, column 12]\n " shape="invhouse"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_6" [label="6: Prune (false branch, do while) \n   n$1=*&b:_Bool [line 19, column 12]\n  PRUNE(!n$1, false); [line 19, column 12]\n " shape="invhouse"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_6" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_3" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_7" [label="7:  BinaryOperatorStmt: Assign \n   n$2=*&x:int [line 18, column 9]\n  *&x:int=(n$2 + 4) [line 18, column 5]\n  EXIT_SCOPE(n$2); [line 18, column 5]\n " shape="box"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_7" [label="7:  BinaryOperatorStmt: Assign \n   n$2=*&x:int [line 18, column 9]\n  *&x:int=(n$2 + 4) [line 18, column 5]\n " shape="box"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_7" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_5" ;
@@ -32,29 +32,29 @@ digraph cfg {
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_8" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_7" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_9" [label="9: Prune (true branch, if) \n   n$3=*&a:_Bool [line 12, column 9]\n  PRUNE(n$3, true); [line 12, column 9]\n  EXIT_SCOPE(n$3); [line 12, column 9]\n " shape="invhouse"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_9" [label="9: Prune (true branch, if) \n   n$3=*&a:_Bool [line 12, column 9]\n  PRUNE(n$3, true); [line 12, column 9]\n " shape="invhouse"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_9" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_11" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_10" [label="10: Prune (false branch, if) \n   n$3=*&a:_Bool [line 12, column 9]\n  PRUNE(!n$3, false); [line 12, column 9]\n  EXIT_SCOPE(n$3); [line 12, column 9]\n " shape="invhouse"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_10" [label="10: Prune (false branch, if) \n   n$3=*&a:_Bool [line 12, column 9]\n  PRUNE(!n$3, false); [line 12, column 9]\n " shape="invhouse"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_10" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_12" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_11" [label="11:  BinaryOperatorStmt: Assign \n   n$5=*&x:int [line 13, column 11]\n  *&x:int=(n$5 + 2) [line 13, column 7]\n  EXIT_SCOPE(n$5); [line 13, column 7]\n " shape="box"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_11" [label="11:  BinaryOperatorStmt: Assign \n   n$5=*&x:int [line 13, column 11]\n  *&x:int=(n$5 + 2) [line 13, column 7]\n " shape="box"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_11" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_5" ;
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_11" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_6" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_12" [label="12:  BinaryOperatorStmt: Assign \n   n$6=*&x:int [line 16, column 11]\n  *&x:int=(n$6 + 3) [line 16, column 7]\n  EXIT_SCOPE(n$6); [line 16, column 7]\n " shape="box"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_12" [label="12:  BinaryOperatorStmt: Assign \n   n$6=*&x:int [line 16, column 11]\n  *&x:int=(n$6 + 3) [line 16, column 7]\n " shape="box"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_12" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_8" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_13" [label="13:  BinaryOperatorStmt: Assign \n   n$8=*&x:int [line 11, column 9]\n  *&x:int=(n$8 + 1) [line 11, column 5]\n  EXIT_SCOPE(n$8); [line 11, column 5]\n " shape="box"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_13" [label="13:  BinaryOperatorStmt: Assign \n   n$8=*&x:int [line 11, column 9]\n  *&x:int=(n$8 + 1) [line 11, column 5]\n " shape="box"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_13" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_9" ;
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_13" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_10" ;
-"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 9, column 3]\n  *&x:int=0 [line 9, column 3]\n  APPLY_ABSTRACTION; [line 9, column 3]\n " shape="box"]
+"test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(x:int); [line 9, column 3]\n  *&x:int=0 [line 9, column 3]\n " shape="box"]
 	
 
 	 "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_14" -> "test1#18336337528475129646.aabe036d545fef7e4b4a130ea21a585c_4" ;

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

@@ -11,28 +11,28 @@ digraph cfg {
 	
 
 	 "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_3" -> "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_9" ;
-"operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_4" [label="4:  BinaryOperatorStmt: NE \n   n$1=*&i1:iterator& [line 19, column 52]\n  n$2=*n$1.val:int [line 19, column 52]\n  n$3=*&i2:iterator& [line 19, column 62]\n  n$4=*n$3.val:int [line 19, column 62]\n  NULLIFY(&i1); [line 19, column 62]\n  NULLIFY(&i2); [line 19, column 62]\n  EXIT_SCOPE(n$1,n$3,i1,i2); [line 19, column 62]\n " shape="box"]
+"operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_4" [label="4:  BinaryOperatorStmt: NE \n   n$1=*&i1:iterator& [line 19, column 52]\n  n$2=*n$1.val:int [line 19, column 52]\n  n$3=*&i2:iterator& [line 19, column 62]\n  n$4=*n$3.val:int [line 19, column 62]\n " shape="box"]
 	
 
 	 "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_4" -> "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_5" ;
 	 "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_4" -> "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_6" ;
-"operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_5" [label="5: Prune (true branch, boolean exp) \n   PRUNE((n$2 != n$4), true); [line 19, column 52]\n  EXIT_SCOPE(n$2,n$4); [line 19, column 52]\n " shape="invhouse"]
+"operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_5" [label="5: Prune (true branch, boolean exp) \n   PRUNE((n$2 != n$4), true); [line 19, column 52]\n " shape="invhouse"]
 	
 
 	 "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_5" -> "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_7" ;
-"operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_6" [label="6: Prune (false branch, boolean exp) \n   PRUNE(!(n$2 != n$4), false); [line 19, column 52]\n  EXIT_SCOPE(n$2,n$4); [line 19, column 52]\n " shape="invhouse"]
+"operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_6" [label="6: Prune (false branch, boolean exp) \n   PRUNE(!(n$2 != n$4), false); [line 19, column 52]\n " shape="invhouse"]
 	
 
 	 "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_6" -> "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_8" ;
-"operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=1 [line 19, column 52]\n  APPLY_ABSTRACTION; [line 19, column 52]\n " shape="box"]
+"operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_7" [label="7:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=1 [line 19, column 52]\n " shape="box"]
 	
 
 	 "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_7" -> "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_3" ;
-"operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=0 [line 19, column 52]\n  APPLY_ABSTRACTION; [line 19, column 52]\n " shape="box"]
+"operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_8" [label="8:  ConditionalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool=0 [line 19, column 52]\n " shape="box"]
 	
 
 	 "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_8" -> "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_3" ;
-"operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_9" [label="9:  Return Stmt \n   n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool [line 19, column 52]\n  *&return:_Bool=n$5 [line 19, column 45]\n  NULLIFY(&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 19, column 45]\n  EXIT_SCOPE(n$5,0$?%__sil_tmpSIL_temp_conditional___n$0); [line 19, column 45]\n  APPLY_ABSTRACTION; [line 19, column 45]\n " shape="box"]
+"operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_9" [label="9:  Return Stmt \n   n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool [line 19, column 52]\n  *&return:_Bool=n$5 [line 19, column 45]\n " shape="box"]
 	
 
 	 "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_9" -> "operator!=#4715710375716659667.eb4126b3edd381f3092a9e38275754d4_2" ;
@@ -40,10 +40,10 @@ digraph cfg {
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_1" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_14" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n   NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$14); [line 38, column 1]\n  NULLIFY(&__end1); [line 38, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_construct_n$27); [line 38, column 1]\n  NULLIFY(&__begin1); [line 38, column 1]\n  NULLIFY(&0$?%__sil_tmpSIL_materialize_temp__n$5); [line 38, column 1]\n  NULLIFY(&vector); [line 38, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_construct_n$29); [line 38, column 1]\n  NULLIFY(&0$?%__sil_tmp__temp_return_n$25); [line 38, column 1]\n " color=yellow style=filled]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Destruction(Scope) \n   _=*&__end1:iterator [line 37, column 3]\n  n$1=_fun_iterator::~iterator(&__end1:iterator*) injected [line 37, column 3]\n  _=*&__begin1:iterator [line 37, column 3]\n  n$3=_fun_iterator::~iterator(&__begin1:iterator*) injected [line 37, column 3]\n  EXIT_SCOPE(_,_,n$1,n$3,__begin1,__end1); [line 37, column 3]\n  APPLY_ABSTRACTION; [line 37, column 3]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Destruction(Scope) \n   _=*&__end1:iterator [line 37, column 3]\n  n$1=_fun_iterator::~iterator(&__end1:iterator*) injected [line 37, column 3]\n  _=*&__begin1:iterator [line 37, column 3]\n  n$3=_fun_iterator::~iterator(&__begin1:iterator*) injected [line 37, column 3]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
@@ -51,44 +51,44 @@ digraph cfg {
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(__end1:iterator); [line 35, column 18]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$5:iterator); [line 35, column 18]\n  n$9=*&__range1:vec& [line 35, column 18]\n  _=*n$9:vec [line 35, column 18]\n  n$12=_fun_vec::end(n$9:vec&,&0$?%__sil_tmpSIL_materialize_temp__n$5:iterator*) assign_last [line 35, column 18]\n  n$13=_fun_iterator::iterator(&__end1:iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$5:iterator&) [line 35, column 18]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$5:iterator [line 35, column 18]\n  n$7=_fun_iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$5:iterator*) injected [line 35, column 18]\n  NULLIFY(&__range1); [line 35, column 18]\n  EXIT_SCOPE(_,_,n$7,n$9,n$12,n$13,0$?%__sil_tmpSIL_materialize_temp__n$5,__range1); [line 35, column 18]\n  APPLY_ABSTRACTION; [line 35, column 18]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(__end1:iterator); [line 35, column 18]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$5:iterator); [line 35, column 18]\n  n$9=*&__range1:vec& [line 35, column 18]\n  _=*n$9:vec [line 35, column 18]\n  n$12=_fun_vec::end(n$9:vec&,&0$?%__sil_tmpSIL_materialize_temp__n$5:iterator*) assign_last [line 35, column 18]\n  n$13=_fun_iterator::iterator(&__end1:iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$5:iterator&) [line 35, column 18]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$5:iterator [line 35, column 18]\n  n$7=_fun_iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$5:iterator*) injected [line 35, column 18]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(__begin1:iterator); [line 35, column 18]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$14:iterator); [line 35, column 18]\n  n$18=*&__range1:vec& [line 35, column 18]\n  _=*n$18:vec [line 35, column 18]\n  n$21=_fun_vec::begin(n$18:vec&,&0$?%__sil_tmpSIL_materialize_temp__n$14:iterator*) assign_last [line 35, column 18]\n  n$22=_fun_iterator::iterator(&__begin1:iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$14:iterator&) [line 35, column 18]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$14:iterator [line 35, column 18]\n  n$16=_fun_iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$14:iterator*) injected [line 35, column 18]\n  EXIT_SCOPE(_,_,n$16,n$18,n$21,n$22,0$?%__sil_tmpSIL_materialize_temp__n$14); [line 35, column 18]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" [label="6:  DeclStmt \n   VARIABLE_DECLARED(__begin1:iterator); [line 35, column 18]\n  VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$14:iterator); [line 35, column 18]\n  n$18=*&__range1:vec& [line 35, column 18]\n  _=*n$18:vec [line 35, column 18]\n  n$21=_fun_vec::begin(n$18:vec&,&0$?%__sil_tmpSIL_materialize_temp__n$14:iterator*) assign_last [line 35, column 18]\n  n$22=_fun_iterator::iterator(&__begin1:iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$14:iterator&) [line 35, column 18]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$14:iterator [line 35, column 18]\n  n$16=_fun_iterator::~iterator(&0$?%__sil_tmpSIL_materialize_temp__n$14:iterator*) injected [line 35, column 18]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_5" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" [label="7:  Call _fun_iterator::operator++ \n   n$26=_fun_iterator::operator++(&__begin1:iterator&,&0$?%__sil_tmp__temp_return_n$25:iterator*) assign_last [line 35, column 18]\n  EXIT_SCOPE(n$26,0$?%__sil_tmp__temp_return_n$25); [line 35, column 18]\n  APPLY_ABSTRACTION; [line 35, column 18]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" [label="7:  Call _fun_iterator::operator++ \n   n$26=_fun_iterator::operator++(&__begin1:iterator&,&0$?%__sil_tmp__temp_return_n$25:iterator*) assign_last [line 35, column 18]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_4" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" [label="8:  Call _fun_operator!= \n   n$28=_fun_iterator::iterator(&0$?%__sil_tmp__temp_construct_n$27:iterator*,&__begin1:iterator&) [line 35, column 18]\n  n$30=_fun_iterator::iterator(&0$?%__sil_tmp__temp_construct_n$29:iterator*,&__end1:iterator&) [line 35, column 18]\n  n$31=_fun_operator!=(&0$?%__sil_tmp__temp_construct_n$27:iterator,&0$?%__sil_tmp__temp_construct_n$29:iterator) [line 35, column 18]\n  EXIT_SCOPE(n$28,n$30); [line 35, column 18]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" [label="8:  Call _fun_operator!= \n   n$28=_fun_iterator::iterator(&0$?%__sil_tmp__temp_construct_n$27:iterator*,&__begin1:iterator&) [line 35, column 18]\n  n$30=_fun_iterator::iterator(&0$?%__sil_tmp__temp_construct_n$29:iterator*,&__end1:iterator&) [line 35, column 18]\n  n$31=_fun_operator!=(&0$?%__sil_tmp__temp_construct_n$27:iterator,&0$?%__sil_tmp__temp_construct_n$29:iterator) [line 35, column 18]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_9" ;
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_8" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_10" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_9" [label="9: Prune (true branch, for loop) \n   PRUNE(n$31, true); [line 35, column 18]\n  EXIT_SCOPE(n$31); [line 35, column 18]\n " shape="invhouse"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_9" [label="9: Prune (true branch, for loop) \n   PRUNE(n$31, true); [line 35, column 18]\n " shape="invhouse"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_9" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_12" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_10" [label="10: Prune (false branch, for loop) \n   PRUNE(!n$31, false); [line 35, column 18]\n  EXIT_SCOPE(n$31); [line 35, column 18]\n " shape="invhouse"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_10" [label="10: Prune (false branch, for loop) \n   PRUNE(!n$31, false); [line 35, column 18]\n " shape="invhouse"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_10" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(temp:int); [line 36, column 5]\n  n$32=*&value:int [line 36, column 16]\n  n$33=*&value:int [line 36, column 24]\n  *&temp:int=((n$32 * n$33) + 10) [line 36, column 5]\n  NULLIFY(&value); [line 36, column 5]\n  NULLIFY(&temp); [line 36, column 5]\n  EXIT_SCOPE(n$32,n$33,value,temp); [line 36, column 5]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_11" [label="11:  DeclStmt \n   VARIABLE_DECLARED(temp:int); [line 36, column 5]\n  n$32=*&value:int [line 36, column 16]\n  n$33=*&value:int [line 36, column 24]\n  *&temp:int=((n$32 * n$33) + 10) [line 36, column 5]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_11" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_7" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(value:int); [line 35, column 8]\n  n$35=_fun_iterator::operator*(&__begin1:iterator&) [line 35, column 18]\n  *&value:int=n$35 [line 35, column 8]\n  EXIT_SCOPE(n$35); [line 35, column 8]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_12" [label="12:  DeclStmt \n   VARIABLE_DECLARED(value:int); [line 35, column 8]\n  n$35=_fun_iterator::operator*(&__begin1:iterator&) [line 35, column 18]\n  *&value:int=n$35 [line 35, column 8]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_12" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_11" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(__range1:vec&); [line 35, column 20]\n  *&__range1:vec&=&vector [line 35, column 20]\n  EXIT_SCOPE(vector); [line 35, column 20]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_13" [label="13:  DeclStmt \n   VARIABLE_DECLARED(__range1:vec&); [line 35, column 20]\n  *&__range1:vec&=&vector [line 35, column 20]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_13" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_6" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(vector:vec); [line 34, column 3]\n  n$37=_fun_vec::vec(&vector:vec*,10:int) [line 34, column 7]\n  EXIT_SCOPE(n$37); [line 34, column 7]\n " shape="box"]
+"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_14" [label="14:  DeclStmt \n   VARIABLE_DECLARED(vector:vec); [line 34, column 3]\n  n$37=_fun_vec::vec(&vector:vec*,10:int) [line 34, column 7]\n " shape="box"]
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_14" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_13" ;
@@ -99,11 +99,11 @@ digraph cfg {
 "operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_2" [label="2: Exit iterator::operator++ \n  " color=yellow style=filled]
 	
 
-"operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_3" [label="3:  Return Stmt \n   n$0=*&__return_param:iterator* [line 13, column 5]\n  n$1=*&this:iterator* [line 13, column 13]\n  n$2=_fun_iterator::iterator(n$0:iterator*,n$1:iterator&) [line 13, column 12]\n  NULLIFY(&__return_param); [line 13, column 12]\n  NULLIFY(&this); [line 13, column 12]\n  EXIT_SCOPE(n$0,n$1,n$2,__return_param,this); [line 13, column 12]\n  APPLY_ABSTRACTION; [line 13, column 12]\n " shape="box"]
+"operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_3" [label="3:  Return Stmt \n   n$0=*&__return_param:iterator* [line 13, column 5]\n  n$1=*&this:iterator* [line 13, column 13]\n  n$2=_fun_iterator::iterator(n$0:iterator*,n$1:iterator&) [line 13, column 12]\n " shape="box"]
 	
 
 	 "operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_3" -> "operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_2" ;
-"operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_4" [label="4:  BinaryOperatorStmt: AddAssign \n   n$3=*&this:iterator* [line 12, column 5]\n  n$4=*n$3.val:int [line 12, column 5]\n  *n$3.val:int=(n$4 + 1) [line 12, column 5]\n  EXIT_SCOPE(n$3,n$4); [line 12, column 5]\n " shape="box"]
+"operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_4" [label="4:  BinaryOperatorStmt: AddAssign \n   n$3=*&this:iterator* [line 12, column 5]\n  n$4=*n$3.val:int [line 12, column 5]\n  *n$3.val:int=(n$4 + 1) [line 12, column 5]\n " shape="box"]
 	
 
 	 "operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_4" -> "operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_3" ;
@@ -114,7 +114,7 @@ digraph cfg {
 "operator*#iterator#(14296957122470685412).e3f593369544fc43a253ad1e4f5ed136_2" [label="2: Exit iterator::operator* \n  " color=yellow style=filled]
 	
 
-"operator*#iterator#(14296957122470685412).e3f593369544fc43a253ad1e4f5ed136_3" [label="3:  Return Stmt \n   n$0=*&this:iterator* [line 16, column 12]\n  n$1=*n$0.val:int [line 16, column 12]\n  *&return:int=n$1 [line 16, column 5]\n  NULLIFY(&this); [line 16, column 5]\n  EXIT_SCOPE(n$0,n$1,this); [line 16, column 5]\n  APPLY_ABSTRACTION; [line 16, column 5]\n " shape="box"]
+"operator*#iterator#(14296957122470685412).e3f593369544fc43a253ad1e4f5ed136_3" [label="3:  Return Stmt \n   n$0=*&this:iterator* [line 16, column 12]\n  n$1=*n$0.val:int [line 16, column 12]\n  *&return:int=n$1 [line 16, column 5]\n " shape="box"]
 	
 
 	 "operator*#iterator#(14296957122470685412).e3f593369544fc43a253ad1e4f5ed136_3" -> "operator*#iterator#(14296957122470685412).e3f593369544fc43a253ad1e4f5ed136_2" ;
@@ -125,7 +125,7 @@ digraph cfg {
 "iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_2" [label="2: Exit iterator::iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_3" [label="3:  Constructor Init \n   n$1=*&this:iterator* [line 9, column 8]\n  n$2=*&__param_0:iterator const & [line 9, column 8]\n  n$3=*n$2.val:int [line 9, column 8]\n  *n$1.val:int=n$3 [line 9, column 8]\n  NULLIFY(&this); [line 9, column 8]\n  NULLIFY(&__param_0); [line 9, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 9, column 8]\n  APPLY_ABSTRACTION; [line 9, column 8]\n " shape="box"]
+"iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_3" [label="3:  Constructor Init \n   n$1=*&this:iterator* [line 9, column 8]\n  n$2=*&__param_0:iterator const & [line 9, column 8]\n  n$3=*n$2.val:int [line 9, column 8]\n  *n$1.val:int=n$3 [line 9, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_3" -> "iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_2" ;
@@ -143,7 +143,7 @@ digraph cfg {
 "iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_2" [label="2: Exit iterator::iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_3" [label="3:  Constructor Init \n   n$1=*&this:iterator* [line 9, column 8]\n  n$2=*&__param_0:iterator& [line 9, column 8]\n  n$3=*n$2.val:int [line 9, column 8]\n  *n$1.val:int=n$3 [line 9, column 8]\n  NULLIFY(&this); [line 9, column 8]\n  NULLIFY(&__param_0); [line 9, column 8]\n  EXIT_SCOPE(n$1,n$2,n$3,this,__param_0); [line 9, column 8]\n  APPLY_ABSTRACTION; [line 9, column 8]\n " shape="box"]
+"iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_3" [label="3:  Constructor Init \n   n$1=*&this:iterator* [line 9, column 8]\n  n$2=*&__param_0:iterator& [line 9, column 8]\n  n$3=*n$2.val:int [line 9, column 8]\n  *n$1.val:int=n$3 [line 9, column 8]\n " shape="box"]
 	
 
 	 "iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_3" -> "iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_2" ;
@@ -154,7 +154,7 @@ digraph cfg {
 "end#vec(class iterator)#(14240882620331653738).aed9da65654959634fd17d4511cfa44d_2" [label="2: Exit vec::end \n  " color=yellow style=filled]
 	
 
-"end#vec(class iterator)#(14240882620331653738).aed9da65654959634fd17d4511cfa44d_3" [label="3:  Return Stmt \n   n$0=*&__return_param:iterator* [line 27, column 20]\n  n$1=*&this:vec* [line 27, column 27]\n  n$2=_fun_iterator::iterator(n$0:iterator*,n$1.end_:iterator&) [line 27, column 27]\n  NULLIFY(&__return_param); [line 27, column 27]\n  NULLIFY(&this); [line 27, column 27]\n  EXIT_SCOPE(n$0,n$1,n$2,__return_param,this); [line 27, column 27]\n  APPLY_ABSTRACTION; [line 27, column 27]\n " shape="box"]
+"end#vec(class iterator)#(14240882620331653738).aed9da65654959634fd17d4511cfa44d_3" [label="3:  Return Stmt \n   n$0=*&__return_param:iterator* [line 27, column 20]\n  n$1=*&this:vec* [line 27, column 27]\n  n$2=_fun_iterator::iterator(n$0:iterator*,n$1.end_:iterator&) [line 27, column 27]\n " shape="box"]
 	
 
 	 "end#vec(class iterator)#(14240882620331653738).aed9da65654959634fd17d4511cfa44d_3" -> "end#vec(class iterator)#(14240882620331653738).aed9da65654959634fd17d4511cfa44d_2" ;
@@ -165,7 +165,7 @@ digraph cfg {
 "begin#vec(class iterator)#(1866137161906470488).407edea568a869b61c9e5e8424e0b5f7_2" [label="2: Exit vec::begin \n  " color=yellow style=filled]
 	
 
-"begin#vec(class iterator)#(1866137161906470488).407edea568a869b61c9e5e8424e0b5f7_3" [label="3:  Return Stmt \n   n$0=*&__return_param:iterator* [line 26, column 22]\n  n$1=*&this:vec* [line 26, column 29]\n  n$2=_fun_iterator::iterator(n$0:iterator*,n$1.begin_:iterator&) [line 26, column 29]\n  NULLIFY(&__return_param); [line 26, column 29]\n  NULLIFY(&this); [line 26, column 29]\n  EXIT_SCOPE(n$0,n$1,n$2,__return_param,this); [line 26, column 29]\n  APPLY_ABSTRACTION; [line 26, column 29]\n " shape="box"]
+"begin#vec(class iterator)#(1866137161906470488).407edea568a869b61c9e5e8424e0b5f7_3" [label="3:  Return Stmt \n   n$0=*&__return_param:iterator* [line 26, column 22]\n  n$1=*&this:vec* [line 26, column 29]\n  n$2=_fun_iterator::iterator(n$0:iterator*,n$1.begin_:iterator&) [line 26, column 29]\n " shape="box"]
 	
 
 	 "begin#vec(class iterator)#(1866137161906470488).407edea568a869b61c9e5e8424e0b5f7_3" -> "begin#vec(class iterator)#(1866137161906470488).407edea568a869b61c9e5e8424e0b5f7_2" ;
@@ -176,19 +176,19 @@ digraph cfg {
 "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_2" [label="2: Exit vec::vec \n  " color=yellow style=filled]
 	
 
-"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:vec* [line 24, column 5]\n  n$1=*&size:int [line 24, column 16]\n  *n$0.end_.val:int=n$1 [line 24, column 5]\n  NULLIFY(&size); [line 24, column 5]\n  NULLIFY(&this); [line 24, column 5]\n  EXIT_SCOPE(n$0,n$1,size,this); [line 24, column 5]\n  APPLY_ABSTRACTION; [line 24, column 5]\n " shape="box"]
+"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:vec* [line 24, column 5]\n  n$1=*&size:int [line 24, column 16]\n  *n$0.end_.val:int=n$1 [line 24, column 5]\n " shape="box"]
 	
 
 	 "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_3" -> "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_2" ;
-"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:vec* [line 23, column 5]\n  *n$2.begin_.val:int=0 [line 23, column 5]\n  EXIT_SCOPE(n$2); [line 23, column 5]\n " shape="box"]
+"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:vec* [line 23, column 5]\n  *n$2.begin_.val:int=0 [line 23, column 5]\n " shape="box"]
 	
 
 	 "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_4" -> "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_3" ;
-"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_5" [label="5:  Constructor Init \n   n$3=*&this:vec* [line 22, column 3]\n  n$4=_fun_iterator::iterator(n$3.end_:iterator*) [line 22, column 3]\n  EXIT_SCOPE(n$3,n$4); [line 22, column 3]\n " shape="box"]
+"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_5" [label="5:  Constructor Init \n   n$3=*&this:vec* [line 22, column 3]\n  n$4=_fun_iterator::iterator(n$3.end_:iterator*) [line 22, column 3]\n " shape="box"]
 	
 
 	 "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_5" -> "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_4" ;
-"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_6" [label="6:  Constructor Init \n   n$5=*&this:vec* [line 22, column 3]\n  n$6=_fun_iterator::iterator(n$5.begin_:iterator*) [line 22, column 3]\n  EXIT_SCOPE(n$5,n$6); [line 22, column 3]\n " shape="box"]
+"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_6" [label="6:  Constructor Init \n   n$5=*&this:vec* [line 22, column 3]\n  n$6=_fun_iterator::iterator(n$5.begin_:iterator*) [line 22, column 3]\n " shape="box"]
 	
 
 	 "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_6" -> "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_5" ;

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

@@ -7,7 +7,7 @@ digraph cfg {
 "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_2" [label="2: Exit foo \n  " color=yellow style=filled]
 	
 
-"foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_3" [label="3:  Return Stmt \n   *&return:int=52 [line 12, column 3]\n  APPLY_ABSTRACTION; [line 12, column 3]\n " shape="box"]
+"foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_3" [label="3:  Return Stmt \n   *&return:int=52 [line 12, column 3]\n " shape="box"]
 	
 
 	 "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_3" -> "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_2" ;
@@ -15,20 +15,20 @@ digraph cfg {
 	
 
 	 "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_4" -> "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_3" ;
-"foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_5" [label="5:  BinaryOperatorStmt: Assign \n   n$0=*&p:int* [line 9, column 9]\n  *n$0:int=0 [line 9, column 8]\n  NULLIFY(&p); [line 9, column 8]\n  EXIT_SCOPE(p); [line 9, column 8]\n " shape="box"]
+"foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_5" [label="5:  BinaryOperatorStmt: Assign \n   n$0=*&p:int* [line 9, column 9]\n  *n$0:int=0 [line 9, column 8]\n " shape="box"]
 	
 
 	 "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_5" -> "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_6" ;
 	 "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_5" -> "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_7" ;
-"foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_6" [label="6: Prune (true branch, if) \n   n$1=*n$0:int [line 9, column 7]\n  PRUNE(n$1, true); [line 9, column 7]\n  EXIT_SCOPE(n$0,n$1); [line 9, column 7]\n " shape="invhouse"]
+"foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_6" [label="6: Prune (true branch, if) \n   n$1=*n$0:int [line 9, column 7]\n  PRUNE(n$1, true); [line 9, column 7]\n " shape="invhouse"]
 	
 
 	 "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_6" -> "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_8" ;
-"foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_7" [label="7: Prune (false branch, if) \n   n$1=*n$0:int [line 9, column 7]\n  PRUNE(!n$1, false); [line 9, column 7]\n  EXIT_SCOPE(n$0,n$1); [line 9, column 7]\n " shape="invhouse"]
+"foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_7" [label="7: Prune (false branch, if) \n   n$1=*n$0:int [line 9, column 7]\n  PRUNE(!n$1, false); [line 9, column 7]\n " shape="invhouse"]
 	
 
 	 "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_7" -> "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_4" ;
-"foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_8" [label="8:  Return Stmt \n   *&return:int=32 [line 10, column 5]\n  APPLY_ABSTRACTION; [line 10, column 5]\n " shape="box"]
+"foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_8" [label="8:  Return Stmt \n   *&return:int=32 [line 10, column 5]\n " shape="box"]
 	
 
 	 "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_8" -> "foo#2836494104225061820.259bb50e98efa97b98306a2c09f474f8_2" ;

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

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

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   VARIABLE_DECLARED(#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); [line 23, column 3]\n  APPLY_ABSTRACTION; [line 23, column 3]\n " shape="box"]
+"__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" [label="3:  DeclStmt \n   VARIABLE_DECLARED(#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 " shape="box"]
 	
 
 	 "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" -> "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_2" ;
@@ -18,15 +18,15 @@ digraph cfg {
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 33, column 3]\n  APPLY_ABSTRACTION; [line 33, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 33, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$x:anonymous_struct_nestedoperators_union.cpp:8:1* [line 32, column 11]\n  n$1=*n$0.b:int [line 32, column 11]\n  *&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.g.w:int=n$1 [line 32, column 3]\n  EXIT_SCOPE(n$0,n$1); [line 32, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$x:anonymous_struct_nestedoperators_union.cpp:8:1* [line 32, column 11]\n  n$1=*n$0.b:int [line 32, column 11]\n  *&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.g.w:int=n$1 [line 32, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.f:int [line 30, column 11]\n  *&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.g.u:int=n$2 [line 30, column 3]\n  EXIT_SCOPE(n$2); [line 30, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.f:int [line 30, column 11]\n  *&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.g.u:int=n$2 [line 30, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -34,7 +34,7 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   n$3=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$x:anonymous_struct_nestedoperators_union.cpp:8:1* [line 28, column 3]\n  *n$3.a:int=1 [line 28, column 3]\n  EXIT_SCOPE(n$3); [line 28, column 3]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   n$3=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$x:anonymous_struct_nestedoperators_union.cpp:8:1* [line 28, column 3]\n  *n$3.a:int=1 [line 28, column 3]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;

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

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

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

@@ -14,7 +14,7 @@ digraph cfg {
 "derefFirstArg2#11387624487828646016.9777f67ce8b8da5c99a0e59eaaf6eb17_2" [label="2: Exit derefFirstArg2 \n  " color=yellow style=filled]
 	
 
-"derefFirstArg2#11387624487828646016.9777f67ce8b8da5c99a0e59eaaf6eb17_3" [label="3:  Return Stmt \n   n$0=*&b:int* [line 26, column 11]\n  n$1=*n$0:int [line 26, column 10]\n  *&return:int=n$1 [line 26, column 3]\n  NULLIFY(&b); [line 26, column 3]\n  EXIT_SCOPE(n$0,n$1,b); [line 26, column 3]\n  APPLY_ABSTRACTION; [line 26, column 3]\n " shape="box"]
+"derefFirstArg2#11387624487828646016.9777f67ce8b8da5c99a0e59eaaf6eb17_3" [label="3:  Return Stmt \n   n$0=*&b:int* [line 26, column 11]\n  n$1=*n$0:int [line 26, column 10]\n  *&return:int=n$1 [line 26, column 3]\n " shape="box"]
 	
 
 	 "derefFirstArg2#11387624487828646016.9777f67ce8b8da5c99a0e59eaaf6eb17_3" -> "derefFirstArg2#11387624487828646016.9777f67ce8b8da5c99a0e59eaaf6eb17_2" ;
@@ -25,11 +25,11 @@ digraph cfg {
 "derefFirstArg2_null_deref#13631548499595216278.23fca23ff6728e4b72a2548ecb3b1ba0_2" [label="2: Exit derefFirstArg2_null_deref \n  " color=yellow style=filled]
 	
 
-"derefFirstArg2_null_deref#13631548499595216278.23fca23ff6728e4b72a2548ecb3b1ba0_3" [label="3:  Return Stmt \n   n$0=*null:int [line 49, column 10]\n  *&return:int=n$0 [line 49, column 3]\n  EXIT_SCOPE(n$0); [line 49, column 3]\n  APPLY_ABSTRACTION; [line 49, column 3]\n " shape="box"]
+"derefFirstArg2_null_deref#13631548499595216278.23fca23ff6728e4b72a2548ecb3b1ba0_3" [label="3:  Return Stmt \n   n$0=*null:int [line 49, column 10]\n  *&return:int=n$0 [line 49, column 3]\n " shape="box"]
 	
 
 	 "derefFirstArg2_null_deref#13631548499595216278.23fca23ff6728e4b72a2548ecb3b1ba0_3" -> "derefFirstArg2_null_deref#13631548499595216278.23fca23ff6728e4b72a2548ecb3b1ba0_2" ;
-"derefFirstArg2_null_deref#13631548499595216278.23fca23ff6728e4b72a2548ecb3b1ba0_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 48, column 3]\n  *&a:int=0 [line 48, column 3]\n  NULLIFY(&a); [line 48, column 3]\n  EXIT_SCOPE(a); [line 48, column 3]\n " shape="box"]
+"derefFirstArg2_null_deref#13631548499595216278.23fca23ff6728e4b72a2548ecb3b1ba0_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 48, column 3]\n  *&a:int=0 [line 48, column 3]\n " shape="box"]
 	
 
 	 "derefFirstArg2_null_deref#13631548499595216278.23fca23ff6728e4b72a2548ecb3b1ba0_4" -> "derefFirstArg2_null_deref#13631548499595216278.23fca23ff6728e4b72a2548ecb3b1ba0_3" ;
@@ -40,7 +40,7 @@ digraph cfg {
 "derefFirstArg2_ok_deref#6873109919028202465.d57ab0b62c0ba18894b8b08d5a8f8e8a_2" [label="2: Exit derefFirstArg2_ok_deref \n  " color=yellow style=filled]
 	
 
-"derefFirstArg2_ok_deref#6873109919028202465.d57ab0b62c0ba18894b8b08d5a8f8e8a_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 54, column 10]\n  *&return:int=n$0 [line 54, column 3]\n  NULLIFY(&a); [line 54, column 3]\n  EXIT_SCOPE(n$0,a); [line 54, column 3]\n  APPLY_ABSTRACTION; [line 54, column 3]\n " shape="box"]
+"derefFirstArg2_ok_deref#6873109919028202465.d57ab0b62c0ba18894b8b08d5a8f8e8a_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 54, column 10]\n  *&return:int=n$0 [line 54, column 3]\n " shape="box"]
 	
 
 	 "derefFirstArg2_ok_deref#6873109919028202465.d57ab0b62c0ba18894b8b08d5a8f8e8a_3" -> "derefFirstArg2_ok_deref#6873109919028202465.d57ab0b62c0ba18894b8b08d5a8f8e8a_2" ;
@@ -55,7 +55,7 @@ digraph cfg {
 "derefFirstArg3#3150650678378709003.fb38cf6b9238ba2f8f6e25136f8beb95_2" [label="2: Exit derefFirstArg3 \n  " color=yellow style=filled]
 	
 
-"derefFirstArg3#3150650678378709003.fb38cf6b9238ba2f8f6e25136f8beb95_3" [label="3:  Return Stmt \n   n$0=*&b:int* [line 33, column 11]\n  n$1=*n$0:int [line 33, column 10]\n  *&return:int=n$1 [line 33, column 3]\n  NULLIFY(&b); [line 33, column 3]\n  EXIT_SCOPE(n$0,n$1,b); [line 33, column 3]\n  APPLY_ABSTRACTION; [line 33, column 3]\n " shape="box"]
+"derefFirstArg3#3150650678378709003.fb38cf6b9238ba2f8f6e25136f8beb95_3" [label="3:  Return Stmt \n   n$0=*&b:int* [line 33, column 11]\n  n$1=*n$0:int [line 33, column 10]\n  *&return:int=n$1 [line 33, column 3]\n " shape="box"]
 	
 
 	 "derefFirstArg3#3150650678378709003.fb38cf6b9238ba2f8f6e25136f8beb95_3" -> "derefFirstArg3#3150650678378709003.fb38cf6b9238ba2f8f6e25136f8beb95_2" ;
@@ -63,10 +63,10 @@ digraph cfg {
 	
 
 	 "derefFirstArg3_null_deref#3036141491555788229.605788dbf5e3c5625520098d1b5d320e_1" -> "derefFirstArg3_null_deref#3036141491555788229.605788dbf5e3c5625520098d1b5d320e_4" ;
-"derefFirstArg3_null_deref#3036141491555788229.605788dbf5e3c5625520098d1b5d320e_2" [label="2: Exit derefFirstArg3_null_deref \n   NULLIFY(&a); [line 65, column 1]\n " color=yellow style=filled]
+"derefFirstArg3_null_deref#3036141491555788229.605788dbf5e3c5625520098d1b5d320e_2" [label="2: Exit derefFirstArg3_null_deref \n  " color=yellow style=filled]
 	
 
-"derefFirstArg3_null_deref#3036141491555788229.605788dbf5e3c5625520098d1b5d320e_3" [label="3:  Return Stmt \n   n$0=_fun_derefFirstArg3(&a:int*,null:int*) [line 64, column 10]\n  *&return:int=n$0 [line 64, column 3]\n  EXIT_SCOPE(n$0,a); [line 64, column 3]\n  APPLY_ABSTRACTION; [line 64, column 3]\n " shape="box"]
+"derefFirstArg3_null_deref#3036141491555788229.605788dbf5e3c5625520098d1b5d320e_3" [label="3:  Return Stmt \n   n$0=_fun_derefFirstArg3(&a:int*,null:int*) [line 64, column 10]\n  *&return:int=n$0 [line 64, column 3]\n " shape="box"]
 	
 
 	 "derefFirstArg3_null_deref#3036141491555788229.605788dbf5e3c5625520098d1b5d320e_3" -> "derefFirstArg3_null_deref#3036141491555788229.605788dbf5e3c5625520098d1b5d320e_2" ;
@@ -78,10 +78,10 @@ digraph cfg {
 	
 
 	 "derefFirstArg3_ok_deref#12266654054137171150.c58c85ea4ba2ebfd89d0336e51301e7a_1" -> "derefFirstArg3_ok_deref#12266654054137171150.c58c85ea4ba2ebfd89d0336e51301e7a_4" ;
-"derefFirstArg3_ok_deref#12266654054137171150.c58c85ea4ba2ebfd89d0336e51301e7a_2" [label="2: Exit derefFirstArg3_ok_deref \n   NULLIFY(&a); [line 60, column 1]\n " color=yellow style=filled]
+"derefFirstArg3_ok_deref#12266654054137171150.c58c85ea4ba2ebfd89d0336e51301e7a_2" [label="2: Exit derefFirstArg3_ok_deref \n  " color=yellow style=filled]
 	
 
-"derefFirstArg3_ok_deref#12266654054137171150.c58c85ea4ba2ebfd89d0336e51301e7a_3" [label="3:  Return Stmt \n   n$0=_fun_derefFirstArg3(null:int*,&a:int*) [line 59, column 10]\n  *&return:int=n$0 [line 59, column 3]\n  EXIT_SCOPE(n$0,a); [line 59, column 3]\n  APPLY_ABSTRACTION; [line 59, column 3]\n " shape="box"]
+"derefFirstArg3_ok_deref#12266654054137171150.c58c85ea4ba2ebfd89d0336e51301e7a_3" [label="3:  Return Stmt \n   n$0=_fun_derefFirstArg3(null:int*,&a:int*) [line 59, column 10]\n  *&return:int=n$0 [line 59, column 3]\n " shape="box"]
 	
 
 	 "derefFirstArg3_ok_deref#12266654054137171150.c58c85ea4ba2ebfd89d0336e51301e7a_3" -> "derefFirstArg3_ok_deref#12266654054137171150.c58c85ea4ba2ebfd89d0336e51301e7a_2" ;
@@ -96,11 +96,11 @@ digraph cfg {
 "derefFirstArg_null_deref#14830687999166111591.325df3347d8f75d0292cfd33a485d28a_2" [label="2: Exit derefFirstArg_null_deref \n  " color=yellow style=filled]
 	
 
-"derefFirstArg_null_deref#14830687999166111591.325df3347d8f75d0292cfd33a485d28a_3" [label="3:  Return Stmt \n   n$0=*null:int [line 39, column 10]\n  *&return:int=n$0 [line 39, column 3]\n  EXIT_SCOPE(n$0); [line 39, column 3]\n  APPLY_ABSTRACTION; [line 39, column 3]\n " shape="box"]
+"derefFirstArg_null_deref#14830687999166111591.325df3347d8f75d0292cfd33a485d28a_3" [label="3:  Return Stmt \n   n$0=*null:int [line 39, column 10]\n  *&return:int=n$0 [line 39, column 3]\n " shape="box"]
 	
 
 	 "derefFirstArg_null_deref#14830687999166111591.325df3347d8f75d0292cfd33a485d28a_3" -> "derefFirstArg_null_deref#14830687999166111591.325df3347d8f75d0292cfd33a485d28a_2" ;
-"derefFirstArg_null_deref#14830687999166111591.325df3347d8f75d0292cfd33a485d28a_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 38, column 3]\n  *&a:int=0 [line 38, column 3]\n  NULLIFY(&a); [line 38, column 3]\n  EXIT_SCOPE(a); [line 38, column 3]\n " shape="box"]
+"derefFirstArg_null_deref#14830687999166111591.325df3347d8f75d0292cfd33a485d28a_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(a:int); [line 38, column 3]\n  *&a:int=0 [line 38, column 3]\n " shape="box"]
 	
 
 	 "derefFirstArg_null_deref#14830687999166111591.325df3347d8f75d0292cfd33a485d28a_4" -> "derefFirstArg_null_deref#14830687999166111591.325df3347d8f75d0292cfd33a485d28a_3" ;
@@ -111,7 +111,7 @@ digraph cfg {
 "derefFirstArg_ok_deref#70986049112502156.78efafe2cdade07d4257a7cd671e75f5_2" [label="2: Exit derefFirstArg_ok_deref \n  " color=yellow style=filled]
 	
 
-"derefFirstArg_ok_deref#70986049112502156.78efafe2cdade07d4257a7cd671e75f5_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 44, column 10]\n  *&return:int=n$0 [line 44, column 3]\n  NULLIFY(&a); [line 44, column 3]\n  EXIT_SCOPE(n$0,a); [line 44, column 3]\n  APPLY_ABSTRACTION; [line 44, column 3]\n " shape="box"]
+"derefFirstArg_ok_deref#70986049112502156.78efafe2cdade07d4257a7cd671e75f5_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 44, column 10]\n  *&return:int=n$0 [line 44, column 3]\n " shape="box"]
 	
 
 	 "derefFirstArg_ok_deref#70986049112502156.78efafe2cdade07d4257a7cd671e75f5_3" -> "derefFirstArg_ok_deref#70986049112502156.78efafe2cdade07d4257a7cd671e75f5_2" ;
@@ -123,18 +123,18 @@ digraph cfg {
 	
 
 	 "getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_1" -> "getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_5" ;
-"getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_2" [label="2: Exit getPtr_null_deref1 \n   NULLIFY(&t); [line 93, column 1]\n " color=yellow style=filled]
+"getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_2" [label="2: Exit getPtr_null_deref1 \n  " color=yellow style=filled]
 	
 
-"getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_3" [label="3:  Return Stmt \n   _=*&t:int* [line 92, column 11]\n  n$1=*&t:int* [line 92, column 11]\n  n$2=*n$1:int [line 92, column 10]\n  *&return:int=n$2 [line 92, column 3]\n  EXIT_SCOPE(_,n$1,n$2,t); [line 92, column 3]\n  APPLY_ABSTRACTION; [line 92, column 3]\n " shape="box"]
+"getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_3" [label="3:  Return Stmt \n   _=*&t:int* [line 92, column 11]\n  n$1=*&t:int* [line 92, column 11]\n  n$2=*n$1:int [line 92, column 10]\n  *&return:int=n$2 [line 92, column 3]\n " shape="box"]
 	
 
 	 "getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_3" -> "getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_2" ;
-"getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 91, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 91, column 3]\n  EXIT_SCOPE(_,n$4); [line 91, column 3]\n " shape="box"]
+"getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 91, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 91, column 3]\n " shape="box"]
 	
 
 	 "getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_4" -> "getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_3" ;
-"getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 90, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 90, column 23]\n  EXIT_SCOPE(n$5); [line 90, column 23]\n " shape="box"]
+"getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 90, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 90, column 23]\n " shape="box"]
 	
 
 	 "getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_5" -> "getPtr_null_deref1#10685326586135592861.d05a7735c36f759fec001951cdc51035_4" ;
@@ -142,18 +142,18 @@ digraph cfg {
 	
 
 	 "getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_1" -> "getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_5" ;
-"getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_2" [label="2: Exit getPtr_null_deref2 \n   NULLIFY(&t); [line 99, column 1]\n " color=yellow style=filled]
+"getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_2" [label="2: Exit getPtr_null_deref2 \n  " color=yellow style=filled]
 	
 
-"getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_3" [label="3:  Return Stmt \n   _=*&t:int* [line 98, column 11]\n  n$1=*&t:int* [line 98, column 11]\n  n$2=*n$1:int [line 98, column 10]\n  *&return:int=n$2 [line 98, column 3]\n  EXIT_SCOPE(_,n$1,n$2,t); [line 98, column 3]\n  APPLY_ABSTRACTION; [line 98, column 3]\n " shape="box"]
+"getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_3" [label="3:  Return Stmt \n   _=*&t:int* [line 98, column 11]\n  n$1=*&t:int* [line 98, column 11]\n  n$2=*n$1:int [line 98, column 10]\n  *&return:int=n$2 [line 98, column 3]\n " shape="box"]
 	
 
 	 "getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_3" -> "getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_2" ;
-"getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 97, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 97, column 3]\n  EXIT_SCOPE(_,n$4); [line 97, column 3]\n " shape="box"]
+"getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 97, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 97, column 3]\n " shape="box"]
 	
 
 	 "getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_4" -> "getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_3" ;
-"getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 96, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 96, column 23]\n  EXIT_SCOPE(n$5); [line 96, column 23]\n " shape="box"]
+"getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 96, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 96, column 23]\n " shape="box"]
 	
 
 	 "getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_5" -> "getPtr_null_deref2#10682492045158632578.de31216813faa493761802feb6f997f2_4" ;
@@ -161,18 +161,18 @@ digraph cfg {
 	
 
 	 "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_1" -> "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_6" ;
-"getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_2" [label="2: Exit getPtr_ok_deref \n   NULLIFY(&a); [line 106, column 1]\n  NULLIFY(&t); [line 106, column 1]\n " color=yellow style=filled]
+"getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_2" [label="2: Exit getPtr_ok_deref \n  " color=yellow style=filled]
 	
 
-"getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_3" [label="3:  Return Stmt \n   _=*&t:int* [line 105, column 11]\n  n$1=*&t:int* [line 105, column 11]\n  n$2=*n$1:int [line 105, column 10]\n  *&return:int=n$2 [line 105, column 3]\n  EXIT_SCOPE(_,n$1,n$2,t); [line 105, column 3]\n  APPLY_ABSTRACTION; [line 105, column 3]\n " shape="box"]
+"getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_3" [label="3:  Return Stmt \n   _=*&t:int* [line 105, column 11]\n  n$1=*&t:int* [line 105, column 11]\n  n$2=*n$1:int [line 105, column 10]\n  *&return:int=n$2 [line 105, column 3]\n " shape="box"]
 	
 
 	 "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_3" -> "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_2" ;
-"getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 104, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,&a:int*) [line 104, column 3]\n  EXIT_SCOPE(_,n$4,a); [line 104, column 3]\n " shape="box"]
+"getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 104, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,&a:int*) [line 104, column 3]\n " shape="box"]
 	
 
 	 "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_4" -> "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_3" ;
-"getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 103, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 103, column 23]\n  EXIT_SCOPE(n$5); [line 103, column 23]\n " shape="box"]
+"getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 103, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 103, column 23]\n " shape="box"]
 	
 
 	 "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_5" -> "getPtr_ok_deref#15608473391071478730.49e56fac5bd82269c2093a9c1e438200_4" ;
@@ -184,18 +184,18 @@ digraph cfg {
 	
 
 	 "getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_1" -> "getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_5" ;
-"getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_2" [label="2: Exit getRef_null_deref1 \n   NULLIFY(&t); [line 131, column 1]\n " color=yellow style=filled]
+"getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_2" [label="2: Exit getRef_null_deref1 \n  " color=yellow style=filled]
 	
 
-"getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_3" [label="3:  Return Stmt \n   _=*&t:int* [line 130, column 10]\n  n$1=*&t:int* [line 130, column 10]\n  n$2=*n$1:int [line 130, column 10]\n  *&return:int=n$2 [line 130, column 3]\n  EXIT_SCOPE(_,n$1,n$2,t); [line 130, column 3]\n  APPLY_ABSTRACTION; [line 130, column 3]\n " shape="box"]
+"getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_3" [label="3:  Return Stmt \n   _=*&t:int* [line 130, column 10]\n  n$1=*&t:int* [line 130, column 10]\n  n$2=*n$1:int [line 130, column 10]\n  *&return:int=n$2 [line 130, column 3]\n " shape="box"]
 	
 
 	 "getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_3" -> "getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_2" ;
-"getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 129, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 129, column 3]\n  EXIT_SCOPE(_,n$4); [line 129, column 3]\n " shape="box"]
+"getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 129, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 129, column 3]\n " shape="box"]
 	
 
 	 "getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_4" -> "getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_3" ;
-"getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 128, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 128, column 23]\n  EXIT_SCOPE(n$5); [line 128, column 23]\n " shape="box"]
+"getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 128, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 128, column 23]\n " shape="box"]
 	
 
 	 "getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_5" -> "getRef_null_deref1#4264296374417396044.654d24b6c4af017d90a5ceff83c121c2_4" ;
@@ -203,18 +203,18 @@ digraph cfg {
 	
 
 	 "getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_1" -> "getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_5" ;
-"getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_2" [label="2: Exit getRef_null_deref2 \n   NULLIFY(&t); [line 137, column 1]\n " color=yellow style=filled]
+"getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_2" [label="2: Exit getRef_null_deref2 \n  " color=yellow style=filled]
 	
 
-"getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_3" [label="3:  Return Stmt \n   _=*&t:int* [line 136, column 10]\n  n$1=*&t:int* [line 136, column 10]\n  n$2=*n$1:int [line 136, column 10]\n  *&return:int=n$2 [line 136, column 3]\n  EXIT_SCOPE(_,n$1,n$2,t); [line 136, column 3]\n  APPLY_ABSTRACTION; [line 136, column 3]\n " shape="box"]
+"getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_3" [label="3:  Return Stmt \n   _=*&t:int* [line 136, column 10]\n  n$1=*&t:int* [line 136, column 10]\n  n$2=*n$1:int [line 136, column 10]\n  *&return:int=n$2 [line 136, column 3]\n " shape="box"]
 	
 
 	 "getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_3" -> "getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_2" ;
-"getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 135, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 135, column 3]\n  EXIT_SCOPE(_,n$4); [line 135, column 3]\n " shape="box"]
+"getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 135, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 135, column 3]\n " shape="box"]
 	
 
 	 "getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_4" -> "getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_3" ;
-"getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 134, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 134, column 23]\n  EXIT_SCOPE(n$5); [line 134, column 23]\n " shape="box"]
+"getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 134, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 134, column 23]\n " shape="box"]
 	
 
 	 "getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_5" -> "getRef_null_deref2#4263471740696427019.45bed1239309132cabf29f4cdd81f3cc_4" ;
@@ -222,18 +222,18 @@ digraph cfg {
 	
 
 	 "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_1" -> "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_6" ;
-"getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_2" [label="2: Exit getRef_ok_deref \n   NULLIFY(&t); [line 144, column 1]\n  NULLIFY(&a); [line 144, column 1]\n " color=yellow style=filled]
+"getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_2" [label="2: Exit getRef_ok_deref \n  " color=yellow style=filled]
 	
 
-"getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_3" [label="3:  Return Stmt \n   _=*&t:int* [line 143, column 10]\n  n$1=*&t:int* [line 143, column 10]\n  n$2=*n$1:int [line 143, column 10]\n  *&return:int=n$2 [line 143, column 3]\n  EXIT_SCOPE(_,n$1,n$2,t); [line 143, column 3]\n  APPLY_ABSTRACTION; [line 143, column 3]\n " shape="box"]
+"getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_3" [label="3:  Return Stmt \n   _=*&t:int* [line 143, column 10]\n  n$1=*&t:int* [line 143, column 10]\n  n$2=*n$1:int [line 143, column 10]\n  *&return:int=n$2 [line 143, column 3]\n " shape="box"]
 	
 
 	 "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_3" -> "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_2" ;
-"getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 142, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,&a:int*) [line 142, column 3]\n  EXIT_SCOPE(_,n$4,a); [line 142, column 3]\n " shape="box"]
+"getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 142, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,&a:int*) [line 142, column 3]\n " shape="box"]
 	
 
 	 "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_4" -> "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_3" ;
-"getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 141, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 141, column 23]\n  EXIT_SCOPE(n$5); [line 141, column 23]\n " shape="box"]
+"getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 141, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 141, column 23]\n " shape="box"]
 	
 
 	 "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_5" -> "getRef_ok_deref#10111201054364386601.e514c65ac6978a31376e6032d81b3d16_4" ;
@@ -245,18 +245,18 @@ digraph cfg {
 	
 
 	 "operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_1" -> "operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_5" ;
-"operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_2" [label="2: Exit operator_star_null_deref1 \n   NULLIFY(&t); [line 112, column 1]\n " color=yellow style=filled]
+"operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_2" [label="2: Exit operator_star_null_deref1 \n  " color=yellow style=filled]
 	
 
-"operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_3" [label="3:  Return Stmt \n   n$1=*&t:int* [line 111, column 10]\n  n$2=*n$1:int [line 111, column 10]\n  *&return:int=n$2 [line 111, column 3]\n  EXIT_SCOPE(n$1,n$2,t); [line 111, column 3]\n  APPLY_ABSTRACTION; [line 111, column 3]\n " shape="box"]
+"operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_3" [label="3:  Return Stmt \n   n$1=*&t:int* [line 111, column 10]\n  n$2=*n$1:int [line 111, column 10]\n  *&return:int=n$2 [line 111, column 3]\n " shape="box"]
 	
 
 	 "operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_3" -> "operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_2" ;
-"operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 110, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 110, column 3]\n  EXIT_SCOPE(_,n$4); [line 110, column 3]\n " shape="box"]
+"operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 110, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 110, column 3]\n " shape="box"]
 	
 
 	 "operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_4" -> "operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_3" ;
-"operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 109, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 109, column 23]\n  EXIT_SCOPE(n$5); [line 109, column 23]\n " shape="box"]
+"operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 109, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 109, column 23]\n " shape="box"]
 	
 
 	 "operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_5" -> "operator_star_null_deref1#14187169119337849630.74372e24230903d2d4cacecae74f498d_4" ;
@@ -264,18 +264,18 @@ digraph cfg {
 	
 
 	 "operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_1" -> "operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_5" ;
-"operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_2" [label="2: Exit operator_star_null_deref2 \n   NULLIFY(&t); [line 118, column 1]\n " color=yellow style=filled]
+"operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_2" [label="2: Exit operator_star_null_deref2 \n  " color=yellow style=filled]
 	
 
-"operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_3" [label="3:  Return Stmt \n   _=*&t:int* [line 117, column 10]\n  n$1=*&t:int* [line 117, column 10]\n  n$2=*n$1:int [line 117, column 10]\n  *&return:int=n$2 [line 117, column 3]\n  EXIT_SCOPE(_,n$1,n$2,t); [line 117, column 3]\n  APPLY_ABSTRACTION; [line 117, column 3]\n " shape="box"]
+"operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_3" [label="3:  Return Stmt \n   _=*&t:int* [line 117, column 10]\n  n$1=*&t:int* [line 117, column 10]\n  n$2=*n$1:int [line 117, column 10]\n  *&return:int=n$2 [line 117, column 3]\n " shape="box"]
 	
 
 	 "operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_3" -> "operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_2" ;
-"operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 116, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 116, column 3]\n  EXIT_SCOPE(_,n$4); [line 116, column 3]\n " shape="box"]
+"operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 116, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,null:int*) [line 116, column 3]\n " shape="box"]
 	
 
 	 "operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_4" -> "operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_3" ;
-"operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 115, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 115, column 23]\n  EXIT_SCOPE(n$5); [line 115, column 23]\n " shape="box"]
+"operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 115, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 115, column 23]\n " shape="box"]
 	
 
 	 "operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_5" -> "operator_star_null_deref2#14189968475942707161.6f6b808f2059b0f1bd8edd63f3e0c27b_4" ;
@@ -283,18 +283,18 @@ digraph cfg {
 	
 
 	 "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_1" -> "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_5" ;
-"operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_2" [label="2: Exit operator_star_ok_deref \n   NULLIFY(&a); [line 125, column 1]\n  NULLIFY(&t); [line 125, column 1]\n " color=yellow style=filled]
+"operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_2" [label="2: Exit operator_star_ok_deref \n  " color=yellow style=filled]
 	
 
-"operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_3" [label="3:  Return Stmt \n   _=*&t:int* [line 124, column 10]\n  n$1=*&t:int* [line 124, column 10]\n  n$2=*n$1:int [line 124, column 10]\n  *&return:int=n$2 [line 124, column 3]\n  EXIT_SCOPE(_,n$1,n$2,t); [line 124, column 3]\n  APPLY_ABSTRACTION; [line 124, column 3]\n " shape="box"]
+"operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_3" [label="3:  Return Stmt \n   _=*&t:int* [line 124, column 10]\n  n$1=*&t:int* [line 124, column 10]\n  n$2=*n$1:int [line 124, column 10]\n  *&return:int=n$2 [line 124, column 3]\n " shape="box"]
 	
 
 	 "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_3" -> "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_2" ;
-"operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 123, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,&a:int*) [line 123, column 3]\n  EXIT_SCOPE(_,n$4,a); [line 123, column 3]\n " shape="box"]
+"operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_4" [label="4:  Call _fun_TranslateAsPtr<int>::setPtr \n   _=*&t:int* [line 123, column 3]\n  n$4=_fun_TranslateAsPtr<int>::setPtr(&t:int*&,&a:int*) [line 123, column 3]\n " shape="box"]
 	
 
 	 "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_4" -> "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_3" ;
-"operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 122, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 122, column 23]\n  EXIT_SCOPE(n$5); [line 122, column 23]\n " shape="box"]
+"operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(t:int*); [line 122, column 3]\n  n$5=_fun_TranslateAsPtr<int>::TranslateAsPtr(&t:int**,null:int*) [line 122, column 23]\n " shape="box"]
 	
 
 	 "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_5" -> "operator_star_ok_deref#11345277927099423171.138b78e88dab5887cd2f20f2590c779f_4" ;
@@ -312,7 +312,7 @@ digraph cfg {
 "setPtr#TranslateAsPtr<int>#(11427652750021041520).3f4d983a0a5cf5a43b2e4fd66c30c6a9_2" [label="2: Exit TranslateAsPtr<int>::setPtr \n  " color=yellow style=filled]
 	
 
-"setPtr#TranslateAsPtr<int>#(11427652750021041520).3f4d983a0a5cf5a43b2e4fd66c30c6a9_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:int** [line 86, column 34]\n  n$1=*&v:int* [line 86, column 43]\n  *n$0:void*=n$1 [line 86, column 23]\n  NULLIFY(&v); [line 86, column 23]\n  NULLIFY(&this); [line 86, column 23]\n  EXIT_SCOPE(n$0,n$1,v,this); [line 86, column 23]\n  APPLY_ABSTRACTION; [line 86, column 23]\n " shape="box"]
+"setPtr#TranslateAsPtr<int>#(11427652750021041520).3f4d983a0a5cf5a43b2e4fd66c30c6a9_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:int** [line 86, column 34]\n  n$1=*&v:int* [line 86, column 43]\n  *n$0:void*=n$1 [line 86, column 23]\n " shape="box"]
 	
 
 	 "setPtr#TranslateAsPtr<int>#(11427652750021041520).3f4d983a0a5cf5a43b2e4fd66c30c6a9_3" -> "setPtr#TranslateAsPtr<int>#(11427652750021041520).3f4d983a0a5cf5a43b2e4fd66c30c6a9_2" ;
@@ -351,7 +351,7 @@ digraph cfg {
 "TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_2" [label="2: Exit TranslateAsPtr<int>::TranslateAsPtr \n  " color=yellow style=filled]
 	
 
-"TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_3" [label="3:  Call _fun_TranslateAsPtr<int>::setPtr \n   n$0=*&this:int** [line 76, column 36]\n  _=*n$0:int* [line 76, column 36]\n  n$2=*&t:int* [line 76, column 43]\n  n$3=_fun_TranslateAsPtr<int>::setPtr(n$0:int**,n$2:int*) [line 76, column 36]\n  NULLIFY(&t); [line 76, column 36]\n  NULLIFY(&this); [line 76, column 36]\n  EXIT_SCOPE(_,n$0,n$2,n$3,t,this); [line 76, column 36]\n  APPLY_ABSTRACTION; [line 76, column 36]\n " shape="box"]
+"TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_3" [label="3:  Call _fun_TranslateAsPtr<int>::setPtr \n   n$0=*&this:int** [line 76, column 36]\n  _=*n$0:int* [line 76, column 36]\n  n$2=*&t:int* [line 76, column 43]\n  n$3=_fun_TranslateAsPtr<int>::setPtr(n$0:int**,n$2:int*) [line 76, column 36]\n " shape="box"]
 	
 
 	 "TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_3" -> "TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_2" ;