Sort nodes when printing cfg to dot file

Summary:
Currently cfg nodes are written into dot files in whatever order they
appear in a hash table.  This seems unnecessarily sensitive, so this
diff sorts the nodes.

Reviewed By: dulmarod

Differential Revision: D4232377

fbshipit-source-id: a907cc6

infer/src/IR/Cfg.re

@@ -45,10 +45,25 @@ let create_proc_desc cfg (proc_attributes: ProcAttributes.t) => {
 
 
 /** Iterate over all the nodes in the cfg */
-let iter_all_nodes f cfg => {
+let iter_all_nodes sorted::sorted=false f cfg => {
   let do_proc_desc _ (pdesc: Procdesc.t) =>
     IList.iter (fun node => f pdesc node) (Procdesc.get_nodes pdesc);
+  if (not sorted) {
     iter_proc_desc cfg do_proc_desc
+  } else {
+    Procname.Hash.fold
+      (
+        fun _ pdesc desc_nodes =>
+          IList.fold_left
+            (fun desc_nodes node => [(pdesc, node), ...desc_nodes])
+            desc_nodes
+            (Procdesc.get_nodes pdesc)
+      )
+      cfg.proc_desc_table
+      [] |>
+    IList.sort [%compare : (Procdesc.t, Procdesc.Node.t)] |>
+    IList.iter (fun (d, n) => f d n)
+  }
 };
 
 

infer/src/IR/Cfg.rei

@@ -54,7 +54,7 @@ let get_defined_procs: cfg => list Procdesc.t;
 
 
 /** Iterate over all the nodes in the cfg */
-let iter_all_nodes: (Procdesc.t => Procdesc.Node.t => unit) => cfg => unit;
+let iter_all_nodes: sorted::bool? => (Procdesc.t => Procdesc.Node.t => unit) => cfg => unit;
 
 
 /** checks whether a cfg is connected or not */

infer/src/IR/Errlog.ml

@@ -43,9 +43,11 @@ module ErrDataSet = (* set err_data with no repeated loc *)
   end)
 
 (** Hash table to implement error logs *)
-module ErrLogHash = Hashtbl.Make (struct
+module ErrLogHash = struct
+  module Key = struct
 
     type t = Exceptions.err_kind * bool * Localise.t * Localise.error_desc * string
+    [@@deriving compare]
 
     let hash (ekind, in_footprint, err_name, desc, _) =
       Hashtbl.hash (ekind, in_footprint, err_name, Localise.error_desc_hash desc)
@@ -56,13 +58,19 @@ module ErrLogHash = Hashtbl.Make (struct
       (ekind1, in_footprint1, err_name1) = (ekind2, in_footprint2, err_name2) &&
       Localise.error_desc_equal desc1 desc2
 
-  end)
+  end
+  include Hashtbl.Make (Key)
+end
 
 (** Type of the error log, to be reset once per function.
     Map err_kind, fotprint / re - execution flag, error name,
     error description, severity, to set of err_data. *)
 type t = ErrDataSet.t ErrLogHash.t
 
+let compare x y =
+  let bindings x = ErrLogHash.fold (fun k d l -> (k, d) :: l) x [] in
+  [%compare: (ErrLogHash.Key.t * ErrDataSet.t) list] (bindings x) (bindings y)
+
 (** Empty error log *)
 let empty () = ErrLogHash.create 13
 

infer/src/IR/Errlog.mli

@@ -26,7 +26,7 @@ val make_trace_element : int -> Location.t -> string -> (string * string) list -
 type loc_trace = loc_trace_elem list
 
 (** Type of the error log *)
-type t
+type t [@@deriving compare]
 
 (** Empty error log *)
 val empty : unit -> t

infer/src/IR/Exceptions.ml

@@ -35,8 +35,7 @@ type exception_severity =
 type err_class = Checker | Prover | Nocat
 
 (** kind of error/warning *)
-type err_kind =
-    Kwarning | Kerror | Kinfo | Kadvice
+type err_kind = Kwarning | Kerror | Kinfo | Kadvice [@@deriving compare]
 
 exception Abduction_case_not_implemented of L.ml_loc
 exception Analysis_stops of Localise.error_desc * L.ml_loc option

infer/src/IR/Exceptions.mli

@@ -27,8 +27,7 @@ type exception_severity =
   | Low (** low severity bug *)
 
 (** kind of error/warning *)
-type err_kind =
-    Kwarning | Kerror | Kinfo | Kadvice
+type err_kind = Kwarning | Kerror | Kinfo | Kadvice [@@deriving compare]
 
 (** class of error *)
 type err_class = Checker | Prover | Nocat

infer/src/IR/Localise.ml

@@ -95,7 +95,7 @@ type error_desc = {
   advice : string option;
   tags : (string * string) list;
   dotty : string option;
-}
+} [@@deriving compare]
 
 (** empty error description *)
 let no_desc: error_desc = {

infer/src/IR/Localise.mli

@@ -92,7 +92,7 @@ type error_desc = {
   advice : string option;
   tags : (string * string) list;
   dotty : string option;
-}
+} [@@deriving compare]
 
 (** empty error description *)
 val no_desc: error_desc

infer/src/IR/PredSymb.re

@@ -19,7 +19,8 @@ let module L = Logging;
 let module F = Format;
 
 type func_attribute =
-  | FA_sentinel int int /** __attribute__((sentinel(int, int))) */;
+  | FA_sentinel int int /** __attribute__((sentinel(int, int))) */
+[@@deriving compare];
 
 
 /** Visibility modifiers. */
@@ -27,7 +28,8 @@ type access =
   | Default
   | Public
   | Private
-  | Protected;
+  | Protected
+[@@deriving compare];
 
 
 /** Return the value of the FA_sentinel attribute in [attr_list] if it is found */

infer/src/IR/PredSymb.rei

@@ -21,7 +21,8 @@ let module F = Format;
 
 /** {2 Programs and Types} */
 type func_attribute =
-  | FA_sentinel int int;
+  | FA_sentinel int int
+[@@deriving compare];
 
 
 /** Return the value of the FA_sentinel attribute in [attr_list] if it is found */
@@ -33,7 +34,8 @@ type access =
   | Default
   | Public
   | Private
-  | Protected;
+  | Protected
+[@@deriving compare];
 
 type mem_kind =
   | Mmalloc /** memory allocated with malloc */

infer/src/IR/ProcAttributes.re

@@ -18,7 +18,8 @@ let module F = Format;
 /** Type for ObjC accessors */
 type objc_accessor_type =
   | Objc_getter Ident.fieldname
-  | Objc_setter Ident.fieldname;
+  | Objc_setter Ident.fieldname
+[@@deriving compare];
 
 type t = {
   access: PredSymb.access, /** visibility access */
@@ -47,7 +48,8 @@ type t = {
   proc_name: Procname.t, /** name of the procedure */
   ret_type: Typ.t, /** return type */
   source_file_captured: DB.source_file /** source file where the procedure was captured */
-};
+}
+[@@deriving compare];
 
 let default proc_name language => {
   access: PredSymb.Default,

infer/src/IR/ProcAttributes.rei

@@ -12,7 +12,8 @@ open! Utils;
 /** Attributes of a procedure. */
 type objc_accessor_type =
   | Objc_getter Ident.fieldname
-  | Objc_setter Ident.fieldname;
+  | Objc_setter Ident.fieldname
+[@@deriving compare];
 
 type t = {
   access: PredSymb.access, /** visibility access */
@@ -41,7 +42,8 @@ type t = {
   proc_name: Procname.t, /** name of the procedure */
   ret_type: Typ.t, /** return type */
   source_file_captured: DB.source_file /** source file where the procedure was captured */
-};
+}
+[@@deriving compare];
 
 
 /** Create a proc_attributes with default values. */

infer/src/IR/Procdesc.re

@@ -328,7 +328,8 @@ type t = {
   mutable nodes_num: int, /** number of nodes */
   mutable start_node: Node.t, /** start node of this procedure */
   mutable exit_node: Node.t /** exit node of ths procedure */
-};
+}
+[@@deriving compare];
 
 
 /** Only call from Cfg */

infer/src/IR/Procdesc.rei

@@ -147,7 +147,7 @@ let module NodeSet: Set.S with type elt = Node.t;
 /** procedure descriptions */
 
 /** proc description */
-type t;
+type t [@@deriving compare];
 
 
 /** append a list of new local variables to the existing list of local variables */

infer/src/backend/dotty.ml

@@ -1019,7 +1019,7 @@ let print_icfg source fmt cfg =
     let loc = Procdesc.Node.get_loc node in
     if (Config.dotty_cfg_libs || DB.equal_source_file loc.Location.file source) then
       F.fprintf fmt "%a\n" (pp_cfgnode pdesc) node in
-  Cfg.iter_all_nodes print_node cfg
+  Cfg.iter_all_nodes ~sorted:true print_node cfg
 
 let write_icfg_dotty_to_file source cfg fname =
   let chan = open_out fname in

infer/src/base/Config.ml

@@ -32,7 +32,7 @@ let clang_frontend_action_symbols = [
   ("lint_and_capture", `Lint_and_capture);
 ]
 
-type language = Clang | Java
+type language = Clang | Java [@@deriving compare]
 
 let string_of_language = function
   | Java -> "Java"

infer/src/base/Config.mli

@@ -22,7 +22,7 @@ type analyzer = Capture | Compile | Infer | Eradicate | Checkers | Tracing
 val string_to_analyzer : (string * analyzer) list
 
 
-type language = Clang | Java
+type language = Clang | Java [@@deriving compare]
 
 val string_of_language : language -> string
 

infer/src/base/Utils.ml

@@ -516,6 +516,11 @@ let filename_to_relative root fname =
 (** flags for a procedure *)
 type proc_flags = (string, string) Hashtbl.t
 
+let compare_proc_flags x y =
+  let bindings x = Hashtbl.fold (fun k d l -> (k, d) :: l) x [] in
+  [%compare: (string * string) list] (bindings x) (bindings y)
+
+
 let proc_flags_empty () : proc_flags = Hashtbl.create 1
 
 let proc_flag_skip = "skip"

infer/src/base/Utils.mli

@@ -244,7 +244,7 @@ val do_outf : outfile option -> (outfile -> unit) -> unit
 val close_outf : outfile -> unit
 
 (** flags for a procedure *)
-type proc_flags = (string, string) Hashtbl.t
+type proc_flags = (string, string) Hashtbl.t [@@deriving compare]
 
 (** keys for proc_flags *)
 

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

@@ -1,115 +1,115 @@
 /* @generated */
 digraph iCFG {
-"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 12]\n  *&return:int=n$0 [line 12]\n " shape="box"]
-	
-
-	 "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" -> "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_2" ;
-"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_2" [label="2: Exit internal::fun \n  " color=yellow style=filled]
-	
-
-"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_1" [label="1: Start internal::fun\nFormals:  a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
-	
-
-	 "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_1" -> "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" ;
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_reset<int,_void> \n   n$0=*&this:int** [line 165]\n  _=*n$0:int* [line 165]\n  _fun_std::__1::shared_ptr<int>_reset<int,_void>(n$0:int**,null:int*) [line 165]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  s:class std::__1::basic_string<8d2d7b7b909d4c24> x:int* \n   DECLARE_LOCALS(&return,&s,&x); [line 17]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" ;
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" [label="2: Exit std::__1::shared_ptr<int>_~shared_ptr \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" [label="1: Start std::__1::shared_ptr<int>_~shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 165]\n " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   _fun_std::__1::basic_string<8d2d7b7b909d4c24>_basic_string(&s:class std::__1::basic_string<8d2d7b7b909d4c24>*,\"1234\":char*) [line 22]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 51]\n  n$1=*&value:void* [line 51]\n  *n$0:void*=n$1 [line 51]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   _fun_std::__1::shared_ptr<int>_shared_ptr(&x:int**) [line 21]\n  n$0=*&x:int* [line 21]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_2" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_2" [label="2: Exit std::__1::shared_ptr<int>_model_set \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  Call _fun_external::fun \n   n$1=_fun_external::fun(1:int) [line 20]\n " shape="box"]
 	
 
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_1" [label="1: Start std::__1::shared_ptr<int>_model_set\nFormals:  self:void** value:void*\nLocals:  \n   DECLARE_LOCALS(&return); [line 50]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_internal_exclude::fun \n   n$2=_fun_internal_exclude::fun(1:int) [line 19]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_1" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
 "main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal::fun \n   n$3=_fun_internal::fun(1:int) [line 18]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_internal_exclude::fun \n   n$2=_fun_internal_exclude::fun(1:int) [line 19]\n " shape="box"]
-	
-
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  Call _fun_external::fun \n   n$1=_fun_external::fun(1:int) [line 20]\n " shape="box"]
+"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_1" [label="1: Start internal::fun\nFormals:  a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   _fun_std::__1::shared_ptr<int>_shared_ptr(&x:int**) [line 21]\n  n$0=*&x:int* [line 21]\n " shape="box"]
+	 "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_1" -> "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" ;
+"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_2" [label="2: Exit internal::fun \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   _fun_std::__1::basic_string<8d2d7b7b909d4c24>_basic_string(&s:class std::__1::basic_string<8d2d7b7b909d4c24>*,\"1234\":char*) [line 22]\n " shape="box"]
+"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 12]\n  *&return:int=n$0 [line 12]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" -> "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_2" ;
+"internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_1" [label="1: Start internal::used_in_main_header\nFormals:  a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  s:class std::__1::basic_string<8d2d7b7b909d4c24> x:int* \n   DECLARE_LOCALS(&return,&s,&x); [line 17]\n " color=yellow style=filled]
+	 "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_1" -> "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_3" ;
+"internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_2" [label="2: Exit internal::used_in_main_header \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
 "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 19]\n  *&return:int=n$0 [line 19]\n " shape="box"]
 	
 
 	 "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_3" -> "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_2" ;
-"internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_2" [label="2: Exit internal::used_in_main_header \n  " color=yellow style=filled]
+"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_1" [label="1: Start unused_deref_in_header\nFormals:  a:int*\nLocals:  x:int \n   DECLARE_LOCALS(&return,&x); [line 16]\n " color=yellow style=filled]
 	
 
-"internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_1" [label="1: Start internal::used_in_main_header\nFormals:  a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
+	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_1" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" ;
+"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_2" [label="2: Exit unused_deref_in_header \n  " color=yellow style=filled]
 	
 
-	 "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_1" -> "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_3" ;
+"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 18]\n  n$1=*n$0:int [line 18]\n  *&return:int=n$1 [line 18]\n " shape="box"]
+	
+
+	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_2" ;
 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" [label="4:  DeclStmt \n   n$2=_fun_internal::used_in_main_header(0:int) [line 17]\n  *&x:int=n$2 [line 17]\n " shape="box"]
 	
 
 	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" ;
-"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 18]\n  n$1=*n$0:int [line 18]\n  *&return:int=n$1 [line 18]\n " shape="box"]
+"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_1" [label="1: Start std::__1::shared_ptr<int>_model_set\nFormals:  self:void** value:void*\nLocals:  \n   DECLARE_LOCALS(&return); [line 50]\n " color=yellow style=filled]
 	
 
-	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_2" ;
-"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_2" [label="2: Exit unused_deref_in_header \n  " color=yellow style=filled]
+	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_1" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" ;
+"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_2" [label="2: Exit std::__1::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_1" [label="1: Start unused_deref_in_header\nFormals:  a:int*\nLocals:  x:int \n   DECLARE_LOCALS(&return,&x); [line 16]\n " color=yellow style=filled]
+"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 51]\n  n$1=*&value:void* [line 51]\n  *n$0:void*=n$1 [line 51]\n " shape="box"]
 	
 
-	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_1" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" ;
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 223]\n  n$1=*&p:int* [line 223]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,n$1:void*) [line 223]\n " shape="box"]
+	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_2" ;
+"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" [label="1: Start std::__1::shared_ptr<int>_shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 84]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" ;
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" [label="2: Exit std::__1::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
+	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" ;
+"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_2" [label="2: Exit std::__1::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" [label="1: Start std::__1::shared_ptr<int>_reset<int,_void>\nFormals:  this:int** p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 217]\n " color=yellow style=filled]
+"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 85]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,null:void*) [line 85]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" ;
+	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_2" ;
 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" [label="4:  Constructor Init \n   n$1=*&this:int** [line 85]\n  _fun_std::__1::std__shared_ptr<int>_std__shared_ptr(n$1:int**) [line 84]\n  n$2=*n$1:int* [line 84]\n " shape="box"]
 	
 
 	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 85]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,null:void*) [line 85]\n " shape="box"]
+"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" [label="1: Start std::__1::shared_ptr<int>_~shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 165]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_2" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_2" [label="2: Exit std::__1::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
+	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" ;
+"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" [label="2: Exit std::__1::shared_ptr<int>_~shared_ptr \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" [label="1: Start std::__1::shared_ptr<int>_shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 84]\n " color=yellow style=filled]
+"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_reset<int,_void> \n   n$0=*&this:int** [line 165]\n  _=*n$0:int* [line 165]\n  _fun_std::__1::shared_ptr<int>_reset<int,_void>(n$0:int**,null:int*) [line 165]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" ;
+	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" ;
+"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" [label="1: Start std::__1::shared_ptr<int>_reset<int,_void>\nFormals:  this:int** p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 217]\n " color=yellow style=filled]
+	
+
+	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" ;
+"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" [label="2: Exit std::__1::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
+	
+
+"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 223]\n  n$1=*&p:int* [line 223]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,n$1:void*) [line 223]\n " shape="box"]
+	
+
+	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" ;
 }

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

@@ -1,115 +1,115 @@
 /* @generated */
 digraph iCFG {
-"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 12]\n  *&return:int=n$0 [line 12]\n " shape="box"]
-	
-
-	 "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" -> "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_2" ;
-"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_2" [label="2: Exit internal::fun \n  " color=yellow style=filled]
-	
-
-"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_1" [label="1: Start internal::fun\nFormals:  a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
-	
-
-	 "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_1" -> "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" ;
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_reset<int,_void> \n   n$0=*&this:int** [line 165]\n  _=*n$0:int* [line 165]\n  _fun_std::__1::shared_ptr<int>_reset<int,_void>(n$0:int**,null:int*) [line 165]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  s:class std::__1::basic_string<8d2d7b7b909d4c24> x:int* \n   DECLARE_LOCALS(&return,&s,&x); [line 17]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" ;
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" [label="2: Exit std::__1::shared_ptr<int>_~shared_ptr \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" [label="1: Start std::__1::shared_ptr<int>_~shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 165]\n " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   _fun_std::__1::basic_string<8d2d7b7b909d4c24>_basic_string(&s:class std::__1::basic_string<8d2d7b7b909d4c24>*,\"1234\":char*) [line 22]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 51]\n  n$1=*&value:void* [line 51]\n  *n$0:void*=n$1 [line 51]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   _fun_std::__1::shared_ptr<int>_shared_ptr(&x:int**) [line 21]\n  n$0=*&x:int* [line 21]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_2" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_2" [label="2: Exit std::__1::shared_ptr<int>_model_set \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  Call _fun_external::fun \n   n$1=_fun_external::fun(1:int) [line 20]\n " shape="box"]
 	
 
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_1" [label="1: Start std::__1::shared_ptr<int>_model_set\nFormals:  self:void** value:void*\nLocals:  \n   DECLARE_LOCALS(&return); [line 50]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_internal_exclude::fun \n   n$2=_fun_internal_exclude::fun(1:int) [line 19]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_1" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
 "main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal::fun \n   n$3=_fun_internal::fun(1:int) [line 18]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_internal_exclude::fun \n   n$2=_fun_internal_exclude::fun(1:int) [line 19]\n " shape="box"]
-	
-
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  Call _fun_external::fun \n   n$1=_fun_external::fun(1:int) [line 20]\n " shape="box"]
+"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_1" [label="1: Start internal::fun\nFormals:  a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   _fun_std::__1::shared_ptr<int>_shared_ptr(&x:int**) [line 21]\n  n$0=*&x:int* [line 21]\n " shape="box"]
+	 "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_1" -> "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" ;
+"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_2" [label="2: Exit internal::fun \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   _fun_std::__1::basic_string<8d2d7b7b909d4c24>_basic_string(&s:class std::__1::basic_string<8d2d7b7b909d4c24>*,\"1234\":char*) [line 22]\n " shape="box"]
+"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 12]\n  *&return:int=n$0 [line 12]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" -> "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_2" ;
+"internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_1" [label="1: Start internal::used_in_main_header\nFormals:  a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  s:class std::__1::basic_string<8d2d7b7b909d4c24> x:int* \n   DECLARE_LOCALS(&return,&s,&x); [line 17]\n " color=yellow style=filled]
+	 "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_1" -> "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_3" ;
+"internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_2" [label="2: Exit internal::used_in_main_header \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
 "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 19]\n  *&return:int=n$0 [line 19]\n " shape="box"]
 	
 
 	 "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_3" -> "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_2" ;
-"internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_2" [label="2: Exit internal::used_in_main_header \n  " color=yellow style=filled]
+"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_1" [label="1: Start unused_deref_in_header\nFormals:  a:int*\nLocals:  x:int \n   DECLARE_LOCALS(&return,&x); [line 16]\n " color=yellow style=filled]
 	
 
-"internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_1" [label="1: Start internal::used_in_main_header\nFormals:  a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
+	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_1" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" ;
+"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_2" [label="2: Exit unused_deref_in_header \n  " color=yellow style=filled]
 	
 
-	 "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_1" -> "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_3" ;
+"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 18]\n  n$1=*n$0:int [line 18]\n  *&return:int=n$1 [line 18]\n " shape="box"]
+	
+
+	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_2" ;
 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" [label="4:  DeclStmt \n   n$2=_fun_internal::used_in_main_header(0:int) [line 17]\n  *&x:int=n$2 [line 17]\n " shape="box"]
 	
 
 	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" ;
-"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 18]\n  n$1=*n$0:int [line 18]\n  *&return:int=n$1 [line 18]\n " shape="box"]
+"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_1" [label="1: Start std::__1::shared_ptr<int>_model_set\nFormals:  self:void** value:void*\nLocals:  \n   DECLARE_LOCALS(&return); [line 50]\n " color=yellow style=filled]
 	
 
-	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_2" ;
-"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_2" [label="2: Exit unused_deref_in_header \n  " color=yellow style=filled]
+	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_1" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" ;
+"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_2" [label="2: Exit std::__1::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_1" [label="1: Start unused_deref_in_header\nFormals:  a:int*\nLocals:  x:int \n   DECLARE_LOCALS(&return,&x); [line 16]\n " color=yellow style=filled]
+"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 51]\n  n$1=*&value:void* [line 51]\n  *n$0:void*=n$1 [line 51]\n " shape="box"]
 	
 
-	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_1" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" ;
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 223]\n  n$1=*&p:int* [line 223]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,n$1:void*) [line 223]\n " shape="box"]
+	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_2" ;
+"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" [label="1: Start std::__1::shared_ptr<int>_shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 84]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" ;
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" [label="2: Exit std::__1::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
+	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" ;
+"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_2" [label="2: Exit std::__1::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" [label="1: Start std::__1::shared_ptr<int>_reset<int,_void>\nFormals:  this:int** p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 217]\n " color=yellow style=filled]
+"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 85]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,null:void*) [line 85]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" ;
+	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_2" ;
 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" [label="4:  Constructor Init \n   n$1=*&this:int** [line 85]\n  _fun_std::__1::std__shared_ptr<int>_std__shared_ptr(n$1:int**) [line 84]\n  n$2=*n$1:int* [line 84]\n " shape="box"]
 	
 
 	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 85]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,null:void*) [line 85]\n " shape="box"]
+"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" [label="1: Start std::__1::shared_ptr<int>_~shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 165]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_2" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_2" [label="2: Exit std::__1::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
+	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" ;
+"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" [label="2: Exit std::__1::shared_ptr<int>_~shared_ptr \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" [label="1: Start std::__1::shared_ptr<int>_shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 84]\n " color=yellow style=filled]
+"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_reset<int,_void> \n   n$0=*&this:int** [line 165]\n  _=*n$0:int* [line 165]\n  _fun_std::__1::shared_ptr<int>_reset<int,_void>(n$0:int**,null:int*) [line 165]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" ;
+	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" ;
+"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" [label="1: Start std::__1::shared_ptr<int>_reset<int,_void>\nFormals:  this:int** p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 217]\n " color=yellow style=filled]
+	
+
+	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" ;
+"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" [label="2: Exit std::__1::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
+	
+
+"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 223]\n  n$1=*&p:int* [line 223]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,n$1:void*) [line 223]\n " shape="box"]
+	
+
+	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" ;
 }

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

@@ -1,115 +1,115 @@
 /* @generated */
 digraph iCFG {
-"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 12]\n  *&return:int=n$0 [line 12]\n " shape="box"]
-	
-
-	 "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" -> "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_2" ;
-"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_2" [label="2: Exit internal::fun \n  " color=yellow style=filled]
-	
-
-"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_1" [label="1: Start internal::fun\nFormals:  a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
-	
-
-	 "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_1" -> "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" ;
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_reset<int,_void> \n   n$0=*&this:int** [line 165]\n  _=*n$0:int* [line 165]\n  _fun_std::__1::shared_ptr<int>_reset<int,_void>(n$0:int**,null:int*) [line 165]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  s:class std::__1::basic_string<8d2d7b7b909d4c24> x:int* \n   DECLARE_LOCALS(&return,&s,&x); [line 17]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" ;
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" [label="2: Exit std::__1::shared_ptr<int>_~shared_ptr \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" [label="1: Start std::__1::shared_ptr<int>_~shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 165]\n " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   _fun_std::__1::basic_string<8d2d7b7b909d4c24>_basic_string(&s:class std::__1::basic_string<8d2d7b7b909d4c24>*,\"1234\":char*) [line 22]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 51]\n  n$1=*&value:void* [line 51]\n  *n$0:void*=n$1 [line 51]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   _fun_std::__1::shared_ptr<int>_shared_ptr(&x:int**) [line 21]\n  n$0=*&x:int* [line 21]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_2" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_2" [label="2: Exit std::__1::shared_ptr<int>_model_set \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  Call _fun_external::fun \n   n$1=_fun_external::fun(1:int) [line 20]\n " shape="box"]
 	
 
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_1" [label="1: Start std::__1::shared_ptr<int>_model_set\nFormals:  self:void** value:void*\nLocals:  \n   DECLARE_LOCALS(&return); [line 50]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_internal_exclude::fun \n   n$2=_fun_internal_exclude::fun(1:int) [line 19]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_1" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
 "main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal::fun \n   n$3=_fun_internal::fun(1:int) [line 18]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_internal_exclude::fun \n   n$2=_fun_internal_exclude::fun(1:int) [line 19]\n " shape="box"]
-	
-
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  Call _fun_external::fun \n   n$1=_fun_external::fun(1:int) [line 20]\n " shape="box"]
+"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_1" [label="1: Start internal::fun\nFormals:  a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   _fun_std::__1::shared_ptr<int>_shared_ptr(&x:int**) [line 21]\n  n$0=*&x:int* [line 21]\n " shape="box"]
+	 "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_1" -> "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" ;
+"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_2" [label="2: Exit internal::fun \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   _fun_std::__1::basic_string<8d2d7b7b909d4c24>_basic_string(&s:class std::__1::basic_string<8d2d7b7b909d4c24>*,\"1234\":char*) [line 22]\n " shape="box"]
+"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 12]\n  *&return:int=n$0 [line 12]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" -> "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_2" ;
+"internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_1" [label="1: Start internal::used_in_main_header\nFormals:  a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  s:class std::__1::basic_string<8d2d7b7b909d4c24> x:int* \n   DECLARE_LOCALS(&return,&s,&x); [line 17]\n " color=yellow style=filled]
+	 "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_1" -> "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_3" ;
+"internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_2" [label="2: Exit internal::used_in_main_header \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
 "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 19]\n  *&return:int=n$0 [line 19]\n " shape="box"]
 	
 
 	 "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_3" -> "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_2" ;
-"internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_2" [label="2: Exit internal::used_in_main_header \n  " color=yellow style=filled]
+"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_1" [label="1: Start unused_deref_in_header\nFormals:  a:int*\nLocals:  x:int \n   DECLARE_LOCALS(&return,&x); [line 16]\n " color=yellow style=filled]
 	
 
-"internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_1" [label="1: Start internal::used_in_main_header\nFormals:  a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
+	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_1" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" ;
+"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_2" [label="2: Exit unused_deref_in_header \n  " color=yellow style=filled]
 	
 
-	 "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_1" -> "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_3" ;
+"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 18]\n  n$1=*n$0:int [line 18]\n  *&return:int=n$1 [line 18]\n " shape="box"]
+	
+
+	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_2" ;
 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" [label="4:  DeclStmt \n   n$2=_fun_internal::used_in_main_header(0:int) [line 17]\n  *&x:int=n$2 [line 17]\n " shape="box"]
 	
 
 	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" ;
-"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 18]\n  n$1=*n$0:int [line 18]\n  *&return:int=n$1 [line 18]\n " shape="box"]
+"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_1" [label="1: Start std::__1::shared_ptr<int>_model_set\nFormals:  self:void** value:void*\nLocals:  \n   DECLARE_LOCALS(&return); [line 50]\n " color=yellow style=filled]
 	
 
-	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_2" ;
-"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_2" [label="2: Exit unused_deref_in_header \n  " color=yellow style=filled]
+	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_1" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" ;
+"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_2" [label="2: Exit std::__1::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_1" [label="1: Start unused_deref_in_header\nFormals:  a:int*\nLocals:  x:int \n   DECLARE_LOCALS(&return,&x); [line 16]\n " color=yellow style=filled]
+"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 51]\n  n$1=*&value:void* [line 51]\n  *n$0:void*=n$1 [line 51]\n " shape="box"]
 	
 
-	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_1" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" ;
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 223]\n  n$1=*&p:int* [line 223]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,n$1:void*) [line 223]\n " shape="box"]
+	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_2" ;
+"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" [label="1: Start std::__1::shared_ptr<int>_shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 84]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" ;
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" [label="2: Exit std::__1::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
+	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" ;
+"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_2" [label="2: Exit std::__1::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" [label="1: Start std::__1::shared_ptr<int>_reset<int,_void>\nFormals:  this:int** p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 217]\n " color=yellow style=filled]
+"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 85]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,null:void*) [line 85]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" ;
+	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_2" ;
 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" [label="4:  Constructor Init \n   n$1=*&this:int** [line 85]\n  _fun_std::__1::std__shared_ptr<int>_std__shared_ptr(n$1:int**) [line 84]\n  n$2=*n$1:int* [line 84]\n " shape="box"]
 	
 
 	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 85]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,null:void*) [line 85]\n " shape="box"]
+"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" [label="1: Start std::__1::shared_ptr<int>_~shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 165]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_2" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_2" [label="2: Exit std::__1::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
+	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" ;
+"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" [label="2: Exit std::__1::shared_ptr<int>_~shared_ptr \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" [label="1: Start std::__1::shared_ptr<int>_shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 84]\n " color=yellow style=filled]
+"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_reset<int,_void> \n   n$0=*&this:int** [line 165]\n  _=*n$0:int* [line 165]\n  _fun_std::__1::shared_ptr<int>_reset<int,_void>(n$0:int**,null:int*) [line 165]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" ;
+	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" ;
+"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" [label="1: Start std::__1::shared_ptr<int>_reset<int,_void>\nFormals:  this:int** p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 217]\n " color=yellow style=filled]
+	
+
+	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" ;
+"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" [label="2: Exit std::__1::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
+	
+
+"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 223]\n  n$1=*&p:int* [line 223]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,n$1:void*) [line 223]\n " shape="box"]
+	
+
+	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" ;
 }

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

@@ -1,115 +1,115 @@
 /* @generated */
 digraph iCFG {
-"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 12]\n  *&return:int=n$0 [line 12]\n " shape="box"]
-	
-
-	 "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" -> "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_2" ;
-"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_2" [label="2: Exit internal::fun \n  " color=yellow style=filled]
-	
-
-"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_1" [label="1: Start internal::fun\nFormals:  a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
-	
-
-	 "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_1" -> "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" ;
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_reset<int,_void> \n   n$0=*&this:int** [line 165]\n  _=*n$0:int* [line 165]\n  _fun_std::__1::shared_ptr<int>_reset<int,_void>(n$0:int**,null:int*) [line 165]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  s:class std::__1::basic_string<8d2d7b7b909d4c24> x:int* \n   DECLARE_LOCALS(&return,&s,&x); [line 17]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" ;
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" [label="2: Exit std::__1::shared_ptr<int>_~shared_ptr \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" [label="1: Start std::__1::shared_ptr<int>_~shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 165]\n " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   _fun_std::__1::basic_string<8d2d7b7b909d4c24>_basic_string(&s:class std::__1::basic_string<8d2d7b7b909d4c24>*,\"1234\":char*) [line 22]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 51]\n  n$1=*&value:void* [line 51]\n  *n$0:void*=n$1 [line 51]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   _fun_std::__1::shared_ptr<int>_shared_ptr(&x:int**) [line 21]\n  n$0=*&x:int* [line 21]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_2" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_2" [label="2: Exit std::__1::shared_ptr<int>_model_set \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  Call _fun_external::fun \n   n$1=_fun_external::fun(1:int) [line 20]\n " shape="box"]
 	
 
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_1" [label="1: Start std::__1::shared_ptr<int>_model_set\nFormals:  self:void** value:void*\nLocals:  \n   DECLARE_LOCALS(&return); [line 50]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_internal_exclude::fun \n   n$2=_fun_internal_exclude::fun(1:int) [line 19]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_1" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
 "main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  Call _fun_internal::fun \n   n$3=_fun_internal::fun(1:int) [line 18]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  Call _fun_internal_exclude::fun \n   n$2=_fun_internal_exclude::fun(1:int) [line 19]\n " shape="box"]
-	
-
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  Call _fun_external::fun \n   n$1=_fun_external::fun(1:int) [line 20]\n " shape="box"]
+"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_1" [label="1: Start internal::fun\nFormals:  a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   _fun_std::__1::shared_ptr<int>_shared_ptr(&x:int**) [line 21]\n  n$0=*&x:int* [line 21]\n " shape="box"]
+	 "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_1" -> "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" ;
+"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_2" [label="2: Exit internal::fun \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   _fun_std::__1::basic_string<8d2d7b7b909d4c24>_basic_string(&s:class std::__1::basic_string<8d2d7b7b909d4c24>*,\"1234\":char*) [line 22]\n " shape="box"]
+"internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 12]\n  *&return:int=n$0 [line 12]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_3" -> "internal::fun{d41d8cd98f00b204e9800998ecf8427e_ZN8internal3funEi}.85135ab105a259368b1d7ebf1f3d3ac2_2" ;
+"internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_1" [label="1: Start internal::used_in_main_header\nFormals:  a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  s:class std::__1::basic_string<8d2d7b7b909d4c24> x:int* \n   DECLARE_LOCALS(&return,&s,&x); [line 17]\n " color=yellow style=filled]
+	 "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_1" -> "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_3" ;
+"internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_2" [label="2: Exit internal::used_in_main_header \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
 "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 19]\n  *&return:int=n$0 [line 19]\n " shape="box"]
 	
 
 	 "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_3" -> "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_2" ;
-"internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_2" [label="2: Exit internal::used_in_main_header \n  " color=yellow style=filled]
+"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_1" [label="1: Start unused_deref_in_header\nFormals:  a:int*\nLocals:  x:int \n   DECLARE_LOCALS(&return,&x); [line 16]\n " color=yellow style=filled]
 	
 
-"internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_1" [label="1: Start internal::used_in_main_header\nFormals:  a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
+	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_1" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" ;
+"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_2" [label="2: Exit unused_deref_in_header \n  " color=yellow style=filled]
 	
 
-	 "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_1" -> "internal::used_in_main_header{d41d8cd98f00b204e9800998ecf8427e_ZN8internal19used_in_main_headerEi}.09c1faf931b185e882c0654aa991822d_3" ;
+"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 18]\n  n$1=*n$0:int [line 18]\n  *&return:int=n$1 [line 18]\n " shape="box"]
+	
+
+	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_2" ;
 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" [label="4:  DeclStmt \n   n$2=_fun_internal::used_in_main_header(0:int) [line 17]\n  *&x:int=n$2 [line 17]\n " shape="box"]
 	
 
 	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" ;
-"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 18]\n  n$1=*n$0:int [line 18]\n  *&return:int=n$1 [line 18]\n " shape="box"]
+"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_1" [label="1: Start std::__1::shared_ptr<int>_model_set\nFormals:  self:void** value:void*\nLocals:  \n   DECLARE_LOCALS(&return); [line 50]\n " color=yellow style=filled]
 	
 
-	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_2" ;
-"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_2" [label="2: Exit unused_deref_in_header \n  " color=yellow style=filled]
+	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_1" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" ;
+"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_2" [label="2: Exit std::__1::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_1" [label="1: Start unused_deref_in_header\nFormals:  a:int*\nLocals:  x:int \n   DECLARE_LOCALS(&return,&x); [line 16]\n " color=yellow style=filled]
+"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 51]\n  n$1=*&value:void* [line 51]\n  *n$0:void*=n$1 [line 51]\n " shape="box"]
 	
 
-	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_1" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" ;
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 223]\n  n$1=*&p:int* [line 223]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,n$1:void*) [line 223]\n " shape="box"]
+	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_3" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvS3_).c02dbe299962364cf3c5255e9c8d287d_2" ;
+"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" [label="1: Start std::__1::shared_ptr<int>_shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 84]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" ;
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" [label="2: Exit std::__1::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
+	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" ;
+"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_2" [label="2: Exit std::__1::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" [label="1: Start std::__1::shared_ptr<int>_reset<int,_void>\nFormals:  this:int** p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 217]\n " color=yellow style=filled]
+"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 85]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,null:void*) [line 85]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" ;
+	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_2" ;
 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" [label="4:  Constructor Init \n   n$1=*&this:int** [line 85]\n  _fun_std::__1::std__shared_ptr<int>_std__shared_ptr(n$1:int**) [line 84]\n  n$2=*n$1:int* [line 84]\n " shape="box"]
 	
 
 	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 85]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,null:void*) [line 85]\n " shape="box"]
+"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" [label="1: Start std::__1::shared_ptr<int>_~shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 165]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_3" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_2" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_2" [label="2: Exit std::__1::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
+	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" ;
+"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" [label="2: Exit std::__1::shared_ptr<int>_~shared_ptr \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" [label="1: Start std::__1::shared_ptr<int>_shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 84]\n " color=yellow style=filled]
+"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_reset<int,_void> \n   n$0=*&this:int** [line 165]\n  _=*n$0:int* [line 165]\n  _fun_std::__1::shared_ptr<int>_reset<int,_void>(n$0:int**,null:int*) [line 165]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" ;
+	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" ;
+"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" [label="1: Start std::__1::shared_ptr<int>_reset<int,_void>\nFormals:  this:int** p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 217]\n " color=yellow style=filled]
+	
+
+	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" ;
+"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" [label="2: Exit std::__1::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
+	
+
+"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 223]\n  n$1=*&p:int* [line 223]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,n$1:void*) [line 223]\n " shape="box"]
+	
+
+	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" ;
 }

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

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

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

@@ -1,26 +1,26 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  DeclStmt \n   *&#GB<codetoanalyze/c/frontend/arithmetic/int_const.c>$main_kDuration:int=3 [line 17]\n " shape="box"]
-	
-
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&large_int:int=9223372036854775807 [line 19]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  overflow_int:int large_int:int d:long double c:float* b:int* a:int \n   DECLARE_LOCALS(&return,&overflow_int,&large_int,&d,&c,&b,&a); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   *&overflow_int:int=n$0 [line 20]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
 "main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 22]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   *&overflow_int:int=n$0 [line 20]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  overflow_int:int large_int:int d:long double c:float* b:int* a:int \n   DECLARE_LOCALS(&return,&overflow_int,&large_int,&d,&c,&b,&a); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&large_int:int=9223372036854775807 [line 19]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  DeclStmt \n   *&#GB<codetoanalyze/c/frontend/arithmetic/int_const.c>$main_kDuration:int=3 [line 17]\n " shape="box"]
+	
+
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
 }

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

@@ -1,99 +1,99 @@
 /* @generated */
 digraph iCFG {
-"neg_bool.e953d6477eaaeafaa430423a26fbaac9_8" [label="8:  Return Stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 14]\n  *&return:int=n$2 [line 14]\n " shape="box"]
+"neg_char.53ef6b31d84386046a4728d1c45b5f7a_1" [label="1: Start neg_char\nFormals:  a:char\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 12]\n " color=yellow style=filled]
 	
 
-	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_8" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_2" ;
-"neg_bool.e953d6477eaaeafaa430423a26fbaac9_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 14]\n " shape="box"]
+	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_1" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_4" ;
+	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_1" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_5" ;
+"neg_char.53ef6b31d84386046a4728d1c45b5f7a_2" [label="2: Exit neg_char \n  " color=yellow style=filled]
 	
 
-	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_7" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_3" ;
-"neg_bool.e953d6477eaaeafaa430423a26fbaac9_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 14]\n " shape="box"]
+"neg_char.53ef6b31d84386046a4728d1c45b5f7a_3" [label="3: + \n  " ]
 	
 
-	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_6" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_3" ;
-"neg_bool.e953d6477eaaeafaa430423a26fbaac9_5" [label="5: Prune (false branch) \n   n$1=*&a:_Bool [line 14]\n  PRUNE((n$1 == 0), false); [line 14]\n " shape="invhouse"]
+	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_3" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_8" ;
+"neg_char.53ef6b31d84386046a4728d1c45b5f7a_4" [label="4: Prune (true branch) \n   n$1=*&a:char [line 12]\n  PRUNE((n$1 != 0), true); [line 12]\n " shape="invhouse"]
 	
 
-	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_5" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_7" ;
-"neg_bool.e953d6477eaaeafaa430423a26fbaac9_4" [label="4: Prune (true branch) \n   n$1=*&a:_Bool [line 14]\n  PRUNE((n$1 != 0), true); [line 14]\n " shape="invhouse"]
+	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_4" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_6" ;
+"neg_char.53ef6b31d84386046a4728d1c45b5f7a_5" [label="5: Prune (false branch) \n   n$1=*&a:char [line 12]\n  PRUNE((n$1 == 0), false); [line 12]\n " shape="invhouse"]
 	
 
-	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_4" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_6" ;
-"neg_bool.e953d6477eaaeafaa430423a26fbaac9_3" [label="3: + \n  " ]
+	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_5" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_7" ;
+"neg_char.53ef6b31d84386046a4728d1c45b5f7a_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 12]\n " shape="box"]
 	
 
-	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_3" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_8" ;
-"neg_bool.e953d6477eaaeafaa430423a26fbaac9_2" [label="2: Exit neg_bool \n  " color=yellow style=filled]
+	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_6" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_3" ;
+"neg_char.53ef6b31d84386046a4728d1c45b5f7a_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 12]\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 12]\n  *&return:int=n$2 [line 12]\n " shape="box"]
+	
+
+	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_8" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_2" ;
 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_1" [label="1: Start neg_bool\nFormals:  a:_Bool\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 14]\n " color=yellow style=filled]
 	
 
 	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_1" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_4" ;
 	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_1" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_5" ;
-"neg_char.53ef6b31d84386046a4728d1c45b5f7a_8" [label="8:  Return Stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 12]\n  *&return:int=n$2 [line 12]\n " shape="box"]
+"neg_bool.e953d6477eaaeafaa430423a26fbaac9_2" [label="2: Exit neg_bool \n  " color=yellow style=filled]
 	
 
-	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_8" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_2" ;
-"neg_char.53ef6b31d84386046a4728d1c45b5f7a_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 12]\n " shape="box"]
+"neg_bool.e953d6477eaaeafaa430423a26fbaac9_3" [label="3: + \n  " ]
 	
 
-	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_7" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_3" ;
-"neg_char.53ef6b31d84386046a4728d1c45b5f7a_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 12]\n " shape="box"]
+	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_3" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_8" ;
+"neg_bool.e953d6477eaaeafaa430423a26fbaac9_4" [label="4: Prune (true branch) \n   n$1=*&a:_Bool [line 14]\n  PRUNE((n$1 != 0), true); [line 14]\n " shape="invhouse"]
 	
 
-	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_6" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_3" ;
-"neg_char.53ef6b31d84386046a4728d1c45b5f7a_5" [label="5: Prune (false branch) \n   n$1=*&a:char [line 12]\n  PRUNE((n$1 == 0), false); [line 12]\n " shape="invhouse"]
+	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_4" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_6" ;
+"neg_bool.e953d6477eaaeafaa430423a26fbaac9_5" [label="5: Prune (false branch) \n   n$1=*&a:_Bool [line 14]\n  PRUNE((n$1 == 0), false); [line 14]\n " shape="invhouse"]
 	
 
-	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_5" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_7" ;
-"neg_char.53ef6b31d84386046a4728d1c45b5f7a_4" [label="4: Prune (true branch) \n   n$1=*&a:char [line 12]\n  PRUNE((n$1 != 0), true); [line 12]\n " shape="invhouse"]
+	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_5" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_7" ;
+"neg_bool.e953d6477eaaeafaa430423a26fbaac9_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 14]\n " shape="box"]
 	
 
-	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_4" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_6" ;
-"neg_char.53ef6b31d84386046a4728d1c45b5f7a_3" [label="3: + \n  " ]
+	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_6" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_3" ;
+"neg_bool.e953d6477eaaeafaa430423a26fbaac9_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 14]\n " shape="box"]
 	
 
-	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_3" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_8" ;
-"neg_char.53ef6b31d84386046a4728d1c45b5f7a_2" [label="2: Exit neg_char \n  " color=yellow style=filled]
+	 "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 14]\n  *&return:int=n$2 [line 14]\n " shape="box"]
 	
 
-"neg_char.53ef6b31d84386046a4728d1c45b5f7a_1" [label="1: Start neg_char\nFormals:  a:char\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 12]\n " color=yellow style=filled]
+	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_8" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_2" ;
+"neg_int.2aa25aca565c41dd997912d11504462c_1" [label="1: Start neg_int\nFormals:  a:int\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 10]\n " color=yellow style=filled]
 	
 
-	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_1" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_4" ;
-	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_1" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_5" ;
-"neg_int.2aa25aca565c41dd997912d11504462c_8" [label="8:  Return Stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 10]\n  *&return:int=n$2 [line 10]\n " shape="box"]
+	 "neg_int.2aa25aca565c41dd997912d11504462c_1" -> "neg_int.2aa25aca565c41dd997912d11504462c_4" ;
+	 "neg_int.2aa25aca565c41dd997912d11504462c_1" -> "neg_int.2aa25aca565c41dd997912d11504462c_5" ;
+"neg_int.2aa25aca565c41dd997912d11504462c_2" [label="2: Exit neg_int \n  " color=yellow style=filled]
 	
 
-	 "neg_int.2aa25aca565c41dd997912d11504462c_8" -> "neg_int.2aa25aca565c41dd997912d11504462c_2" ;
-"neg_int.2aa25aca565c41dd997912d11504462c_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 10]\n " shape="box"]
+"neg_int.2aa25aca565c41dd997912d11504462c_3" [label="3: + \n  " ]
 	
 
-	 "neg_int.2aa25aca565c41dd997912d11504462c_7" -> "neg_int.2aa25aca565c41dd997912d11504462c_3" ;
-"neg_int.2aa25aca565c41dd997912d11504462c_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 10]\n " shape="box"]
+	 "neg_int.2aa25aca565c41dd997912d11504462c_3" -> "neg_int.2aa25aca565c41dd997912d11504462c_8" ;
+"neg_int.2aa25aca565c41dd997912d11504462c_4" [label="4: Prune (true branch) \n   n$1=*&a:int [line 10]\n  PRUNE((n$1 != 0), true); [line 10]\n " shape="invhouse"]
 	
 
-	 "neg_int.2aa25aca565c41dd997912d11504462c_6" -> "neg_int.2aa25aca565c41dd997912d11504462c_3" ;
+	 "neg_int.2aa25aca565c41dd997912d11504462c_4" -> "neg_int.2aa25aca565c41dd997912d11504462c_6" ;
 "neg_int.2aa25aca565c41dd997912d11504462c_5" [label="5: Prune (false branch) \n   n$1=*&a:int [line 10]\n  PRUNE((n$1 == 0), false); [line 10]\n " shape="invhouse"]
 	
 
 	 "neg_int.2aa25aca565c41dd997912d11504462c_5" -> "neg_int.2aa25aca565c41dd997912d11504462c_7" ;
-"neg_int.2aa25aca565c41dd997912d11504462c_4" [label="4: Prune (true branch) \n   n$1=*&a:int [line 10]\n  PRUNE((n$1 != 0), true); [line 10]\n " shape="invhouse"]
-	
-
-	 "neg_int.2aa25aca565c41dd997912d11504462c_4" -> "neg_int.2aa25aca565c41dd997912d11504462c_6" ;
-"neg_int.2aa25aca565c41dd997912d11504462c_3" [label="3: + \n  " ]
+"neg_int.2aa25aca565c41dd997912d11504462c_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 10]\n " shape="box"]
 	
 
-	 "neg_int.2aa25aca565c41dd997912d11504462c_3" -> "neg_int.2aa25aca565c41dd997912d11504462c_8" ;
-"neg_int.2aa25aca565c41dd997912d11504462c_2" [label="2: Exit neg_int \n  " color=yellow style=filled]
+	 "neg_int.2aa25aca565c41dd997912d11504462c_6" -> "neg_int.2aa25aca565c41dd997912d11504462c_3" ;
+"neg_int.2aa25aca565c41dd997912d11504462c_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 10]\n " shape="box"]
 	
 
-"neg_int.2aa25aca565c41dd997912d11504462c_1" [label="1: Start neg_int\nFormals:  a:int\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 10]\n " color=yellow style=filled]
+	 "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 10]\n  *&return:int=n$2 [line 10]\n " shape="box"]
 	
 
-	 "neg_int.2aa25aca565c41dd997912d11504462c_1" -> "neg_int.2aa25aca565c41dd997912d11504462c_4" ;
-	 "neg_int.2aa25aca565c41dd997912d11504462c_1" -> "neg_int.2aa25aca565c41dd997912d11504462c_5" ;
+	 "neg_int.2aa25aca565c41dd997912d11504462c_8" -> "neg_int.2aa25aca565c41dd997912d11504462c_2" ;
 }

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

@@ -1,22 +1,22 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&x:int=2 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  z:int x:int \n   DECLARE_LOCALS(&return,&z,&x); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   *&z:int=3 [line 12]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
 "main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 13]\n  n$1=*&z:int [line 13]\n  *&return:int=(n$0 + n$1) [line 13]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   *&z:int=3 [line 12]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  z:int x:int \n   DECLARE_LOCALS(&return,&z,&x); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&x:int=2 [line 11]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
 }

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

@@ -1,62 +1,62 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   *&x:int=1 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  b:int* a:int y:int x:int \n   DECLARE_LOCALS(&return,&b,&a,&y,&x); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
-"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  BinaryOperatorStmt: Assign \n   n$12=*&x:int [line 14]\n  *&y:int=~n$12 [line 14]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
-"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  BinaryOperatorStmt: Assign \n   n$11=*&x:int [line 15]\n  *&y:int=-n$11 [line 15]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 32]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  BinaryOperatorStmt: Assign \n   n$10=*&x:int [line 16]\n  *&y:int=n$10 [line 16]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&a:int [line 30]\n  *&a:int=n$0 [line 30]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  BinaryOperatorStmt: Assign \n   n$9=*&x:int [line 18]\n  *&x:int=(n$9 + 1) [line 18]\n  *&y:int=n$9 [line 18]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$1=*&b:int* [line 29]\n  n$2=*&b:int* [line 29]\n  n$3=*n$2:int [line 29]\n  *n$1:int=(n$3 + 1) [line 29]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  BinaryOperatorStmt: Assign \n   n$8=*&x:int [line 19]\n  *&x:int=(n$8 + 1) [line 19]\n  *&y:int=(n$8 + 1) [line 19]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   n$4=*&b:int* [line 28]\n  n$5=*(n$4 + 1):int [line 28]\n  *&a:int=n$5 [line 28]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  BinaryOperatorStmt: Assign \n   n$7=*&x:int [line 21]\n  *&x:int=(n$7 - 1) [line 21]\n  *&y:int=(n$7 - 1) [line 21]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   *&b:int*=&a [line 27]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
 "main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   n$6=*&x:int [line 22]\n  *&x:int=(n$6 - 1) [line 22]\n  *&y:int=n$6 [line 22]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   *&b:int*=&a [line 27]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  BinaryOperatorStmt: Assign \n   n$7=*&x:int [line 21]\n  *&x:int=(n$7 - 1) [line 21]\n  *&y:int=(n$7 - 1) [line 21]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   n$4=*&b:int* [line 28]\n  n$5=*(n$4 + 1):int [line 28]\n  *&a:int=n$5 [line 28]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  BinaryOperatorStmt: Assign \n   n$8=*&x:int [line 19]\n  *&x:int=(n$8 + 1) [line 19]\n  *&y:int=(n$8 + 1) [line 19]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$1=*&b:int* [line 29]\n  n$2=*&b:int* [line 29]\n  n$3=*n$2:int [line 29]\n  *n$1:int=(n$3 + 1) [line 29]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  BinaryOperatorStmt: Assign \n   n$9=*&x:int [line 18]\n  *&x:int=(n$9 + 1) [line 18]\n  *&y:int=n$9 [line 18]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&a:int [line 30]\n  *&a:int=n$0 [line 30]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  BinaryOperatorStmt: Assign \n   n$10=*&x:int [line 16]\n  *&y:int=n$10 [line 16]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 32]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
+"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  BinaryOperatorStmt: Assign \n   n$11=*&x:int [line 15]\n  *&y:int=-n$11 [line 15]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
+"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  BinaryOperatorStmt: Assign \n   n$12=*&x:int [line 14]\n  *&y:int=~n$12 [line 14]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  b:int* a:int y:int x:int \n   DECLARE_LOCALS(&return,&b,&a,&y,&x); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   *&x:int=1 [line 11]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
 }

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

@@ -1,14 +1,14 @@
 /* @generated */
 digraph iCFG {
-"revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_3" [label="3:  Return Stmt \n   n$0=*&e:_Bool [line 12]\n  *&return:_Bool=n$0 [line 12]\n " shape="box"]
+"revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_1" [label="1: Start revert\nFormals:  e:_Bool\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
-	 "revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_3" -> "revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_2" ;
+	 "revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_1" -> "revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_3" ;
 "revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_2" [label="2: Exit revert \n  " color=yellow style=filled]
 	
 
-"revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_1" [label="1: Start revert\nFormals:  e:_Bool\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
+"revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_3" [label="3:  Return Stmt \n   n$0=*&e:_Bool [line 12]\n  *&return:_Bool=n$0 [line 12]\n " shape="box"]
 	
 
-	 "revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_1" -> "revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_3" ;
+	 "revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_3" -> "revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_2" ;
 }

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

@@ -1,25 +1,25 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   *&x:int=3 [line 13]\n " shape="box"]
-	
-
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Call _fun_check \n   n$0=*&x:int [line 14]\n  _fun_check((n$0 < 2):int) [line 14]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  x:int \n   DECLARE_LOCALS(&return,&x); [line 12]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  x:int \n   DECLARE_LOCALS(&return,&x); [line 12]\n " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Call _fun_check \n   n$0=*&x:int [line 14]\n  _fun_check((n$0 < 2):int) [line 14]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"check.0ba4439ee9a46d9d9f14c60f88f45f87_2" [label="2: Exit check \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   *&x:int=3 [line 13]\n " shape="box"]
 	
 
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
 "check.0ba4439ee9a46d9d9f14c60f88f45f87_1" [label="1: Start check\nFormals:  x:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
 	 "check.0ba4439ee9a46d9d9f14c60f88f45f87_1" -> "check.0ba4439ee9a46d9d9f14c60f88f45f87_2" ;
+"check.0ba4439ee9a46d9d9f14c60f88f45f87_2" [label="2: Exit check \n  " color=yellow style=filled]
+	
+
 }

infer/tests/codetoanalyze/c/frontend/c_prototype/prototype.c.dot

@@ -1,29 +1,29 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=_fun_sum(2:int,3:int) [line 20]\n  *&total:int=n$0 [line 20]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  total:int \n   DECLARE_LOCALS(&return,&total); [line 17]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 22]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 22]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  total:int \n   DECLARE_LOCALS(&return,&total); [line 17]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=_fun_sum(2:int,3:int) [line 20]\n  *&total:int=n$0 [line 20]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"sum.1d623b89683f9ce4e074de1676d12416_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 25]\n  n$1=*&b:int [line 25]\n  *&return:int=(n$0 + n$1) [line 25]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"sum.1d623b89683f9ce4e074de1676d12416_1" [label="1: Start sum\nFormals:  a:int b:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 25]\n " color=yellow style=filled]
 	
 
-	 "sum.1d623b89683f9ce4e074de1676d12416_3" -> "sum.1d623b89683f9ce4e074de1676d12416_2" ;
+	 "sum.1d623b89683f9ce4e074de1676d12416_1" -> "sum.1d623b89683f9ce4e074de1676d12416_3" ;
 "sum.1d623b89683f9ce4e074de1676d12416_2" [label="2: Exit sum \n  " color=yellow style=filled]
 	
 
-"sum.1d623b89683f9ce4e074de1676d12416_1" [label="1: Start sum\nFormals:  a:int b:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 25]\n " color=yellow style=filled]
+"sum.1d623b89683f9ce4e074de1676d12416_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 25]\n  n$1=*&b:int [line 25]\n  *&return:int=(n$0 + n$1) [line 25]\n " shape="box"]
 	
 
-	 "sum.1d623b89683f9ce4e074de1676d12416_1" -> "sum.1d623b89683f9ce4e074de1676d12416_3" ;
+	 "sum.1d623b89683f9ce4e074de1676d12416_3" -> "sum.1d623b89683f9ce4e074de1676d12416_2" ;
 }

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

@@ -1,76 +1,76 @@
 /* @generated */
 digraph iCFG {
-"comma_1.bafaed8336991f5a2e612ee2580c1506_6" [label="6:  DeclStmt \n   *&a:int=9 [line 11]\n " shape="box"]
-	
-
-	 "comma_1.bafaed8336991f5a2e612ee2580c1506_6" -> "comma_1.bafaed8336991f5a2e612ee2580c1506_5" ;
-"comma_1.bafaed8336991f5a2e612ee2580c1506_5" [label="5:  DeclStmt \n   *&b:int=7 [line 11]\n " shape="box"]
+"comma_1.bafaed8336991f5a2e612ee2580c1506_1" [label="1: Start comma_1\nFormals: \nLocals:  d:int b:int a:int \n   DECLARE_LOCALS(&return,&d,&b,&a); [line 10]\n " color=yellow style=filled]
 	
 
-	 "comma_1.bafaed8336991f5a2e612ee2580c1506_5" -> "comma_1.bafaed8336991f5a2e612ee2580c1506_4" ;
-"comma_1.bafaed8336991f5a2e612ee2580c1506_4" [label="4:  DeclStmt \n   n$1=*&a:int [line 12]\n  *&a:int=(n$1 * 2) [line 12]\n  n$2=*&a:int [line 12]\n  n$3=*&a:int [line 12]\n  *&a:int=(n$3 + 1) [line 12]\n  *&b:int=(7 * n$3) [line 12]\n  n$4=*&b:int [line 12]\n  *&d:int=n$4 [line 12]\n " shape="box"]
+	 "comma_1.bafaed8336991f5a2e612ee2580c1506_1" -> "comma_1.bafaed8336991f5a2e612ee2580c1506_6" ;
+"comma_1.bafaed8336991f5a2e612ee2580c1506_2" [label="2: Exit comma_1 \n  " color=yellow style=filled]
 	
 
-	 "comma_1.bafaed8336991f5a2e612ee2580c1506_4" -> "comma_1.bafaed8336991f5a2e612ee2580c1506_3" ;
 "comma_1.bafaed8336991f5a2e612ee2580c1506_3" [label="3:  Return Stmt \n   n$0=*&d:int [line 13]\n  *&return:int=n$0 [line 13]\n " shape="box"]
 	
 
 	 "comma_1.bafaed8336991f5a2e612ee2580c1506_3" -> "comma_1.bafaed8336991f5a2e612ee2580c1506_2" ;
-"comma_1.bafaed8336991f5a2e612ee2580c1506_2" [label="2: Exit comma_1 \n  " color=yellow style=filled]
+"comma_1.bafaed8336991f5a2e612ee2580c1506_4" [label="4:  DeclStmt \n   n$1=*&a:int [line 12]\n  *&a:int=(n$1 * 2) [line 12]\n  n$2=*&a:int [line 12]\n  n$3=*&a:int [line 12]\n  *&a:int=(n$3 + 1) [line 12]\n  *&b:int=(7 * n$3) [line 12]\n  n$4=*&b:int [line 12]\n  *&d:int=n$4 [line 12]\n " shape="box"]
 	
 
-"comma_1.bafaed8336991f5a2e612ee2580c1506_1" [label="1: Start comma_1\nFormals: \nLocals:  d:int b:int a:int \n   DECLARE_LOCALS(&return,&d,&b,&a); [line 10]\n " color=yellow style=filled]
+	 "comma_1.bafaed8336991f5a2e612ee2580c1506_4" -> "comma_1.bafaed8336991f5a2e612ee2580c1506_3" ;
+"comma_1.bafaed8336991f5a2e612ee2580c1506_5" [label="5:  DeclStmt \n   *&b:int=7 [line 11]\n " shape="box"]
 	
 
-	 "comma_1.bafaed8336991f5a2e612ee2580c1506_1" -> "comma_1.bafaed8336991f5a2e612ee2580c1506_6" ;
-"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_6" [label="6:  DeclStmt \n   *&a:int=9 [line 17]\n " shape="box"]
+	 "comma_1.bafaed8336991f5a2e612ee2580c1506_5" -> "comma_1.bafaed8336991f5a2e612ee2580c1506_4" ;
+"comma_1.bafaed8336991f5a2e612ee2580c1506_6" [label="6:  DeclStmt \n   *&a:int=9 [line 11]\n " shape="box"]
 	
 
-	 "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_6" -> "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_5" ;
-"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_5" [label="5:  DeclStmt \n   *&b:int=7 [line 17]\n " shape="box"]
+	 "comma_1.bafaed8336991f5a2e612ee2580c1506_6" -> "comma_1.bafaed8336991f5a2e612ee2580c1506_5" ;
+"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_1" [label="1: Start comma_2\nFormals: \nLocals:  d:int b:int a:int \n   DECLARE_LOCALS(&return,&d,&b,&a); [line 16]\n " color=yellow style=filled]
 	
 
-	 "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_5" -> "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_4" ;
-"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_4" [label="4:  DeclStmt \n   n$1=*&a:int [line 18]\n  *&a:int=(n$1 * 2) [line 18]\n  n$2=*&a:int [line 18]\n  n$3=*&a:int [line 18]\n  *&a:int=(n$3 + 1) [line 18]\n  *&b:int=(7 * n$3) [line 18]\n  n$4=*&b:int [line 18]\n  n$5=*&a:int [line 18]\n  n$6=*&b:int [line 18]\n  *&d:int=((n$5 + n$6) + 9) [line 18]\n " shape="box"]
+	 "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_1" -> "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_6" ;
+"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_2" [label="2: Exit comma_2 \n  " color=yellow style=filled]
 	
 
-	 "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_4" -> "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_3" ;
 "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_3" [label="3:  Return Stmt \n   n$0=*&d:int [line 19]\n  *&return:int=n$0 [line 19]\n " shape="box"]
 	
 
 	 "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_3" -> "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_2" ;
-"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_2" [label="2: Exit comma_2 \n  " color=yellow style=filled]
+"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_4" [label="4:  DeclStmt \n   n$1=*&a:int [line 18]\n  *&a:int=(n$1 * 2) [line 18]\n  n$2=*&a:int [line 18]\n  n$3=*&a:int [line 18]\n  *&a:int=(n$3 + 1) [line 18]\n  *&b:int=(7 * n$3) [line 18]\n  n$4=*&b:int [line 18]\n  n$5=*&a:int [line 18]\n  n$6=*&b:int [line 18]\n  *&d:int=((n$5 + n$6) + 9) [line 18]\n " shape="box"]
 	
 
-"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_1" [label="1: Start comma_2\nFormals: \nLocals:  d:int b:int a:int \n   DECLARE_LOCALS(&return,&d,&b,&a); [line 16]\n " color=yellow style=filled]
+	 "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_4" -> "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_3" ;
+"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_5" [label="5:  DeclStmt \n   *&b:int=7 [line 17]\n " shape="box"]
 	
 
-	 "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_1" -> "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_6" ;
-"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_7" [label="7:  DeclStmt \n   *&a:int=9 [line 23]\n " shape="box"]
+	 "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_5" -> "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_4" ;
+"comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_6" [label="6:  DeclStmt \n   *&a:int=9 [line 17]\n " shape="box"]
 	
 
-	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_7" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_6" ;
-"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_6" [label="6:  DeclStmt \n   *&b:int=7 [line 23]\n " shape="box"]
+	 "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_6" -> "comma_2.aa5fd44d8dfe78041d816bb9ce86a85f_5" ;
+"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_1" [label="1: Start comma_3\nFormals: \nLocals:  d:int c:int b:int a:int \n   DECLARE_LOCALS(&return,&d,&c,&b,&a); [line 22]\n " color=yellow style=filled]
 	
 
-	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_6" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_5" ;
-"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_5" [label="5:  DeclStmt \n   *&c:int=3 [line 23]\n " shape="box"]
+	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_1" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_7" ;
+"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_2" [label="2: Exit comma_3 \n  " color=yellow style=filled]
 	
 
-	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_5" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_4" ;
+"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_3" [label="3:  Return Stmt \n   n$0=*&d:int [line 25]\n  *&return:int=n$0 [line 25]\n " shape="box"]
+	
+
+	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_3" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_2" ;
 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_4" [label="4:  DeclStmt \n   n$1=*&a:int [line 24]\n  *&a:int=(n$1 * 2) [line 24]\n  n$2=*&a:int [line 24]\n  n$3=*&a:int [line 24]\n  *&a:int=(n$3 + 1) [line 24]\n  *&b:int=(7 * n$3) [line 24]\n  n$4=*&b:int [line 24]\n  n$5=*&a:int [line 24]\n  n$6=*&b:int [line 24]\n  *&c:int=((n$5 + n$6) + 9) [line 24]\n  n$7=*&c:int [line 24]\n  n$8=*&c:int [line 24]\n  *&d:int=n$8 [line 24]\n " shape="box"]
 	
 
 	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_4" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_3" ;
-"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_3" [label="3:  Return Stmt \n   n$0=*&d:int [line 25]\n  *&return:int=n$0 [line 25]\n " shape="box"]
+"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_5" [label="5:  DeclStmt \n   *&c:int=3 [line 23]\n " shape="box"]
 	
 
-	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_3" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_2" ;
-"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_2" [label="2: Exit comma_3 \n  " color=yellow style=filled]
+	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_5" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_4" ;
+"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_6" [label="6:  DeclStmt \n   *&b:int=7 [line 23]\n " shape="box"]
 	
 
-"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_1" [label="1: Start comma_3\nFormals: \nLocals:  d:int c:int b:int a:int \n   DECLARE_LOCALS(&return,&d,&c,&b,&a); [line 22]\n " color=yellow style=filled]
+	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_6" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_5" ;
+"comma_3.94b9d12e6a2f1dbb384d21928d4e092d_7" [label="7:  DeclStmt \n   *&a:int=9 [line 23]\n " shape="box"]
 	
 
-	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_1" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_7" ;
+	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_7" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_6" ;
 }

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

@@ -1,82 +1,82 @@
 /* @generated */
 digraph iCFG {
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_19" [label="19: Prune (false branch) \n   n$14=*&p:int** [line 11]\n  n$15=*n$14[0]:int* [line 11]\n  PRUNE((n$15 == 0), false); [line 11]\n " shape="invhouse"]
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_1" [label="1: Start dereference_in_array_access\nFormals:  p:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
-	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_19" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_17" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_18" [label="18: Prune (true branch) \n   n$14=*&p:int** [line 11]\n  n$15=*n$14[0]:int* [line 11]\n  PRUNE((n$15 != 0), true); [line 11]\n " shape="invhouse"]
+	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_1" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_18" ;
+	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_1" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_19" ;
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_2" [label="2: Exit dereference_in_array_access \n  " color=yellow style=filled]
 	
 
-	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_18" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_17" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_17" [label="17: + \n  " ]
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_3" [label="3: + \n  " ]
 	
 
-	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_17" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_14" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_16" [label="16: Prune (false branch) \n   n$12=*n$11:int* [line 13]\n  n$13=*n$12[1]:int [line 13]\n  PRUNE((n$13 == 0), false); [line 13]\n " shape="invhouse"]
+	 "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  " shape="box"]
 	
 
-	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_16" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_13" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_15" [label="15: Prune (true branch) \n   n$12=*n$11:int* [line 13]\n  n$13=*n$12[1]:int [line 13]\n  PRUNE((n$13 != 0), true); [line 13]\n " shape="invhouse"]
+	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_4" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_2" ;
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_5" [label="5:  UnaryOperator \n   n$0=*&p:int** [line 17]\n " shape="box"]
 	
 
-	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_15" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_13" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_14" [label="14:  UnaryOperator \n   n$11=*&p:int** [line 13]\n " shape="box"]
+	 "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 17]\n  n$3=*n$2:int* [line 17]\n " shape="box"]
 	
 
-	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_14" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_15" ;
-	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_14" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_16" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_13" [label="13: + \n  " ]
+	 "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) \n   n$1=*n$0:int* [line 17]\n  n$4=*n$3:int [line 17]\n  n$5=*n$1[n$4]:int [line 17]\n  PRUNE((n$5 != 0), true); [line 17]\n " shape="invhouse"]
 	
 
-	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_13" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_10" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_12" [label="12: Prune (false branch) \n   n$6=*&p:int** [line 15]\n  n$9=*n$8:int [line 15]\n  n$10=*n$6[n$9]:int* [line 15]\n  PRUNE((n$10 == 0), false); [line 15]\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) \n   n$1=*n$0:int* [line 17]\n  n$4=*n$3:int [line 17]\n  n$5=*n$1[n$4]:int [line 17]\n  PRUNE((n$5 == 0), false); [line 17]\n " shape="invhouse"]
 	
 
-	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_12" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_9" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_11" [label="11: Prune (true branch) \n   n$6=*&p:int** [line 15]\n  n$9=*n$8:int [line 15]\n  n$10=*n$6[n$9]:int* [line 15]\n  PRUNE((n$10 != 0), true); [line 15]\n " shape="invhouse"]
+	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_8" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_3" ;
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_9" [label="9: + \n  " ]
 	
 
-	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_11" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_9" ;
+	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_9" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_5" ;
 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_10" [label="10:  UnaryOperator \n   n$7=*&p:int** [line 15]\n  n$8=*n$7:int* [line 15]\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_9" [label="9: + \n  " ]
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_11" [label="11: Prune (true branch) \n   n$6=*&p:int** [line 15]\n  n$9=*n$8:int [line 15]\n  n$10=*n$6[n$9]:int* [line 15]\n  PRUNE((n$10 != 0), true); [line 15]\n " shape="invhouse"]
 	
 
-	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_9" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_5" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_8" [label="8: Prune (false branch) \n   n$1=*n$0:int* [line 17]\n  n$4=*n$3:int [line 17]\n  n$5=*n$1[n$4]:int [line 17]\n  PRUNE((n$5 == 0), false); [line 17]\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) \n   n$6=*&p:int** [line 15]\n  n$9=*n$8:int [line 15]\n  n$10=*n$6[n$9]:int* [line 15]\n  PRUNE((n$10 == 0), false); [line 15]\n " shape="invhouse"]
 	
 
-	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_8" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_3" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_7" [label="7: Prune (true branch) \n   n$1=*n$0:int* [line 17]\n  n$4=*n$3:int [line 17]\n  n$5=*n$1[n$4]:int [line 17]\n  PRUNE((n$5 != 0), true); [line 17]\n " shape="invhouse"]
+	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_12" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_9" ;
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_13" [label="13: + \n  " ]
 	
 
-	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_7" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_3" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_6" [label="6:  UnaryOperator \n   n$2=*&p:int** [line 17]\n  n$3=*n$2:int* [line 17]\n " shape="box"]
+	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_13" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_10" ;
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_14" [label="14:  UnaryOperator \n   n$11=*&p:int** [line 13]\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_5" [label="5:  UnaryOperator \n   n$0=*&p:int** [line 17]\n " shape="box"]
+	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_14" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_15" ;
+	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_14" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_16" ;
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_15" [label="15: Prune (true branch) \n   n$12=*n$11:int* [line 13]\n  n$13=*n$12[1]:int [line 13]\n  PRUNE((n$13 != 0), true); [line 13]\n " shape="invhouse"]
 	
 
-	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_5" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_6" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_4" [label="4:  between_join_and_exit \n  " shape="box"]
+	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_15" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_13" ;
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_16" [label="16: Prune (false branch) \n   n$12=*n$11:int* [line 13]\n  n$13=*n$12[1]:int [line 13]\n  PRUNE((n$13 == 0), false); [line 13]\n " shape="invhouse"]
 	
 
-	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_4" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_2" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_3" [label="3: + \n  " ]
+	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_16" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_13" ;
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_17" [label="17: + \n  " ]
 	
 
-	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_3" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_4" ;
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_2" [label="2: Exit dereference_in_array_access \n  " color=yellow style=filled]
+	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_17" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_14" ;
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_18" [label="18: Prune (true branch) \n   n$14=*&p:int** [line 11]\n  n$15=*n$14[0]:int* [line 11]\n  PRUNE((n$15 != 0), true); [line 11]\n " shape="invhouse"]
 	
 
-"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_1" [label="1: Start dereference_in_array_access\nFormals:  p:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
+	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_18" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_17" ;
+"dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_19" [label="19: Prune (false branch) \n   n$14=*&p:int** [line 11]\n  n$15=*n$14[0]:int* [line 11]\n  PRUNE((n$15 == 0), false); [line 11]\n " shape="invhouse"]
 	
 
-	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_1" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_18" ;
-	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_1" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_19" ;
+	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_19" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_17" ;
 }

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

@@ -1,202 +1,202 @@
 /* @generated */
 digraph iCFG {
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_48" [label="48:  BinaryOperatorStmt: Assign \n   n$31=*&0$?%__sil_tmpSIL_temp_conditional___n$28:int [line 13]\n  *&x1:int=(n$31 + 77) [line 13]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_1" [label="1: Start binop_with_side_effects\nFormals:  z:int\nLocals:  y3:int 0$?%__sil_tmpSIL_temp_conditional___n$0:int 0$?%__sil_tmpSIL_temp_conditional___n$4:int y2:int 0$?%__sil_tmpSIL_temp_conditional___n$8:int y1:int 0$?%__sil_tmpSIL_temp_conditional___n$12:int 0$?%__sil_tmpSIL_temp_conditional___n$16:int 0$?%__sil_tmpSIL_temp_conditional___n$20:int x3:int 0$?%__sil_tmpSIL_temp_conditional___n$24:int x2:int 0$?%__sil_tmpSIL_temp_conditional___n$28:int x1:int \n   DECLARE_LOCALS(&return,&y3,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$4,&y2,&0$?%__sil_tmpSIL_temp_conditional___n$8,&y1,&0$?%__sil_tmpSIL_temp_conditional___n$12,&0$?%__sil_tmpSIL_temp_conditional___n$16,&0$?%__sil_tmpSIL_temp_conditional___n$20,&x3,&0$?%__sil_tmpSIL_temp_conditional___n$24,&x2,&0$?%__sil_tmpSIL_temp_conditional___n$28,&x1); [line 10]\n " color=yellow style=filled]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_48" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_38" ;
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_48" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_39" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_47" [label="47:  ConditinalStmt Branch \n   n$30=*&z:int [line 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$28:int=n$30 [line 13]\n " shape="box"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_1" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_44" ;
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_1" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_45" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_2" [label="2: Exit binop_with_side_effects \n  " color=yellow style=filled]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_47" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_43" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_46" [label="46:  ConditinalStmt Branch \n   n$29=*&z:int [line 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$28:int=n$29 [line 13]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_3" [label="3: + \n  " ]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_46" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_43" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_45" [label="45: Prune (false branch) \n   PRUNE((1 == 0), false); [line 13]\n " shape="invhouse"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_3" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_9" ;
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_3" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_10" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 26]\n " shape="invhouse"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_45" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_47" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_44" [label="44: Prune (true branch) \n   PRUNE((1 != 0), true); [line 13]\n " shape="invhouse"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_4" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_6" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 26]\n " shape="invhouse"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_44" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_46" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_43" [label="43: + \n  " ]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_5" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_7" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_6" [label="6:  ConditinalStmt Branch \n   n$1=*&z:int [line 26]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$1 [line 26]\n " shape="box"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_43" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_48" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_42" [label="42:  BinaryOperatorStmt: Assign \n   n$27=*&0$?%__sil_tmpSIL_temp_conditional___n$24:int [line 16]\n  *&x2:int=(77 + n$27) [line 16]\n " shape="box"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_6" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_3" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_7" [label="7:  ConditinalStmt Branch \n   n$2=*&z:int [line 26]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$2 [line 26]\n " shape="box"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_42" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_27" ;
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_42" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_28" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_41" [label="41:  ConditinalStmt Branch \n   n$26=*&z:int [line 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$24:int=n$26 [line 16]\n " shape="box"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_7" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_3" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_8" [label="8: + \n  " ]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_41" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_37" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_40" [label="40:  ConditinalStmt Branch \n   n$25=*&z:int [line 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$24:int=n$25 [line 16]\n " shape="box"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_8" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_13" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_9" [label="9: Prune (true branch) \n   PRUNE((1 != 0), true); [line 26]\n " shape="invhouse"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_40" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_37" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_39" [label="39: Prune (false branch) \n   PRUNE((1 == 0), false); [line 16]\n " shape="invhouse"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_9" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_11" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_10" [label="10: Prune (false branch) \n   PRUNE((1 == 0), false); [line 26]\n " shape="invhouse"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_39" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_41" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_38" [label="38: Prune (true branch) \n   PRUNE((1 != 0), true); [line 16]\n " shape="invhouse"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_10" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_12" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_11" [label="11:  ConditinalStmt Branch \n   n$5=*&z:int [line 26]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=n$5 [line 26]\n " shape="box"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_38" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_40" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_37" [label="37: + \n  " ]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_11" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_8" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_12" [label="12:  ConditinalStmt Branch \n   n$6=*&z:int [line 26]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=n$6 [line 26]\n " shape="box"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_37" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_42" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_36" [label="36:  BinaryOperatorStmt: Assign \n   n$19=*&0$?%__sil_tmpSIL_temp_conditional___n$16:int [line 19]\n  n$23=*&0$?%__sil_tmpSIL_temp_conditional___n$20:int [line 19]\n  *&x3:int=(n$19 + n$23) [line 19]\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   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 26]\n  n$7=*&0$?%__sil_tmpSIL_temp_conditional___n$4:int [line 26]\n  *&y3:int=(n$3 + n$7) [line 26]\n " shape="box"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_36" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_21" ;
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_36" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_22" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_35" [label="35:  ConditinalStmt Branch \n   n$22=*&z:int [line 19]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$20:int=n$22 [line 19]\n " shape="box"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_13" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_2" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_14" [label="14: + \n  " ]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_35" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_31" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_34" [label="34:  ConditinalStmt Branch \n   n$21=*&z:int [line 19]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$20:int=n$21 [line 19]\n " shape="box"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_14" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_19" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_15" [label="15: Prune (true branch) \n   PRUNE((1 != 0), true); [line 24]\n " shape="invhouse"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_34" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_31" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_33" [label="33: Prune (false branch) \n   PRUNE((1 == 0), false); [line 19]\n " shape="invhouse"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_15" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_17" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_16" [label="16: Prune (false branch) \n   PRUNE((1 == 0), false); [line 24]\n " shape="invhouse"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_33" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_35" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_32" [label="32: Prune (true branch) \n   PRUNE((1 != 0), true); [line 19]\n " shape="invhouse"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_16" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_18" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_17" [label="17:  ConditinalStmt Branch \n   n$9=*&z:int [line 24]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=n$9 [line 24]\n " shape="box"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_32" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_34" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_31" [label="31: + \n  " ]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_17" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_14" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_18" [label="18:  ConditinalStmt Branch \n   n$10=*&z:int [line 24]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=n$10 [line 24]\n " shape="box"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_31" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_36" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_30" [label="30:  ConditinalStmt Branch \n   n$18=*&z:int [line 19]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$16:int=n$18 [line 19]\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   n$11=*&0$?%__sil_tmpSIL_temp_conditional___n$8:int [line 24]\n  *&y2:int=(77 + n$11) [line 24]\n " shape="box"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_30" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_26" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_29" [label="29:  ConditinalStmt Branch \n   n$17=*&z:int [line 19]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$16:int=n$17 [line 19]\n " shape="box"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_19" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_4" ;
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_19" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_5" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_20" [label="20: + \n  " ]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_29" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_26" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_28" [label="28: Prune (false branch) \n   PRUNE((1 == 0), false); [line 19]\n " shape="invhouse"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_20" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_25" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_21" [label="21: Prune (true branch) \n   PRUNE((1 != 0), true); [line 22]\n " shape="invhouse"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_28" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_30" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_27" [label="27: Prune (true branch) \n   PRUNE((1 != 0), true); [line 19]\n " shape="invhouse"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_21" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_23" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_22" [label="22: Prune (false branch) \n   PRUNE((1 == 0), false); [line 22]\n " shape="invhouse"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_27" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_29" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_26" [label="26: + \n  " ]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_22" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_24" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_23" [label="23:  ConditinalStmt Branch \n   n$13=*&z:int [line 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$12:int=n$13 [line 22]\n " shape="box"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_26" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_32" ;
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_26" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_33" ;
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_23" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_20" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_24" [label="24:  ConditinalStmt Branch \n   n$14=*&z:int [line 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$12:int=n$14 [line 22]\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   n$15=*&0$?%__sil_tmpSIL_temp_conditional___n$12:int [line 22]\n  *&y1:int=(n$15 + 77) [line 22]\n " shape="box"]
 	
 
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_25" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_15" ;
 	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_25" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_16" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_24" [label="24:  ConditinalStmt Branch \n   n$14=*&z:int [line 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$12:int=n$14 [line 22]\n " shape="box"]
-	
-
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_24" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_20" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_23" [label="23:  ConditinalStmt Branch \n   n$13=*&z:int [line 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$12:int=n$13 [line 22]\n " shape="box"]
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_26" [label="26: + \n  " ]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_23" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_20" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_22" [label="22: Prune (false branch) \n   PRUNE((1 == 0), false); [line 22]\n " shape="invhouse"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_26" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_32" ;
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_26" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_33" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_27" [label="27: Prune (true branch) \n   PRUNE((1 != 0), true); [line 19]\n " shape="invhouse"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_22" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_24" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_21" [label="21: Prune (true branch) \n   PRUNE((1 != 0), true); [line 22]\n " shape="invhouse"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_27" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_29" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_28" [label="28: Prune (false branch) \n   PRUNE((1 == 0), false); [line 19]\n " shape="invhouse"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_21" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_23" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_20" [label="20: + \n  " ]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_28" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_30" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_29" [label="29:  ConditinalStmt Branch \n   n$17=*&z:int [line 19]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$16:int=n$17 [line 19]\n " shape="box"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_20" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_25" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_19" [label="19:  DeclStmt \n   n$11=*&0$?%__sil_tmpSIL_temp_conditional___n$8:int [line 24]\n  *&y2:int=(77 + n$11) [line 24]\n " shape="box"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_29" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_26" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_30" [label="30:  ConditinalStmt Branch \n   n$18=*&z:int [line 19]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$16:int=n$18 [line 19]\n " shape="box"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_19" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_4" ;
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_19" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_5" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_18" [label="18:  ConditinalStmt Branch \n   n$10=*&z:int [line 24]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=n$10 [line 24]\n " shape="box"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_30" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_26" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_31" [label="31: + \n  " ]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_18" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_14" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_17" [label="17:  ConditinalStmt Branch \n   n$9=*&z:int [line 24]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=n$9 [line 24]\n " shape="box"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_31" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_36" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_32" [label="32: Prune (true branch) \n   PRUNE((1 != 0), true); [line 19]\n " shape="invhouse"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_17" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_14" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_16" [label="16: Prune (false branch) \n   PRUNE((1 == 0), false); [line 24]\n " shape="invhouse"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_32" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_34" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_33" [label="33: Prune (false branch) \n   PRUNE((1 == 0), false); [line 19]\n " shape="invhouse"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_16" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_18" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_15" [label="15: Prune (true branch) \n   PRUNE((1 != 0), true); [line 24]\n " shape="invhouse"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_33" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_35" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_34" [label="34:  ConditinalStmt Branch \n   n$21=*&z:int [line 19]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$20:int=n$21 [line 19]\n " shape="box"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_15" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_17" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_14" [label="14: + \n  " ]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_34" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_31" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_35" [label="35:  ConditinalStmt Branch \n   n$22=*&z:int [line 19]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$20:int=n$22 [line 19]\n " shape="box"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_14" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_19" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_13" [label="13:  DeclStmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 26]\n  n$7=*&0$?%__sil_tmpSIL_temp_conditional___n$4:int [line 26]\n  *&y3:int=(n$3 + n$7) [line 26]\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 19]\n  n$23=*&0$?%__sil_tmpSIL_temp_conditional___n$20:int [line 19]\n  *&x3:int=(n$19 + n$23) [line 19]\n " shape="box"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_13" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_2" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_12" [label="12:  ConditinalStmt Branch \n   n$6=*&z:int [line 26]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=n$6 [line 26]\n " shape="box"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_36" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_21" ;
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_36" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_22" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_37" [label="37: + \n  " ]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_12" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_8" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_11" [label="11:  ConditinalStmt Branch \n   n$5=*&z:int [line 26]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=n$5 [line 26]\n " shape="box"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_37" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_42" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_38" [label="38: Prune (true branch) \n   PRUNE((1 != 0), true); [line 16]\n " shape="invhouse"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_11" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_8" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_10" [label="10: Prune (false branch) \n   PRUNE((1 == 0), false); [line 26]\n " shape="invhouse"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_38" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_40" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_39" [label="39: Prune (false branch) \n   PRUNE((1 == 0), false); [line 16]\n " shape="invhouse"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_10" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_12" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_9" [label="9: Prune (true branch) \n   PRUNE((1 != 0), true); [line 26]\n " shape="invhouse"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_39" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_41" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_40" [label="40:  ConditinalStmt Branch \n   n$25=*&z:int [line 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$24:int=n$25 [line 16]\n " shape="box"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_9" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_11" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_8" [label="8: + \n  " ]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_40" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_37" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_41" [label="41:  ConditinalStmt Branch \n   n$26=*&z:int [line 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$24:int=n$26 [line 16]\n " shape="box"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_8" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_13" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_7" [label="7:  ConditinalStmt Branch \n   n$2=*&z:int [line 26]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$2 [line 26]\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 16]\n  *&x2:int=(77 + n$27) [line 16]\n " shape="box"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_7" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_3" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_6" [label="6:  ConditinalStmt Branch \n   n$1=*&z:int [line 26]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$1 [line 26]\n " shape="box"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_42" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_27" ;
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_42" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_28" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_43" [label="43: + \n  " ]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_6" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_3" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 26]\n " shape="invhouse"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_43" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_48" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_44" [label="44: Prune (true branch) \n   PRUNE((1 != 0), true); [line 13]\n " shape="invhouse"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_5" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_7" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 26]\n " shape="invhouse"]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_44" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_46" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_45" [label="45: Prune (false branch) \n   PRUNE((1 == 0), false); [line 13]\n " shape="invhouse"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_4" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_6" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_3" [label="3: + \n  " ]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_45" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_47" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_46" [label="46:  ConditinalStmt Branch \n   n$29=*&z:int [line 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$28:int=n$29 [line 13]\n " shape="box"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_3" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_9" ;
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_3" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_10" ;
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_2" [label="2: Exit binop_with_side_effects \n  " color=yellow style=filled]
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_46" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_43" ;
+"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_47" [label="47:  ConditinalStmt Branch \n   n$30=*&z:int [line 13]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$28:int=n$30 [line 13]\n " shape="box"]
 	
 
-"binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_1" [label="1: Start binop_with_side_effects\nFormals:  z:int\nLocals:  y3:int 0$?%__sil_tmpSIL_temp_conditional___n$0:int 0$?%__sil_tmpSIL_temp_conditional___n$4:int y2:int 0$?%__sil_tmpSIL_temp_conditional___n$8:int y1:int 0$?%__sil_tmpSIL_temp_conditional___n$12:int 0$?%__sil_tmpSIL_temp_conditional___n$16:int 0$?%__sil_tmpSIL_temp_conditional___n$20:int x3:int 0$?%__sil_tmpSIL_temp_conditional___n$24:int x2:int 0$?%__sil_tmpSIL_temp_conditional___n$28:int x1:int \n   DECLARE_LOCALS(&return,&y3,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$4,&y2,&0$?%__sil_tmpSIL_temp_conditional___n$8,&y1,&0$?%__sil_tmpSIL_temp_conditional___n$12,&0$?%__sil_tmpSIL_temp_conditional___n$16,&0$?%__sil_tmpSIL_temp_conditional___n$20,&x3,&0$?%__sil_tmpSIL_temp_conditional___n$24,&x2,&0$?%__sil_tmpSIL_temp_conditional___n$28,&x1); [line 10]\n " color=yellow style=filled]
+	 "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 13]\n  *&x1:int=(n$31 + 77) [line 13]\n " shape="box"]
 	
 
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_1" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_44" ;
-	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_1" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_45" ;
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_48" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_38" ;
+	 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_48" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_39" ;
 }

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

@@ -1,243 +1,243 @@
 /* @generated */
 digraph iCFG {
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_37" [label="37:  DeclStmt \n   *&x:int=5 [line 11]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_1" [label="1: Start foo\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int 0$?%__sil_tmpSIL_temp_conditional___n$2:int 0$?%__sil_tmpSIL_temp_conditional___n$3:int n:int 0$?%__sil_tmpSIL_temp_conditional___n$6:int y:int x:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$2,&0$?%__sil_tmpSIL_temp_conditional___n$3,&n,&0$?%__sil_tmpSIL_temp_conditional___n$6,&y,&x); [line 10]\n " color=yellow style=filled]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_37" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_31" ;
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_37" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_32" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_36" [label="36:  BinaryOperatorStmt: Assign \n   *&x:int=0 [line 13]\n " shape="box"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_1" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_37" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_2" [label="2: Exit foo \n  " color=yellow style=filled]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_36" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_30" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_35" [label="35: Prune (false branch) \n   PRUNE(((7 < n$10) == 0), false); [line 12]\n " shape="invhouse"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_3" [label="3: + \n  " ]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_35" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_30" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_34" [label="34: Prune (true branch) \n   PRUNE(((7 < n$10) != 0), true); [line 12]\n " shape="invhouse"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_8" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_4" [label="4: Prune (true branch) \n   PRUNE(((7 > 9) != 0), true); [line 18]\n " shape="invhouse"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_34" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_36" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_33" [label="33:  BinaryOperatorStmt: LT \n   n$10=*&x:int [line 12]\n  *&x:int=(n$10 + 1) [line 12]\n " shape="box"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_4" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_6" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_5" [label="5: Prune (false branch) \n   PRUNE(((7 > 9) == 0), false); [line 18]\n " shape="invhouse"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_33" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_34" ;
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_33" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_35" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_32" [label="32: Prune (false branch) \n   PRUNE(((3 < 4) == 0), false); [line 12]\n " shape="invhouse"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_5" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_7" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 18]\n " shape="box"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_32" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_33" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_31" [label="31: Prune (true branch) \n   PRUNE(((3 < 4) != 0), true); [line 12]\n " shape="invhouse"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_6" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 18]\n " shape="box"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_31" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_36" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_30" [label="30: + \n  " ]
+	 "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 18]\n  *&return:int=(0 + n$1) [line 18]\n " shape="box"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_30" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_29" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_29" [label="29:  DeclStmt \n   *&y:int=19 [line 15]\n " shape="box"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_8" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_2" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_9" [label="9: + \n  " ]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_29" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_21" ;
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_29" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_22" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_28" [label="28:  DeclStmt \n   n$9=*&0$?%__sil_tmpSIL_temp_conditional___n$6:int [line 16]\n  *&n:int=n$9 [line 16]\n " shape="box"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_9" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_19" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_10" [label="10: Prune (true branch) \n   PRUNE(((2 < 1) != 0), true); [line 17]\n " shape="invhouse"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_28" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_10" ;
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_28" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_11" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_27" [label="27:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=2 [line 16]\n " shape="box"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_10" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_12" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_11" [label="11: Prune (false branch) \n   PRUNE(((2 < 1) == 0), false); [line 17]\n " shape="invhouse"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_27" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_20" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_26" [label="26:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=1 [line 16]\n " shape="box"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_11" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_14" ;
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_11" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_15" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 17]\n " shape="box"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_26" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_20" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_25" [label="25: Prune (false branch) \n   PRUNE(((7 < (n$7 - n$8)) == 0), false); [line 16]\n " shape="invhouse"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_12" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_9" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_13" [label="13: + \n  " ]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_25" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_27" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_24" [label="24: Prune (true branch) \n   PRUNE(((7 < (n$7 - n$8)) != 0), true); [line 16]\n " shape="invhouse"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_13" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_18" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_14" [label="14: Prune (true branch) \n   PRUNE(((5 > 4) != 0), true); [line 17]\n " shape="invhouse"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_24" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_26" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_23" [label="23:  BinaryOperatorStmt: LT \n   n$7=*&x:int [line 16]\n  *&x:int=(n$7 + 1) [line 16]\n  n$8=*&y:int [line 16]\n " shape="box"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_14" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_16" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_15" [label="15: Prune (false branch) \n   PRUNE(((5 > 4) == 0), false); [line 17]\n " shape="invhouse"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_23" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_24" ;
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_23" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_25" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_22" [label="22: Prune (false branch) \n   PRUNE(((3 < 4) == 0), false); [line 16]\n " shape="invhouse"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_15" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_17" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 17]\n " shape="box"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_22" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_23" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_21" [label="21: Prune (true branch) \n   PRUNE(((3 < 4) != 0), true); [line 16]\n " shape="invhouse"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_16" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_13" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=2 [line 17]\n " shape="box"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_21" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_26" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_20" [label="20: + \n  " ]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_17" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_13" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_18" [label="18:  ConditinalStmt Branch \n   n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$4 [line 17]\n " shape="box"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_20" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_28" ;
+	 "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 17]\n  *&n:int=n$5 [line 17]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_19" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_4" ;
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_19" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_5" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_18" [label="18:  ConditinalStmt Branch \n   n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$4 [line 17]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_20" [label="20: + \n  " ]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_18" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_9" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=2 [line 17]\n " shape="box"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_20" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_28" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_21" [label="21: Prune (true branch) \n   PRUNE(((3 < 4) != 0), true); [line 16]\n " shape="invhouse"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_17" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_13" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 17]\n " shape="box"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_21" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_26" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_22" [label="22: Prune (false branch) \n   PRUNE(((3 < 4) == 0), false); [line 16]\n " shape="invhouse"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_16" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_13" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_15" [label="15: Prune (false branch) \n   PRUNE(((5 > 4) == 0), false); [line 17]\n " shape="invhouse"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_22" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_23" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_23" [label="23:  BinaryOperatorStmt: LT \n   n$7=*&x:int [line 16]\n  *&x:int=(n$7 + 1) [line 16]\n  n$8=*&y:int [line 16]\n " shape="box"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_15" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_17" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_14" [label="14: Prune (true branch) \n   PRUNE(((5 > 4) != 0), true); [line 17]\n " shape="invhouse"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_23" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_24" ;
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_23" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_25" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_24" [label="24: Prune (true branch) \n   PRUNE(((7 < (n$7 - n$8)) != 0), true); [line 16]\n " shape="invhouse"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_14" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_16" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_13" [label="13: + \n  " ]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_24" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_26" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_25" [label="25: Prune (false branch) \n   PRUNE(((7 < (n$7 - n$8)) == 0), false); [line 16]\n " shape="invhouse"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_13" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_18" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 17]\n " shape="box"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_25" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_27" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_26" [label="26:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=1 [line 16]\n " shape="box"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_12" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_9" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_11" [label="11: Prune (false branch) \n   PRUNE(((2 < 1) == 0), false); [line 17]\n " shape="invhouse"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_26" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_20" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_27" [label="27:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=2 [line 16]\n " shape="box"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_11" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_14" ;
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_11" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_15" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_10" [label="10: Prune (true branch) \n   PRUNE(((2 < 1) != 0), true); [line 17]\n " shape="invhouse"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_27" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_20" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_28" [label="28:  DeclStmt \n   n$9=*&0$?%__sil_tmpSIL_temp_conditional___n$6:int [line 16]\n  *&n:int=n$9 [line 16]\n " shape="box"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_10" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_12" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_9" [label="9: + \n  " ]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_28" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_10" ;
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_28" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_11" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_29" [label="29:  DeclStmt \n   *&y:int=19 [line 15]\n " shape="box"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_9" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_19" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_8" [label="8:  Return Stmt \n   n$1=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 18]\n  *&return:int=(0 + n$1) [line 18]\n " shape="box"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_29" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_21" ;
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_29" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_22" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_30" [label="30: + \n  " ]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_8" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_2" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 18]\n " shape="box"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_30" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_29" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_31" [label="31: Prune (true branch) \n   PRUNE(((3 < 4) != 0), true); [line 12]\n " shape="invhouse"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_7" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 18]\n " shape="box"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_31" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_36" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_32" [label="32: Prune (false branch) \n   PRUNE(((3 < 4) == 0), false); [line 12]\n " shape="invhouse"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_6" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_5" [label="5: Prune (false branch) \n   PRUNE(((7 > 9) == 0), false); [line 18]\n " shape="invhouse"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_32" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_33" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_33" [label="33:  BinaryOperatorStmt: LT \n   n$10=*&x:int [line 12]\n  *&x:int=(n$10 + 1) [line 12]\n " shape="box"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_5" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_7" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_4" [label="4: Prune (true branch) \n   PRUNE(((7 > 9) != 0), true); [line 18]\n " shape="invhouse"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_33" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_34" ;
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_33" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_35" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_34" [label="34: Prune (true branch) \n   PRUNE(((7 < n$10) != 0), true); [line 12]\n " shape="invhouse"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_4" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_6" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_3" [label="3: + \n  " ]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_34" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_36" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_35" [label="35: Prune (false branch) \n   PRUNE(((7 < n$10) == 0), false); [line 12]\n " shape="invhouse"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_8" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_2" [label="2: Exit foo \n  " color=yellow style=filled]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_35" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_30" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_36" [label="36:  BinaryOperatorStmt: Assign \n   *&x:int=0 [line 13]\n " shape="box"]
 	
 
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_1" [label="1: Start foo\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int 0$?%__sil_tmpSIL_temp_conditional___n$2:int 0$?%__sil_tmpSIL_temp_conditional___n$3:int n:int 0$?%__sil_tmpSIL_temp_conditional___n$6:int y:int x:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$2,&0$?%__sil_tmpSIL_temp_conditional___n$3,&n,&0$?%__sil_tmpSIL_temp_conditional___n$6,&y,&x); [line 10]\n " color=yellow style=filled]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_36" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_30" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_37" [label="37:  DeclStmt \n   *&x:int=5 [line 11]\n " shape="box"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_1" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_37" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_21" [label="21:  BinaryOperatorStmt: Assign \n   n$9=*&0$?%__sil_tmpSIL_temp_conditional___n$5:int [line 23]\n  *&y:int=n$9 [line 23]\n " shape="box"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_37" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_31" ;
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_37" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_32" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_1" [label="1: Start bar\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int 0$?%__sil_tmpSIL_temp_conditional___n$1:int 0$?%__sil_tmpSIL_temp_conditional___n$5:int y:int x:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$1,&0$?%__sil_tmpSIL_temp_conditional___n$5,&y,&x); [line 21]\n " color=yellow style=filled]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_21" -> "bar.37b51d194a7513e45b56f6524f2d51f2_5" ;
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_21" -> "bar.37b51d194a7513e45b56f6524f2d51f2_6" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_20" [label="20:  ConditinalStmt Branch \n   n$8=*&x:int [line 23]\n  *&x:int=(n$8 - 1) [line 23]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int=n$8 [line 23]\n " shape="box"]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_1" -> "bar.37b51d194a7513e45b56f6524f2d51f2_16" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_2" [label="2: Exit bar \n  " color=yellow style=filled]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_20" -> "bar.37b51d194a7513e45b56f6524f2d51f2_15" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_19" [label="19:  ConditinalStmt Branch \n   n$7=*&x:int [line 23]\n  *&x:int=(n$7 + 1) [line 23]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int=(n$7 + 1) [line 23]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_3" [label="3: + \n  " ]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_19" -> "bar.37b51d194a7513e45b56f6524f2d51f2_15" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_18" [label="18: Prune (false branch) \n   PRUNE(((n$6 > 1) == 0), false); [line 23]\n " shape="invhouse"]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_3" -> "bar.37b51d194a7513e45b56f6524f2d51f2_14" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_4" [label="4: + \n  " ]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_18" -> "bar.37b51d194a7513e45b56f6524f2d51f2_20" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_17" [label="17: Prune (true branch) \n   PRUNE(((n$6 > 1) != 0), true); [line 23]\n " shape="invhouse"]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_4" -> "bar.37b51d194a7513e45b56f6524f2d51f2_9" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_5" [label="5: Prune (true branch) \n   PRUNE(((3 > 4) != 0), true); [line 24]\n " shape="invhouse"]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_17" -> "bar.37b51d194a7513e45b56f6524f2d51f2_19" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_16" [label="16:  BinaryOperatorStmt: GT \n   *&x:int=1 [line 23]\n  n$6=*&x:int [line 23]\n " shape="box"]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_5" -> "bar.37b51d194a7513e45b56f6524f2d51f2_7" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_6" [label="6: Prune (false branch) \n   PRUNE(((3 > 4) == 0), false); [line 24]\n " shape="invhouse"]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_16" -> "bar.37b51d194a7513e45b56f6524f2d51f2_17" ;
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_16" -> "bar.37b51d194a7513e45b56f6524f2d51f2_18" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_15" [label="15: + \n  " ]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_6" -> "bar.37b51d194a7513e45b56f6524f2d51f2_8" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 24]\n " shape="box"]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_15" -> "bar.37b51d194a7513e45b56f6524f2d51f2_21" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_14" [label="14:  Return Stmt \n   n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 24]\n  *&return:int=(0 + n$4) [line 24]\n " shape="box"]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_7" -> "bar.37b51d194a7513e45b56f6524f2d51f2_4" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=2 [line 24]\n " shape="box"]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_14" -> "bar.37b51d194a7513e45b56f6524f2d51f2_2" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_13" [label="13:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 24]\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 24]\n " shape="box"]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_13" -> "bar.37b51d194a7513e45b56f6524f2d51f2_3" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_12" [label="12:  ConditinalStmt Branch \n   *&x:int=1 [line 24]\n  n$3=*&x:int [line 24]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$3 [line 24]\n " shape="box"]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_9" -> "bar.37b51d194a7513e45b56f6524f2d51f2_10" ;
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_9" -> "bar.37b51d194a7513e45b56f6524f2d51f2_11" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_10" [label="10: Prune (true branch) \n   PRUNE(((n$2 > 1) != 0), true); [line 24]\n " shape="invhouse"]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_12" -> "bar.37b51d194a7513e45b56f6524f2d51f2_3" ;
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_10" -> "bar.37b51d194a7513e45b56f6524f2d51f2_12" ;
 "bar.37b51d194a7513e45b56f6524f2d51f2_11" [label="11: Prune (false branch) \n   PRUNE(((n$2 > 1) == 0), false); [line 24]\n " shape="invhouse"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_11" -> "bar.37b51d194a7513e45b56f6524f2d51f2_13" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_10" [label="10: Prune (true branch) \n   PRUNE(((n$2 > 1) != 0), true); [line 24]\n " shape="invhouse"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_12" [label="12:  ConditinalStmt Branch \n   *&x:int=1 [line 24]\n  n$3=*&x:int [line 24]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$3 [line 24]\n " shape="box"]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_10" -> "bar.37b51d194a7513e45b56f6524f2d51f2_12" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_9" [label="9:  BinaryOperatorStmt: GT \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 24]\n " shape="box"]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_12" -> "bar.37b51d194a7513e45b56f6524f2d51f2_3" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_13" [label="13:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 24]\n " shape="box"]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_9" -> "bar.37b51d194a7513e45b56f6524f2d51f2_10" ;
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_9" -> "bar.37b51d194a7513e45b56f6524f2d51f2_11" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=2 [line 24]\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 24]\n  *&return:int=(0 + n$4) [line 24]\n " shape="box"]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_8" -> "bar.37b51d194a7513e45b56f6524f2d51f2_4" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 24]\n " shape="box"]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_14" -> "bar.37b51d194a7513e45b56f6524f2d51f2_2" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_15" [label="15: + \n  " ]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_7" -> "bar.37b51d194a7513e45b56f6524f2d51f2_4" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_6" [label="6: Prune (false branch) \n   PRUNE(((3 > 4) == 0), false); [line 24]\n " shape="invhouse"]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_15" -> "bar.37b51d194a7513e45b56f6524f2d51f2_21" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_16" [label="16:  BinaryOperatorStmt: GT \n   *&x:int=1 [line 23]\n  n$6=*&x:int [line 23]\n " shape="box"]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_6" -> "bar.37b51d194a7513e45b56f6524f2d51f2_8" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_5" [label="5: Prune (true branch) \n   PRUNE(((3 > 4) != 0), true); [line 24]\n " shape="invhouse"]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_16" -> "bar.37b51d194a7513e45b56f6524f2d51f2_17" ;
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_16" -> "bar.37b51d194a7513e45b56f6524f2d51f2_18" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_17" [label="17: Prune (true branch) \n   PRUNE(((n$6 > 1) != 0), true); [line 23]\n " shape="invhouse"]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_5" -> "bar.37b51d194a7513e45b56f6524f2d51f2_7" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_4" [label="4: + \n  " ]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_17" -> "bar.37b51d194a7513e45b56f6524f2d51f2_19" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_18" [label="18: Prune (false branch) \n   PRUNE(((n$6 > 1) == 0), false); [line 23]\n " shape="invhouse"]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_4" -> "bar.37b51d194a7513e45b56f6524f2d51f2_9" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_3" [label="3: + \n  " ]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_18" -> "bar.37b51d194a7513e45b56f6524f2d51f2_20" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_19" [label="19:  ConditinalStmt Branch \n   n$7=*&x:int [line 23]\n  *&x:int=(n$7 + 1) [line 23]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int=(n$7 + 1) [line 23]\n " shape="box"]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_3" -> "bar.37b51d194a7513e45b56f6524f2d51f2_14" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_2" [label="2: Exit bar \n  " color=yellow style=filled]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_19" -> "bar.37b51d194a7513e45b56f6524f2d51f2_15" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_20" [label="20:  ConditinalStmt Branch \n   n$8=*&x:int [line 23]\n  *&x:int=(n$8 - 1) [line 23]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int=n$8 [line 23]\n " shape="box"]
 	
 
-"bar.37b51d194a7513e45b56f6524f2d51f2_1" [label="1: Start bar\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int 0$?%__sil_tmpSIL_temp_conditional___n$1:int 0$?%__sil_tmpSIL_temp_conditional___n$5:int y:int x:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$1,&0$?%__sil_tmpSIL_temp_conditional___n$5,&y,&x); [line 21]\n " color=yellow style=filled]
+	 "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 23]\n  *&y:int=n$9 [line 23]\n " shape="box"]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_1" -> "bar.37b51d194a7513e45b56f6524f2d51f2_16" ;
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_21" -> "bar.37b51d194a7513e45b56f6524f2d51f2_5" ;
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_21" -> "bar.37b51d194a7513e45b56f6524f2d51f2_6" ;
 }

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

@@ -1,266 +1,266 @@
 /* @generated */
 digraph iCFG {
-"test3.8ad8757baa8564dc136c1e07507f4a98_10" [label="10:  DeclStmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 22]\n  *&x:int=n$3 [line 22]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_1" [label="1: Start test\nFormals:  b:int\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 14]\n " color=yellow style=filled]
 	
 
-	 "test3.8ad8757baa8564dc136c1e07507f4a98_10" -> "test3.8ad8757baa8564dc136c1e07507f4a98_3" ;
-"test3.8ad8757baa8564dc136c1e07507f4a98_9" [label="9:  BinaryConditinalStmt Init \n   n$1=*&b:int [line 22]\n " shape="box"]
+	 "test.098f6bcd4621d373cade4e832627b4f6_1" -> "test.098f6bcd4621d373cade4e832627b4f6_4" ;
+	 "test.098f6bcd4621d373cade4e832627b4f6_1" -> "test.098f6bcd4621d373cade4e832627b4f6_5" ;
+"test.098f6bcd4621d373cade4e832627b4f6_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-	 "test3.8ad8757baa8564dc136c1e07507f4a98_9" -> "test3.8ad8757baa8564dc136c1e07507f4a98_5" ;
-	 "test3.8ad8757baa8564dc136c1e07507f4a98_9" -> "test3.8ad8757baa8564dc136c1e07507f4a98_6" ;
-"test3.8ad8757baa8564dc136c1e07507f4a98_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 22]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_3" [label="3: + \n  " ]
 	
 
-	 "test3.8ad8757baa8564dc136c1e07507f4a98_8" -> "test3.8ad8757baa8564dc136c1e07507f4a98_4" ;
-"test3.8ad8757baa8564dc136c1e07507f4a98_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$1 [line 22]\n " shape="box"]
+	 "test.098f6bcd4621d373cade4e832627b4f6_3" -> "test.098f6bcd4621d373cade4e832627b4f6_8" ;
+"test.098f6bcd4621d373cade4e832627b4f6_4" [label="4: Prune (true branch) \n   n$1=*&b:int [line 14]\n  PRUNE((n$1 != 0), true); [line 14]\n " shape="invhouse"]
 	
 
-	 "test3.8ad8757baa8564dc136c1e07507f4a98_7" -> "test3.8ad8757baa8564dc136c1e07507f4a98_4" ;
-"test3.8ad8757baa8564dc136c1e07507f4a98_6" [label="6: Prune (false branch) \n   PRUNE((n$1 == 0), false); [line 22]\n " shape="invhouse"]
+	 "test.098f6bcd4621d373cade4e832627b4f6_4" -> "test.098f6bcd4621d373cade4e832627b4f6_6" ;
+"test.098f6bcd4621d373cade4e832627b4f6_5" [label="5: Prune (false branch) \n   n$1=*&b:int [line 14]\n  PRUNE((n$1 == 0), false); [line 14]\n " shape="invhouse"]
 	
 
-	 "test3.8ad8757baa8564dc136c1e07507f4a98_6" -> "test3.8ad8757baa8564dc136c1e07507f4a98_8" ;
-"test3.8ad8757baa8564dc136c1e07507f4a98_5" [label="5: Prune (true branch) \n   PRUNE((n$1 != 0), true); [line 22]\n " shape="invhouse"]
+	 "test.098f6bcd4621d373cade4e832627b4f6_5" -> "test.098f6bcd4621d373cade4e832627b4f6_7" ;
+"test.098f6bcd4621d373cade4e832627b4f6_6" [label="6:  ConditinalStmt Branch \n   n$2=*&b:int [line 14]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$2 [line 14]\n " shape="box"]
 	
 
-	 "test3.8ad8757baa8564dc136c1e07507f4a98_5" -> "test3.8ad8757baa8564dc136c1e07507f4a98_7" ;
-"test3.8ad8757baa8564dc136c1e07507f4a98_4" [label="4: + \n  " ]
+	 "test.098f6bcd4621d373cade4e832627b4f6_6" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;
+"test.098f6bcd4621d373cade4e832627b4f6_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 14]\n " shape="box"]
 	
 
-	 "test3.8ad8757baa8564dc136c1e07507f4a98_4" -> "test3.8ad8757baa8564dc136c1e07507f4a98_10" ;
-"test3.8ad8757baa8564dc136c1e07507f4a98_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 23]\n  *&return:int=n$0 [line 23]\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 14]\n  n$4=_fun_test2(n$3:int) [line 14]\n  *&return:int=n$4 [line 14]\n " shape="box"]
 	
 
-	 "test3.8ad8757baa8564dc136c1e07507f4a98_3" -> "test3.8ad8757baa8564dc136c1e07507f4a98_2" ;
-"test3.8ad8757baa8564dc136c1e07507f4a98_2" [label="2: Exit test3 \n  " color=yellow style=filled]
+	 "test.098f6bcd4621d373cade4e832627b4f6_8" -> "test.098f6bcd4621d373cade4e832627b4f6_2" ;
+"test1.5a105e8b9d40e1329780d62ea2265d8a_1" [label="1: Start test1\nFormals:  b:int\nLocals:  x:int 0$?%__sil_tmpSIL_temp_conditional___n$1:int \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 16]\n " color=yellow style=filled]
 	
 
-"test3.8ad8757baa8564dc136c1e07507f4a98_1" [label="1: Start test3\nFormals:  b:int\nLocals:  x:int 0$?%__sil_tmpSIL_temp_conditional___n$2:int \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_temp_conditional___n$2); [line 21]\n " color=yellow style=filled]
+	 "test1.5a105e8b9d40e1329780d62ea2265d8a_1" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_5" ;
+	 "test1.5a105e8b9d40e1329780d62ea2265d8a_1" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_6" ;
+"test1.5a105e8b9d40e1329780d62ea2265d8a_2" [label="2: Exit test1 \n  " color=yellow style=filled]
 	
 
-	 "test3.8ad8757baa8564dc136c1e07507f4a98_1" -> "test3.8ad8757baa8564dc136c1e07507f4a98_9" ;
-"test5.e3d704f3542b44a621ebed70dc0efe13_9" [label="9:  Return Stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 28]\n  *&return:int=n$2 [line 28]\n " shape="box"]
+"test1.5a105e8b9d40e1329780d62ea2265d8a_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 18]\n  *&return:int=n$0 [line 18]\n " shape="box"]
 	
 
-	 "test5.e3d704f3542b44a621ebed70dc0efe13_9" -> "test5.e3d704f3542b44a621ebed70dc0efe13_2" ;
-"test5.e3d704f3542b44a621ebed70dc0efe13_8" [label="8:  BinaryConditinalStmt Init \n   n$0=*&b:int [line 28]\n " shape="box"]
+	 "test1.5a105e8b9d40e1329780d62ea2265d8a_3" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_2" ;
+"test1.5a105e8b9d40e1329780d62ea2265d8a_4" [label="4: + \n  " ]
 	
 
-	 "test5.e3d704f3542b44a621ebed70dc0efe13_8" -> "test5.e3d704f3542b44a621ebed70dc0efe13_4" ;
-	 "test5.e3d704f3542b44a621ebed70dc0efe13_8" -> "test5.e3d704f3542b44a621ebed70dc0efe13_5" ;
-"test5.e3d704f3542b44a621ebed70dc0efe13_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 28]\n " shape="box"]
+	 "test1.5a105e8b9d40e1329780d62ea2265d8a_4" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_9" ;
+"test1.5a105e8b9d40e1329780d62ea2265d8a_5" [label="5: Prune (true branch) \n   n$2=*&b:int [line 17]\n  PRUNE((n$2 != 0), true); [line 17]\n " shape="invhouse"]
 	
 
-	 "test5.e3d704f3542b44a621ebed70dc0efe13_7" -> "test5.e3d704f3542b44a621ebed70dc0efe13_3" ;
-"test5.e3d704f3542b44a621ebed70dc0efe13_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$0 [line 28]\n " shape="box"]
+	 "test1.5a105e8b9d40e1329780d62ea2265d8a_5" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_7" ;
+"test1.5a105e8b9d40e1329780d62ea2265d8a_6" [label="6: Prune (false branch) \n   n$2=*&b:int [line 17]\n  PRUNE((n$2 == 0), false); [line 17]\n " shape="invhouse"]
 	
 
-	 "test5.e3d704f3542b44a621ebed70dc0efe13_6" -> "test5.e3d704f3542b44a621ebed70dc0efe13_3" ;
-"test5.e3d704f3542b44a621ebed70dc0efe13_5" [label="5: Prune (false branch) \n   PRUNE((n$0 == 0), false); [line 28]\n " shape="invhouse"]
+	 "test1.5a105e8b9d40e1329780d62ea2265d8a_6" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_8" ;
+"test1.5a105e8b9d40e1329780d62ea2265d8a_7" [label="7:  ConditinalStmt Branch \n   n$3=*&b:int [line 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$3 [line 17]\n " shape="box"]
 	
 
-	 "test5.e3d704f3542b44a621ebed70dc0efe13_5" -> "test5.e3d704f3542b44a621ebed70dc0efe13_7" ;
-"test5.e3d704f3542b44a621ebed70dc0efe13_4" [label="4: Prune (true branch) \n   PRUNE((n$0 != 0), true); [line 28]\n " shape="invhouse"]
+	 "test1.5a105e8b9d40e1329780d62ea2265d8a_7" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_4" ;
+"test1.5a105e8b9d40e1329780d62ea2265d8a_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 17]\n " shape="box"]
 	
 
-	 "test5.e3d704f3542b44a621ebed70dc0efe13_4" -> "test5.e3d704f3542b44a621ebed70dc0efe13_6" ;
-"test5.e3d704f3542b44a621ebed70dc0efe13_3" [label="3: + \n  " ]
+	 "test1.5a105e8b9d40e1329780d62ea2265d8a_8" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_4" ;
+"test1.5a105e8b9d40e1329780d62ea2265d8a_9" [label="9:  DeclStmt \n   n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 17]\n  *&x:int=n$4 [line 17]\n " shape="box"]
 	
 
-	 "test5.e3d704f3542b44a621ebed70dc0efe13_3" -> "test5.e3d704f3542b44a621ebed70dc0efe13_9" ;
-"test5.e3d704f3542b44a621ebed70dc0efe13_2" [label="2: Exit test5 \n  " color=yellow style=filled]
+	 "test1.5a105e8b9d40e1329780d62ea2265d8a_9" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_3" ;
+"test3.8ad8757baa8564dc136c1e07507f4a98_1" [label="1: Start test3\nFormals:  b:int\nLocals:  x:int 0$?%__sil_tmpSIL_temp_conditional___n$2:int \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_temp_conditional___n$2); [line 21]\n " color=yellow style=filled]
 	
 
-"test5.e3d704f3542b44a621ebed70dc0efe13_1" [label="1: Start test5\nFormals:  b:int\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$1:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 28]\n " color=yellow style=filled]
+	 "test3.8ad8757baa8564dc136c1e07507f4a98_1" -> "test3.8ad8757baa8564dc136c1e07507f4a98_9" ;
+"test3.8ad8757baa8564dc136c1e07507f4a98_2" [label="2: Exit test3 \n  " color=yellow style=filled]
 	
 
-	 "test5.e3d704f3542b44a621ebed70dc0efe13_1" -> "test5.e3d704f3542b44a621ebed70dc0efe13_8" ;
-"test4.86985e105f79b95d6bc918fb45ec7727_9" [label="9:  Return Stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 26]\n  n$3=_fun_test2(n$2:int) [line 26]\n  *&return:int=n$3 [line 26]\n " shape="box"]
+"test3.8ad8757baa8564dc136c1e07507f4a98_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 23]\n  *&return:int=n$0 [line 23]\n " shape="box"]
 	
 
-	 "test4.86985e105f79b95d6bc918fb45ec7727_9" -> "test4.86985e105f79b95d6bc918fb45ec7727_2" ;
-"test4.86985e105f79b95d6bc918fb45ec7727_8" [label="8:  BinaryConditinalStmt Init \n   n$0=*&b:int [line 26]\n " shape="box"]
+	 "test3.8ad8757baa8564dc136c1e07507f4a98_3" -> "test3.8ad8757baa8564dc136c1e07507f4a98_2" ;
+"test3.8ad8757baa8564dc136c1e07507f4a98_4" [label="4: + \n  " ]
 	
 
-	 "test4.86985e105f79b95d6bc918fb45ec7727_8" -> "test4.86985e105f79b95d6bc918fb45ec7727_4" ;
-	 "test4.86985e105f79b95d6bc918fb45ec7727_8" -> "test4.86985e105f79b95d6bc918fb45ec7727_5" ;
-"test4.86985e105f79b95d6bc918fb45ec7727_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 26]\n " shape="box"]
+	 "test3.8ad8757baa8564dc136c1e07507f4a98_4" -> "test3.8ad8757baa8564dc136c1e07507f4a98_10" ;
+"test3.8ad8757baa8564dc136c1e07507f4a98_5" [label="5: Prune (true branch) \n   PRUNE((n$1 != 0), true); [line 22]\n " shape="invhouse"]
 	
 
-	 "test4.86985e105f79b95d6bc918fb45ec7727_7" -> "test4.86985e105f79b95d6bc918fb45ec7727_3" ;
-"test4.86985e105f79b95d6bc918fb45ec7727_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$0 [line 26]\n " shape="box"]
+	 "test3.8ad8757baa8564dc136c1e07507f4a98_5" -> "test3.8ad8757baa8564dc136c1e07507f4a98_7" ;
+"test3.8ad8757baa8564dc136c1e07507f4a98_6" [label="6: Prune (false branch) \n   PRUNE((n$1 == 0), false); [line 22]\n " shape="invhouse"]
 	
 
-	 "test4.86985e105f79b95d6bc918fb45ec7727_6" -> "test4.86985e105f79b95d6bc918fb45ec7727_3" ;
-"test4.86985e105f79b95d6bc918fb45ec7727_5" [label="5: Prune (false branch) \n   PRUNE((n$0 == 0), false); [line 26]\n " shape="invhouse"]
+	 "test3.8ad8757baa8564dc136c1e07507f4a98_6" -> "test3.8ad8757baa8564dc136c1e07507f4a98_8" ;
+"test3.8ad8757baa8564dc136c1e07507f4a98_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$1 [line 22]\n " shape="box"]
 	
 
-	 "test4.86985e105f79b95d6bc918fb45ec7727_5" -> "test4.86985e105f79b95d6bc918fb45ec7727_7" ;
-"test4.86985e105f79b95d6bc918fb45ec7727_4" [label="4: Prune (true branch) \n   PRUNE((n$0 != 0), true); [line 26]\n " shape="invhouse"]
+	 "test3.8ad8757baa8564dc136c1e07507f4a98_7" -> "test3.8ad8757baa8564dc136c1e07507f4a98_4" ;
+"test3.8ad8757baa8564dc136c1e07507f4a98_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 22]\n " shape="box"]
 	
 
-	 "test4.86985e105f79b95d6bc918fb45ec7727_4" -> "test4.86985e105f79b95d6bc918fb45ec7727_6" ;
-"test4.86985e105f79b95d6bc918fb45ec7727_3" [label="3: + \n  " ]
+	 "test3.8ad8757baa8564dc136c1e07507f4a98_8" -> "test3.8ad8757baa8564dc136c1e07507f4a98_4" ;
+"test3.8ad8757baa8564dc136c1e07507f4a98_9" [label="9:  BinaryConditinalStmt Init \n   n$1=*&b:int [line 22]\n " shape="box"]
 	
 
-	 "test4.86985e105f79b95d6bc918fb45ec7727_3" -> "test4.86985e105f79b95d6bc918fb45ec7727_9" ;
-"test4.86985e105f79b95d6bc918fb45ec7727_2" [label="2: Exit test4 \n  " color=yellow style=filled]
+	 "test3.8ad8757baa8564dc136c1e07507f4a98_9" -> "test3.8ad8757baa8564dc136c1e07507f4a98_5" ;
+	 "test3.8ad8757baa8564dc136c1e07507f4a98_9" -> "test3.8ad8757baa8564dc136c1e07507f4a98_6" ;
+"test3.8ad8757baa8564dc136c1e07507f4a98_10" [label="10:  DeclStmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 22]\n  *&x:int=n$3 [line 22]\n " shape="box"]
 	
 
+	 "test3.8ad8757baa8564dc136c1e07507f4a98_10" -> "test3.8ad8757baa8564dc136c1e07507f4a98_3" ;
 "test4.86985e105f79b95d6bc918fb45ec7727_1" [label="1: Start test4\nFormals:  b:int\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$1:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 26]\n " color=yellow style=filled]
 	
 
 	 "test4.86985e105f79b95d6bc918fb45ec7727_1" -> "test4.86985e105f79b95d6bc918fb45ec7727_8" ;
-"test2.ad0234829205b9033196ba818f7a872b_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 12]\n  *&return:int=n$0 [line 12]\n " shape="box"]
+"test4.86985e105f79b95d6bc918fb45ec7727_2" [label="2: Exit test4 \n  " color=yellow style=filled]
 	
 
-	 "test2.ad0234829205b9033196ba818f7a872b_3" -> "test2.ad0234829205b9033196ba818f7a872b_2" ;
-"test2.ad0234829205b9033196ba818f7a872b_2" [label="2: Exit test2 \n  " color=yellow style=filled]
+"test4.86985e105f79b95d6bc918fb45ec7727_3" [label="3: + \n  " ]
 	
 
-"test2.ad0234829205b9033196ba818f7a872b_1" [label="1: Start test2\nFormals:  x:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
+	 "test4.86985e105f79b95d6bc918fb45ec7727_3" -> "test4.86985e105f79b95d6bc918fb45ec7727_9" ;
+"test4.86985e105f79b95d6bc918fb45ec7727_4" [label="4: Prune (true branch) \n   PRUNE((n$0 != 0), true); [line 26]\n " shape="invhouse"]
 	
 
-	 "test2.ad0234829205b9033196ba818f7a872b_1" -> "test2.ad0234829205b9033196ba818f7a872b_3" ;
-"test1.5a105e8b9d40e1329780d62ea2265d8a_9" [label="9:  DeclStmt \n   n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 17]\n  *&x:int=n$4 [line 17]\n " shape="box"]
+	 "test4.86985e105f79b95d6bc918fb45ec7727_4" -> "test4.86985e105f79b95d6bc918fb45ec7727_6" ;
+"test4.86985e105f79b95d6bc918fb45ec7727_5" [label="5: Prune (false branch) \n   PRUNE((n$0 == 0), false); [line 26]\n " shape="invhouse"]
 	
 
-	 "test1.5a105e8b9d40e1329780d62ea2265d8a_9" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_3" ;
-"test1.5a105e8b9d40e1329780d62ea2265d8a_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 17]\n " shape="box"]
+	 "test4.86985e105f79b95d6bc918fb45ec7727_5" -> "test4.86985e105f79b95d6bc918fb45ec7727_7" ;
+"test4.86985e105f79b95d6bc918fb45ec7727_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$0 [line 26]\n " shape="box"]
 	
 
-	 "test1.5a105e8b9d40e1329780d62ea2265d8a_8" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_4" ;
-"test1.5a105e8b9d40e1329780d62ea2265d8a_7" [label="7:  ConditinalStmt Branch \n   n$3=*&b:int [line 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$3 [line 17]\n " shape="box"]
+	 "test4.86985e105f79b95d6bc918fb45ec7727_6" -> "test4.86985e105f79b95d6bc918fb45ec7727_3" ;
+"test4.86985e105f79b95d6bc918fb45ec7727_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 26]\n " shape="box"]
 	
 
-	 "test1.5a105e8b9d40e1329780d62ea2265d8a_7" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_4" ;
-"test1.5a105e8b9d40e1329780d62ea2265d8a_6" [label="6: Prune (false branch) \n   n$2=*&b:int [line 17]\n  PRUNE((n$2 == 0), false); [line 17]\n " shape="invhouse"]
+	 "test4.86985e105f79b95d6bc918fb45ec7727_7" -> "test4.86985e105f79b95d6bc918fb45ec7727_3" ;
+"test4.86985e105f79b95d6bc918fb45ec7727_8" [label="8:  BinaryConditinalStmt Init \n   n$0=*&b:int [line 26]\n " shape="box"]
 	
 
-	 "test1.5a105e8b9d40e1329780d62ea2265d8a_6" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_8" ;
-"test1.5a105e8b9d40e1329780d62ea2265d8a_5" [label="5: Prune (true branch) \n   n$2=*&b:int [line 17]\n  PRUNE((n$2 != 0), true); [line 17]\n " shape="invhouse"]
+	 "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 26]\n  n$3=_fun_test2(n$2:int) [line 26]\n  *&return:int=n$3 [line 26]\n " shape="box"]
 	
 
-	 "test1.5a105e8b9d40e1329780d62ea2265d8a_5" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_7" ;
-"test1.5a105e8b9d40e1329780d62ea2265d8a_4" [label="4: + \n  " ]
+	 "test4.86985e105f79b95d6bc918fb45ec7727_9" -> "test4.86985e105f79b95d6bc918fb45ec7727_2" ;
+"test5.e3d704f3542b44a621ebed70dc0efe13_1" [label="1: Start test5\nFormals:  b:int\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$1:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 28]\n " color=yellow style=filled]
 	
 
-	 "test1.5a105e8b9d40e1329780d62ea2265d8a_4" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_9" ;
-"test1.5a105e8b9d40e1329780d62ea2265d8a_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 18]\n  *&return:int=n$0 [line 18]\n " shape="box"]
+	 "test5.e3d704f3542b44a621ebed70dc0efe13_1" -> "test5.e3d704f3542b44a621ebed70dc0efe13_8" ;
+"test5.e3d704f3542b44a621ebed70dc0efe13_2" [label="2: Exit test5 \n  " color=yellow style=filled]
 	
 
-	 "test1.5a105e8b9d40e1329780d62ea2265d8a_3" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_2" ;
-"test1.5a105e8b9d40e1329780d62ea2265d8a_2" [label="2: Exit test1 \n  " color=yellow style=filled]
+"test5.e3d704f3542b44a621ebed70dc0efe13_3" [label="3: + \n  " ]
 	
 
-"test1.5a105e8b9d40e1329780d62ea2265d8a_1" [label="1: Start test1\nFormals:  b:int\nLocals:  x:int 0$?%__sil_tmpSIL_temp_conditional___n$1:int \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 16]\n " color=yellow style=filled]
+	 "test5.e3d704f3542b44a621ebed70dc0efe13_3" -> "test5.e3d704f3542b44a621ebed70dc0efe13_9" ;
+"test5.e3d704f3542b44a621ebed70dc0efe13_4" [label="4: Prune (true branch) \n   PRUNE((n$0 != 0), true); [line 28]\n " shape="invhouse"]
 	
 
-	 "test1.5a105e8b9d40e1329780d62ea2265d8a_1" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_5" ;
-	 "test1.5a105e8b9d40e1329780d62ea2265d8a_1" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_6" ;
-"test7.b04083e53e242626595e2b8ea327e525_9" [label="9:  Return Stmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 35]\n  *&return:int=n$3 [line 35]\n " shape="box"]
+	 "test5.e3d704f3542b44a621ebed70dc0efe13_4" -> "test5.e3d704f3542b44a621ebed70dc0efe13_6" ;
+"test5.e3d704f3542b44a621ebed70dc0efe13_5" [label="5: Prune (false branch) \n   PRUNE((n$0 == 0), false); [line 28]\n " shape="invhouse"]
 	
 
-	 "test7.b04083e53e242626595e2b8ea327e525_9" -> "test7.b04083e53e242626595e2b8ea327e525_2" ;
-"test7.b04083e53e242626595e2b8ea327e525_8" [label="8:  BinaryConditinalStmt Init \n   n$0=_fun_test2(2:int) [line 35]\n  n$1=_fun_test2((2 + n$0):int) [line 35]\n " shape="box"]
+	 "test5.e3d704f3542b44a621ebed70dc0efe13_5" -> "test5.e3d704f3542b44a621ebed70dc0efe13_7" ;
+"test5.e3d704f3542b44a621ebed70dc0efe13_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$0 [line 28]\n " shape="box"]
 	
 
-	 "test7.b04083e53e242626595e2b8ea327e525_8" -> "test7.b04083e53e242626595e2b8ea327e525_4" ;
-	 "test7.b04083e53e242626595e2b8ea327e525_8" -> "test7.b04083e53e242626595e2b8ea327e525_5" ;
-"test7.b04083e53e242626595e2b8ea327e525_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=2 [line 35]\n " shape="box"]
+	 "test5.e3d704f3542b44a621ebed70dc0efe13_6" -> "test5.e3d704f3542b44a621ebed70dc0efe13_3" ;
+"test5.e3d704f3542b44a621ebed70dc0efe13_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 28]\n " shape="box"]
 	
 
-	 "test7.b04083e53e242626595e2b8ea327e525_7" -> "test7.b04083e53e242626595e2b8ea327e525_3" ;
-"test7.b04083e53e242626595e2b8ea327e525_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$1 [line 35]\n " shape="box"]
+	 "test5.e3d704f3542b44a621ebed70dc0efe13_7" -> "test5.e3d704f3542b44a621ebed70dc0efe13_3" ;
+"test5.e3d704f3542b44a621ebed70dc0efe13_8" [label="8:  BinaryConditinalStmt Init \n   n$0=*&b:int [line 28]\n " shape="box"]
 	
 
-	 "test7.b04083e53e242626595e2b8ea327e525_6" -> "test7.b04083e53e242626595e2b8ea327e525_3" ;
-"test7.b04083e53e242626595e2b8ea327e525_5" [label="5: Prune (false branch) \n   PRUNE((n$1 == 0), false); [line 35]\n " shape="invhouse"]
+	 "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 28]\n  *&return:int=n$2 [line 28]\n " shape="box"]
 	
 
-	 "test7.b04083e53e242626595e2b8ea327e525_5" -> "test7.b04083e53e242626595e2b8ea327e525_7" ;
-"test7.b04083e53e242626595e2b8ea327e525_4" [label="4: Prune (true branch) \n   PRUNE((n$1 != 0), true); [line 35]\n " shape="invhouse"]
+	 "test5.e3d704f3542b44a621ebed70dc0efe13_9" -> "test5.e3d704f3542b44a621ebed70dc0efe13_2" ;
+"test7.b04083e53e242626595e2b8ea327e525_1" [label="1: Start test7\nFormals:  b:int\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$2:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$2); [line 35]\n " color=yellow style=filled]
+	
+
+	 "test7.b04083e53e242626595e2b8ea327e525_1" -> "test7.b04083e53e242626595e2b8ea327e525_8" ;
+"test7.b04083e53e242626595e2b8ea327e525_2" [label="2: Exit test7 \n  " color=yellow style=filled]
 	
 
-	 "test7.b04083e53e242626595e2b8ea327e525_4" -> "test7.b04083e53e242626595e2b8ea327e525_6" ;
 "test7.b04083e53e242626595e2b8ea327e525_3" [label="3: + \n  " ]
 	
 
 	 "test7.b04083e53e242626595e2b8ea327e525_3" -> "test7.b04083e53e242626595e2b8ea327e525_9" ;
-"test7.b04083e53e242626595e2b8ea327e525_2" [label="2: Exit test7 \n  " color=yellow style=filled]
+"test7.b04083e53e242626595e2b8ea327e525_4" [label="4: Prune (true branch) \n   PRUNE((n$1 != 0), true); [line 35]\n " shape="invhouse"]
 	
 
-"test7.b04083e53e242626595e2b8ea327e525_1" [label="1: Start test7\nFormals:  b:int\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$2:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$2); [line 35]\n " color=yellow style=filled]
+	 "test7.b04083e53e242626595e2b8ea327e525_4" -> "test7.b04083e53e242626595e2b8ea327e525_6" ;
+"test7.b04083e53e242626595e2b8ea327e525_5" [label="5: Prune (false branch) \n   PRUNE((n$1 == 0), false); [line 35]\n " shape="invhouse"]
 	
 
-	 "test7.b04083e53e242626595e2b8ea327e525_1" -> "test7.b04083e53e242626595e2b8ea327e525_8" ;
-"test6.4cfad7076129962ee70c36839a1e3e15_9" [label="9:  DeclStmt \n   n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 31]\n  *&z:int=n$4 [line 31]\n " shape="box"]
+	 "test7.b04083e53e242626595e2b8ea327e525_5" -> "test7.b04083e53e242626595e2b8ea327e525_7" ;
+"test7.b04083e53e242626595e2b8ea327e525_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$1 [line 35]\n " shape="box"]
 	
 
-	 "test6.4cfad7076129962ee70c36839a1e3e15_9" -> "test6.4cfad7076129962ee70c36839a1e3e15_3" ;
-"test6.4cfad7076129962ee70c36839a1e3e15_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=0 [line 31]\n " shape="box"]
+	 "test7.b04083e53e242626595e2b8ea327e525_6" -> "test7.b04083e53e242626595e2b8ea327e525_3" ;
+"test7.b04083e53e242626595e2b8ea327e525_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=2 [line 35]\n " shape="box"]
 	
 
-	 "test6.4cfad7076129962ee70c36839a1e3e15_8" -> "test6.4cfad7076129962ee70c36839a1e3e15_4" ;
-"test6.4cfad7076129962ee70c36839a1e3e15_7" [label="7:  ConditinalStmt Branch \n   n$2=*&p:int* [line 31]\n  n$3=*n$2:int [line 31]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$3 [line 31]\n " shape="box"]
+	 "test7.b04083e53e242626595e2b8ea327e525_7" -> "test7.b04083e53e242626595e2b8ea327e525_3" ;
+"test7.b04083e53e242626595e2b8ea327e525_8" [label="8:  BinaryConditinalStmt Init \n   n$0=_fun_test2(2:int) [line 35]\n  n$1=_fun_test2((2 + n$0):int) [line 35]\n " shape="box"]
 	
 
-	 "test6.4cfad7076129962ee70c36839a1e3e15_7" -> "test6.4cfad7076129962ee70c36839a1e3e15_4" ;
-"test6.4cfad7076129962ee70c36839a1e3e15_6" [label="6: Prune (false branch) \n   PRUNE((1 == 0), false); [line 31]\n " shape="invhouse"]
+	 "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 35]\n  *&return:int=n$3 [line 35]\n " shape="box"]
 	
 
-	 "test6.4cfad7076129962ee70c36839a1e3e15_6" -> "test6.4cfad7076129962ee70c36839a1e3e15_8" ;
-"test6.4cfad7076129962ee70c36839a1e3e15_5" [label="5: Prune (true branch) \n   PRUNE((1 != 0), true); [line 31]\n " shape="invhouse"]
+	 "test7.b04083e53e242626595e2b8ea327e525_9" -> "test7.b04083e53e242626595e2b8ea327e525_2" ;
+"test6.4cfad7076129962ee70c36839a1e3e15_1" [label="1: Start test6\nFormals:  p:int*\nLocals:  z:int 0$?%__sil_tmpSIL_temp_conditional___n$1:int \n   DECLARE_LOCALS(&return,&z,&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 30]\n " color=yellow style=filled]
 	
 
-	 "test6.4cfad7076129962ee70c36839a1e3e15_5" -> "test6.4cfad7076129962ee70c36839a1e3e15_7" ;
-"test6.4cfad7076129962ee70c36839a1e3e15_4" [label="4: + \n  " ]
+	 "test6.4cfad7076129962ee70c36839a1e3e15_1" -> "test6.4cfad7076129962ee70c36839a1e3e15_5" ;
+	 "test6.4cfad7076129962ee70c36839a1e3e15_1" -> "test6.4cfad7076129962ee70c36839a1e3e15_6" ;
+"test6.4cfad7076129962ee70c36839a1e3e15_2" [label="2: Exit test6 \n  " color=yellow style=filled]
 	
 
-	 "test6.4cfad7076129962ee70c36839a1e3e15_4" -> "test6.4cfad7076129962ee70c36839a1e3e15_9" ;
 "test6.4cfad7076129962ee70c36839a1e3e15_3" [label="3:  Return Stmt \n   n$0=*&z:int [line 32]\n  *&return:int=n$0 [line 32]\n " shape="box"]
 	
 
 	 "test6.4cfad7076129962ee70c36839a1e3e15_3" -> "test6.4cfad7076129962ee70c36839a1e3e15_2" ;
-"test6.4cfad7076129962ee70c36839a1e3e15_2" [label="2: Exit test6 \n  " color=yellow style=filled]
-	
-
-"test6.4cfad7076129962ee70c36839a1e3e15_1" [label="1: Start test6\nFormals:  p:int*\nLocals:  z:int 0$?%__sil_tmpSIL_temp_conditional___n$1:int \n   DECLARE_LOCALS(&return,&z,&0$?%__sil_tmpSIL_temp_conditional___n$1); [line 30]\n " color=yellow style=filled]
+"test6.4cfad7076129962ee70c36839a1e3e15_4" [label="4: + \n  " ]
 	
 
-	 "test6.4cfad7076129962ee70c36839a1e3e15_1" -> "test6.4cfad7076129962ee70c36839a1e3e15_5" ;
-	 "test6.4cfad7076129962ee70c36839a1e3e15_1" -> "test6.4cfad7076129962ee70c36839a1e3e15_6" ;
-"test.098f6bcd4621d373cade4e832627b4f6_8" [label="8:  Return Stmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 14]\n  n$4=_fun_test2(n$3:int) [line 14]\n  *&return:int=n$4 [line 14]\n " shape="box"]
+	 "test6.4cfad7076129962ee70c36839a1e3e15_4" -> "test6.4cfad7076129962ee70c36839a1e3e15_9" ;
+"test6.4cfad7076129962ee70c36839a1e3e15_5" [label="5: Prune (true branch) \n   PRUNE((1 != 0), true); [line 31]\n " shape="invhouse"]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_8" -> "test.098f6bcd4621d373cade4e832627b4f6_2" ;
-"test.098f6bcd4621d373cade4e832627b4f6_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 14]\n " shape="box"]
+	 "test6.4cfad7076129962ee70c36839a1e3e15_5" -> "test6.4cfad7076129962ee70c36839a1e3e15_7" ;
+"test6.4cfad7076129962ee70c36839a1e3e15_6" [label="6: Prune (false branch) \n   PRUNE((1 == 0), false); [line 31]\n " shape="invhouse"]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_7" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;
-"test.098f6bcd4621d373cade4e832627b4f6_6" [label="6:  ConditinalStmt Branch \n   n$2=*&b:int [line 14]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$2 [line 14]\n " shape="box"]
+	 "test6.4cfad7076129962ee70c36839a1e3e15_6" -> "test6.4cfad7076129962ee70c36839a1e3e15_8" ;
+"test6.4cfad7076129962ee70c36839a1e3e15_7" [label="7:  ConditinalStmt Branch \n   n$2=*&p:int* [line 31]\n  n$3=*n$2:int [line 31]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$3 [line 31]\n " shape="box"]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_6" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;
-"test.098f6bcd4621d373cade4e832627b4f6_5" [label="5: Prune (false branch) \n   n$1=*&b:int [line 14]\n  PRUNE((n$1 == 0), false); [line 14]\n " shape="invhouse"]
+	 "test6.4cfad7076129962ee70c36839a1e3e15_7" -> "test6.4cfad7076129962ee70c36839a1e3e15_4" ;
+"test6.4cfad7076129962ee70c36839a1e3e15_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=0 [line 31]\n " shape="box"]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_5" -> "test.098f6bcd4621d373cade4e832627b4f6_7" ;
-"test.098f6bcd4621d373cade4e832627b4f6_4" [label="4: Prune (true branch) \n   n$1=*&b:int [line 14]\n  PRUNE((n$1 != 0), true); [line 14]\n " shape="invhouse"]
+	 "test6.4cfad7076129962ee70c36839a1e3e15_8" -> "test6.4cfad7076129962ee70c36839a1e3e15_4" ;
+"test6.4cfad7076129962ee70c36839a1e3e15_9" [label="9:  DeclStmt \n   n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 31]\n  *&z:int=n$4 [line 31]\n " shape="box"]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_4" -> "test.098f6bcd4621d373cade4e832627b4f6_6" ;
-"test.098f6bcd4621d373cade4e832627b4f6_3" [label="3: + \n  " ]
+	 "test6.4cfad7076129962ee70c36839a1e3e15_9" -> "test6.4cfad7076129962ee70c36839a1e3e15_3" ;
+"test2.ad0234829205b9033196ba818f7a872b_1" [label="1: Start test2\nFormals:  x:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_3" -> "test.098f6bcd4621d373cade4e832627b4f6_8" ;
-"test.098f6bcd4621d373cade4e832627b4f6_2" [label="2: Exit test \n  " color=yellow style=filled]
+	 "test2.ad0234829205b9033196ba818f7a872b_1" -> "test2.ad0234829205b9033196ba818f7a872b_3" ;
+"test2.ad0234829205b9033196ba818f7a872b_2" [label="2: Exit test2 \n  " color=yellow style=filled]
 	
 
-"test.098f6bcd4621d373cade4e832627b4f6_1" [label="1: Start test\nFormals:  b:int\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 14]\n " color=yellow style=filled]
+"test2.ad0234829205b9033196ba818f7a872b_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 12]\n  *&return:int=n$0 [line 12]\n " shape="box"]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_1" -> "test.098f6bcd4621d373cade4e832627b4f6_4" ;
-	 "test.098f6bcd4621d373cade4e832627b4f6_1" -> "test.098f6bcd4621d373cade4e832627b4f6_5" ;
+	 "test2.ad0234829205b9033196ba818f7a872b_3" -> "test2.ad0234829205b9033196ba818f7a872b_2" ;
 }

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

@@ -1,278 +1,278 @@
 /* @generated */
 digraph iCFG {
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_23" [label="23:  Call n$1 \n   n$1=*&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*) [line 15]\n  n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 15]\n  n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$4:int [line 15]\n  n$7=*&0$?%__sil_tmpSIL_temp_conditional___n$6:int [line 15]\n  n$1(n$3:int,n$5:int,n$7:int) [line 15]\n " shape="box"]
+"fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_1" [label="1: Start fun_ifthenelse1\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*) \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 12]\n " color=yellow style=filled]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_23" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_2" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_22" [label="22:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=3 [line 15]\n " shape="box"]
+	 "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_1" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_4" ;
+	 "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_1" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_5" ;
+"fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_2" [label="2: Exit fun_ifthenelse1 \n  " color=yellow style=filled]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_22" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_18" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_21" [label="21:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=3 [line 15]\n " shape="box"]
+"fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_3" [label="3: + \n  " ]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_21" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_18" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_20" [label="20: Prune (false branch) \n   PRUNE((0 == 0), false); [line 15]\n " shape="invhouse"]
+	 "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_3" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_8" ;
+"fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 12]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_20" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_22" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_19" [label="19: Prune (true branch) \n   PRUNE((0 != 0), true); [line 15]\n " shape="invhouse"]
+	 "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_4" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_6" ;
+"fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 12]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_19" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_21" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_18" [label="18: + \n  " ]
+	 "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_5" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_7" ;
+"fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 12]\n " shape="box"]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_18" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_23" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=2 [line 15]\n " shape="box"]
+	 "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_6" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_3" ;
+"fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 12]\n " shape="box"]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_17" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_13" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=2 [line 15]\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 12]\n  n$1(1:int,2:int,3:int) [line 12]\n " shape="box"]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_16" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_13" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_15" [label="15: Prune (false branch) \n   PRUNE((0 == 0), false); [line 15]\n " shape="invhouse"]
+	 "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_8" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_2" ;
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_1" [label="1: Start fun_ifthenelse2\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*) 0$?%__sil_tmpSIL_temp_conditional___n$2:int 0$?%__sil_tmpSIL_temp_conditional___n$4:int 0$?%__sil_tmpSIL_temp_conditional___n$6:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$2,&0$?%__sil_tmpSIL_temp_conditional___n$4,&0$?%__sil_tmpSIL_temp_conditional___n$6); [line 14]\n " color=yellow style=filled]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_15" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_17" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_14" [label="14: Prune (true branch) \n   PRUNE((0 != 0), true); [line 15]\n " shape="invhouse"]
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_1" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_4" ;
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_1" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_5" ;
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_2" [label="2: Exit fun_ifthenelse2 \n  " color=yellow style=filled]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_14" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_16" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_13" [label="13: + \n  " ]
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_3" [label="3: + \n  " ]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_13" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_19" ;
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_13" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_20" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 15]\n " shape="box"]
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_3" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_9" ;
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_3" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_10" ;
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 15]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_12" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_8" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 15]\n " shape="box"]
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_4" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_6" ;
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 15]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_11" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_8" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_10" [label="10: Prune (false branch) \n   PRUNE((0 == 0), false); [line 15]\n " shape="invhouse"]
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_5" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_7" ;
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 15]\n " shape="box"]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_10" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_12" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_9" [label="9: Prune (true branch) \n   PRUNE((0 != 0), true); [line 15]\n " shape="invhouse"]
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_6" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_3" ;
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 15]\n " shape="box"]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_9" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_11" ;
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_7" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_3" ;
 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_8" [label="8: + \n  " ]
 	
 
 	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_8" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_14" ;
 	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_8" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_15" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 15]\n " shape="box"]
-	
-
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_7" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_3" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 15]\n " shape="box"]
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_9" [label="9: Prune (true branch) \n   PRUNE((0 != 0), true); [line 15]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_6" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_3" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 15]\n " shape="invhouse"]
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_9" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_11" ;
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_10" [label="10: Prune (false branch) \n   PRUNE((0 == 0), false); [line 15]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_5" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_7" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 15]\n " shape="invhouse"]
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_10" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_12" ;
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 15]\n " shape="box"]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_4" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_6" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_3" [label="3: + \n  " ]
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_11" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_8" ;
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 15]\n " shape="box"]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_3" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_9" ;
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_3" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_10" ;
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_2" [label="2: Exit fun_ifthenelse2 \n  " color=yellow style=filled]
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_12" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_8" ;
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_13" [label="13: + \n  " ]
 	
 
-"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_1" [label="1: Start fun_ifthenelse2\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*) 0$?%__sil_tmpSIL_temp_conditional___n$2:int 0$?%__sil_tmpSIL_temp_conditional___n$4:int 0$?%__sil_tmpSIL_temp_conditional___n$6:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$2,&0$?%__sil_tmpSIL_temp_conditional___n$4,&0$?%__sil_tmpSIL_temp_conditional___n$6); [line 14]\n " color=yellow style=filled]
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_13" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_19" ;
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_13" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_20" ;
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_14" [label="14: Prune (true branch) \n   PRUNE((0 != 0), true); [line 15]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_1" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_4" ;
-	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_1" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_5" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_18" [label="18:  Call n$1 \n   n$1=*&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*) [line 20]\n  n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 20]\n  n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$4:int [line 20]\n  n$1(n$3:int,2:int,n$5:int) [line 20]\n " shape="box"]
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_14" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_16" ;
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_15" [label="15: Prune (false branch) \n   PRUNE((0 == 0), false); [line 15]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_18" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_2" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 20]\n " shape="box"]
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_15" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_17" ;
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=2 [line 15]\n " shape="box"]
 	
 
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_17" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_13" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 20]\n " shape="box"]
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_16" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_13" ;
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=2 [line 15]\n " shape="box"]
 	
 
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_16" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_13" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_15" [label="15: Prune (false branch) \n   PRUNE((0 == 0), false); [line 20]\n " shape="invhouse"]
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_17" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_13" ;
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_18" [label="18: + \n  " ]
 	
 
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_15" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_17" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_14" [label="14: Prune (true branch) \n   PRUNE((0 != 0), true); [line 20]\n " shape="invhouse"]
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_18" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_23" ;
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_19" [label="19: Prune (true branch) \n   PRUNE((0 != 0), true); [line 15]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_14" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_16" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_13" [label="13: + \n  " ]
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_19" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_21" ;
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_20" [label="20: Prune (false branch) \n   PRUNE((0 == 0), false); [line 15]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_13" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_18" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 20]\n " shape="box"]
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_20" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_22" ;
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_21" [label="21:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=3 [line 15]\n " shape="box"]
 	
 
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_12" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_8" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 20]\n " shape="box"]
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_21" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_18" ;
+"fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_22" [label="22:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=3 [line 15]\n " shape="box"]
 	
 
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_11" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_8" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_10" [label="10: Prune (false branch) \n   PRUNE((0 == 0), false); [line 20]\n " shape="invhouse"]
+	 "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 15]\n  n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 15]\n  n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$4:int [line 15]\n  n$7=*&0$?%__sil_tmpSIL_temp_conditional___n$6:int [line 15]\n  n$1(n$3:int,n$5:int,n$7:int) [line 15]\n " shape="box"]
 	
 
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_10" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_12" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_9" [label="9: Prune (true branch) \n   PRUNE((0 != 0), true); [line 20]\n " shape="invhouse"]
+	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_23" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_2" ;
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_1" [label="1: Start fun_ifthenelse3\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int 0$?%__sil_tmpSIL_temp_conditional___n$2:int 0$?%__sil_tmpSIL_temp_conditional___n$4:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$2,&0$?%__sil_tmpSIL_temp_conditional___n$4); [line 18]\n " color=yellow style=filled]
 	
 
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_9" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_11" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_8" [label="8: + \n  " ]
+	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_1" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_4" ;
+	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_1" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_5" ;
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_2" [label="2: Exit fun_ifthenelse3 \n  " color=yellow style=filled]
 	
 
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_8" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_14" ;
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_8" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_15" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 20]\n " shape="box"]
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_3" [label="3: + \n  " ]
 	
 
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_7" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_3" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 20]\n " shape="box"]
+	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_3" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_9" ;
+	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_3" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_10" ;
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_4" [label="4: Prune (true branch) \n   PRUNE((0 != 0), true); [line 18]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_6" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_3" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 20]\n " shape="invhouse"]
+	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_4" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_6" ;
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_5" [label="5: Prune (false branch) \n   PRUNE((0 == 0), false); [line 18]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_5" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_7" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 20]\n " shape="invhouse"]
+	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_5" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_7" ;
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 18]\n " shape="box"]
 	
 
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_4" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_6" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_3" [label="3: + \n  " ]
+	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_6" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_3" ;
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 18]\n " shape="box"]
 	
 
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_3" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_9" ;
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_3" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_10" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_2" [label="2: Exit fun_ifthenelse4 \n  " color=yellow style=filled]
+	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_7" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_3" ;
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_8" [label="8: + \n  " ]
 	
 
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_1" [label="1: Start fun_ifthenelse4\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*) 0$?%__sil_tmpSIL_temp_conditional___n$2:int 0$?%__sil_tmpSIL_temp_conditional___n$4:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$2,&0$?%__sil_tmpSIL_temp_conditional___n$4); [line 20]\n " color=yellow style=filled]
+	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_8" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_14" ;
+	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_8" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_15" ;
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_9" [label="9: Prune (true branch) \n   PRUNE((0 != 0), true); [line 18]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_1" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_4" ;
-	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_1" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_5" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_18" [label="18:  Call _fun_some_f \n   n$1=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 18]\n  n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 18]\n  n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$4:int [line 18]\n  _fun_some_f(n$1:int,n$3:int,n$5:int) [line 18]\n " shape="box"]
+	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_9" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_11" ;
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_10" [label="10: Prune (false branch) \n   PRUNE((0 == 0), false); [line 18]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_18" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_2" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 18]\n " shape="box"]
+	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_10" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_12" ;
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=2 [line 18]\n " shape="box"]
 	
 
-	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_17" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_13" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 18]\n " shape="box"]
+	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_11" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_8" ;
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=2 [line 18]\n " shape="box"]
 	
 
-	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_16" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_13" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_15" [label="15: Prune (false branch) \n   PRUNE((0 == 0), false); [line 18]\n " shape="invhouse"]
+	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_12" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_8" ;
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_13" [label="13: + \n  " ]
 	
 
-	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_15" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_17" ;
+	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_13" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_18" ;
 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_14" [label="14: Prune (true branch) \n   PRUNE((0 != 0), true); [line 18]\n " shape="invhouse"]
 	
 
 	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_14" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_16" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_13" [label="13: + \n  " ]
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_15" [label="15: Prune (false branch) \n   PRUNE((0 == 0), false); [line 18]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_13" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_18" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=2 [line 18]\n " shape="box"]
+	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_15" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_17" ;
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 18]\n " shape="box"]
 	
 
-	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_12" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_8" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=2 [line 18]\n " shape="box"]
+	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_16" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_13" ;
+"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 18]\n " shape="box"]
 	
 
-	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_11" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_8" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_10" [label="10: Prune (false branch) \n   PRUNE((0 == 0), false); [line 18]\n " shape="invhouse"]
+	 "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 18]\n  n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 18]\n  n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$4:int [line 18]\n  _fun_some_f(n$1:int,n$3:int,n$5:int) [line 18]\n " shape="box"]
 	
 
-	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_10" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_12" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_9" [label="9: Prune (true branch) \n   PRUNE((0 != 0), true); [line 18]\n " shape="invhouse"]
+	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_18" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_2" ;
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_1" [label="1: Start fun_ifthenelse4\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*) 0$?%__sil_tmpSIL_temp_conditional___n$2:int 0$?%__sil_tmpSIL_temp_conditional___n$4:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$2,&0$?%__sil_tmpSIL_temp_conditional___n$4); [line 20]\n " color=yellow style=filled]
 	
 
-	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_9" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_11" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_8" [label="8: + \n  " ]
+	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_1" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_4" ;
+	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_1" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_5" ;
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_2" [label="2: Exit fun_ifthenelse4 \n  " color=yellow style=filled]
 	
 
-	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_8" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_14" ;
-	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_8" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_15" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 18]\n " shape="box"]
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_3" [label="3: + \n  " ]
 	
 
-	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_7" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_3" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 18]\n " shape="box"]
+	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_3" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_9" ;
+	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_3" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_10" ;
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 20]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_6" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_3" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_5" [label="5: Prune (false branch) \n   PRUNE((0 == 0), false); [line 18]\n " shape="invhouse"]
+	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_4" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_6" ;
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 20]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_5" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_7" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_4" [label="4: Prune (true branch) \n   PRUNE((0 != 0), true); [line 18]\n " shape="invhouse"]
+	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_5" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_7" ;
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 20]\n " shape="box"]
 	
 
-	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_4" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_6" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_3" [label="3: + \n  " ]
+	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_6" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_3" ;
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 20]\n " shape="box"]
 	
 
-	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_3" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_9" ;
-	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_3" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_10" ;
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_2" [label="2: Exit fun_ifthenelse3 \n  " color=yellow style=filled]
+	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_7" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_3" ;
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_8" [label="8: + \n  " ]
 	
 
-"fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_1" [label="1: Start fun_ifthenelse3\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int 0$?%__sil_tmpSIL_temp_conditional___n$2:int 0$?%__sil_tmpSIL_temp_conditional___n$4:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$2,&0$?%__sil_tmpSIL_temp_conditional___n$4); [line 18]\n " color=yellow style=filled]
+	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_8" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_14" ;
+	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_8" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_15" ;
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_9" [label="9: Prune (true branch) \n   PRUNE((0 != 0), true); [line 20]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_1" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_4" ;
-	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_1" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_5" ;
-"fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_8" [label="8:  Call n$1 \n   n$1=*&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*) [line 12]\n  n$1(1:int,2:int,3:int) [line 12]\n " shape="box"]
+	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_9" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_11" ;
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_10" [label="10: Prune (false branch) \n   PRUNE((0 == 0), false); [line 20]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_8" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_2" ;
-"fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 12]\n " shape="box"]
+	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_10" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_12" ;
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 20]\n " shape="box"]
 	
 
-	 "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_7" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_3" ;
-"fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*)=_fun_some_f [line 12]\n " shape="box"]
+	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_11" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_8" ;
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 20]\n " shape="box"]
 	
 
-	 "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_6" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_3" ;
-"fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 12]\n " shape="invhouse"]
+	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_12" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_8" ;
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_13" [label="13: + \n  " ]
 	
 
-	 "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_5" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_7" ;
-"fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 12]\n " shape="invhouse"]
+	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_13" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_18" ;
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_14" [label="14: Prune (true branch) \n   PRUNE((0 != 0), true); [line 20]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_4" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_6" ;
-"fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_3" [label="3: + \n  " ]
+	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_14" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_16" ;
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_15" [label="15: Prune (false branch) \n   PRUNE((0 == 0), false); [line 20]\n " shape="invhouse"]
 	
 
-	 "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_3" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_8" ;
-"fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_2" [label="2: Exit fun_ifthenelse1 \n  " color=yellow style=filled]
+	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_15" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_17" ;
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 20]\n " shape="box"]
 	
 
-"fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_1" [label="1: Start fun_ifthenelse1\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:_fn_(*) \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 12]\n " color=yellow style=filled]
+	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_16" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_13" ;
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 20]\n " shape="box"]
 	
 
-	 "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_1" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_4" ;
-	 "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_1" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_5" ;
+	 "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 20]\n  n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$2:int [line 20]\n  n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$4:int [line 20]\n  n$1(n$3:int,2:int,n$5:int) [line 20]\n " shape="box"]
+	
+
+	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_18" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_2" ;
 }

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

@@ -1,398 +1,398 @@
 /* @generated */
 digraph iCFG {
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_12" [label="12:  BinaryOperatorStmt: Assign \n   *&x:int*=32 [line 17]\n " shape="box"]
+"test_loop.254a9d372f8f45542e409771135b9322_1" [label="1: Start test_loop\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int 0$?%__sil_tmpSIL_temp_conditional___n$3:int 0$?%__sil_tmpSIL_temp_conditional___n$7:int block_size:char* spec:char* \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$3,&0$?%__sil_tmpSIL_temp_conditional___n$7,&block_size,&spec); [line 29]\n " color=yellow style=filled]
 	
 
-	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_12" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_3" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_11" [label="11:  BinaryOperatorStmt: Assign \n   *&x:int*=17 [line 15]\n " shape="box"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_1" -> "test_loop.254a9d372f8f45542e409771135b9322_28" ;
+"test_loop.254a9d372f8f45542e409771135b9322_2" [label="2: Exit test_loop \n  " color=yellow style=filled]
 	
 
-	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_11" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_3" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_10" [label="10: Prune (false branch) \n   PRUNE(((n$2 == 2) == 0), false); [line 14]\n " shape="invhouse"]
+"test_loop.254a9d372f8f45542e409771135b9322_3" [label="3: + \n  " ]
 	
 
-	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_10" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_12" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_9" [label="9: Prune (true branch) \n   PRUNE(((n$2 == 2) != 0), true); [line 14]\n " shape="invhouse"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_3" -> "test_loop.254a9d372f8f45542e409771135b9322_5" ;
+	 "test_loop.254a9d372f8f45542e409771135b9322_3" -> "test_loop.254a9d372f8f45542e409771135b9322_6" ;
+"test_loop.254a9d372f8f45542e409771135b9322_4" [label="4: + \n  " ]
 	
 
-	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_9" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_11" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_8" [label="8:  BinaryOperatorStmt: EQ \n   n$1=*&x:int* [line 14]\n  n$2=*n$1:int [line 14]\n " shape="box"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_4" -> "test_loop.254a9d372f8f45542e409771135b9322_9" ;
+	 "test_loop.254a9d372f8f45542e409771135b9322_4" -> "test_loop.254a9d372f8f45542e409771135b9322_10" ;
+"test_loop.254a9d372f8f45542e409771135b9322_5" [label="5: Prune (true branch) \n   n$1=*&spec:char* [line 36]\n  PRUNE((n$1 != 0), true); [line 36]\n " shape="invhouse"]
 	
 
-	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_8" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_9" ;
-	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_8" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_10" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_7" [label="7: Prune (false branch) \n   PRUNE(((n$0 == 0) == 0), false); [line 14]\n " shape="invhouse"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_5" -> "test_loop.254a9d372f8f45542e409771135b9322_7" ;
+"test_loop.254a9d372f8f45542e409771135b9322_6" [label="6: Prune (false branch) \n   n$1=*&spec:char* [line 36]\n  PRUNE((n$1 == 0), false); [line 36]\n " shape="invhouse"]
 	
 
-	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_7" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_8" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_6" [label="6: Prune (true branch) \n   PRUNE(((n$0 == 0) != 0), true); [line 14]\n " shape="invhouse"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_6" -> "test_loop.254a9d372f8f45542e409771135b9322_8" ;
+"test_loop.254a9d372f8f45542e409771135b9322_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 36]\n " shape="box"]
 	
 
-	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_6" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_11" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_5" [label="5:  BinaryOperatorStmt: EQ \n   n$0=*&x:int* [line 14]\n " shape="box"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_7" -> "test_loop.254a9d372f8f45542e409771135b9322_4" ;
+"test_loop.254a9d372f8f45542e409771135b9322_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 36]\n " shape="box"]
 	
 
-	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_5" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_6" ;
-	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_5" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_7" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_4" [label="4:  between_join_and_exit \n  " shape="box"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_8" -> "test_loop.254a9d372f8f45542e409771135b9322_4" ;
+"test_loop.254a9d372f8f45542e409771135b9322_9" [label="9: Prune (true branch) \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 36]\n  PRUNE((n$2 != 0), true); [line 36]\n " shape="invhouse"]
 	
 
-	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_4" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_2" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_3" [label="3: + \n  " ]
+	 "test_loop.254a9d372f8f45542e409771135b9322_9" -> "test_loop.254a9d372f8f45542e409771135b9322_12" ;
+"test_loop.254a9d372f8f45542e409771135b9322_10" [label="10: Prune (false branch) \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 36]\n  PRUNE((n$2 == 0), false); [line 36]\n " shape="invhouse"]
 	
 
-	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_3" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_4" ;
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_2" [label="2: Exit shortcircuit_or \n  " color=yellow style=filled]
+	 "test_loop.254a9d372f8f45542e409771135b9322_10" -> "test_loop.254a9d372f8f45542e409771135b9322_2" ;
+"test_loop.254a9d372f8f45542e409771135b9322_11" [label="11: + \n  " ]
 	
 
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_1" [label="1: Start shortcircuit_or\nFormals:  x:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
+	 "test_loop.254a9d372f8f45542e409771135b9322_11" -> "test_loop.254a9d372f8f45542e409771135b9322_17" ;
+	 "test_loop.254a9d372f8f45542e409771135b9322_11" -> "test_loop.254a9d372f8f45542e409771135b9322_18" ;
+"test_loop.254a9d372f8f45542e409771135b9322_12" [label="12:  BinaryOperatorStmt: Assign \n   n$4=_fun_getenv(\"BLOCK_SIZE\":char*) [line 36]\n  *&spec:char*=n$4 [line 36]\n  n$5=*&spec:char* [line 36]\n " shape="box"]
 	
 
-	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_1" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_5" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_21" [label="21:  BinaryOperatorStmt: Assign \n   n$7=*&x:int* [line 25]\n  *n$7:int=32 [line 25]\n " shape="box"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_12" -> "test_loop.254a9d372f8f45542e409771135b9322_13" ;
+	 "test_loop.254a9d372f8f45542e409771135b9322_12" -> "test_loop.254a9d372f8f45542e409771135b9322_14" ;
+"test_loop.254a9d372f8f45542e409771135b9322_13" [label="13: Prune (true branch) \n   PRUNE((n$5 != 0), true); [line 36]\n " shape="invhouse"]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_21" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_3" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_20" [label="20:  BinaryOperatorStmt: Assign \n   *&x:int*=17 [line 23]\n " shape="box"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_13" -> "test_loop.254a9d372f8f45542e409771135b9322_15" ;
+"test_loop.254a9d372f8f45542e409771135b9322_14" [label="14: Prune (false branch) \n   PRUNE((n$5 == 0), false); [line 36]\n " shape="invhouse"]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_20" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_3" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_19" [label="19: Prune (false branch) \n   n$6=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 22]\n  PRUNE((n$6 == 0), false); [line 22]\n " shape="invhouse"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_14" -> "test_loop.254a9d372f8f45542e409771135b9322_16" ;
+"test_loop.254a9d372f8f45542e409771135b9322_15" [label="15:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=0 [line 36]\n " shape="box"]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_19" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_21" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_18" [label="18: Prune (true branch) \n   n$6=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 22]\n  PRUNE((n$6 != 0), true); [line 22]\n " shape="invhouse"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_15" -> "test_loop.254a9d372f8f45542e409771135b9322_11" ;
+"test_loop.254a9d372f8f45542e409771135b9322_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 36]\n " shape="box"]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_18" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_20" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 22]\n " shape="box"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_16" -> "test_loop.254a9d372f8f45542e409771135b9322_11" ;
+"test_loop.254a9d372f8f45542e409771135b9322_17" [label="17: Prune (true branch) \n   n$6=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 36]\n  PRUNE((n$6 != 0), true); [line 36]\n " shape="invhouse"]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_17" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_12" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=0 [line 22]\n " shape="box"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_17" -> "test_loop.254a9d372f8f45542e409771135b9322_20" ;
+"test_loop.254a9d372f8f45542e409771135b9322_18" [label="18: Prune (false branch) \n   n$6=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 36]\n  PRUNE((n$6 == 0), false); [line 36]\n " shape="invhouse"]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_16" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_12" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_15" [label="15: Prune (false branch) \n   PRUNE((n$5 == 0), false); [line 22]\n " shape="invhouse"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_18" -> "test_loop.254a9d372f8f45542e409771135b9322_2" ;
+"test_loop.254a9d372f8f45542e409771135b9322_19" [label="19: + \n  " ]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_15" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_17" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_14" [label="14: Prune (true branch) \n   PRUNE((n$5 != 0), true); [line 22]\n " shape="invhouse"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_19" -> "test_loop.254a9d372f8f45542e409771135b9322_25" ;
+	 "test_loop.254a9d372f8f45542e409771135b9322_19" -> "test_loop.254a9d372f8f45542e409771135b9322_26" ;
+"test_loop.254a9d372f8f45542e409771135b9322_20" [label="20:  BinaryOperatorStmt: Assign \n   n$8=_fun_getenv(\"BLOCKSIZE\":char*) [line 37]\n  *&spec:char*=n$8 [line 37]\n  n$9=*&spec:char* [line 37]\n " shape="box"]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_14" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_16" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_13" [label="13:  BinaryOperatorStmt: Assign \n   n$4=_fun_getenv(\"BLOCK\":char*) [line 22]\n  *&x:int*=n$4 [line 22]\n  n$5=*&x:int* [line 22]\n " shape="box"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_20" -> "test_loop.254a9d372f8f45542e409771135b9322_21" ;
+	 "test_loop.254a9d372f8f45542e409771135b9322_20" -> "test_loop.254a9d372f8f45542e409771135b9322_22" ;
+"test_loop.254a9d372f8f45542e409771135b9322_21" [label="21: Prune (true branch) \n   PRUNE((n$9 != 0), true); [line 37]\n " shape="invhouse"]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_13" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_14" ;
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_13" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_15" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_12" [label="12: + \n  " ]
+	 "test_loop.254a9d372f8f45542e409771135b9322_21" -> "test_loop.254a9d372f8f45542e409771135b9322_23" ;
+"test_loop.254a9d372f8f45542e409771135b9322_22" [label="22: Prune (false branch) \n   PRUNE((n$9 == 0), false); [line 37]\n " shape="invhouse"]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_12" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_18" ;
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_12" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_19" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_11" [label="11: Prune (false branch) \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 22]\n  PRUNE((n$2 == 0), false); [line 22]\n " shape="invhouse"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_22" -> "test_loop.254a9d372f8f45542e409771135b9322_24" ;
+"test_loop.254a9d372f8f45542e409771135b9322_23" [label="23:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=0 [line 37]\n " shape="box"]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_11" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_21" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_10" [label="10: Prune (true branch) \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 22]\n  PRUNE((n$2 != 0), true); [line 22]\n " shape="invhouse"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_23" -> "test_loop.254a9d372f8f45542e409771135b9322_19" ;
+"test_loop.254a9d372f8f45542e409771135b9322_24" [label="24:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=1 [line 37]\n " shape="box"]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_10" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_13" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_9" [label="9:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 22]\n " shape="box"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_24" -> "test_loop.254a9d372f8f45542e409771135b9322_19" ;
+"test_loop.254a9d372f8f45542e409771135b9322_25" [label="25: Prune (true branch) \n   n$10=*&0$?%__sil_tmpSIL_temp_conditional___n$7:int [line 37]\n  PRUNE((n$10 != 0), true); [line 37]\n " shape="invhouse"]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_9" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_5" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 22]\n " shape="box"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_25" -> "test_loop.254a9d372f8f45542e409771135b9322_27" ;
+"test_loop.254a9d372f8f45542e409771135b9322_26" [label="26: Prune (false branch) \n   n$10=*&0$?%__sil_tmpSIL_temp_conditional___n$7:int [line 37]\n  PRUNE((n$10 == 0), false); [line 37]\n " shape="invhouse"]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_8" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_5" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_7" [label="7: Prune (false branch) \n   n$1=*&x:int* [line 22]\n  PRUNE((n$1 == 0), false); [line 22]\n " shape="invhouse"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_26" -> "test_loop.254a9d372f8f45542e409771135b9322_2" ;
+"test_loop.254a9d372f8f45542e409771135b9322_27" [label="27:  BinaryOperatorStmt: Assign \n   *&block_size:char*=0 [line 38]\n " shape="box"]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_7" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_9" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_6" [label="6: Prune (true branch) \n   n$1=*&x:int* [line 22]\n  PRUNE((n$1 != 0), true); [line 22]\n " shape="invhouse"]
+	 "test_loop.254a9d372f8f45542e409771135b9322_27" -> "test_loop.254a9d372f8f45542e409771135b9322_3" ;
+"test_loop.254a9d372f8f45542e409771135b9322_28" [label="28:  BinaryOperatorStmt: Assign \n   n$11=_fun_getenv(\"BLOCK\":char*) [line 34]\n  *&spec:char*=n$11 [line 34]\n " shape="box"]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_6" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_8" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_5" [label="5: + \n  " ]
+	 "test_loop.254a9d372f8f45542e409771135b9322_28" -> "test_loop.254a9d372f8f45542e409771135b9322_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int 0$?%__sil_tmpSIL_temp_conditional___n$3:int 0$?%__sil_tmpSIL_temp_conditional___n$7:int block_size:char* spec:char* \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$3,&0$?%__sil_tmpSIL_temp_conditional___n$7,&block_size,&spec); [line 42]\n " color=yellow style=filled]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_5" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_10" ;
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_5" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_11" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_4" [label="4:  between_join_and_exit \n  " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_34" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_4" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_2" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_3" [label="3: + \n  " ]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 56]\n " shape="box"]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_3" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_4" ;
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_2" [label="2: Exit shortcircuit_and \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
 	
 
-"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_1" [label="1: Start shortcircuit_and\nFormals:  x:int*\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int 0$?%__sil_tmpSIL_temp_conditional___n$3:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$3); [line 21]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5: + \n  " ]
 	
 
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_1" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_6" ;
-	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_1" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_7" ;
-"test_loop.254a9d372f8f45542e409771135b9322_28" [label="28:  BinaryOperatorStmt: Assign \n   n$11=_fun_getenv(\"BLOCK\":char*) [line 34]\n  *&spec:char*=n$11 [line 34]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch) \n   n$1=*&spec:char* [line 49]\n  PRUNE((n$1 != 0), true); [line 49]\n " shape="invhouse"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_28" -> "test_loop.254a9d372f8f45542e409771135b9322_3" ;
-"test_loop.254a9d372f8f45542e409771135b9322_27" [label="27:  BinaryOperatorStmt: Assign \n   *&block_size:char*=0 [line 38]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch) \n   n$1=*&spec:char* [line 49]\n  PRUNE((n$1 == 0), false); [line 49]\n " shape="invhouse"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_27" -> "test_loop.254a9d372f8f45542e409771135b9322_3" ;
-"test_loop.254a9d372f8f45542e409771135b9322_26" [label="26: Prune (false branch) \n   n$10=*&0$?%__sil_tmpSIL_temp_conditional___n$7:int [line 37]\n  PRUNE((n$10 == 0), false); [line 37]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 49]\n " shape="box"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_26" -> "test_loop.254a9d372f8f45542e409771135b9322_2" ;
-"test_loop.254a9d372f8f45542e409771135b9322_25" [label="25: Prune (true branch) \n   n$10=*&0$?%__sil_tmpSIL_temp_conditional___n$7:int [line 37]\n  PRUNE((n$10 != 0), true); [line 37]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 49]\n " shape="box"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_25" -> "test_loop.254a9d372f8f45542e409771135b9322_27" ;
-"test_loop.254a9d372f8f45542e409771135b9322_24" [label="24:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=1 [line 37]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10: Prune (true branch) \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 49]\n  PRUNE((n$2 != 0), true); [line 49]\n " shape="invhouse"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_24" -> "test_loop.254a9d372f8f45542e409771135b9322_19" ;
-"test_loop.254a9d372f8f45542e409771135b9322_23" [label="23:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=0 [line 37]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11: Prune (false branch) \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 49]\n  PRUNE((n$2 == 0), false); [line 49]\n " shape="invhouse"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_23" -> "test_loop.254a9d372f8f45542e409771135b9322_19" ;
-"test_loop.254a9d372f8f45542e409771135b9322_22" [label="22: Prune (false branch) \n   PRUNE((n$9 == 0), false); [line 37]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_30" ;
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12: + \n  " ]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_22" -> "test_loop.254a9d372f8f45542e409771135b9322_24" ;
-"test_loop.254a9d372f8f45542e409771135b9322_21" [label="21: Prune (true branch) \n   PRUNE((n$9 != 0), true); [line 37]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_18" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_19" ;
+"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  BinaryOperatorStmt: Assign \n   n$4=_fun_getenv(\"BLOCK_SIZE\":char*) [line 49]\n  *&spec:char*=n$4 [line 49]\n  n$5=*&spec:char* [line 49]\n " shape="box"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_21" -> "test_loop.254a9d372f8f45542e409771135b9322_23" ;
-"test_loop.254a9d372f8f45542e409771135b9322_20" [label="20:  BinaryOperatorStmt: Assign \n   n$8=_fun_getenv(\"BLOCKSIZE\":char*) [line 37]\n  *&spec:char*=n$8 [line 37]\n  n$9=*&spec:char* [line 37]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
+"main.fad58de7366495db4650cfefac2fcd61_14" [label="14: Prune (true branch) \n   PRUNE((n$5 != 0), true); [line 49]\n " shape="invhouse"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_20" -> "test_loop.254a9d372f8f45542e409771135b9322_21" ;
-	 "test_loop.254a9d372f8f45542e409771135b9322_20" -> "test_loop.254a9d372f8f45542e409771135b9322_22" ;
-"test_loop.254a9d372f8f45542e409771135b9322_19" [label="19: + \n  " ]
+	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_16" ;
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15: Prune (false branch) \n   PRUNE((n$5 == 0), false); [line 49]\n " shape="invhouse"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_19" -> "test_loop.254a9d372f8f45542e409771135b9322_25" ;
-	 "test_loop.254a9d372f8f45542e409771135b9322_19" -> "test_loop.254a9d372f8f45542e409771135b9322_26" ;
-"test_loop.254a9d372f8f45542e409771135b9322_18" [label="18: Prune (false branch) \n   n$6=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 36]\n  PRUNE((n$6 == 0), false); [line 36]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_17" ;
+"main.fad58de7366495db4650cfefac2fcd61_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=0 [line 49]\n " shape="box"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_18" -> "test_loop.254a9d372f8f45542e409771135b9322_2" ;
-"test_loop.254a9d372f8f45542e409771135b9322_17" [label="17: Prune (true branch) \n   n$6=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 36]\n  PRUNE((n$6 != 0), true); [line 36]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_16" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
+"main.fad58de7366495db4650cfefac2fcd61_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 49]\n " shape="box"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_17" -> "test_loop.254a9d372f8f45542e409771135b9322_20" ;
-"test_loop.254a9d372f8f45542e409771135b9322_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 36]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_17" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
+"main.fad58de7366495db4650cfefac2fcd61_18" [label="18: Prune (true branch) \n   n$6=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 49]\n  PRUNE((n$6 != 0), true); [line 49]\n " shape="invhouse"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_16" -> "test_loop.254a9d372f8f45542e409771135b9322_11" ;
-"test_loop.254a9d372f8f45542e409771135b9322_15" [label="15:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=0 [line 36]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_18" -> "main.fad58de7366495db4650cfefac2fcd61_21" ;
+"main.fad58de7366495db4650cfefac2fcd61_19" [label="19: Prune (false branch) \n   n$6=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 49]\n  PRUNE((n$6 == 0), false); [line 49]\n " shape="invhouse"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_15" -> "test_loop.254a9d372f8f45542e409771135b9322_11" ;
-"test_loop.254a9d372f8f45542e409771135b9322_14" [label="14: Prune (false branch) \n   PRUNE((n$5 == 0), false); [line 36]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_19" -> "main.fad58de7366495db4650cfefac2fcd61_30" ;
+"main.fad58de7366495db4650cfefac2fcd61_20" [label="20: + \n  " ]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_14" -> "test_loop.254a9d372f8f45542e409771135b9322_16" ;
-"test_loop.254a9d372f8f45542e409771135b9322_13" [label="13: Prune (true branch) \n   PRUNE((n$5 != 0), true); [line 36]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_20" -> "main.fad58de7366495db4650cfefac2fcd61_26" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_20" -> "main.fad58de7366495db4650cfefac2fcd61_27" ;
+"main.fad58de7366495db4650cfefac2fcd61_21" [label="21:  BinaryOperatorStmt: Assign \n   n$8=_fun_getenv(\"BLOCKSIZE\":char*) [line 49]\n  *&spec:char*=n$8 [line 49]\n  n$9=*&spec:char* [line 49]\n " shape="box"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_13" -> "test_loop.254a9d372f8f45542e409771135b9322_15" ;
-"test_loop.254a9d372f8f45542e409771135b9322_12" [label="12:  BinaryOperatorStmt: Assign \n   n$4=_fun_getenv(\"BLOCK_SIZE\":char*) [line 36]\n  *&spec:char*=n$4 [line 36]\n  n$5=*&spec:char* [line 36]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_21" -> "main.fad58de7366495db4650cfefac2fcd61_22" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_21" -> "main.fad58de7366495db4650cfefac2fcd61_23" ;
+"main.fad58de7366495db4650cfefac2fcd61_22" [label="22: Prune (true branch) \n   PRUNE((n$9 != 0), true); [line 49]\n " shape="invhouse"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_12" -> "test_loop.254a9d372f8f45542e409771135b9322_13" ;
-	 "test_loop.254a9d372f8f45542e409771135b9322_12" -> "test_loop.254a9d372f8f45542e409771135b9322_14" ;
-"test_loop.254a9d372f8f45542e409771135b9322_11" [label="11: + \n  " ]
+	 "main.fad58de7366495db4650cfefac2fcd61_22" -> "main.fad58de7366495db4650cfefac2fcd61_24" ;
+"main.fad58de7366495db4650cfefac2fcd61_23" [label="23: Prune (false branch) \n   PRUNE((n$9 == 0), false); [line 49]\n " shape="invhouse"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_11" -> "test_loop.254a9d372f8f45542e409771135b9322_17" ;
-	 "test_loop.254a9d372f8f45542e409771135b9322_11" -> "test_loop.254a9d372f8f45542e409771135b9322_18" ;
-"test_loop.254a9d372f8f45542e409771135b9322_10" [label="10: Prune (false branch) \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 36]\n  PRUNE((n$2 == 0), false); [line 36]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_23" -> "main.fad58de7366495db4650cfefac2fcd61_25" ;
+"main.fad58de7366495db4650cfefac2fcd61_24" [label="24:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=0 [line 49]\n " shape="box"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_10" -> "test_loop.254a9d372f8f45542e409771135b9322_2" ;
-"test_loop.254a9d372f8f45542e409771135b9322_9" [label="9: Prune (true branch) \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 36]\n  PRUNE((n$2 != 0), true); [line 36]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_24" -> "main.fad58de7366495db4650cfefac2fcd61_20" ;
+"main.fad58de7366495db4650cfefac2fcd61_25" [label="25:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=1 [line 49]\n " shape="box"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_9" -> "test_loop.254a9d372f8f45542e409771135b9322_12" ;
-"test_loop.254a9d372f8f45542e409771135b9322_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 36]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_25" -> "main.fad58de7366495db4650cfefac2fcd61_20" ;
+"main.fad58de7366495db4650cfefac2fcd61_26" [label="26: Prune (true branch) \n   n$10=*&0$?%__sil_tmpSIL_temp_conditional___n$7:int [line 49]\n  PRUNE((n$10 != 0), true); [line 49]\n " shape="invhouse"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_8" -> "test_loop.254a9d372f8f45542e409771135b9322_4" ;
-"test_loop.254a9d372f8f45542e409771135b9322_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 36]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_26" -> "main.fad58de7366495db4650cfefac2fcd61_28" ;
+"main.fad58de7366495db4650cfefac2fcd61_27" [label="27: Prune (false branch) \n   n$10=*&0$?%__sil_tmpSIL_temp_conditional___n$7:int [line 49]\n  PRUNE((n$10 == 0), false); [line 49]\n " shape="invhouse"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_7" -> "test_loop.254a9d372f8f45542e409771135b9322_4" ;
-"test_loop.254a9d372f8f45542e409771135b9322_6" [label="6: Prune (false branch) \n   n$1=*&spec:char* [line 36]\n  PRUNE((n$1 == 0), false); [line 36]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_27" -> "main.fad58de7366495db4650cfefac2fcd61_30" ;
+"main.fad58de7366495db4650cfefac2fcd61_28" [label="28:  BinaryOperatorStmt: Assign \n   *&block_size:char*=0 [line 50]\n " shape="box"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_6" -> "test_loop.254a9d372f8f45542e409771135b9322_8" ;
-"test_loop.254a9d372f8f45542e409771135b9322_5" [label="5: Prune (true branch) \n   n$1=*&spec:char* [line 36]\n  PRUNE((n$1 != 0), true); [line 36]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_28" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_29" [label="29: + \n  " ]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_5" -> "test_loop.254a9d372f8f45542e409771135b9322_7" ;
-"test_loop.254a9d372f8f45542e409771135b9322_4" [label="4: + \n  " ]
+	 "main.fad58de7366495db4650cfefac2fcd61_29" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_30" [label="30:  BinaryOperatorStmt: EQ \n   n$11=*&spec:char* [line 52]\n  n$12=*n$11:char [line 52]\n " shape="box"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_4" -> "test_loop.254a9d372f8f45542e409771135b9322_9" ;
-	 "test_loop.254a9d372f8f45542e409771135b9322_4" -> "test_loop.254a9d372f8f45542e409771135b9322_10" ;
-"test_loop.254a9d372f8f45542e409771135b9322_3" [label="3: + \n  " ]
+	 "main.fad58de7366495db4650cfefac2fcd61_30" -> "main.fad58de7366495db4650cfefac2fcd61_31" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_30" -> "main.fad58de7366495db4650cfefac2fcd61_32" ;
+"main.fad58de7366495db4650cfefac2fcd61_31" [label="31: Prune (true branch) \n   PRUNE(((n$12 == 39) != 0), true); [line 52]\n " shape="invhouse"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_3" -> "test_loop.254a9d372f8f45542e409771135b9322_5" ;
-	 "test_loop.254a9d372f8f45542e409771135b9322_3" -> "test_loop.254a9d372f8f45542e409771135b9322_6" ;
-"test_loop.254a9d372f8f45542e409771135b9322_2" [label="2: Exit test_loop \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_31" -> "main.fad58de7366495db4650cfefac2fcd61_33" ;
+"main.fad58de7366495db4650cfefac2fcd61_32" [label="32: Prune (false branch) \n   PRUNE(((n$12 == 39) == 0), false); [line 52]\n " shape="invhouse"]
 	
 
-"test_loop.254a9d372f8f45542e409771135b9322_1" [label="1: Start test_loop\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int 0$?%__sil_tmpSIL_temp_conditional___n$3:int 0$?%__sil_tmpSIL_temp_conditional___n$7:int block_size:char* spec:char* \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$3,&0$?%__sil_tmpSIL_temp_conditional___n$7,&block_size,&spec); [line 29]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_32" -> "main.fad58de7366495db4650cfefac2fcd61_29" ;
+"main.fad58de7366495db4650cfefac2fcd61_33" [label="33:  BinaryOperatorStmt: Assign \n   *&block_size:char*=0 [line 53]\n " shape="box"]
 	
 
-	 "test_loop.254a9d372f8f45542e409771135b9322_1" -> "test_loop.254a9d372f8f45542e409771135b9322_28" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_33" -> "main.fad58de7366495db4650cfefac2fcd61_29" ;
 "main.fad58de7366495db4650cfefac2fcd61_34" [label="34:  BinaryOperatorStmt: Assign \n   n$13=_fun_getenv(\"BLOCK\":char*) [line 47]\n  *&spec:char*=n$13 [line 47]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_34" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_34" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_33" [label="33:  BinaryOperatorStmt: Assign \n   *&block_size:char*=0 [line 53]\n " shape="box"]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_1" [label="1: Start shortcircuit_or\nFormals:  x:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_33" -> "main.fad58de7366495db4650cfefac2fcd61_29" ;
-"main.fad58de7366495db4650cfefac2fcd61_32" [label="32: Prune (false branch) \n   PRUNE(((n$12 == 39) == 0), false); [line 52]\n " shape="invhouse"]
+	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_1" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_5" ;
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_2" [label="2: Exit shortcircuit_or \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_32" -> "main.fad58de7366495db4650cfefac2fcd61_29" ;
-"main.fad58de7366495db4650cfefac2fcd61_31" [label="31: Prune (true branch) \n   PRUNE(((n$12 == 39) != 0), true); [line 52]\n " shape="invhouse"]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_3" [label="3: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_31" -> "main.fad58de7366495db4650cfefac2fcd61_33" ;
-"main.fad58de7366495db4650cfefac2fcd61_30" [label="30:  BinaryOperatorStmt: EQ \n   n$11=*&spec:char* [line 52]\n  n$12=*n$11:char [line 52]\n " shape="box"]
+	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_3" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_4" ;
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_30" -> "main.fad58de7366495db4650cfefac2fcd61_31" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_30" -> "main.fad58de7366495db4650cfefac2fcd61_32" ;
-"main.fad58de7366495db4650cfefac2fcd61_29" [label="29: + \n  " ]
+	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_4" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_2" ;
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_5" [label="5:  BinaryOperatorStmt: EQ \n   n$0=*&x:int* [line 14]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_29" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_28" [label="28:  BinaryOperatorStmt: Assign \n   *&block_size:char*=0 [line 50]\n " shape="box"]
+	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_5" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_6" ;
+	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_5" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_7" ;
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_6" [label="6: Prune (true branch) \n   PRUNE(((n$0 == 0) != 0), true); [line 14]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_28" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_27" [label="27: Prune (false branch) \n   n$10=*&0$?%__sil_tmpSIL_temp_conditional___n$7:int [line 49]\n  PRUNE((n$10 == 0), false); [line 49]\n " shape="invhouse"]
+	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_6" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_11" ;
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_7" [label="7: Prune (false branch) \n   PRUNE(((n$0 == 0) == 0), false); [line 14]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_27" -> "main.fad58de7366495db4650cfefac2fcd61_30" ;
-"main.fad58de7366495db4650cfefac2fcd61_26" [label="26: Prune (true branch) \n   n$10=*&0$?%__sil_tmpSIL_temp_conditional___n$7:int [line 49]\n  PRUNE((n$10 != 0), true); [line 49]\n " shape="invhouse"]
+	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_7" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_8" ;
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_8" [label="8:  BinaryOperatorStmt: EQ \n   n$1=*&x:int* [line 14]\n  n$2=*n$1:int [line 14]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_26" -> "main.fad58de7366495db4650cfefac2fcd61_28" ;
-"main.fad58de7366495db4650cfefac2fcd61_25" [label="25:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=1 [line 49]\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) \n   PRUNE(((n$2 == 2) != 0), true); [line 14]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_25" -> "main.fad58de7366495db4650cfefac2fcd61_20" ;
-"main.fad58de7366495db4650cfefac2fcd61_24" [label="24:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=0 [line 49]\n " shape="box"]
+	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_9" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_11" ;
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_10" [label="10: Prune (false branch) \n   PRUNE(((n$2 == 2) == 0), false); [line 14]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_24" -> "main.fad58de7366495db4650cfefac2fcd61_20" ;
-"main.fad58de7366495db4650cfefac2fcd61_23" [label="23: Prune (false branch) \n   PRUNE((n$9 == 0), false); [line 49]\n " shape="invhouse"]
+	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_10" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_12" ;
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_11" [label="11:  BinaryOperatorStmt: Assign \n   *&x:int*=17 [line 15]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_23" -> "main.fad58de7366495db4650cfefac2fcd61_25" ;
-"main.fad58de7366495db4650cfefac2fcd61_22" [label="22: Prune (true branch) \n   PRUNE((n$9 != 0), true); [line 49]\n " shape="invhouse"]
+	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_11" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_3" ;
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_12" [label="12:  BinaryOperatorStmt: Assign \n   *&x:int*=32 [line 17]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_22" -> "main.fad58de7366495db4650cfefac2fcd61_24" ;
-"main.fad58de7366495db4650cfefac2fcd61_21" [label="21:  BinaryOperatorStmt: Assign \n   n$8=_fun_getenv(\"BLOCKSIZE\":char*) [line 49]\n  *&spec:char*=n$8 [line 49]\n  n$9=*&spec:char* [line 49]\n " shape="box"]
+	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_12" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_3" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_1" [label="1: Start shortcircuit_and\nFormals:  x:int*\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int 0$?%__sil_tmpSIL_temp_conditional___n$3:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$3); [line 21]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_21" -> "main.fad58de7366495db4650cfefac2fcd61_22" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_21" -> "main.fad58de7366495db4650cfefac2fcd61_23" ;
-"main.fad58de7366495db4650cfefac2fcd61_20" [label="20: + \n  " ]
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_1" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_6" ;
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_1" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_7" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_2" [label="2: Exit shortcircuit_and \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_20" -> "main.fad58de7366495db4650cfefac2fcd61_26" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_20" -> "main.fad58de7366495db4650cfefac2fcd61_27" ;
-"main.fad58de7366495db4650cfefac2fcd61_19" [label="19: Prune (false branch) \n   n$6=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 49]\n  PRUNE((n$6 == 0), false); [line 49]\n " shape="invhouse"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_3" [label="3: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_19" -> "main.fad58de7366495db4650cfefac2fcd61_30" ;
-"main.fad58de7366495db4650cfefac2fcd61_18" [label="18: Prune (true branch) \n   n$6=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 49]\n  PRUNE((n$6 != 0), true); [line 49]\n " shape="invhouse"]
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_3" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_4" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_18" -> "main.fad58de7366495db4650cfefac2fcd61_21" ;
-"main.fad58de7366495db4650cfefac2fcd61_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 49]\n " shape="box"]
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_4" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_2" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_5" [label="5: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_17" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
-"main.fad58de7366495db4650cfefac2fcd61_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=0 [line 49]\n " shape="box"]
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_5" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_10" ;
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_5" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_11" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_6" [label="6: Prune (true branch) \n   n$1=*&x:int* [line 22]\n  PRUNE((n$1 != 0), true); [line 22]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_16" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15: Prune (false branch) \n   PRUNE((n$5 == 0), false); [line 49]\n " shape="invhouse"]
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_6" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_8" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_7" [label="7: Prune (false branch) \n   n$1=*&x:int* [line 22]\n  PRUNE((n$1 == 0), false); [line 22]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_17" ;
-"main.fad58de7366495db4650cfefac2fcd61_14" [label="14: Prune (true branch) \n   PRUNE((n$5 != 0), true); [line 49]\n " shape="invhouse"]
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_7" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_9" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 22]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_16" ;
-"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  BinaryOperatorStmt: Assign \n   n$4=_fun_getenv(\"BLOCK_SIZE\":char*) [line 49]\n  *&spec:char*=n$4 [line 49]\n  n$5=*&spec:char* [line 49]\n " shape="box"]
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_8" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_5" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_9" [label="9:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 22]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12: + \n  " ]
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_9" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_5" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_10" [label="10: Prune (true branch) \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 22]\n  PRUNE((n$2 != 0), true); [line 22]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_18" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_19" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11: Prune (false branch) \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 49]\n  PRUNE((n$2 == 0), false); [line 49]\n " shape="invhouse"]
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_10" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_13" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_11" [label="11: Prune (false branch) \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 22]\n  PRUNE((n$2 == 0), false); [line 22]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_30" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10: Prune (true branch) \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 49]\n  PRUNE((n$2 != 0), true); [line 49]\n " shape="invhouse"]
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_11" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_21" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_12" [label="12: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 49]\n " shape="box"]
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_12" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_18" ;
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_12" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_19" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_13" [label="13:  BinaryOperatorStmt: Assign \n   n$4=_fun_getenv(\"BLOCK\":char*) [line 22]\n  *&x:int*=n$4 [line 22]\n  n$5=*&x:int* [line 22]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 49]\n " shape="box"]
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_13" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_14" ;
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_13" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_15" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_14" [label="14: Prune (true branch) \n   PRUNE((n$5 != 0), true); [line 22]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch) \n   n$1=*&spec:char* [line 49]\n  PRUNE((n$1 == 0), false); [line 49]\n " shape="invhouse"]
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_14" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_16" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_15" [label="15: Prune (false branch) \n   PRUNE((n$5 == 0), false); [line 22]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch) \n   n$1=*&spec:char* [line 49]\n  PRUNE((n$1 != 0), true); [line 49]\n " shape="invhouse"]
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_15" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_17" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=0 [line 22]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5: + \n  " ]
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_16" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_12" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 22]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_17" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_12" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_18" [label="18: Prune (true branch) \n   n$6=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 22]\n  PRUNE((n$6 != 0), true); [line 22]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 56]\n " shape="box"]
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_18" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_20" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_19" [label="19: Prune (false branch) \n   n$6=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 22]\n  PRUNE((n$6 == 0), false); [line 22]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_19" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_21" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_20" [label="20:  BinaryOperatorStmt: Assign \n   *&x:int*=17 [line 23]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int 0$?%__sil_tmpSIL_temp_conditional___n$3:int 0$?%__sil_tmpSIL_temp_conditional___n$7:int block_size:char* spec:char* \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$3,&0$?%__sil_tmpSIL_temp_conditional___n$7,&block_size,&spec); [line 42]\n " color=yellow style=filled]
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_20" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_3" ;
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_21" [label="21:  BinaryOperatorStmt: Assign \n   n$7=*&x:int* [line 25]\n  *n$7:int=32 [line 25]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_34" ;
+	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_21" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_3" ;
 }

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

@@ -1,139 +1,139 @@
 /* @generated */
 digraph iCFG {
-"neg.f24c2c15b9d03797c6874986a8d19516_8" [label="8:  Return Stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 29]\n  *&return:int=n$2 [line 29]\n " shape="box"]
-	
-
-	 "neg.f24c2c15b9d03797c6874986a8d19516_8" -> "neg.f24c2c15b9d03797c6874986a8d19516_2" ;
-"neg.f24c2c15b9d03797c6874986a8d19516_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 29]\n " shape="box"]
+"identity.ff483d1ff591898a9942916050d2ca3f_1" [label="1: Start identity\nFormals:  x:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
-	 "neg.f24c2c15b9d03797c6874986a8d19516_7" -> "neg.f24c2c15b9d03797c6874986a8d19516_3" ;
-"neg.f24c2c15b9d03797c6874986a8d19516_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 29]\n " shape="box"]
+	 "identity.ff483d1ff591898a9942916050d2ca3f_1" -> "identity.ff483d1ff591898a9942916050d2ca3f_3" ;
+"identity.ff483d1ff591898a9942916050d2ca3f_2" [label="2: Exit identity \n  " color=yellow style=filled]
 	
 
-	 "neg.f24c2c15b9d03797c6874986a8d19516_6" -> "neg.f24c2c15b9d03797c6874986a8d19516_3" ;
-"neg.f24c2c15b9d03797c6874986a8d19516_5" [label="5: Prune (false branch) \n   n$1=*&x:int [line 29]\n  PRUNE((n$1 == 0), false); [line 29]\n " shape="invhouse"]
+"identity.ff483d1ff591898a9942916050d2ca3f_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 10]\n  *&return:int=n$0 [line 10]\n " shape="box"]
 	
 
-	 "neg.f24c2c15b9d03797c6874986a8d19516_5" -> "neg.f24c2c15b9d03797c6874986a8d19516_7" ;
-"neg.f24c2c15b9d03797c6874986a8d19516_4" [label="4: Prune (true branch) \n   n$1=*&x:int [line 29]\n  PRUNE((n$1 != 0), true); [line 29]\n " shape="invhouse"]
+	 "identity.ff483d1ff591898a9942916050d2ca3f_3" -> "identity.ff483d1ff591898a9942916050d2ca3f_2" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_1" [label="1: Start bar\nFormals:  x:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
-	 "neg.f24c2c15b9d03797c6874986a8d19516_4" -> "neg.f24c2c15b9d03797c6874986a8d19516_6" ;
-"neg.f24c2c15b9d03797c6874986a8d19516_3" [label="3: + \n  " ]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_1" -> "bar.37b51d194a7513e45b56f6524f2d51f2_5" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_2" [label="2: Exit bar \n  " color=yellow style=filled]
 	
 
-	 "neg.f24c2c15b9d03797c6874986a8d19516_3" -> "neg.f24c2c15b9d03797c6874986a8d19516_8" ;
-"neg.f24c2c15b9d03797c6874986a8d19516_2" [label="2: Exit neg \n  " color=yellow style=filled]
+"bar.37b51d194a7513e45b56f6524f2d51f2_3" [label="3: + \n  " ]
 	
 
-"neg.f24c2c15b9d03797c6874986a8d19516_1" [label="1: Start neg\nFormals:  x:int\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 29]\n " color=yellow style=filled]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_3" -> "bar.37b51d194a7513e45b56f6524f2d51f2_4" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
-	 "neg.f24c2c15b9d03797c6874986a8d19516_1" -> "neg.f24c2c15b9d03797c6874986a8d19516_4" ;
-	 "neg.f24c2c15b9d03797c6874986a8d19516_1" -> "neg.f24c2c15b9d03797c6874986a8d19516_5" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_14" [label="14:  Return Stmt \n   *&return:int=0 [line 25]\n " shape="box"]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_4" -> "bar.37b51d194a7513e45b56f6524f2d51f2_2" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_5" [label="5:  Call _fun_identity \n   n$0=*&x:int [line 13]\n  n$1=_fun_identity(n$0:int) [line 13]\n " shape="box"]
 	
 
-	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_14" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_2" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_13" [label="13:  Return Stmt \n   *&return:int=1 [line 23]\n " shape="box"]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_5" -> "bar.37b51d194a7513e45b56f6524f2d51f2_6" ;
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_5" -> "bar.37b51d194a7513e45b56f6524f2d51f2_7" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_6" [label="6: Prune (true branch) \n   PRUNE((n$1 != 0), true); [line 13]\n " shape="invhouse"]
 	
 
-	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_13" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_2" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_12" [label="12: Prune (false branch) \n   PRUNE((n$3 == 0), false); [line 22]\n " shape="invhouse"]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_6" -> "bar.37b51d194a7513e45b56f6524f2d51f2_8" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_7" [label="7: Prune (false branch) \n   PRUNE((n$1 == 0), false); [line 13]\n " shape="invhouse"]
 	
 
-	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_12" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_14" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_11" [label="11: Prune (true branch) \n   PRUNE((n$3 != 0), true); [line 22]\n " shape="invhouse"]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_7" -> "bar.37b51d194a7513e45b56f6524f2d51f2_9" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_8" [label="8:  Return Stmt \n   *&return:int=1 [line 14]\n " shape="box"]
 	
 
-	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_11" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_13" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_10" [label="10:  Call _fun_identity \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 22]\n  n$3=_fun_identity(n$2:int) [line 22]\n " shape="box"]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_8" -> "bar.37b51d194a7513e45b56f6524f2d51f2_2" ;
+"bar.37b51d194a7513e45b56f6524f2d51f2_9" [label="9:  Return Stmt \n   *&return:int=0 [line 16]\n " shape="box"]
 	
 
-	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_10" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_11" ;
-	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_10" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_12" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_9" [label="9:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 22]\n " shape="box"]
+	 "bar.37b51d194a7513e45b56f6524f2d51f2_9" -> "bar.37b51d194a7513e45b56f6524f2d51f2_2" ;
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_1" [label="1: Start baz\nFormals:  x:int\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 20]\n " color=yellow style=filled]
 	
 
-	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_9" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_5" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 22]\n " shape="box"]
+	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_1" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_6" ;
+	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_1" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_7" ;
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_2" [label="2: Exit baz \n  " color=yellow style=filled]
 	
 
-	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_8" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_5" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_7" [label="7: Prune (false branch) \n   n$1=*&x:int [line 22]\n  PRUNE((n$1 == 0), false); [line 22]\n " shape="invhouse"]
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_3" [label="3: + \n  " ]
 	
 
-	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_7" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_9" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_6" [label="6: Prune (true branch) \n   n$1=*&x:int [line 22]\n  PRUNE((n$1 != 0), true); [line 22]\n " shape="invhouse"]
+	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_3" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_4" ;
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
-	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_6" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_8" ;
+	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_4" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_2" ;
 "baz.73feffa4b7f6bb68e44cf984c85f6e88_5" [label="5: + \n  " ]
 	
 
 	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_5" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_10" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_4" [label="4:  between_join_and_exit \n  " shape="box"]
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_6" [label="6: Prune (true branch) \n   n$1=*&x:int [line 22]\n  PRUNE((n$1 != 0), true); [line 22]\n " shape="invhouse"]
 	
 
-	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_4" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_2" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_3" [label="3: + \n  " ]
+	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_6" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_8" ;
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_7" [label="7: Prune (false branch) \n   n$1=*&x:int [line 22]\n  PRUNE((n$1 == 0), false); [line 22]\n " shape="invhouse"]
 	
 
-	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_3" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_4" ;
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_2" [label="2: Exit baz \n  " color=yellow style=filled]
+	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_7" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_9" ;
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 22]\n " shape="box"]
 	
 
-"baz.73feffa4b7f6bb68e44cf984c85f6e88_1" [label="1: Start baz\nFormals:  x:int\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 20]\n " color=yellow style=filled]
+	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_8" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_5" ;
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_9" [label="9:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 22]\n " shape="box"]
 	
 
-	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_1" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_6" ;
-	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_1" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_7" ;
-"identity.ff483d1ff591898a9942916050d2ca3f_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 10]\n  *&return:int=n$0 [line 10]\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 22]\n  n$3=_fun_identity(n$2:int) [line 22]\n " shape="box"]
 	
 
-	 "identity.ff483d1ff591898a9942916050d2ca3f_3" -> "identity.ff483d1ff591898a9942916050d2ca3f_2" ;
-"identity.ff483d1ff591898a9942916050d2ca3f_2" [label="2: Exit identity \n  " color=yellow style=filled]
+	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_10" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_11" ;
+	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_10" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_12" ;
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_11" [label="11: Prune (true branch) \n   PRUNE((n$3 != 0), true); [line 22]\n " shape="invhouse"]
 	
 
-"identity.ff483d1ff591898a9942916050d2ca3f_1" [label="1: Start identity\nFormals:  x:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
+	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_11" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_13" ;
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_12" [label="12: Prune (false branch) \n   PRUNE((n$3 == 0), false); [line 22]\n " shape="invhouse"]
 	
 
-	 "identity.ff483d1ff591898a9942916050d2ca3f_1" -> "identity.ff483d1ff591898a9942916050d2ca3f_3" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_9" [label="9:  Return Stmt \n   *&return:int=0 [line 16]\n " shape="box"]
+	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_12" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_14" ;
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_13" [label="13:  Return Stmt \n   *&return:int=1 [line 23]\n " shape="box"]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_9" -> "bar.37b51d194a7513e45b56f6524f2d51f2_2" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_8" [label="8:  Return Stmt \n   *&return:int=1 [line 14]\n " shape="box"]
+	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_13" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_2" ;
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_14" [label="14:  Return Stmt \n   *&return:int=0 [line 25]\n " shape="box"]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_8" -> "bar.37b51d194a7513e45b56f6524f2d51f2_2" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_7" [label="7: Prune (false branch) \n   PRUNE((n$1 == 0), false); [line 13]\n " shape="invhouse"]
+	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_14" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_2" ;
+"neg.f24c2c15b9d03797c6874986a8d19516_1" [label="1: Start neg\nFormals:  x:int\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 29]\n " color=yellow style=filled]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_7" -> "bar.37b51d194a7513e45b56f6524f2d51f2_9" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_6" [label="6: Prune (true branch) \n   PRUNE((n$1 != 0), true); [line 13]\n " shape="invhouse"]
+	 "neg.f24c2c15b9d03797c6874986a8d19516_1" -> "neg.f24c2c15b9d03797c6874986a8d19516_4" ;
+	 "neg.f24c2c15b9d03797c6874986a8d19516_1" -> "neg.f24c2c15b9d03797c6874986a8d19516_5" ;
+"neg.f24c2c15b9d03797c6874986a8d19516_2" [label="2: Exit neg \n  " color=yellow style=filled]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_6" -> "bar.37b51d194a7513e45b56f6524f2d51f2_8" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_5" [label="5:  Call _fun_identity \n   n$0=*&x:int [line 13]\n  n$1=_fun_identity(n$0:int) [line 13]\n " shape="box"]
+"neg.f24c2c15b9d03797c6874986a8d19516_3" [label="3: + \n  " ]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_5" -> "bar.37b51d194a7513e45b56f6524f2d51f2_6" ;
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_5" -> "bar.37b51d194a7513e45b56f6524f2d51f2_7" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_4" [label="4:  between_join_and_exit \n  " shape="box"]
+	 "neg.f24c2c15b9d03797c6874986a8d19516_3" -> "neg.f24c2c15b9d03797c6874986a8d19516_8" ;
+"neg.f24c2c15b9d03797c6874986a8d19516_4" [label="4: Prune (true branch) \n   n$1=*&x:int [line 29]\n  PRUNE((n$1 != 0), true); [line 29]\n " shape="invhouse"]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_4" -> "bar.37b51d194a7513e45b56f6524f2d51f2_2" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_3" [label="3: + \n  " ]
+	 "neg.f24c2c15b9d03797c6874986a8d19516_4" -> "neg.f24c2c15b9d03797c6874986a8d19516_6" ;
+"neg.f24c2c15b9d03797c6874986a8d19516_5" [label="5: Prune (false branch) \n   n$1=*&x:int [line 29]\n  PRUNE((n$1 == 0), false); [line 29]\n " shape="invhouse"]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_3" -> "bar.37b51d194a7513e45b56f6524f2d51f2_4" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_2" [label="2: Exit bar \n  " color=yellow style=filled]
+	 "neg.f24c2c15b9d03797c6874986a8d19516_5" -> "neg.f24c2c15b9d03797c6874986a8d19516_7" ;
+"neg.f24c2c15b9d03797c6874986a8d19516_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 29]\n " shape="box"]
 	
 
-"bar.37b51d194a7513e45b56f6524f2d51f2_1" [label="1: Start bar\nFormals:  x:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
+	 "neg.f24c2c15b9d03797c6874986a8d19516_6" -> "neg.f24c2c15b9d03797c6874986a8d19516_3" ;
+"neg.f24c2c15b9d03797c6874986a8d19516_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 29]\n " shape="box"]
 	
 
-	 "bar.37b51d194a7513e45b56f6524f2d51f2_1" -> "bar.37b51d194a7513e45b56f6524f2d51f2_5" ;
+	 "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 29]\n  *&return:int=n$2 [line 29]\n " shape="box"]
+	
+
+	 "neg.f24c2c15b9d03797c6874986a8d19516_8" -> "neg.f24c2c15b9d03797c6874986a8d19516_2" ;
 }

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

@@ -1,99 +1,99 @@
 /* @generated */
 digraph iCFG {
-"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_8" [label="8:  DeclStmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 22]\n  *&z:int=n$3 [line 22]\n " shape="box"]
+"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_1" [label="1: Start call_ife_then_access_field\nFormals: \nLocals:  z:int 0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&z,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 20]\n " color=yellow style=filled]
 	
 
-	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_8" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_2" ;
-"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 22]\n " shape="box"]
+	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_1" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_4" ;
+	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_1" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_5" ;
+"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_2" [label="2: Exit call_ife_then_access_field \n  " color=yellow style=filled]
 	
 
-	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_7" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_3" ;
-"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_6" [label="6:  ConditinalStmt Branch \n   n$1=_fun_ret_ptr(4:int) [line 22]\n  n$2=*n$1.field:int [line 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$2 [line 22]\n " shape="box"]
+"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_3" [label="3: + \n  " ]
 	
 
-	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_6" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_3" ;
-"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 22]\n " shape="invhouse"]
+	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_3" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_8" ;
+"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 20]\n " shape="invhouse"]
 	
 
-	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_5" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_7" ;
-"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 22]\n " shape="invhouse"]
+	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_4" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_6" ;
+"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 20]\n " shape="invhouse"]
 	
 
-	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_4" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_6" ;
-"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_3" [label="3: + \n  " ]
+	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_5" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_7" ;
+"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=2 [line 20]\n " shape="box"]
 	
 
-	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_3" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_8" ;
-"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_2" [label="2: Exit access_field_in_ife_branch \n  " color=yellow style=filled]
+	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_6" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_3" ;
+"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=3 [line 20]\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   n$1=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 20]\n  n$2=_fun_ret_ptr(n$1:int) [line 20]\n  n$3=*n$2.field:int [line 20]\n  *&z:int=n$3 [line 20]\n " shape="box"]
+	
+
+	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_8" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_2" ;
 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_1" [label="1: Start access_field_in_ife_branch\nFormals: \nLocals:  z:int 0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&z,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 22]\n " color=yellow style=filled]
 	
 
 	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_1" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_4" ;
 	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_1" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_5" ;
-"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_8" [label="8:  DeclStmt \n   n$1=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 20]\n  n$2=_fun_ret_ptr(n$1:int) [line 20]\n  n$3=*n$2.field:int [line 20]\n  *&z:int=n$3 [line 20]\n " shape="box"]
+"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_2" [label="2: Exit access_field_in_ife_branch \n  " color=yellow style=filled]
 	
 
-	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_8" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_2" ;
-"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=3 [line 20]\n " shape="box"]
+"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_3" [label="3: + \n  " ]
 	
 
-	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_7" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_3" ;
-"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=2 [line 20]\n " shape="box"]
+	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_3" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_8" ;
+"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 22]\n " shape="invhouse"]
 	
 
-	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_6" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_3" ;
-"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 20]\n " shape="invhouse"]
+	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_4" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_6" ;
+"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 22]\n " shape="invhouse"]
 	
 
-	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_5" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_7" ;
-"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 20]\n " shape="invhouse"]
+	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_5" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_7" ;
+"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_6" [label="6:  ConditinalStmt Branch \n   n$1=_fun_ret_ptr(4:int) [line 22]\n  n$2=*n$1.field:int [line 22]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=n$2 [line 22]\n " shape="box"]
 	
 
-	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_4" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_6" ;
-"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_3" [label="3: + \n  " ]
+	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_6" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_3" ;
+"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 22]\n " shape="box"]
 	
 
-	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_3" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_8" ;
-"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_2" [label="2: Exit call_ife_then_access_field \n  " color=yellow style=filled]
+	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_7" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_3" ;
+"access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_8" [label="8:  DeclStmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 22]\n  *&z:int=n$3 [line 22]\n " shape="box"]
 	
 
-"call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_1" [label="1: Start call_ife_then_access_field\nFormals: \nLocals:  z:int 0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&z,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 20]\n " color=yellow style=filled]
+	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_8" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_2" ;
+"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_1" [label="1: Start ife_then_access_field\nFormals:  p:struct s* q:struct s*\nLocals:  z:int 0$?%__sil_tmpSIL_temp_conditional___n$0:struct s* \n   DECLARE_LOCALS(&return,&z,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 16]\n " color=yellow style=filled]
 	
 
-	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_1" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_4" ;
-	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_1" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_5" ;
-"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_8" [label="8:  DeclStmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:struct s* [line 17]\n  n$4=*n$3.field:int [line 17]\n  *&z:int=n$4 [line 17]\n " shape="box"]
+	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_1" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_4" ;
+	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_1" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_5" ;
+"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_2" [label="2: Exit ife_then_access_field \n  " color=yellow style=filled]
 	
 
-	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_8" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_2" ;
-"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_7" [label="7:  ConditinalStmt Branch \n   n$2=*&q:struct s* [line 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:struct s*=n$2 [line 17]\n " shape="box"]
+"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_3" [label="3: + \n  " ]
 	
 
-	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_7" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_3" ;
-"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_6" [label="6:  ConditinalStmt Branch \n   n$1=*&p:struct s* [line 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:struct s*=n$1 [line 17]\n " shape="box"]
+	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_3" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_8" ;
+"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 17]\n " shape="invhouse"]
 	
 
-	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_6" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_3" ;
+	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_4" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_6" ;
 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 17]\n " shape="invhouse"]
 	
 
 	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_5" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_7" ;
-"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 17]\n " shape="invhouse"]
-	
-
-	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_4" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_6" ;
-"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_3" [label="3: + \n  " ]
+"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_6" [label="6:  ConditinalStmt Branch \n   n$1=*&p:struct s* [line 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:struct s*=n$1 [line 17]\n " shape="box"]
 	
 
-	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_3" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_8" ;
-"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_2" [label="2: Exit ife_then_access_field \n  " color=yellow style=filled]
+	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_6" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_3" ;
+"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_7" [label="7:  ConditinalStmt Branch \n   n$2=*&q:struct s* [line 17]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:struct s*=n$2 [line 17]\n " shape="box"]
 	
 
-"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_1" [label="1: Start ife_then_access_field\nFormals:  p:struct s* q:struct s*\nLocals:  z:int 0$?%__sil_tmpSIL_temp_conditional___n$0:struct s* \n   DECLARE_LOCALS(&return,&z,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 16]\n " color=yellow style=filled]
+	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_7" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_3" ;
+"ife_then_access_field.314daa5b993f0f569c257230f350e2e2_8" [label="8:  DeclStmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:struct s* [line 17]\n  n$4=*n$3.field:int [line 17]\n  *&z:int=n$4 [line 17]\n " shape="box"]
 	
 
-	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_1" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_4" ;
-	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_1" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_5" ;
+	 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_8" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_2" ;
 }

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

@@ -1,110 +1,110 @@
 /* @generated */
 digraph iCFG {
-"preincrement.db7c6523f16e1ab3058057cee6614472_26" [label="26:  BinaryOperatorStmt: AddAssign \n   n$16=*&p:struct s* [line 15]\n  n$17=*n$16.x:int [line 15]\n  *n$16.x:int=(n$17 + 1) [line 15]\n " shape="box"]
-	
-
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_26" -> "preincrement.db7c6523f16e1ab3058057cee6614472_21" ;
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_26" -> "preincrement.db7c6523f16e1ab3058057cee6614472_22" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_25" [label="25:  BinaryOperatorStmt: AddAssign \n   n$14=*&0$?%__sil_tmpSIL_temp_conditional___n$11:struct s* [line 16]\n  n$15=*n$14.x:int [line 16]\n  *n$14.x:int=(n$15 + 1) [line 16]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_1" [label="1: Start preincrement\nFormals:  p:struct s*\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:struct s* 0$?%__sil_tmpSIL_temp_conditional___n$4:int 0$?%__sil_tmpSIL_temp_conditional___n$8:int 0$?%__sil_tmpSIL_temp_conditional___n$11:struct s* \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$4,&0$?%__sil_tmpSIL_temp_conditional___n$8,&0$?%__sil_tmpSIL_temp_conditional___n$11); [line 14]\n " color=yellow style=filled]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_25" -> "preincrement.db7c6523f16e1ab3058057cee6614472_15" ;
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_25" -> "preincrement.db7c6523f16e1ab3058057cee6614472_16" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_24" [label="24:  ConditinalStmt Branch \n   n$13=*&p:struct s* [line 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$11:struct s*=n$13 [line 16]\n " shape="box"]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_1" -> "preincrement.db7c6523f16e1ab3058057cee6614472_26" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_2" [label="2: Exit preincrement \n  " color=yellow style=filled]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_24" -> "preincrement.db7c6523f16e1ab3058057cee6614472_20" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_23" [label="23:  ConditinalStmt Branch \n   n$12=*&p:struct s* [line 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$11:struct s*=n$12 [line 16]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_3" [label="3: + \n  " ]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_23" -> "preincrement.db7c6523f16e1ab3058057cee6614472_20" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_22" [label="22: Prune (false branch) \n   PRUNE((1 == 0), false); [line 16]\n " shape="invhouse"]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_3" -> "preincrement.db7c6523f16e1ab3058057cee6614472_9" ;
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_3" -> "preincrement.db7c6523f16e1ab3058057cee6614472_10" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 18]\n " shape="invhouse"]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_22" -> "preincrement.db7c6523f16e1ab3058057cee6614472_24" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_21" [label="21: Prune (true branch) \n   PRUNE((1 != 0), true); [line 16]\n " shape="invhouse"]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_4" -> "preincrement.db7c6523f16e1ab3058057cee6614472_6" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 18]\n " shape="invhouse"]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_21" -> "preincrement.db7c6523f16e1ab3058057cee6614472_23" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_20" [label="20: + \n  " ]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_5" -> "preincrement.db7c6523f16e1ab3058057cee6614472_7" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_6" [label="6:  ConditinalStmt Branch \n   n$1=*&p:struct s* [line 18]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:struct s*=n$1 [line 18]\n " shape="box"]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_20" -> "preincrement.db7c6523f16e1ab3058057cee6614472_25" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_19" [label="19:  BinaryOperatorStmt: AddAssign \n   n$7=*&p:struct s* [line 17]\n  n$9=*&0$?%__sil_tmpSIL_temp_conditional___n$8:int [line 17]\n  n$10=*n$7.x:int [line 17]\n  *n$7.x:int=(n$10 + n$9) [line 17]\n " shape="box"]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_6" -> "preincrement.db7c6523f16e1ab3058057cee6614472_3" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_7" [label="7:  ConditinalStmt Branch \n   n$2=*&p:struct s* [line 18]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:struct s*=n$2 [line 18]\n " shape="box"]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_19" -> "preincrement.db7c6523f16e1ab3058057cee6614472_4" ;
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_19" -> "preincrement.db7c6523f16e1ab3058057cee6614472_5" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_18" [label="18:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=7 [line 17]\n " shape="box"]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_7" -> "preincrement.db7c6523f16e1ab3058057cee6614472_3" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_8" [label="8: + \n  " ]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_18" -> "preincrement.db7c6523f16e1ab3058057cee6614472_14" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=3 [line 17]\n " shape="box"]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_8" -> "preincrement.db7c6523f16e1ab3058057cee6614472_13" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_9" [label="9: Prune (true branch) \n   PRUNE((1 != 0), true); [line 18]\n " shape="invhouse"]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_17" -> "preincrement.db7c6523f16e1ab3058057cee6614472_14" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_16" [label="16: Prune (false branch) \n   PRUNE((1 == 0), false); [line 17]\n " shape="invhouse"]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_9" -> "preincrement.db7c6523f16e1ab3058057cee6614472_11" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_10" [label="10: Prune (false branch) \n   PRUNE((1 == 0), false); [line 18]\n " shape="invhouse"]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_16" -> "preincrement.db7c6523f16e1ab3058057cee6614472_18" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_15" [label="15: Prune (true branch) \n   PRUNE((1 != 0), true); [line 17]\n " shape="invhouse"]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_10" -> "preincrement.db7c6523f16e1ab3058057cee6614472_12" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 18]\n " shape="box"]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_15" -> "preincrement.db7c6523f16e1ab3058057cee6614472_17" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_14" [label="14: + \n  " ]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_11" -> "preincrement.db7c6523f16e1ab3058057cee6614472_8" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=7 [line 18]\n " shape="box"]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_14" -> "preincrement.db7c6523f16e1ab3058057cee6614472_19" ;
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_12" -> "preincrement.db7c6523f16e1ab3058057cee6614472_8" ;
 "preincrement.db7c6523f16e1ab3058057cee6614472_13" [label="13:  BinaryOperatorStmt: AddAssign \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:struct s* [line 18]\n  n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$4:int [line 18]\n  n$6=*n$3.x:int [line 18]\n  *n$3.x:int=(n$6 + n$5) [line 18]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_13" -> "preincrement.db7c6523f16e1ab3058057cee6614472_2" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=7 [line 18]\n " shape="box"]
+"preincrement.db7c6523f16e1ab3058057cee6614472_14" [label="14: + \n  " ]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_12" -> "preincrement.db7c6523f16e1ab3058057cee6614472_8" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 18]\n " shape="box"]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_14" -> "preincrement.db7c6523f16e1ab3058057cee6614472_19" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_15" [label="15: Prune (true branch) \n   PRUNE((1 != 0), true); [line 17]\n " shape="invhouse"]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_11" -> "preincrement.db7c6523f16e1ab3058057cee6614472_8" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_10" [label="10: Prune (false branch) \n   PRUNE((1 == 0), false); [line 18]\n " shape="invhouse"]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_15" -> "preincrement.db7c6523f16e1ab3058057cee6614472_17" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_16" [label="16: Prune (false branch) \n   PRUNE((1 == 0), false); [line 17]\n " shape="invhouse"]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_10" -> "preincrement.db7c6523f16e1ab3058057cee6614472_12" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_9" [label="9: Prune (true branch) \n   PRUNE((1 != 0), true); [line 18]\n " shape="invhouse"]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_16" -> "preincrement.db7c6523f16e1ab3058057cee6614472_18" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=3 [line 17]\n " shape="box"]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_9" -> "preincrement.db7c6523f16e1ab3058057cee6614472_11" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_8" [label="8: + \n  " ]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_17" -> "preincrement.db7c6523f16e1ab3058057cee6614472_14" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_18" [label="18:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=7 [line 17]\n " shape="box"]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_8" -> "preincrement.db7c6523f16e1ab3058057cee6614472_13" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_7" [label="7:  ConditinalStmt Branch \n   n$2=*&p:struct s* [line 18]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:struct s*=n$2 [line 18]\n " shape="box"]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_18" -> "preincrement.db7c6523f16e1ab3058057cee6614472_14" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_19" [label="19:  BinaryOperatorStmt: AddAssign \n   n$7=*&p:struct s* [line 17]\n  n$9=*&0$?%__sil_tmpSIL_temp_conditional___n$8:int [line 17]\n  n$10=*n$7.x:int [line 17]\n  *n$7.x:int=(n$10 + n$9) [line 17]\n " shape="box"]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_7" -> "preincrement.db7c6523f16e1ab3058057cee6614472_3" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_6" [label="6:  ConditinalStmt Branch \n   n$1=*&p:struct s* [line 18]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:struct s*=n$1 [line 18]\n " shape="box"]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_19" -> "preincrement.db7c6523f16e1ab3058057cee6614472_4" ;
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_19" -> "preincrement.db7c6523f16e1ab3058057cee6614472_5" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_20" [label="20: + \n  " ]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_6" -> "preincrement.db7c6523f16e1ab3058057cee6614472_3" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 18]\n " shape="invhouse"]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_20" -> "preincrement.db7c6523f16e1ab3058057cee6614472_25" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_21" [label="21: Prune (true branch) \n   PRUNE((1 != 0), true); [line 16]\n " shape="invhouse"]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_5" -> "preincrement.db7c6523f16e1ab3058057cee6614472_7" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 18]\n " shape="invhouse"]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_21" -> "preincrement.db7c6523f16e1ab3058057cee6614472_23" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_22" [label="22: Prune (false branch) \n   PRUNE((1 == 0), false); [line 16]\n " shape="invhouse"]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_4" -> "preincrement.db7c6523f16e1ab3058057cee6614472_6" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_3" [label="3: + \n  " ]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_22" -> "preincrement.db7c6523f16e1ab3058057cee6614472_24" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_23" [label="23:  ConditinalStmt Branch \n   n$12=*&p:struct s* [line 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$11:struct s*=n$12 [line 16]\n " shape="box"]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_3" -> "preincrement.db7c6523f16e1ab3058057cee6614472_9" ;
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_3" -> "preincrement.db7c6523f16e1ab3058057cee6614472_10" ;
-"preincrement.db7c6523f16e1ab3058057cee6614472_2" [label="2: Exit preincrement \n  " color=yellow style=filled]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_23" -> "preincrement.db7c6523f16e1ab3058057cee6614472_20" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_24" [label="24:  ConditinalStmt Branch \n   n$13=*&p:struct s* [line 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$11:struct s*=n$13 [line 16]\n " shape="box"]
 	
 
-"preincrement.db7c6523f16e1ab3058057cee6614472_1" [label="1: Start preincrement\nFormals:  p:struct s*\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:struct s* 0$?%__sil_tmpSIL_temp_conditional___n$4:int 0$?%__sil_tmpSIL_temp_conditional___n$8:int 0$?%__sil_tmpSIL_temp_conditional___n$11:struct s* \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&0$?%__sil_tmpSIL_temp_conditional___n$4,&0$?%__sil_tmpSIL_temp_conditional___n$8,&0$?%__sil_tmpSIL_temp_conditional___n$11); [line 14]\n " color=yellow style=filled]
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_24" -> "preincrement.db7c6523f16e1ab3058057cee6614472_20" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_25" [label="25:  BinaryOperatorStmt: AddAssign \n   n$14=*&0$?%__sil_tmpSIL_temp_conditional___n$11:struct s* [line 16]\n  n$15=*n$14.x:int [line 16]\n  *n$14.x:int=(n$15 + 1) [line 16]\n " shape="box"]
 	
 
-	 "preincrement.db7c6523f16e1ab3058057cee6614472_1" -> "preincrement.db7c6523f16e1ab3058057cee6614472_26" ;
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_25" -> "preincrement.db7c6523f16e1ab3058057cee6614472_15" ;
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_25" -> "preincrement.db7c6523f16e1ab3058057cee6614472_16" ;
+"preincrement.db7c6523f16e1ab3058057cee6614472_26" [label="26:  BinaryOperatorStmt: AddAssign \n   n$16=*&p:struct s* [line 15]\n  n$17=*n$16.x:int [line 15]\n  *n$16.x:int=(n$17 + 1) [line 15]\n " shape="box"]
+	
+
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_26" -> "preincrement.db7c6523f16e1ab3058057cee6614472_21" ;
+	 "preincrement.db7c6523f16e1ab3058057cee6614472_26" -> "preincrement.db7c6523f16e1ab3058057cee6614472_22" ;
 }

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

@@ -1,85 +1,85 @@
 /* @generated */
 digraph iCFG {
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_20" [label="20:  BinaryOperatorStmt: Assign \n   n$13=*&0$?%__sil_tmpSIL_temp_conditional___n$10:int* [line 12]\n  n$14=*n$13:int [line 12]\n  *&x:int=n$14 [line 12]\n " shape="box"]
-	
-
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_20" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_10" ;
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_20" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_11" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_19" [label="19:  ConditinalStmt Branch \n   n$12=*&p:int* [line 12]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$10:int*=n$12 [line 12]\n " shape="box"]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_1" [label="1: Start dereference_ifthenelse\nFormals:  p:int*\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int* y:int 0$?%__sil_tmpSIL_temp_conditional___n$5:int* 0$?%__sil_tmpSIL_temp_conditional___n$10:int* x:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&y,&0$?%__sil_tmpSIL_temp_conditional___n$5,&0$?%__sil_tmpSIL_temp_conditional___n$10,&x); [line 10]\n " color=yellow style=filled]
 	
 
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_19" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_15" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_18" [label="18:  ConditinalStmt Branch \n   n$11=*&p:int* [line 12]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$10:int*=n$11 [line 12]\n " shape="box"]
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_1" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_16" ;
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_1" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_17" ;
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_2" [label="2: Exit dereference_ifthenelse \n  " color=yellow style=filled]
 	
 
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_18" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_15" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_17" [label="17: Prune (false branch) \n   PRUNE((1 == 0), false); [line 12]\n " shape="invhouse"]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_3" [label="3: + \n  " ]
 	
 
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_17" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_19" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_16" [label="16: Prune (true branch) \n   PRUNE((1 != 0), true); [line 12]\n " shape="invhouse"]
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_3" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_8" ;
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 16]\n " shape="invhouse"]
 	
 
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_16" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_18" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_15" [label="15: + \n  " ]
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_4" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_6" ;
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 16]\n " shape="invhouse"]
 	
 
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_15" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_20" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_14" [label="14:  DeclStmt \n   n$8=*&0$?%__sil_tmpSIL_temp_conditional___n$5:int* [line 14]\n  n$9=*n$8:int [line 14]\n  *&y:int=n$9 [line 14]\n " shape="box"]
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_5" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_7" ;
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_6" [label="6:  ConditinalStmt Branch \n   n$1=*&p:int* [line 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int*=n$1 [line 16]\n " shape="box"]
 	
 
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_14" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_4" ;
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_14" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_5" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_13" [label="13:  ConditinalStmt Branch \n   n$7=*&p:int* [line 14]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int*=n$7 [line 14]\n " shape="box"]
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_6" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_3" ;
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_7" [label="7:  ConditinalStmt Branch \n   n$2=*&p:int* [line 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int*=n$2 [line 16]\n " shape="box"]
 	
 
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_13" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_9" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_12" [label="12:  ConditinalStmt Branch \n   n$6=*&p:int* [line 14]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int*=n$6 [line 14]\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 16]\n " shape="box"]
 	
 
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_12" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_9" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_11" [label="11: Prune (false branch) \n   PRUNE((1 == 0), false); [line 14]\n " shape="invhouse"]
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_8" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_2" ;
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_9" [label="9: + \n  " ]
 	
 
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_11" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_13" ;
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_9" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_14" ;
 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_10" [label="10: Prune (true branch) \n   PRUNE((1 != 0), true); [line 14]\n " shape="invhouse"]
 	
 
 	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_10" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_12" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_9" [label="9: + \n  " ]
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_11" [label="11: Prune (false branch) \n   PRUNE((1 == 0), false); [line 14]\n " shape="invhouse"]
 	
 
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_9" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_14" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_8" [label="8:  UnaryOperator \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int* [line 16]\n " shape="box"]
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_11" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_13" ;
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_12" [label="12:  ConditinalStmt Branch \n   n$6=*&p:int* [line 14]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int*=n$6 [line 14]\n " shape="box"]
 	
 
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_8" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_2" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_7" [label="7:  ConditinalStmt Branch \n   n$2=*&p:int* [line 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int*=n$2 [line 16]\n " shape="box"]
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_12" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_9" ;
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_13" [label="13:  ConditinalStmt Branch \n   n$7=*&p:int* [line 14]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$5:int*=n$7 [line 14]\n " shape="box"]
 	
 
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_7" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_3" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_6" [label="6:  ConditinalStmt Branch \n   n$1=*&p:int* [line 16]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$0:int*=n$1 [line 16]\n " shape="box"]
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_13" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_9" ;
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_14" [label="14:  DeclStmt \n   n$8=*&0$?%__sil_tmpSIL_temp_conditional___n$5:int* [line 14]\n  n$9=*n$8:int [line 14]\n  *&y:int=n$9 [line 14]\n " shape="box"]
 	
 
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_6" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_3" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 16]\n " shape="invhouse"]
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_14" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_4" ;
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_14" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_5" ;
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_15" [label="15: + \n  " ]
 	
 
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_5" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_7" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 16]\n " shape="invhouse"]
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_15" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_20" ;
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_16" [label="16: Prune (true branch) \n   PRUNE((1 != 0), true); [line 12]\n " shape="invhouse"]
 	
 
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_4" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_6" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_3" [label="3: + \n  " ]
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_16" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_18" ;
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_17" [label="17: Prune (false branch) \n   PRUNE((1 == 0), false); [line 12]\n " shape="invhouse"]
 	
 
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_3" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_8" ;
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_2" [label="2: Exit dereference_ifthenelse \n  " color=yellow style=filled]
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_17" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_19" ;
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_18" [label="18:  ConditinalStmt Branch \n   n$11=*&p:int* [line 12]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$10:int*=n$11 [line 12]\n " shape="box"]
 	
 
-"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_1" [label="1: Start dereference_ifthenelse\nFormals:  p:int*\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int* y:int 0$?%__sil_tmpSIL_temp_conditional___n$5:int* 0$?%__sil_tmpSIL_temp_conditional___n$10:int* x:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0,&y,&0$?%__sil_tmpSIL_temp_conditional___n$5,&0$?%__sil_tmpSIL_temp_conditional___n$10,&x); [line 10]\n " color=yellow style=filled]
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_18" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_15" ;
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_19" [label="19:  ConditinalStmt Branch \n   n$12=*&p:int* [line 12]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$10:int*=n$12 [line 12]\n " shape="box"]
 	
 
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_1" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_16" ;
-	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_1" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_17" ;
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_19" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_15" ;
+"dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_20" [label="20:  BinaryOperatorStmt: Assign \n   n$13=*&0$?%__sil_tmpSIL_temp_conditional___n$10:int* [line 12]\n  n$14=*n$13:int [line 12]\n  *&x:int=n$14 [line 12]\n " shape="box"]
+	
+
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_20" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_10" ;
+	 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_20" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_11" ;
 }

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

@@ -1,34 +1,34 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   *&today:int=0 [line 22]\n " shape="box"]
-	
-
-	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   *&today:int=1 [line 23]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  i:int today:int \n   DECLARE_LOCALS(&return,&i,&today); [line 20]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   n$0=*&today:int [line 24]\n  *&today:int=(n$0 + 4) [line 24]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   *&today:int=(2 + 1) [line 25]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 27]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
 "main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   *&i:int=(2 + (2 - 0)) [line 26]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 27]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   *&today:int=(2 + 1) [line 25]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   n$0=*&today:int [line 24]\n  *&today:int=(n$0 + 4) [line 24]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  i:int today:int \n   DECLARE_LOCALS(&return,&i,&today); [line 20]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   *&today:int=1 [line 23]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   *&today:int=0 [line 22]\n " shape="box"]
+	
+
+	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
 }

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

@@ -1,18 +1,18 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   *&option1:int=(1 << 0) [line 16]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  option2:int option1:int \n   DECLARE_LOCALS(&return,&option2,&option1); [line 15]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   *&option2:int=(1 << 1) [line 17]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   *&option2:int=(1 << 1) [line 17]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  option2:int option1:int \n   DECLARE_LOCALS(&return,&option2,&option1); [line 15]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   *&option1:int=(1 << 0) [line 16]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
 }

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

@@ -1,82 +1,82 @@
 /* @generated */
 digraph iCFG {
-"other_enum_test.100f3583adf0259001be6c944828c44a_11" [label="11:  DeclStmt \n   *&foo_g:int=(2 + 10) [line 23]\n " shape="box"]
-	
-
-	 "other_enum_test.100f3583adf0259001be6c944828c44a_11" -> "other_enum_test.100f3583adf0259001be6c944828c44a_10" ;
-"other_enum_test.100f3583adf0259001be6c944828c44a_10" [label="10:  DeclStmt \n   *&foo_a:int=0 [line 24]\n " shape="box"]
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_1" [label="1: Start other_enum_main\nFormals: \nLocals:  foo_g:int foo_f:int foo_e:int foo_d:int foo_c:int foo_b:int foo_a:int \n   DECLARE_LOCALS(&return,&foo_g,&foo_f,&foo_e,&foo_d,&foo_c,&foo_b,&foo_a); [line 12]\n " color=yellow style=filled]
 	
 
-	 "other_enum_test.100f3583adf0259001be6c944828c44a_10" -> "other_enum_test.100f3583adf0259001be6c944828c44a_5" ;
-"other_enum_test.100f3583adf0259001be6c944828c44a_9" [label="9:  Return Stmt \n   *&return:int=0 [line 28]\n " shape="box"]
+	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_1" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_9" ;
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_2" [label="2: Exit other_enum_main \n  " color=yellow style=filled]
 	
 
-	 "other_enum_test.100f3583adf0259001be6c944828c44a_9" -> "other_enum_test.100f3583adf0259001be6c944828c44a_2" ;
-"other_enum_test.100f3583adf0259001be6c944828c44a_8" [label="8:  Return Stmt \n   n$1=*&foo_g:int [line 26]\n  n$2=*&foo_a:int [line 26]\n  *&return:int=(n$1 / n$2) [line 26]\n " shape="box"]
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_3" [label="3:  DeclStmt \n   *&foo_g:int=(2 + 10) [line 19]\n " shape="box"]
 	
 
-	 "other_enum_test.100f3583adf0259001be6c944828c44a_8" -> "other_enum_test.100f3583adf0259001be6c944828c44a_2" ;
-"other_enum_test.100f3583adf0259001be6c944828c44a_7" [label="7: Prune (false branch) \n   PRUNE(((n$0 == 12) == 0), false); [line 25]\n " shape="invhouse"]
+	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_3" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_2" ;
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_4" [label="4:  DeclStmt \n   *&foo_f:int=2 [line 18]\n " shape="box"]
 	
 
-	 "other_enum_test.100f3583adf0259001be6c944828c44a_7" -> "other_enum_test.100f3583adf0259001be6c944828c44a_9" ;
-"other_enum_test.100f3583adf0259001be6c944828c44a_6" [label="6: Prune (true branch) \n   PRUNE(((n$0 == 12) != 0), true); [line 25]\n " shape="invhouse"]
+	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_4" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_3" ;
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_5" [label="5:  DeclStmt \n   *&foo_e:int=1 [line 17]\n " shape="box"]
 	
 
-	 "other_enum_test.100f3583adf0259001be6c944828c44a_6" -> "other_enum_test.100f3583adf0259001be6c944828c44a_8" ;
-"other_enum_test.100f3583adf0259001be6c944828c44a_5" [label="5:  BinaryOperatorStmt: EQ \n   n$0=*&foo_g:int [line 25]\n " shape="box"]
+	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_5" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_4" ;
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_6" [label="6:  DeclStmt \n   *&foo_d:int=11 [line 16]\n " shape="box"]
 	
 
-	 "other_enum_test.100f3583adf0259001be6c944828c44a_5" -> "other_enum_test.100f3583adf0259001be6c944828c44a_6" ;
-	 "other_enum_test.100f3583adf0259001be6c944828c44a_5" -> "other_enum_test.100f3583adf0259001be6c944828c44a_7" ;
-"other_enum_test.100f3583adf0259001be6c944828c44a_4" [label="4:  between_join_and_exit \n  " shape="box"]
+	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_6" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_5" ;
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_7" [label="7:  DeclStmt \n   *&foo_c:int=10 [line 15]\n " shape="box"]
 	
 
-	 "other_enum_test.100f3583adf0259001be6c944828c44a_4" -> "other_enum_test.100f3583adf0259001be6c944828c44a_2" ;
-"other_enum_test.100f3583adf0259001be6c944828c44a_3" [label="3: + \n  " ]
+	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_7" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_6" ;
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_8" [label="8:  DeclStmt \n   *&foo_b:int=1 [line 14]\n " shape="box"]
 	
 
-	 "other_enum_test.100f3583adf0259001be6c944828c44a_3" -> "other_enum_test.100f3583adf0259001be6c944828c44a_4" ;
-"other_enum_test.100f3583adf0259001be6c944828c44a_2" [label="2: Exit other_enum_test \n  " color=yellow style=filled]
+	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_8" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_7" ;
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_9" [label="9:  DeclStmt \n   *&foo_a:int=0 [line 13]\n " shape="box"]
 	
 
+	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_9" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_8" ;
 "other_enum_test.100f3583adf0259001be6c944828c44a_1" [label="1: Start other_enum_test\nFormals: \nLocals:  foo_a:int foo_g:int \n   DECLARE_LOCALS(&return,&foo_a,&foo_g); [line 22]\n " color=yellow style=filled]
 	
 
 	 "other_enum_test.100f3583adf0259001be6c944828c44a_1" -> "other_enum_test.100f3583adf0259001be6c944828c44a_11" ;
-"other_enum_main.572f04969b0ade4902dd1faf86fac461_9" [label="9:  DeclStmt \n   *&foo_a:int=0 [line 13]\n " shape="box"]
+"other_enum_test.100f3583adf0259001be6c944828c44a_2" [label="2: Exit other_enum_test \n  " color=yellow style=filled]
 	
 
-	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_9" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_8" ;
-"other_enum_main.572f04969b0ade4902dd1faf86fac461_8" [label="8:  DeclStmt \n   *&foo_b:int=1 [line 14]\n " shape="box"]
+"other_enum_test.100f3583adf0259001be6c944828c44a_3" [label="3: + \n  " ]
 	
 
-	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_8" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_7" ;
-"other_enum_main.572f04969b0ade4902dd1faf86fac461_7" [label="7:  DeclStmt \n   *&foo_c:int=10 [line 15]\n " shape="box"]
+	 "other_enum_test.100f3583adf0259001be6c944828c44a_3" -> "other_enum_test.100f3583adf0259001be6c944828c44a_4" ;
+"other_enum_test.100f3583adf0259001be6c944828c44a_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
-	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_7" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_6" ;
-"other_enum_main.572f04969b0ade4902dd1faf86fac461_6" [label="6:  DeclStmt \n   *&foo_d:int=11 [line 16]\n " shape="box"]
+	 "other_enum_test.100f3583adf0259001be6c944828c44a_4" -> "other_enum_test.100f3583adf0259001be6c944828c44a_2" ;
+"other_enum_test.100f3583adf0259001be6c944828c44a_5" [label="5:  BinaryOperatorStmt: EQ \n   n$0=*&foo_g:int [line 25]\n " shape="box"]
 	
 
-	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_6" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_5" ;
-"other_enum_main.572f04969b0ade4902dd1faf86fac461_5" [label="5:  DeclStmt \n   *&foo_e:int=1 [line 17]\n " shape="box"]
+	 "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) \n   PRUNE(((n$0 == 12) != 0), true); [line 25]\n " shape="invhouse"]
 	
 
-	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_5" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_4" ;
-"other_enum_main.572f04969b0ade4902dd1faf86fac461_4" [label="4:  DeclStmt \n   *&foo_f:int=2 [line 18]\n " shape="box"]
+	 "other_enum_test.100f3583adf0259001be6c944828c44a_6" -> "other_enum_test.100f3583adf0259001be6c944828c44a_8" ;
+"other_enum_test.100f3583adf0259001be6c944828c44a_7" [label="7: Prune (false branch) \n   PRUNE(((n$0 == 12) == 0), false); [line 25]\n " shape="invhouse"]
 	
 
-	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_4" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_3" ;
-"other_enum_main.572f04969b0ade4902dd1faf86fac461_3" [label="3:  DeclStmt \n   *&foo_g:int=(2 + 10) [line 19]\n " shape="box"]
+	 "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 26]\n  n$2=*&foo_a:int [line 26]\n  *&return:int=(n$1 / n$2) [line 26]\n " shape="box"]
 	
 
-	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_3" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_2" ;
-"other_enum_main.572f04969b0ade4902dd1faf86fac461_2" [label="2: Exit other_enum_main \n  " color=yellow style=filled]
+	 "other_enum_test.100f3583adf0259001be6c944828c44a_8" -> "other_enum_test.100f3583adf0259001be6c944828c44a_2" ;
+"other_enum_test.100f3583adf0259001be6c944828c44a_9" [label="9:  Return Stmt \n   *&return:int=0 [line 28]\n " shape="box"]
 	
 
-"other_enum_main.572f04969b0ade4902dd1faf86fac461_1" [label="1: Start other_enum_main\nFormals: \nLocals:  foo_g:int foo_f:int foo_e:int foo_d:int foo_c:int foo_b:int foo_a:int \n   DECLARE_LOCALS(&return,&foo_g,&foo_f,&foo_e,&foo_d,&foo_c,&foo_b,&foo_a); [line 12]\n " color=yellow style=filled]
+	 "other_enum_test.100f3583adf0259001be6c944828c44a_9" -> "other_enum_test.100f3583adf0259001be6c944828c44a_2" ;
+"other_enum_test.100f3583adf0259001be6c944828c44a_10" [label="10:  DeclStmt \n   *&foo_a:int=0 [line 24]\n " shape="box"]
 	
 
-	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_1" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_9" ;
+	 "other_enum_test.100f3583adf0259001be6c944828c44a_10" -> "other_enum_test.100f3583adf0259001be6c944828c44a_5" ;
+"other_enum_test.100f3583adf0259001be6c944828c44a_11" [label="11:  DeclStmt \n   *&foo_g:int=(2 + 10) [line 23]\n " shape="box"]
+	
+
+	 "other_enum_test.100f3583adf0259001be6c944828c44a_11" -> "other_enum_test.100f3583adf0259001be6c944828c44a_10" ;
 }

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

@@ -1,14 +1,14 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   n$0=*&z:int [line 12]\n  *&a[0][0]:int=(n$0 + 1) [line 12]\n  *&a[0][1]:int=2 [line 12]\n  *&a[0][2]:int=3 [line 12]\n  *&a[1][0]:int=5 [line 12]\n  *&a[1][1]:int=6 [line 12]\n  *&a[1][2]:int=7 [line 12]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  a:int[3][2] z:int \n   DECLARE_LOCALS(&return,&a,&z); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  a:int[3][2] z:int \n   DECLARE_LOCALS(&return,&a,&z); [line 10]\n " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   n$0=*&z:int [line 12]\n  *&a[0][0]:int=(n$0 + 1) [line 12]\n  *&a[0][1]:int=2 [line 12]\n  *&a[0][2]:int=3 [line 12]\n  *&a[1][0]:int=5 [line 12]\n  *&a[1][1]:int=6 [line 12]\n  *&a[1][2]:int=7 [line 12]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
 }

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

@@ -1,29 +1,29 @@
 /* @generated */
 digraph iCFG {
-"init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_4" [label="4:  DeclStmt \n   *&p.x:int=32 [line 18]\n  *&p.y:int=52 [line 18]\n  n$1=*&p:struct point [line 18]\n " shape="box"]
+"compound_literal_expr.137fbe19f590ba2423c07134917ec888_1" [label="1: Start compound_literal_expr\nFormals: \nLocals:  0$?%__sil_tmpSIL_compound_literal__n$0:struct point \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_compound_literal__n$0); [line 15]\n " color=yellow style=filled]
 	
 
-	 "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_4" -> "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_3" ;
-"init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_3" [label="3:  Return Stmt \n   n$0=*&p.x:int [line 19]\n  *&return:int=(1 / (n$0 - 32)) [line 19]\n " shape="box"]
+	 "compound_literal_expr.137fbe19f590ba2423c07134917ec888_1" -> "compound_literal_expr.137fbe19f590ba2423c07134917ec888_3" ;
+"compound_literal_expr.137fbe19f590ba2423c07134917ec888_2" [label="2: Exit compound_literal_expr \n  " color=yellow style=filled]
 	
 
-	 "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_3" -> "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_2" ;
-"init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_2" [label="2: Exit init_with_compound_literal \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 15]\n  *&0$?%__sil_tmpSIL_compound_literal__n$0.y:int=32 [line 15]\n  n$1=*&0$?%__sil_tmpSIL_compound_literal__n$0.x:int [line 15]\n  *&return:int=n$1 [line 15]\n " shape="box"]
 	
 
+	 "compound_literal_expr.137fbe19f590ba2423c07134917ec888_3" -> "compound_literal_expr.137fbe19f590ba2423c07134917ec888_2" ;
 "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_1" [label="1: Start init_with_compound_literal\nFormals: \nLocals:  p:struct point \n   DECLARE_LOCALS(&return,&p); [line 17]\n " color=yellow style=filled]
 	
 
 	 "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_1" -> "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_4" ;
-"compound_literal_expr.137fbe19f590ba2423c07134917ec888_3" [label="3:  Return Stmt \n   *&0$?%__sil_tmpSIL_compound_literal__n$0.x:int=52 [line 15]\n  *&0$?%__sil_tmpSIL_compound_literal__n$0.y:int=32 [line 15]\n  n$1=*&0$?%__sil_tmpSIL_compound_literal__n$0.x:int [line 15]\n  *&return:int=n$1 [line 15]\n " shape="box"]
+"init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_2" [label="2: Exit init_with_compound_literal \n  " color=yellow style=filled]
 	
 
-	 "compound_literal_expr.137fbe19f590ba2423c07134917ec888_3" -> "compound_literal_expr.137fbe19f590ba2423c07134917ec888_2" ;
-"compound_literal_expr.137fbe19f590ba2423c07134917ec888_2" [label="2: Exit compound_literal_expr \n  " color=yellow style=filled]
+"init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_3" [label="3:  Return Stmt \n   n$0=*&p.x:int [line 19]\n  *&return:int=(1 / (n$0 - 32)) [line 19]\n " shape="box"]
 	
 
-"compound_literal_expr.137fbe19f590ba2423c07134917ec888_1" [label="1: Start compound_literal_expr\nFormals: \nLocals:  0$?%__sil_tmpSIL_compound_literal__n$0:struct point \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_compound_literal__n$0); [line 15]\n " color=yellow style=filled]
+	 "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_3" -> "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_2" ;
+"init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_4" [label="4:  DeclStmt \n   *&p.x:int=32 [line 18]\n  *&p.y:int=52 [line 18]\n  n$1=*&p:struct point [line 18]\n " shape="box"]
 	
 
-	 "compound_literal_expr.137fbe19f590ba2423c07134917ec888_1" -> "compound_literal_expr.137fbe19f590ba2423c07134917ec888_3" ;
+	 "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_4" -> "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_3" ;
 }

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

@@ -1,70 +1,70 @@
 /* @generated */
 digraph iCFG {
-"implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_4" [label="4:  BinaryOperatorStmt: Assign \n   *&imageDrawRect.origin.x.a:int=0 [line 58]\n  *&imageDrawRect.origin.x.b:int=0 [line 58]\n  *&imageDrawRect.origin.y:int=0 [line 58]\n  *&imageDrawRect.z:int=0 [line 58]\n  *&imageDrawRect.size:int=5 [line 58]\n  n$1=*&imageDrawRect:struct rect [line 58]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_1" [label="1: Start foo\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
-	 "implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_4" -> "implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_3" ;
-"implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_3" [label="3:  Return Stmt \n   n$0=*&imageDrawRect.origin.x.a:int [line 59]\n  *&return:int=(1 / n$0) [line 59]\n " shape="box"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_1" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_2" [label="2: Exit foo \n  " color=yellow style=filled]
 	
 
-	 "implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_3" -> "implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_2" ;
-"implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_2" [label="2: Exit implicit_expr_set_correctly \n  " color=yellow style=filled]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_3" [label="3:  Return Stmt \n   *&return:int=5 [line 15]\n " shape="box"]
 	
 
-"implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_1" [label="1: Start implicit_expr_set_correctly\nFormals: \nLocals:  imageDrawRect:struct rect \n   DECLARE_LOCALS(&return,&imageDrawRect); [line 56]\n " color=yellow style=filled]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  p:struct Point \n   DECLARE_LOCALS(&return,&p); [line 17]\n " color=yellow style=filled]
+	
+
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_1" -> "implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_4" ;
 "main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   n$0=_fun_foo() [line 17]\n  *&p.x:int=1 [line 17]\n  *&p.y:int=(n$0 + 3) [line 17]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+"field_set_correctly.b8d9a4294a85d24818c312a099420dce_1" [label="1: Start field_set_correctly\nFormals: \nLocals:  e:struct Employee \n   DECLARE_LOCALS(&return,&e); [line 34]\n " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  p:struct Point \n   DECLARE_LOCALS(&return,&p); [line 17]\n " color=yellow style=filled]
+	 "field_set_correctly.b8d9a4294a85d24818c312a099420dce_1" -> "field_set_correctly.b8d9a4294a85d24818c312a099420dce_4" ;
+"field_set_correctly.b8d9a4294a85d24818c312a099420dce_2" [label="2: Exit field_set_correctly \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_3" [label="3:  Return Stmt \n   *&return:int=5 [line 15]\n " shape="box"]
+"field_set_correctly.b8d9a4294a85d24818c312a099420dce_3" [label="3:  Return Stmt \n   n$0=*&e.ssn:int [line 36]\n  *&return:int=(1 / (n$0 - 12)) [line 36]\n " shape="box"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_2" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_2" [label="2: Exit foo \n  " color=yellow style=filled]
+	 "field_set_correctly.b8d9a4294a85d24818c312a099420dce_3" -> "field_set_correctly.b8d9a4294a85d24818c312a099420dce_2" ;
+"field_set_correctly.b8d9a4294a85d24818c312a099420dce_4" [label="4:  DeclStmt \n   *&e.ssn:int=12 [line 35]\n  *&e.salary:float=3000.500000 [line 35]\n  *&e.doj.date:int=12 [line 35]\n  *&e.doj.month:int=12 [line 35]\n  *&e.doj.year:int=2010 [line 35]\n " shape="box"]
 	
 
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_1" [label="1: Start foo\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
+	 "field_set_correctly.b8d9a4294a85d24818c312a099420dce_4" -> "field_set_correctly.b8d9a4294a85d24818c312a099420dce_3" ;
+"implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_1" [label="1: Start implicit_expr_set_correctly\nFormals: \nLocals:  imageDrawRect:struct rect \n   DECLARE_LOCALS(&return,&imageDrawRect); [line 56]\n " color=yellow style=filled]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_1" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" ;
-"point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&p:struct Point* [line 20]\n  *n$2.x:int=4 [line 20]\n  *n$2.y:int=5 [line 20]\n  n$3=*n$2:struct Point [line 20]\n " shape="box"]
+	 "implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_1" -> "implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_4" ;
+"implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_2" [label="2: Exit implicit_expr_set_correctly \n  " color=yellow style=filled]
 	
 
-	 "point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_4" -> "point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_3" ;
-"point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_3" [label="3:  Return Stmt \n   n$0=*&p:struct Point* [line 21]\n  n$1=*n$0.x:int [line 21]\n  *&return:int=(1 / (n$1 - 4)) [line 21]\n " shape="box"]
+"implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_3" [label="3:  Return Stmt \n   n$0=*&imageDrawRect.origin.x.a:int [line 59]\n  *&return:int=(1 / n$0) [line 59]\n " shape="box"]
 	
 
-	 "point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_3" -> "point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_2" ;
-"point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_2" [label="2: Exit point_coords_set_correctly \n  " color=yellow style=filled]
+	 "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 58]\n  *&imageDrawRect.origin.x.b:int=0 [line 58]\n  *&imageDrawRect.origin.y:int=0 [line 58]\n  *&imageDrawRect.z:int=0 [line 58]\n  *&imageDrawRect.size:int=5 [line 58]\n  n$1=*&imageDrawRect:struct rect [line 58]\n " shape="box"]
 	
 
+	 "implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_4" -> "implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_3" ;
 "point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_1" [label="1: Start point_coords_set_correctly\nFormals:  p:struct Point*\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
 	
 
 	 "point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_1" -> "point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_4" ;
-"field_set_correctly.b8d9a4294a85d24818c312a099420dce_4" [label="4:  DeclStmt \n   *&e.ssn:int=12 [line 35]\n  *&e.salary:float=3000.500000 [line 35]\n  *&e.doj.date:int=12 [line 35]\n  *&e.doj.month:int=12 [line 35]\n  *&e.doj.year:int=2010 [line 35]\n " shape="box"]
-	
-
-	 "field_set_correctly.b8d9a4294a85d24818c312a099420dce_4" -> "field_set_correctly.b8d9a4294a85d24818c312a099420dce_3" ;
-"field_set_correctly.b8d9a4294a85d24818c312a099420dce_3" [label="3:  Return Stmt \n   n$0=*&e.ssn:int [line 36]\n  *&return:int=(1 / (n$0 - 12)) [line 36]\n " shape="box"]
+"point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_2" [label="2: Exit point_coords_set_correctly \n  " color=yellow style=filled]
 	
 
-	 "field_set_correctly.b8d9a4294a85d24818c312a099420dce_3" -> "field_set_correctly.b8d9a4294a85d24818c312a099420dce_2" ;
-"field_set_correctly.b8d9a4294a85d24818c312a099420dce_2" [label="2: Exit field_set_correctly \n  " color=yellow style=filled]
+"point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_3" [label="3:  Return Stmt \n   n$0=*&p:struct Point* [line 21]\n  n$1=*n$0.x:int [line 21]\n  *&return:int=(1 / (n$1 - 4)) [line 21]\n " shape="box"]
 	
 
-"field_set_correctly.b8d9a4294a85d24818c312a099420dce_1" [label="1: Start field_set_correctly\nFormals: \nLocals:  e:struct Employee \n   DECLARE_LOCALS(&return,&e); [line 34]\n " color=yellow style=filled]
+	 "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:struct Point* [line 20]\n  *n$2.x:int=4 [line 20]\n  *n$2.y:int=5 [line 20]\n  n$3=*n$2:struct Point [line 20]\n " shape="box"]
 	
 
-	 "field_set_correctly.b8d9a4294a85d24818c312a099420dce_1" -> "field_set_correctly.b8d9a4294a85d24818c312a099420dce_4" ;
+	 "point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_4" -> "point_coords_set_correctly.3abf7d8dcf379339f0fa9b69df909b28_3" ;
 }

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

@@ -1,43 +1,43 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   *&a:int=10 [line 11]\n " shape="box"]
-	
-
-	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&b:int=0 [line 12]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  b:int a:int \n   DECLARE_LOCALS(&return,&b,&a); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 14]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch) \n   PRUNE(((n$0 < 20) == 0), false); [line 15]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 17]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch) \n   PRUNE(((n$0 < 20) != 0), true); [line 15]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
 "main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: LT \n   n$0=*&b:int [line 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch) \n   PRUNE(((n$0 < 20) != 0), true); [line 15]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 17]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch) \n   PRUNE(((n$0 < 20) == 0), false); [line 15]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 14]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  b:int a:int \n   DECLARE_LOCALS(&return,&b,&a); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&b:int=0 [line 12]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   *&a:int=10 [line 11]\n " shape="box"]
+	
+
+	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
 }

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

@@ -1,43 +1,43 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   *&a:int=10 [line 11]\n " shape="box"]
-	
-
-	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&b:int=0 [line 12]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  b:int a:int \n   DECLARE_LOCALS(&return,&b,&a); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 14]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch) \n   PRUNE((n$0 == 0), false); [line 15]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 17]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch) \n   PRUNE((n$0 != 0), true); [line 15]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
 "main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   *&b:int=40 [line 15]\n  n$0=*&b:int [line 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch) \n   PRUNE((n$0 != 0), true); [line 15]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 17]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch) \n   PRUNE((n$0 == 0), false); [line 15]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 14]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  b:int a:int \n   DECLARE_LOCALS(&return,&b,&a); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&b:int=0 [line 12]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   *&a:int=10 [line 11]\n " shape="box"]
+	
+
+	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
 }

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

@@ -1,64 +1,64 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   *&a:int=10 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  b:int a:int \n   DECLARE_LOCALS(&return,&b,&a); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
-"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  DeclStmt \n   *&b:int=0 [line 12]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 14]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 20]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  BinaryOperatorStmt: Assign \n   *&a:int=2 [line 16]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11: Prune (false branch) \n   PRUNE(((n$1 < 30) == 0), false); [line 17]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: LT \n   n$0=*&b:int [line 18]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10: Prune (true branch) \n   PRUNE(((n$1 < 30) != 0), true); [line 17]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch) \n   PRUNE(((n$0 < 20) != 0), true); [line 18]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  BinaryOperatorStmt: LT \n   n$1=*&b:int [line 17]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch) \n   PRUNE(((n$0 < 20) == 0), false); [line 18]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
 "main.fad58de7366495db4650cfefac2fcd61_8" [label="8: + \n  " ]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch) \n   PRUNE(((n$0 < 20) == 0), false); [line 18]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  BinaryOperatorStmt: LT \n   n$1=*&b:int [line 17]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch) \n   PRUNE(((n$0 < 20) != 0), true); [line 18]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10: Prune (true branch) \n   PRUNE(((n$1 < 30) != 0), true); [line 17]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: LT \n   n$0=*&b:int [line 18]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11: Prune (false branch) \n   PRUNE(((n$1 < 30) == 0), false); [line 17]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
+	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  BinaryOperatorStmt: Assign \n   *&a:int=2 [line 16]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 20]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
+"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 14]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  DeclStmt \n   *&b:int=0 [line 12]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  b:int a:int \n   DECLARE_LOCALS(&return,&b,&a); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   *&a:int=10 [line 11]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
 }

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

@@ -1,51 +1,51 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  DeclStmt \n   *&j:int=0 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  b:int i:int j:int \n   DECLARE_LOCALS(&return,&b,&i,&j); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   *&i:int=0 [line 12]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  BinaryOperatorStmt: AddAssign \n   n$2=*&j:int [line 14]\n  n$3=*&j:int [line 14]\n  *&j:int=(n$3 + n$2) [line 14]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 16]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (false branch) \n   PRUNE((n$1 == 0), false); [line 13]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (true branch) \n   PRUNE((n$1 != 0), true); [line 13]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&b:int=3 [line 13]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  UnaryOperator \n   n$0=*&i:int [line 13]\n  *&i:int=(n$0 + 1) [line 13]\n " shape="box"]
+	
+
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
 "main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   *&b:int=10 [line 13]\n  n$1=*&b:int [line 13]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  UnaryOperator \n   n$0=*&i:int [line 13]\n  *&i:int=(n$0 + 1) [line 13]\n " shape="box"]
-	
-
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&b:int=3 [line 13]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (true branch) \n   PRUNE((n$1 != 0), true); [line 13]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
+	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (false branch) \n   PRUNE((n$1 == 0), false); [line 13]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 16]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  BinaryOperatorStmt: AddAssign \n   n$2=*&j:int [line 14]\n  n$3=*&j:int [line 14]\n  *&j:int=(n$3 + n$2) [line 14]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   *&i:int=0 [line 12]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  b:int i:int j:int \n   DECLARE_LOCALS(&return,&b,&i,&j); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  DeclStmt \n   *&j:int=0 [line 11]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
 }

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

@@ -1,72 +1,72 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_17" [label="17:  DeclStmt \n   *&k:int=0 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  i:int j:int k:int \n   DECLARE_LOCALS(&return,&i,&j,&k); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_17" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_16" [label="16:  BinaryOperatorStmt: Assign \n   n$5=*&k:int [line 14]\n  n$6=*&i:int [line 14]\n  *&k:int=(n$5 + n$6) [line 14]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_17" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_16" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15: Prune (false branch) \n   PRUNE(((n$4 < 10) == 0), false); [line 13]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   n$0=*&k:int [line 17]\n  *&return:int=n$0 [line 17]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_14" [label="14: Prune (true branch) \n   PRUNE(((n$4 < 10) != 0), true); [line 13]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_16" ;
-"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  BinaryOperatorStmt: LT \n   n$4=*&j:int [line 13]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&i:int=0 [line 12]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  UnaryOperator \n   n$3=*&j:int [line 13]\n  *&j:int=(n$3 + 1) [line 13]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  UnaryOperator \n   n$1=*&i:int [line 12]\n  *&i:int=(n$1 + 1) [line 12]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   *&j:int=0 [line 13]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: LT \n   n$2=*&i:int [line 12]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10: + \n  " ]
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (true branch) \n   PRUNE(((n$2 < 10) != 0), true); [line 12]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
 "main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (false branch) \n   PRUNE(((n$2 < 10) == 0), false); [line 12]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (true branch) \n   PRUNE(((n$2 < 10) != 0), true); [line 12]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: LT \n   n$2=*&i:int [line 12]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   *&j:int=0 [line 13]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  UnaryOperator \n   n$1=*&i:int [line 12]\n  *&i:int=(n$1 + 1) [line 12]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  UnaryOperator \n   n$3=*&j:int [line 13]\n  *&j:int=(n$3 + 1) [line 13]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&i:int=0 [line 12]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
+"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  BinaryOperatorStmt: LT \n   n$4=*&j:int [line 13]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
+	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
+"main.fad58de7366495db4650cfefac2fcd61_14" [label="14: Prune (true branch) \n   PRUNE(((n$4 < 10) != 0), true); [line 13]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   n$0=*&k:int [line 17]\n  *&return:int=n$0 [line 17]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_16" ;
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15: Prune (false branch) \n   PRUNE(((n$4 < 10) == 0), false); [line 13]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
+"main.fad58de7366495db4650cfefac2fcd61_16" [label="16:  BinaryOperatorStmt: Assign \n   n$5=*&k:int [line 14]\n  n$6=*&i:int [line 14]\n  *&k:int=(n$5 + n$6) [line 14]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  i:int j:int k:int \n   DECLARE_LOCALS(&return,&i,&j,&k); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_16" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
+"main.fad58de7366495db4650cfefac2fcd61_17" [label="17:  DeclStmt \n   *&k:int=0 [line 11]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_17" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_17" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
 }

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

@@ -1,43 +1,43 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   *&j:int=0 [line 11]\n " shape="box"]
-	
-
-	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  BinaryOperatorStmt: AddAssign \n   n$1=*&j:int [line 13]\n  n$2=*&j:int [line 13]\n  *&j:int=(n$2 + n$1) [line 13]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  b:int j:int \n   DECLARE_LOCALS(&return,&b,&j); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (false branch) \n   PRUNE((1 == 0), false); [line 12]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (true branch) \n   PRUNE((1 != 0), true); [line 12]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  UnaryOperator \n   n$0=*&b:int [line 12]\n  *&b:int=(n$0 + 1) [line 12]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
 "main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&b:int=0 [line 12]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  UnaryOperator \n   n$0=*&b:int [line 12]\n  *&b:int=(n$0 + 1) [line 12]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (true branch) \n   PRUNE((1 != 0), true); [line 12]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (false branch) \n   PRUNE((1 == 0), false); [line 12]\n " shape="invhouse"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  b:int j:int \n   DECLARE_LOCALS(&return,&b,&j); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  BinaryOperatorStmt: AddAssign \n   n$1=*&j:int [line 13]\n  n$2=*&j:int [line 13]\n  *&j:int=(n$2 + n$1) [line 13]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   *&j:int=0 [line 11]\n " shape="box"]
+	
+
+	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
 }

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

@@ -1,39 +1,39 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&j:int=0 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  b:int j:int \n   DECLARE_LOCALS(&return,&b,&j); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: AddAssign \n   n$0=*&j:int [line 13]\n  n$1=*&j:int [line 13]\n  *&j:int=(n$1 + n$0) [line 13]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch) \n   PRUNE((1 == 0), false); [line 12]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch) \n   PRUNE((1 != 0), true); [line 12]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
 "main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&b:int=0 [line 12]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch) \n   PRUNE((1 != 0), true); [line 12]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch) \n   PRUNE((1 == 0), false); [line 12]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: AddAssign \n   n$0=*&j:int [line 13]\n  n$1=*&j:int [line 13]\n  *&j:int=(n$1 + n$0) [line 13]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  b:int j:int \n   DECLARE_LOCALS(&return,&b,&j); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&j:int=0 [line 11]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
 }

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

@@ -1,35 +1,35 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  DeclStmt \n   *&d:int=0 [line 11]\n " shape="box"]
-	
-
-	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch) \n   PRUNE((1 == 0), false); [line 12]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  d:int \n   DECLARE_LOCALS(&return,&d); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch) \n   PRUNE((1 != 0), true); [line 12]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   *&d:int=0 [line 12]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 14]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
 "main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 14]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   *&d:int=0 [line 12]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch) \n   PRUNE((1 != 0), true); [line 12]\n " shape="invhouse"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  d:int \n   DECLARE_LOCALS(&return,&d); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch) \n   PRUNE((1 == 0), false); [line 12]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  DeclStmt \n   *&d:int=0 [line 11]\n " shape="box"]
+	
+
+	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
 }

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

@@ -1,35 +1,35 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  DeclStmt \n   *&i:int=0 [line 11]\n " shape="box"]
-	
-
-	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  UnaryOperator \n   n$0=*&i:int [line 13]\n  *&i:int=(n$0 + 1) [line 13]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  i:int \n   DECLARE_LOCALS(&return,&i); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (false branch) \n   PRUNE((1 == 0), false); [line 14]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5: Prune (true branch) \n   PRUNE((1 != 0), true); [line 14]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
 "main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5: Prune (true branch) \n   PRUNE((1 != 0), true); [line 14]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (false branch) \n   PRUNE((1 == 0), false); [line 14]\n " shape="invhouse"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  i:int \n   DECLARE_LOCALS(&return,&i); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  UnaryOperator \n   n$0=*&i:int [line 13]\n  *&i:int=(n$0 + 1) [line 13]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  DeclStmt \n   *&i:int=0 [line 11]\n " shape="box"]
+	
+
+	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
 }

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

@@ -1,47 +1,47 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   *&j:int=0 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  i:int j:int \n   DECLARE_LOCALS(&return,&i,&j); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  BinaryOperatorStmt: AddAssign \n   n$2=*&j:int [line 13]\n  n$3=*&j:int [line 13]\n  *&j:int=(n$3 + n$2) [line 13]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (false branch) \n   PRUNE(((n$1 < 10) == 0), false); [line 12]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (true branch) \n   PRUNE(((n$1 < 10) != 0), true); [line 12]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: LT \n   n$1=*&i:int [line 12]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&i:int=0 [line 12]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
 "main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  UnaryOperator \n   n$0=*&i:int [line 12]\n  *&i:int=(n$0 + 1) [line 12]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&i:int=0 [line 12]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: LT \n   n$1=*&i:int [line 12]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (true branch) \n   PRUNE(((n$1 < 10) != 0), true); [line 12]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (false branch) \n   PRUNE(((n$1 < 10) == 0), false); [line 12]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  BinaryOperatorStmt: AddAssign \n   n$2=*&j:int [line 13]\n  n$3=*&j:int [line 13]\n  *&j:int=(n$3 + n$2) [line 13]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  i:int j:int \n   DECLARE_LOCALS(&return,&i,&j); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   *&j:int=0 [line 11]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
 }

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

@@ -1,64 +1,64 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   *&k:int=0 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  i:int k:int \n   DECLARE_LOCALS(&return,&i,&k); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  UnaryOperator \n   n$4=*&k:int [line 14]\n  *&k:int=(n$4 + 1) [line 14]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_13" [label="13: Prune (false branch) \n   PRUNE(((n$3 < 10) == 0), false); [line 13]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   n$0=*&k:int [line 17]\n  *&return:int=n$0 [line 17]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12: Prune (true branch) \n   PRUNE(((n$3 < 10) != 0), true); [line 13]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  BinaryOperatorStmt: LT \n   n$3=*&k:int [line 13]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&i:int=0 [line 12]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10: + \n  " ]
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  UnaryOperator \n   n$1=*&i:int [line 12]\n  *&i:int=(n$1 + 1) [line 12]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (false branch) \n   PRUNE(((n$2 < 10) == 0), false); [line 12]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: LT \n   n$2=*&i:int [line 12]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
 "main.fad58de7366495db4650cfefac2fcd61_8" [label="8: Prune (true branch) \n   PRUNE(((n$2 < 10) != 0), true); [line 12]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: LT \n   n$2=*&i:int [line 12]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (false branch) \n   PRUNE(((n$2 < 10) == 0), false); [line 12]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  UnaryOperator \n   n$1=*&i:int [line 12]\n  *&i:int=(n$1 + 1) [line 12]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&i:int=0 [line 12]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  BinaryOperatorStmt: LT \n   n$3=*&k:int [line 13]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
+	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12: Prune (true branch) \n   PRUNE(((n$3 < 10) != 0), true); [line 13]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   n$0=*&k:int [line 17]\n  *&return:int=n$0 [line 17]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
+"main.fad58de7366495db4650cfefac2fcd61_13" [label="13: Prune (false branch) \n   PRUNE(((n$3 < 10) == 0), false); [line 13]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
+"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  UnaryOperator \n   n$4=*&k:int [line 14]\n  *&k:int=(n$4 + 1) [line 14]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  i:int k:int \n   DECLARE_LOCALS(&return,&i,&k); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   *&k:int=0 [line 11]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
 }

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

@@ -1,39 +1,39 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&i:int=0 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  i:int \n   DECLARE_LOCALS(&return,&i); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  UnaryOperator \n   n$1=*&i:int [line 13]\n  *&i:int=(n$1 + 1) [line 13]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch) \n   PRUNE(((n$0 <= 10) == 0), false); [line 12]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch) \n   PRUNE(((n$0 <= 10) != 0), true); [line 12]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
 "main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: LE \n   n$0=*&i:int [line 12]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch) \n   PRUNE(((n$0 <= 10) != 0), true); [line 12]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch) \n   PRUNE(((n$0 <= 10) == 0), false); [line 12]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  UnaryOperator \n   n$1=*&i:int [line 13]\n  *&i:int=(n$1 + 1) [line 13]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  i:int \n   DECLARE_LOCALS(&return,&i); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&i:int=0 [line 11]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
 }

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

@@ -1,39 +1,39 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&i:int=0 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  i:int \n   DECLARE_LOCALS(&return,&i); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  UnaryOperator \n   n$1=*&i:int [line 13]\n  *&i:int=(n$1 + 1) [line 13]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch) \n   PRUNE((n$0 == 0), false); [line 12]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch) \n   PRUNE((n$0 != 0), true); [line 12]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
 "main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   *&i:int=10 [line 12]\n  n$0=*&i:int [line 12]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch) \n   PRUNE((n$0 != 0), true); [line 12]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch) \n   PRUNE((n$0 == 0), false); [line 12]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  UnaryOperator \n   n$1=*&i:int [line 13]\n  *&i:int=(n$1 + 1) [line 13]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  i:int \n   DECLARE_LOCALS(&return,&i); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&i:int=0 [line 11]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
 }

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

@@ -1,64 +1,64 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   *&i:int=0 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  k:int i:int \n   DECLARE_LOCALS(&return,&k,&i); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
-"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  DeclStmt \n   *&k:int=0 [line 12]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  UnaryOperator \n   n$3=*&k:int [line 15]\n  *&k:int=(n$3 + 1) [line 15]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 19]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12: Prune (false branch) \n   PRUNE(((n$2 <= 5) == 0), false); [line 14]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11: Prune (true branch) \n   PRUNE(((n$2 <= 5) != 0), true); [line 14]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: LE \n   n$0=*&i:int [line 13]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  BinaryOperatorStmt: LE \n   n$2=*&k:int [line 14]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch) \n   PRUNE(((n$0 <= 10) != 0), true); [line 13]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: + \n  " ]
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch) \n   PRUNE(((n$0 <= 10) == 0), false); [line 13]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
 "main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  UnaryOperator \n   n$1=*&i:int [line 17]\n  *&i:int=(n$1 + 1) [line 17]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: Prune (false branch) \n   PRUNE(((n$0 <= 10) == 0), false); [line 13]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (true branch) \n   PRUNE(((n$0 <= 10) != 0), true); [line 13]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  BinaryOperatorStmt: LE \n   n$2=*&k:int [line 14]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: LE \n   n$0=*&i:int [line 13]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11: Prune (true branch) \n   PRUNE(((n$2 <= 5) != 0), true); [line 14]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
+	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12: Prune (false branch) \n   PRUNE(((n$2 <= 5) == 0), false); [line 14]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 19]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  UnaryOperator \n   n$3=*&k:int [line 15]\n  *&k:int=(n$3 + 1) [line 15]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
+"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  DeclStmt \n   *&k:int=0 [line 12]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  k:int i:int \n   DECLARE_LOCALS(&return,&k,&i); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   *&i:int=0 [line 11]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
 }

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

@@ -1,27 +1,27 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (false branch) \n   PRUNE((1 == 0), false); [line 11]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5: Prune (true branch) \n   PRUNE((1 != 0), true); [line 11]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 13]\n " shape="box"]
+	
+
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
 "main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 13]\n " shape="box"]
-	
-
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5: Prune (true branch) \n   PRUNE((1 != 0), true); [line 11]\n " shape="invhouse"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (false branch) \n   PRUNE((1 == 0), false); [line 11]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
 }

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

@@ -1,82 +1,82 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_19" [label="19:  DeclStmt \n   *&x:int=0 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  x:int \n   DECLARE_LOCALS(&return,&x); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_19" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_18" [label="18:  BinaryOperatorStmt: AddAssign \n   n$2=*&x:int [line 14]\n  *&x:int=(n$2 + 1) [line 14]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_19" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_18" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
-"main.fad58de7366495db4650cfefac2fcd61_17" [label="17: Prune (false branch) \n   PRUNE(((n$1 > 5) == 0), false); [line 15]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 23]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_17" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
-"main.fad58de7366495db4650cfefac2fcd61_16" [label="16: Prune (true branch) \n   PRUNE(((n$1 > 5) != 0), true); [line 15]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_16" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  BinaryOperatorStmt: GT \n   n$1=*&x:int [line 15]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5: Prune (true branch) \n   PRUNE((1 != 0), true); [line 12]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_16" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_17" ;
-"main.fad58de7366495db4650cfefac2fcd61_14" [label="14: + \n  " ]
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (false branch) \n   PRUNE((1 == 0), false); [line 12]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
-"main.fad58de7366495db4650cfefac2fcd61_13" [label="13: Prune (false branch) \n   PRUNE((2 == 0), false); [line 13]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12: Prune (true branch) \n   PRUNE((2 != 0), true); [line 13]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: EQ \n   n$0=*&x:int [line 19]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_18" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11: + \n  " ]
+	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (true branch) \n   PRUNE(((n$0 == 2) != 0), true); [line 19]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
 "main.fad58de7366495db4650cfefac2fcd61_10" [label="10: Prune (false branch) \n   PRUNE(((n$0 == 2) == 0), false); [line 19]\n " shape="invhouse"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_10" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9: Prune (true branch) \n   PRUNE(((n$0 == 2) != 0), true); [line 19]\n " shape="invhouse"]
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: EQ \n   n$0=*&x:int [line 19]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12: Prune (true branch) \n   PRUNE((2 != 0), true); [line 13]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7: + \n  " ]
+	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_18" ;
+"main.fad58de7366495db4650cfefac2fcd61_13" [label="13: Prune (false branch) \n   PRUNE((2 == 0), false); [line 13]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6: Prune (false branch) \n   PRUNE((1 == 0), false); [line 12]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+"main.fad58de7366495db4650cfefac2fcd61_14" [label="14: + \n  " ]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5: Prune (true branch) \n   PRUNE((1 != 0), true); [line 12]\n " shape="invhouse"]
+	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  BinaryOperatorStmt: GT \n   n$1=*&x:int [line 15]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4: + \n  " ]
+	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_16" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_17" ;
+"main.fad58de7366495db4650cfefac2fcd61_16" [label="16: Prune (true branch) \n   PRUNE(((n$1 > 5) != 0), true); [line 15]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 23]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_16" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
+"main.fad58de7366495db4650cfefac2fcd61_17" [label="17: Prune (false branch) \n   PRUNE(((n$1 > 5) == 0), false); [line 15]\n " shape="invhouse"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_17" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
+"main.fad58de7366495db4650cfefac2fcd61_18" [label="18:  BinaryOperatorStmt: AddAssign \n   n$2=*&x:int [line 14]\n  *&x:int=(n$2 + 1) [line 14]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  x:int \n   DECLARE_LOCALS(&return,&x); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_18" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
+"main.fad58de7366495db4650cfefac2fcd61_19" [label="19:  DeclStmt \n   *&x:int=0 [line 11]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_19" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_19" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
 }

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

@@ -1,35 +1,35 @@
 /* @generated */
 digraph iCFG {
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_8" [label="8:  Return Stmt \n   *&return:int=32 [line 12]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_1" [label="1: Start foo\nFormals:  p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_8" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_2" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_7" [label="7: Prune (false branch) \n   PRUNE((n$1 == 0), false); [line 11]\n " shape="invhouse"]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_1" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_5" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_2" [label="2: Exit foo \n  " color=yellow style=filled]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_7" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_4" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_6" [label="6: Prune (true branch) \n   PRUNE((n$1 != 0), true); [line 11]\n " shape="invhouse"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_3" [label="3:  Return Stmt \n   *&return:int=52 [line 14]\n " shape="box"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_6" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_8" ;
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_2" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_4" [label="4: + \n  " ]
+	
+
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_4" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" ;
 "foo.acbd18db4cc2f85cedef654fccc4a4d8_5" [label="5:  BinaryOperatorStmt: Assign \n   n$0=*&p:int* [line 11]\n  *n$0:int=0 [line 11]\n  n$1=*n$0:int [line 11]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_5" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_6" ;
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_5" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_7" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_4" [label="4: + \n  " ]
-	
-
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_4" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_3" [label="3:  Return Stmt \n   *&return:int=52 [line 14]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_6" [label="6: Prune (true branch) \n   PRUNE((n$1 != 0), true); [line 11]\n " shape="invhouse"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_2" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_2" [label="2: Exit foo \n  " color=yellow style=filled]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_6" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_8" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_7" [label="7: Prune (false branch) \n   PRUNE((n$1 == 0), false); [line 11]\n " shape="invhouse"]
 	
 
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_1" [label="1: Start foo\nFormals:  p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_7" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_4" ;
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_8" [label="8:  Return Stmt \n   *&return:int=32 [line 12]\n " shape="box"]
 	
 
-	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_1" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_5" ;
+	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_8" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_2" ;
 }

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

@@ -1,30 +1,30 @@
 /* @generated */
 digraph iCFG {
-"test.098f6bcd4621d373cade4e832627b4f6_7" [label="7:  DeclStmt \n   *&a:int=3 [line 11]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_1" [label="1: Start test\nFormals: \nLocals:  e:int d:int c:int b:int a:int \n   DECLARE_LOCALS(&return,&e,&d,&c,&b,&a); [line 10]\n " color=yellow style=filled]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_7" -> "test.098f6bcd4621d373cade4e832627b4f6_6" ;
-"test.098f6bcd4621d373cade4e832627b4f6_6" [label="6:  DeclStmt \n   n$3=*&a:int [line 12]\n  *&a:int=(n$3 + 1) [line 12]\n  *&b:int=(n$3 + 1) [line 12]\n " shape="box"]
+	 "test.098f6bcd4621d373cade4e832627b4f6_1" -> "test.098f6bcd4621d373cade4e832627b4f6_7" ;
+"test.098f6bcd4621d373cade4e832627b4f6_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_6" -> "test.098f6bcd4621d373cade4e832627b4f6_5" ;
-"test.098f6bcd4621d373cade4e832627b4f6_5" [label="5:  DeclStmt \n   n$2=*&a:int [line 13]\n  *&a:int=(n$2 + 1) [line 13]\n  *&c:int=n$2 [line 13]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_3" [label="3:  DeclStmt \n   n$0=*&a:int [line 15]\n  *&a:int=(n$0 - 1) [line 15]\n  *&e:int=n$0 [line 15]\n " shape="box"]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_5" -> "test.098f6bcd4621d373cade4e832627b4f6_4" ;
+	 "test.098f6bcd4621d373cade4e832627b4f6_3" -> "test.098f6bcd4621d373cade4e832627b4f6_2" ;
 "test.098f6bcd4621d373cade4e832627b4f6_4" [label="4:  DeclStmt \n   n$1=*&a:int [line 14]\n  *&a:int=(n$1 - 1) [line 14]\n  *&d:int=(n$1 - 1) [line 14]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_4" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;
-"test.098f6bcd4621d373cade4e832627b4f6_3" [label="3:  DeclStmt \n   n$0=*&a:int [line 15]\n  *&a:int=(n$0 - 1) [line 15]\n  *&e:int=n$0 [line 15]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_5" [label="5:  DeclStmt \n   n$2=*&a:int [line 13]\n  *&a:int=(n$2 + 1) [line 13]\n  *&c:int=n$2 [line 13]\n " shape="box"]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_3" -> "test.098f6bcd4621d373cade4e832627b4f6_2" ;
-"test.098f6bcd4621d373cade4e832627b4f6_2" [label="2: Exit test \n  " color=yellow style=filled]
+	 "test.098f6bcd4621d373cade4e832627b4f6_5" -> "test.098f6bcd4621d373cade4e832627b4f6_4" ;
+"test.098f6bcd4621d373cade4e832627b4f6_6" [label="6:  DeclStmt \n   n$3=*&a:int [line 12]\n  *&a:int=(n$3 + 1) [line 12]\n  *&b:int=(n$3 + 1) [line 12]\n " shape="box"]
 	
 
-"test.098f6bcd4621d373cade4e832627b4f6_1" [label="1: Start test\nFormals: \nLocals:  e:int d:int c:int b:int a:int \n   DECLARE_LOCALS(&return,&e,&d,&c,&b,&a); [line 10]\n " color=yellow style=filled]
+	 "test.098f6bcd4621d373cade4e832627b4f6_6" -> "test.098f6bcd4621d373cade4e832627b4f6_5" ;
+"test.098f6bcd4621d373cade4e832627b4f6_7" [label="7:  DeclStmt \n   *&a:int=3 [line 11]\n " shape="box"]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_1" -> "test.098f6bcd4621d373cade4e832627b4f6_7" ;
+	 "test.098f6bcd4621d373cade4e832627b4f6_7" -> "test.098f6bcd4621d373cade4e832627b4f6_6" ;
 }

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

@@ -1,33 +1,33 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&y:int=3 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  X:int y:int \n   DECLARE_LOCALS(&return,&X,&y); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   *&X:int=4 [line 14]\n  n$0=*&X:int [line 15]\n  *&y:int=n$0 [line 13]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
 "main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 17]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   *&X:int=4 [line 14]\n  n$0=*&X:int [line 15]\n  *&y:int=n$0 [line 13]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  X:int y:int \n   DECLARE_LOCALS(&return,&X,&y); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&y:int=3 [line 11]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"test.098f6bcd4621d373cade4e832627b4f6_3" [label="3:  Return Stmt \n   n$2=*&p:int* [line 22]\n  n$3=*n$2:int [line 22]\n  *&x:int=n$3 [line 22]\n  *&y:int=1 [line 23]\n  n$0=*&x:int [line 24]\n  n$1=*&y:int [line 24]\n  *&return:int=(n$0 + n$1) [line 21]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"test.098f6bcd4621d373cade4e832627b4f6_1" [label="1: Start test\nFormals:  p:int*\nLocals:  y:int x:int \n   DECLARE_LOCALS(&return,&y,&x); [line 20]\n " color=yellow style=filled]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_3" -> "test.098f6bcd4621d373cade4e832627b4f6_2" ;
+	 "test.098f6bcd4621d373cade4e832627b4f6_1" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;
 "test.098f6bcd4621d373cade4e832627b4f6_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test.098f6bcd4621d373cade4e832627b4f6_1" [label="1: Start test\nFormals:  p:int*\nLocals:  y:int x:int \n   DECLARE_LOCALS(&return,&y,&x); [line 20]\n " color=yellow style=filled]
+"test.098f6bcd4621d373cade4e832627b4f6_3" [label="3:  Return Stmt \n   n$2=*&p:int* [line 22]\n  n$3=*n$2:int [line 22]\n  *&x:int=n$3 [line 22]\n  *&y:int=1 [line 23]\n  n$0=*&x:int [line 24]\n  n$1=*&y:int [line 24]\n  *&return:int=(n$0 + n$1) [line 21]\n " shape="box"]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_1" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;
+	 "test.098f6bcd4621d373cade4e832627b4f6_3" -> "test.098f6bcd4621d373cade4e832627b4f6_2" ;
 }

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

@@ -1,38 +1,38 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&x:double=1.000000 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  t:double s:double r:double q:double x:double \n   DECLARE_LOCALS(&return,&t,&s,&r,&q,&x); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   n$11=*&s:double [line 13]\n  *&x:double=n$11 [line 13]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   *&x:double=3 [line 14]\n  n$10=*&x:double [line 14]\n  *&q:double=n$10 [line 14]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 18]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: AddAssign \n   n$9=*&x:double [line 15]\n  *&x:double=(n$9 + 7) [line 15]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&t:double [line 17]\n  n$1=*&s:double [line 17]\n  *&s:double=(n$1 + n$0) [line 17]\n  n$2=*&s:double [line 17]\n  n$3=*&r:double [line 17]\n  *&r:double=(n$3 + n$2) [line 17]\n  n$4=*&r:double [line 17]\n  n$5=*&x:double [line 17]\n  *&x:double=(n$5 + n$4) [line 17]\n  n$6=*&x:double [line 17]\n  *&q:double=n$6 [line 17]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
 "main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$7=*&x:double [line 16]\n  *&x:double=(n$7 + 1.000000) [line 16]\n  n$8=*&x:double [line 16]\n  *&q:double=n$8 [line 16]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&t:double [line 17]\n  n$1=*&s:double [line 17]\n  *&s:double=(n$1 + n$0) [line 17]\n  n$2=*&s:double [line 17]\n  n$3=*&r:double [line 17]\n  *&r:double=(n$3 + n$2) [line 17]\n  n$4=*&r:double [line 17]\n  n$5=*&x:double [line 17]\n  *&x:double=(n$5 + n$4) [line 17]\n  n$6=*&x:double [line 17]\n  *&q:double=n$6 [line 17]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: AddAssign \n   n$9=*&x:double [line 15]\n  *&x:double=(n$9 + 7) [line 15]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 18]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   *&x:double=3 [line 14]\n  n$10=*&x:double [line 14]\n  *&q:double=n$10 [line 14]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   n$11=*&s:double [line 13]\n  *&x:double=n$11 [line 13]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  t:double s:double r:double q:double x:double \n   DECLARE_LOCALS(&return,&t,&s,&r,&q,&x); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&x:double=1.000000 [line 11]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
 }

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

@@ -1,30 +1,30 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   n$3=*&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$x:struct anonymous_struct_nestedoperators_union.c:12:1* [line 32]\n  *n$3.a:int=1 [line 32]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  l:int \n   DECLARE_LOCALS(&return,&l); [line 29]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   *&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$y.f:int=7 [line 33]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=*&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$y.f:int [line 34]\n  *&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$y.g.u:int=n$2 [line 34]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 37]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
 "main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$x:struct anonymous_struct_nestedoperators_union.c:12:1* [line 36]\n  n$1=*n$0.b:int [line 36]\n  *&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$y.g.w:int=n$1 [line 36]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 37]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=*&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$y.f:int [line 34]\n  *&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$y.g.u:int=n$2 [line 34]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   *&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$y.f:int=7 [line 33]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  l:int \n   DECLARE_LOCALS(&return,&l); [line 29]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   n$3=*&#GB<codetoanalyze/c/frontend/nestedoperators/union.c>$x:struct anonymous_struct_nestedoperators_union.c:12:1* [line 32]\n  *n$3.a:int=1 [line 32]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
 }

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

@@ -1,43 +1,43 @@
 /* @generated */
 digraph iCFG {
-"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_10" [label="10:  DeclStmt \n   *&i:int=n$1 [line 19]\n " shape="box"]
-	
-
-	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_10" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_5" ;
-"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_9" [label="9:  Return Stmt \n   *&return:int=(4 / 0) [line 23]\n " shape="box"]
+"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_1" [label="1: Start test_offsetof_expr\nFormals: \nLocals:  i:int \n   DECLARE_LOCALS(&return,&i); [line 18]\n " color=yellow style=filled]
 	
 
-	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_9" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_2" ;
-"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_8" [label="8:  Return Stmt \n   *&return:int=(9 / 0) [line 21]\n " shape="box"]
+	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_1" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_10" ;
+"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_2" [label="2: Exit test_offsetof_expr \n  " color=yellow style=filled]
 	
 
-	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_8" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_2" ;
-"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_7" [label="7: Prune (false branch) \n   PRUNE(((n$0 == 9) == 0), false); [line 20]\n " shape="invhouse"]
+"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_3" [label="3: + \n  " ]
 	
 
-	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_7" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_9" ;
-"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_6" [label="6: Prune (true branch) \n   PRUNE(((n$0 == 9) != 0), true); [line 20]\n " shape="invhouse"]
+	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_3" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_4" ;
+"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
-	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_6" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_8" ;
+	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_4" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_2" ;
 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_5" [label="5:  BinaryOperatorStmt: EQ \n   n$0=*&i:int [line 20]\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_4" [label="4:  between_join_and_exit \n  " shape="box"]
+"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_6" [label="6: Prune (true branch) \n   PRUNE(((n$0 == 9) != 0), true); [line 20]\n " shape="invhouse"]
 	
 
-	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_4" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_2" ;
-"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_3" [label="3: + \n  " ]
+	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_6" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_8" ;
+"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_7" [label="7: Prune (false branch) \n   PRUNE(((n$0 == 9) == 0), false); [line 20]\n " shape="invhouse"]
 	
 
-	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_3" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_4" ;
-"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_2" [label="2: Exit test_offsetof_expr \n  " color=yellow style=filled]
+	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_7" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_9" ;
+"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_8" [label="8:  Return Stmt \n   *&return:int=(9 / 0) [line 21]\n " shape="box"]
 	
 
-"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_1" [label="1: Start test_offsetof_expr\nFormals: \nLocals:  i:int \n   DECLARE_LOCALS(&return,&i); [line 18]\n " color=yellow style=filled]
+	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_8" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_2" ;
+"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_9" [label="9:  Return Stmt \n   *&return:int=(4 / 0) [line 23]\n " shape="box"]
 	
 
-	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_1" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_10" ;
+	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_9" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_2" ;
+"test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_10" [label="10:  DeclStmt \n   *&i:int=n$1 [line 19]\n " shape="box"]
+	
+
+	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_10" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_5" ;
 }

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

@@ -1,18 +1,18 @@
 /* @generated */
 digraph iCFG {
-"test.098f6bcd4621d373cade4e832627b4f6_4" [label="4:  BinaryOperatorStmt: Assign \n   *&x.a:int=10 [line 17]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_1" [label="1: Start test\nFormals: \nLocals:  x:struct X \n   DECLARE_LOCALS(&return,&x); [line 15]\n " color=yellow style=filled]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_4" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;
-"test.098f6bcd4621d373cade4e832627b4f6_3" [label="3:  BinaryOperatorStmt: Assign \n   *&x.b:int=20 [line 18]\n " shape="box"]
+	 "test.098f6bcd4621d373cade4e832627b4f6_1" -> "test.098f6bcd4621d373cade4e832627b4f6_4" ;
+"test.098f6bcd4621d373cade4e832627b4f6_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_3" -> "test.098f6bcd4621d373cade4e832627b4f6_2" ;
-"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 18]\n " shape="box"]
 	
 
-"test.098f6bcd4621d373cade4e832627b4f6_1" [label="1: Start test\nFormals: \nLocals:  x:struct X \n   DECLARE_LOCALS(&return,&x); [line 15]\n " color=yellow style=filled]
+	 "test.098f6bcd4621d373cade4e832627b4f6_3" -> "test.098f6bcd4621d373cade4e832627b4f6_2" ;
+"test.098f6bcd4621d373cade4e832627b4f6_4" [label="4:  BinaryOperatorStmt: Assign \n   *&x.a:int=10 [line 17]\n " shape="box"]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_1" -> "test.098f6bcd4621d373cade4e832627b4f6_4" ;
+	 "test.098f6bcd4621d373cade4e832627b4f6_4" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;
 }

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

@@ -1,18 +1,18 @@
 /* @generated */
 digraph iCFG {
-"test_typename.b2359812ef4a83b4e2638a11e6c522b3_4" [label="4:  DeclStmt \n   *&x:void=_t$1 [line 15]\n " shape="box"]
+"test_typename.b2359812ef4a83b4e2638a11e6c522b3_1" [label="1: Start test_typename\nFormals: \nLocals:  z:int x:int y:int s:char \n   DECLARE_LOCALS(&return,&z,&x,&y,&s); [line 12]\n " color=yellow style=filled]
 	
 
-	 "test_typename.b2359812ef4a83b4e2638a11e6c522b3_4" -> "test_typename.b2359812ef4a83b4e2638a11e6c522b3_3" ;
-"test_typename.b2359812ef4a83b4e2638a11e6c522b3_3" [label="3:  DeclStmt \n   *&z:void=_t$0 [line 16]\n " shape="box"]
+	 "test_typename.b2359812ef4a83b4e2638a11e6c522b3_1" -> "test_typename.b2359812ef4a83b4e2638a11e6c522b3_4" ;
+"test_typename.b2359812ef4a83b4e2638a11e6c522b3_2" [label="2: Exit test_typename \n  " color=yellow style=filled]
 	
 
-	 "test_typename.b2359812ef4a83b4e2638a11e6c522b3_3" -> "test_typename.b2359812ef4a83b4e2638a11e6c522b3_2" ;
-"test_typename.b2359812ef4a83b4e2638a11e6c522b3_2" [label="2: Exit test_typename \n  " color=yellow style=filled]
+"test_typename.b2359812ef4a83b4e2638a11e6c522b3_3" [label="3:  DeclStmt \n   *&z:void=_t$0 [line 16]\n " shape="box"]
 	
 
-"test_typename.b2359812ef4a83b4e2638a11e6c522b3_1" [label="1: Start test_typename\nFormals: \nLocals:  z:int x:int y:int s:char \n   DECLARE_LOCALS(&return,&z,&x,&y,&s); [line 12]\n " color=yellow style=filled]
+	 "test_typename.b2359812ef4a83b4e2638a11e6c522b3_3" -> "test_typename.b2359812ef4a83b4e2638a11e6c522b3_2" ;
+"test_typename.b2359812ef4a83b4e2638a11e6c522b3_4" [label="4:  DeclStmt \n   *&x:void=_t$1 [line 15]\n " shape="box"]
 	
 
-	 "test_typename.b2359812ef4a83b4e2638a11e6c522b3_1" -> "test_typename.b2359812ef4a83b4e2638a11e6c522b3_4" ;
+	 "test_typename.b2359812ef4a83b4e2638a11e6c522b3_4" -> "test_typename.b2359812ef4a83b4e2638a11e6c522b3_3" ;
 }

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

@@ -1,37 +1,37 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&src:int=1 [line 20]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_1" [label="1: Start test\nFormals: \nLocals:  h:int z:int y:int x:int \n   DECLARE_LOCALS(&return,&h,&z,&y,&x); [line 10]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  GCCAsmStmt \n   n$0=*&src:int [line 27]\n  _fun___infer_skip_gcc_asm_stmt(&dst:int&,n$0:int) [line 23]\n " shape="box"]
+	 "test.098f6bcd4621d373cade4e832627b4f6_1" -> "test.098f6bcd4621d373cade4e832627b4f6_4" ;
+"test.098f6bcd4621d373cade4e832627b4f6_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 28]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_3" [label="3:  Return Stmt \n   *&return:int=0 [line 16]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
+	 "test.098f6bcd4621d373cade4e832627b4f6_3" -> "test.098f6bcd4621d373cade4e832627b4f6_2" ;
+"test.098f6bcd4621d373cade4e832627b4f6_4" [label="4:  GCCAsmStmt \n   _fun___infer_skip_gcc_asm_stmt(&x:int&,&y:int&,&z:int&,&h:int&,0:int) [line 15]\n " shape="box"]
 	
 
+	 "test.098f6bcd4621d373cade4e832627b4f6_4" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;
 "main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  dst:int src:int \n   DECLARE_LOCALS(&return,&dst,&src); [line 19]\n " color=yellow style=filled]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"test.098f6bcd4621d373cade4e832627b4f6_4" [label="4:  GCCAsmStmt \n   _fun___infer_skip_gcc_asm_stmt(&x:int&,&y:int&,&z:int&,&h:int&,0:int) [line 15]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_4" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;
-"test.098f6bcd4621d373cade4e832627b4f6_3" [label="3:  Return Stmt \n   *&return:int=0 [line 16]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 28]\n " shape="box"]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_3" -> "test.098f6bcd4621d373cade4e832627b4f6_2" ;
-"test.098f6bcd4621d373cade4e832627b4f6_2" [label="2: Exit test \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  GCCAsmStmt \n   n$0=*&src:int [line 27]\n  _fun___infer_skip_gcc_asm_stmt(&dst:int&,n$0:int) [line 23]\n " shape="box"]
 	
 
-"test.098f6bcd4621d373cade4e832627b4f6_1" [label="1: Start test\nFormals: \nLocals:  h:int z:int y:int x:int \n   DECLARE_LOCALS(&return,&h,&z,&y,&x); [line 10]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&src:int=1 [line 20]\n " shape="box"]
 	
 
-	 "test.098f6bcd4621d373cade4e832627b4f6_1" -> "test.098f6bcd4621d373cade4e832627b4f6_4" ;
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
 }

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

@@ -1,51 +1,51 @@
 /* @generated */
 digraph iCFG {
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_12" [label="12:  Call _fun___builtin_va_start \n   _fun___builtin_va_start(&valist:void*,&x:int&) [line 14]\n " shape="box"]
-	
-
-	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_12" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_11" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_11" [label="11:  DeclStmt \n   *&i:int=n$2 [line 15]\n " shape="box"]
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_1" [label="1: Start vaarg_foo\nFormals:  x:int\nLocals:  val:int i:int valist:void[1] \n   DECLARE_LOCALS(&return,&val,&i,&valist); [line 12]\n " color=yellow style=filled]
 	
 
-	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_11" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_6" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_10" [label="10:  BinaryOperatorStmt: Assign \n   *&val:int=(4 / 0) [line 20]\n " shape="box"]
+	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_1" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_12" ;
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_2" [label="2: Exit vaarg_foo \n  " color=yellow style=filled]
 	
 
-	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_10" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_5" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_9" [label="9:  BinaryOperatorStmt: Assign \n   *&val:int=(9 / 0) [line 18]\n " shape="box"]
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_3" [label="3:  Return Stmt \n   n$0=*&val:int [line 23]\n  *&return:int=n$0 [line 23]\n " shape="box"]
 	
 
-	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_9" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_5" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_8" [label="8: Prune (false branch) \n   PRUNE(((n$1 == 9) == 0), false); [line 17]\n " shape="invhouse"]
+	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_3" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_2" ;
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_4" [label="4:  Call _fun___builtin_va_end \n   _fun___builtin_va_end(&valist:void*) [line 22]\n " shape="box"]
 	
 
-	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_8" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_10" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_7" [label="7: Prune (true branch) \n   PRUNE(((n$1 == 9) != 0), true); [line 17]\n " shape="invhouse"]
+	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_4" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_3" ;
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_5" [label="5: + \n  " ]
 	
 
-	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_7" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_9" ;
+	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_5" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_4" ;
 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_6" [label="6:  BinaryOperatorStmt: EQ \n   n$1=*&i:int [line 17]\n " shape="box"]
 	
 
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_6" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_7" ;
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_6" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_8" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_5" [label="5: + \n  " ]
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_7" [label="7: Prune (true branch) \n   PRUNE(((n$1 == 9) != 0), true); [line 17]\n " shape="invhouse"]
 	
 
-	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_5" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_4" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_4" [label="4:  Call _fun___builtin_va_end \n   _fun___builtin_va_end(&valist:void*) [line 22]\n " shape="box"]
+	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_7" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_9" ;
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_8" [label="8: Prune (false branch) \n   PRUNE(((n$1 == 9) == 0), false); [line 17]\n " shape="invhouse"]
 	
 
-	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_4" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_3" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_3" [label="3:  Return Stmt \n   n$0=*&val:int [line 23]\n  *&return:int=n$0 [line 23]\n " shape="box"]
+	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_8" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_10" ;
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_9" [label="9:  BinaryOperatorStmt: Assign \n   *&val:int=(9 / 0) [line 18]\n " shape="box"]
 	
 
-	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_3" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_2" ;
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_2" [label="2: Exit vaarg_foo \n  " color=yellow style=filled]
+	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_9" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_5" ;
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_10" [label="10:  BinaryOperatorStmt: Assign \n   *&val:int=(4 / 0) [line 20]\n " shape="box"]
 	
 
-"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_1" [label="1: Start vaarg_foo\nFormals:  x:int\nLocals:  val:int i:int valist:void[1] \n   DECLARE_LOCALS(&return,&val,&i,&valist); [line 12]\n " color=yellow style=filled]
+	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_10" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_5" ;
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_11" [label="11:  DeclStmt \n   *&i:int=n$2 [line 15]\n " shape="box"]
 	
 
-	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_1" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_12" ;
+	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_11" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_6" ;
+"vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_12" [label="12:  Call _fun___builtin_va_start \n   _fun___builtin_va_start(&valist:void*,&x:int&) [line 14]\n " shape="box"]
+	
+
+	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_12" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_11" ;
 }

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

@@ -1,84 +1,84 @@
 /* @generated */
 digraph iCFG {
-"h{d41d8cd98f00b204e9800998ecf8427e_Z1hv}.803b5572e1c1e91410fbdd09f43d6a22_3" [label="3:  Return Stmt \n   *&return:int=3 [line 10]\n " shape="box"]
+"h{d41d8cd98f00b204e9800998ecf8427e_Z1hv}.803b5572e1c1e91410fbdd09f43d6a22_1" [label="1: Start h\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
-	 "h{d41d8cd98f00b204e9800998ecf8427e_Z1hv}.803b5572e1c1e91410fbdd09f43d6a22_3" -> "h{d41d8cd98f00b204e9800998ecf8427e_Z1hv}.803b5572e1c1e91410fbdd09f43d6a22_2" ;
+	 "h{d41d8cd98f00b204e9800998ecf8427e_Z1hv}.803b5572e1c1e91410fbdd09f43d6a22_1" -> "h{d41d8cd98f00b204e9800998ecf8427e_Z1hv}.803b5572e1c1e91410fbdd09f43d6a22_3" ;
 "h{d41d8cd98f00b204e9800998ecf8427e_Z1hv}.803b5572e1c1e91410fbdd09f43d6a22_2" [label="2: Exit h \n  " color=yellow style=filled]
 	
 
-"h{d41d8cd98f00b204e9800998ecf8427e_Z1hv}.803b5572e1c1e91410fbdd09f43d6a22_1" [label="1: Start h\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
+"h{d41d8cd98f00b204e9800998ecf8427e_Z1hv}.803b5572e1c1e91410fbdd09f43d6a22_3" [label="3:  Return Stmt \n   *&return:int=3 [line 10]\n " shape="box"]
 	
 
-	 "h{d41d8cd98f00b204e9800998ecf8427e_Z1hv}.803b5572e1c1e91410fbdd09f43d6a22_1" -> "h{d41d8cd98f00b204e9800998ecf8427e_Z1hv}.803b5572e1c1e91410fbdd09f43d6a22_3" ;
-"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_14" [label="14:  DeclStmt \n   *&res:int=5 [line 13]\n " shape="box"]
+	 "h{d41d8cd98f00b204e9800998ecf8427e_Z1hv}.803b5572e1c1e91410fbdd09f43d6a22_3" -> "h{d41d8cd98f00b204e9800998ecf8427e_Z1hv}.803b5572e1c1e91410fbdd09f43d6a22_2" ;
+"test_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z16test_fallthroughv}.b153f1307a65c2b5f6cad976bac36a19_1" [label="1: Start test_fallthrough\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 27]\n " color=yellow style=filled]
 	
 
-	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_14" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_4" ;
-"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_13" [label="13: Prune (false branch) \n   PRUNE(((n$1 == 22) == 0), false); [line 15]\n " shape="invhouse"]
+	 "test_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z16test_fallthroughv}.b153f1307a65c2b5f6cad976bac36a19_1" -> "test_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z16test_fallthroughv}.b153f1307a65c2b5f6cad976bac36a19_3" ;
+"test_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z16test_fallthroughv}.b153f1307a65c2b5f6cad976bac36a19_2" [label="2: Exit test_fallthrough \n  " color=yellow style=filled]
 	
 
-	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_13" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_10" ;
-	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_13" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_11" ;
-"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_12" [label="12: Prune (true branch) \n   PRUNE(((n$1 == 22) != 0), true); [line 15]\n " shape="invhouse"]
+"test_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z16test_fallthroughv}.b153f1307a65c2b5f6cad976bac36a19_3" [label="3:  Return Stmt \n   n$0=_fun_switch_with_fallthrough(66:int) [line 27]\n  *&return:int=(1 / (n$0 - 3)) [line 27]\n " shape="box"]
 	
 
-	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_12" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_5" ;
-"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_11" [label="11: Prune (false branch) \n   PRUNE(((n$1 == 33) == 0), false); [line 16]\n " shape="invhouse"]
+	 "test_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z16test_fallthroughv}.b153f1307a65c2b5f6cad976bac36a19_3" -> "test_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z16test_fallthroughv}.b153f1307a65c2b5f6cad976bac36a19_2" ;
+"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_1" [label="1: Start switch_with_fallthrough\nFormals:  n:int\nLocals:  res:int \n   DECLARE_LOCALS(&return,&res); [line 12]\n " color=yellow style=filled]
 	
 
-	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_11" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_8" ;
-	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_11" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_9" ;
-"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_10" [label="10: Prune (true branch) \n   PRUNE(((n$1 == 33) != 0), true); [line 16]\n " shape="invhouse"]
+	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_1" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_14" ;
+"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_2" [label="2: Exit switch_with_fallthrough \n  " color=yellow style=filled]
 	
 
-	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_10" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_5" ;
-"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_9" [label="9: Prune (false branch) \n   PRUNE(((n$1 == 66) == 0), false); [line 18]\n " shape="invhouse"]
+"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_3" [label="3:  Return Stmt \n   n$0=*&res:int [line 24]\n  *&return:int=n$0 [line 24]\n " shape="box"]
 	
 
-	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_9" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_6" ;
-	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_9" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_7" ;
-"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_8" [label="8: Prune (true branch) \n   PRUNE(((n$1 == 66) != 0), true); [line 18]\n " shape="invhouse"]
+	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_3" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_2" ;
+"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_4" [label="4:  Switch_stmt \n   n$1=*&n:int [line 14]\n " shape="box"]
 	
 
-	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_8" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_5" ;
-"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_7" [label="7: Prune (false branch) \n   PRUNE(((n$1 == 77) == 0), false); [line 20]\n " shape="invhouse"]
+	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_4" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_12" ;
+	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_4" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_13" ;
+"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=_fun_h() [line 21]\n  *&res:int=n$2 [line 21]\n " shape="box"]
 	
 
-	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_7" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_3" ;
+	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_5" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_3" ;
 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_6" [label="6: Prune (true branch) \n   PRUNE(((n$1 == 77) != 0), true); [line 20]\n " shape="invhouse"]
 	
 
 	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_6" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_5" ;
-"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=_fun_h() [line 21]\n  *&res:int=n$2 [line 21]\n " shape="box"]
+"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_7" [label="7: Prune (false branch) \n   PRUNE(((n$1 == 77) == 0), false); [line 20]\n " shape="invhouse"]
 	
 
-	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_5" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_3" ;
-"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_4" [label="4:  Switch_stmt \n   n$1=*&n:int [line 14]\n " shape="box"]
+	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_7" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_3" ;
+"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_8" [label="8: Prune (true branch) \n   PRUNE(((n$1 == 66) != 0), true); [line 18]\n " shape="invhouse"]
 	
 
-	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_4" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_12" ;
-	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_4" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_13" ;
-"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_3" [label="3:  Return Stmt \n   n$0=*&res:int [line 24]\n  *&return:int=n$0 [line 24]\n " shape="box"]
+	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_8" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_5" ;
+"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_9" [label="9: Prune (false branch) \n   PRUNE(((n$1 == 66) == 0), false); [line 18]\n " shape="invhouse"]
 	
 
-	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_3" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_2" ;
-"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_2" [label="2: Exit switch_with_fallthrough \n  " color=yellow style=filled]
+	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_9" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_6" ;
+	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_9" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_7" ;
+"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_10" [label="10: Prune (true branch) \n   PRUNE(((n$1 == 33) != 0), true); [line 16]\n " shape="invhouse"]
 	
 
-"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_1" [label="1: Start switch_with_fallthrough\nFormals:  n:int\nLocals:  res:int \n   DECLARE_LOCALS(&return,&res); [line 12]\n " color=yellow style=filled]
+	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_10" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_5" ;
+"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_11" [label="11: Prune (false branch) \n   PRUNE(((n$1 == 33) == 0), false); [line 16]\n " shape="invhouse"]
 	
 
-	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_1" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_14" ;
-"test_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z16test_fallthroughv}.b153f1307a65c2b5f6cad976bac36a19_3" [label="3:  Return Stmt \n   n$0=_fun_switch_with_fallthrough(66:int) [line 27]\n  *&return:int=(1 / (n$0 - 3)) [line 27]\n " shape="box"]
+	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_11" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_8" ;
+	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_11" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_9" ;
+"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_12" [label="12: Prune (true branch) \n   PRUNE(((n$1 == 22) != 0), true); [line 15]\n " shape="invhouse"]
 	
 
-	 "test_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z16test_fallthroughv}.b153f1307a65c2b5f6cad976bac36a19_3" -> "test_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z16test_fallthroughv}.b153f1307a65c2b5f6cad976bac36a19_2" ;
-"test_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z16test_fallthroughv}.b153f1307a65c2b5f6cad976bac36a19_2" [label="2: Exit test_fallthrough \n  " color=yellow style=filled]
+	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_12" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_5" ;
+"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_13" [label="13: Prune (false branch) \n   PRUNE(((n$1 == 22) == 0), false); [line 15]\n " shape="invhouse"]
 	
 
-"test_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z16test_fallthroughv}.b153f1307a65c2b5f6cad976bac36a19_1" [label="1: Start test_fallthrough\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 27]\n " color=yellow style=filled]
+	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_13" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_10" ;
+	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_13" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_11" ;
+"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_14" [label="14:  DeclStmt \n   *&res:int=5 [line 13]\n " shape="box"]
 	
 
-	 "test_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z16test_fallthroughv}.b153f1307a65c2b5f6cad976bac36a19_1" -> "test_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z16test_fallthroughv}.b153f1307a65c2b5f6cad976bac36a19_3" ;
+	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_14" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_4" ;
 }

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

@@ -1,26 +1,26 @@
 /* @generated */
 digraph iCFG {
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" [label="6:  DeclStmt \n   *&x:int=2 [line 11]\n " shape="box"]
-	
-
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" [label="5:  DeclStmt \n   n$2=_fun___new(sizeof(int):unsigned long) [line 12]\n  *&i:int*=n$2 [line 12]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" [label="1: Start test\nFormals: \nLocals:  i:int* x:int \n   DECLARE_LOCALS(&return,&i,&x); [line 10]\n " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" [label="4:  CXXNewExpr \n   n$1=_fun___new(sizeof(int):unsigned long) [line 13]\n " shape="box"]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  Call delete \n   n$0=*&i:int* [line 14]\n  _fun___delete(n$0:int*) [line 14]\n " shape="box"]
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" [label="2: Exit test \n  " color=yellow style=filled]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" [label="4:  CXXNewExpr \n   n$1=_fun___new(sizeof(int):unsigned long) [line 13]\n " shape="box"]
 	
 
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" [label="1: Start test\nFormals: \nLocals:  i:int* x:int \n   DECLARE_LOCALS(&return,&i,&x); [line 10]\n " color=yellow style=filled]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" [label="5:  DeclStmt \n   n$2=_fun___new(sizeof(int):unsigned long) [line 12]\n  *&i:int*=n$2 [line 12]\n " shape="box"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" ;
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" [label="6:  DeclStmt \n   *&x:int=2 [line 11]\n " shape="box"]
+	
+
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" ;
 }

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

@@ -1,14 +1,14 @@
 /* @generated */
 digraph iCFG {
-"f{d41d8cd98f00b204e9800998ecf8427e_Z1fP6Person}.1a568c7910039e98ba51fbec36c568f8_3" [label="3:  Call _fun_Person_~Person \n   n$0=*&p:class Person* [line 15]\n  _=*n$0:class Person [line 15]\n  _fun_Person_~Person(n$0:class Person*) [line 15]\n " shape="box"]
+"f{d41d8cd98f00b204e9800998ecf8427e_Z1fP6Person}.1a568c7910039e98ba51fbec36c568f8_1" [label="1: Start f\nFormals:  p:class Person*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
-	 "f{d41d8cd98f00b204e9800998ecf8427e_Z1fP6Person}.1a568c7910039e98ba51fbec36c568f8_3" -> "f{d41d8cd98f00b204e9800998ecf8427e_Z1fP6Person}.1a568c7910039e98ba51fbec36c568f8_2" ;
+	 "f{d41d8cd98f00b204e9800998ecf8427e_Z1fP6Person}.1a568c7910039e98ba51fbec36c568f8_1" -> "f{d41d8cd98f00b204e9800998ecf8427e_Z1fP6Person}.1a568c7910039e98ba51fbec36c568f8_3" ;
 "f{d41d8cd98f00b204e9800998ecf8427e_Z1fP6Person}.1a568c7910039e98ba51fbec36c568f8_2" [label="2: Exit f \n  " color=yellow style=filled]
 	
 
-"f{d41d8cd98f00b204e9800998ecf8427e_Z1fP6Person}.1a568c7910039e98ba51fbec36c568f8_1" [label="1: Start f\nFormals:  p:class Person*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
+"f{d41d8cd98f00b204e9800998ecf8427e_Z1fP6Person}.1a568c7910039e98ba51fbec36c568f8_3" [label="3:  Call _fun_Person_~Person \n   n$0=*&p:class Person* [line 15]\n  _=*n$0:class Person [line 15]\n  _fun_Person_~Person(n$0:class Person*) [line 15]\n " shape="box"]
 	
 
-	 "f{d41d8cd98f00b204e9800998ecf8427e_Z1fP6Person}.1a568c7910039e98ba51fbec36c568f8_1" -> "f{d41d8cd98f00b204e9800998ecf8427e_Z1fP6Person}.1a568c7910039e98ba51fbec36c568f8_3" ;
+	 "f{d41d8cd98f00b204e9800998ecf8427e_Z1fP6Person}.1a568c7910039e98ba51fbec36c568f8_3" -> "f{d41d8cd98f00b204e9800998ecf8427e_Z1fP6Person}.1a568c7910039e98ba51fbec36c568f8_2" ;
 }

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

@@ -1,32 +1,32 @@
 /* @generated */
 digraph iCFG {
-"deleteInt{d41d8cd98f00b204e9800998ecf8427e_Z9deleteIntPi}.647508014cd09d4d2e192f8294614963_3" [label="3:  Call delete \n   n$0=*&x:int* [line 16]\n  _fun___delete(n$0:int*) [line 16]\n " shape="box"]
+"X_~X(_ZN1XD0Ev).79046c7c7695389a6748314fdf070e54_1" [label="1: Start X_~X\nFormals:  this:class X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
 	
 
-	 "deleteInt{d41d8cd98f00b204e9800998ecf8427e_Z9deleteIntPi}.647508014cd09d4d2e192f8294614963_3" -> "deleteInt{d41d8cd98f00b204e9800998ecf8427e_Z9deleteIntPi}.647508014cd09d4d2e192f8294614963_2" ;
-"deleteInt{d41d8cd98f00b204e9800998ecf8427e_Z9deleteIntPi}.647508014cd09d4d2e192f8294614963_2" [label="2: Exit deleteInt \n  " color=yellow style=filled]
+	 "X_~X(_ZN1XD0Ev).79046c7c7695389a6748314fdf070e54_1" -> "X_~X(_ZN1XD0Ev).79046c7c7695389a6748314fdf070e54_2" ;
+"X_~X(_ZN1XD0Ev).79046c7c7695389a6748314fdf070e54_2" [label="2: Exit X_~X \n  " color=yellow style=filled]
 	
 
 "deleteInt{d41d8cd98f00b204e9800998ecf8427e_Z9deleteIntPi}.647508014cd09d4d2e192f8294614963_1" [label="1: Start deleteInt\nFormals:  x:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 16]\n " color=yellow style=filled]
 	
 
 	 "deleteInt{d41d8cd98f00b204e9800998ecf8427e_Z9deleteIntPi}.647508014cd09d4d2e192f8294614963_1" -> "deleteInt{d41d8cd98f00b204e9800998ecf8427e_Z9deleteIntPi}.647508014cd09d4d2e192f8294614963_3" ;
-"X_~X(_ZN1XD0Ev).79046c7c7695389a6748314fdf070e54_2" [label="2: Exit X_~X \n  " color=yellow style=filled]
+"deleteInt{d41d8cd98f00b204e9800998ecf8427e_Z9deleteIntPi}.647508014cd09d4d2e192f8294614963_2" [label="2: Exit deleteInt \n  " color=yellow style=filled]
 	
 
-"X_~X(_ZN1XD0Ev).79046c7c7695389a6748314fdf070e54_1" [label="1: Start X_~X\nFormals:  this:class X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
+"deleteInt{d41d8cd98f00b204e9800998ecf8427e_Z9deleteIntPi}.647508014cd09d4d2e192f8294614963_3" [label="3:  Call delete \n   n$0=*&x:int* [line 16]\n  _fun___delete(n$0:int*) [line 16]\n " shape="box"]
 	
 
-	 "X_~X(_ZN1XD0Ev).79046c7c7695389a6748314fdf070e54_1" -> "X_~X(_ZN1XD0Ev).79046c7c7695389a6748314fdf070e54_2" ;
-"deleteX{d41d8cd98f00b204e9800998ecf8427e_Z7deleteXP1X}.e65990f4969cec963a8cf25f2a7e0fa6_3" [label="3:  Call delete \n   n$0=*&x:class X* [line 14]\n  _fun___delete(n$0:class X*) [line 14]\n " shape="box"]
+	 "deleteInt{d41d8cd98f00b204e9800998ecf8427e_Z9deleteIntPi}.647508014cd09d4d2e192f8294614963_3" -> "deleteInt{d41d8cd98f00b204e9800998ecf8427e_Z9deleteIntPi}.647508014cd09d4d2e192f8294614963_2" ;
+"deleteX{d41d8cd98f00b204e9800998ecf8427e_Z7deleteXP1X}.e65990f4969cec963a8cf25f2a7e0fa6_1" [label="1: Start deleteX\nFormals:  x:class X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
 	
 
-	 "deleteX{d41d8cd98f00b204e9800998ecf8427e_Z7deleteXP1X}.e65990f4969cec963a8cf25f2a7e0fa6_3" -> "deleteX{d41d8cd98f00b204e9800998ecf8427e_Z7deleteXP1X}.e65990f4969cec963a8cf25f2a7e0fa6_2" ;
+	 "deleteX{d41d8cd98f00b204e9800998ecf8427e_Z7deleteXP1X}.e65990f4969cec963a8cf25f2a7e0fa6_1" -> "deleteX{d41d8cd98f00b204e9800998ecf8427e_Z7deleteXP1X}.e65990f4969cec963a8cf25f2a7e0fa6_3" ;
 "deleteX{d41d8cd98f00b204e9800998ecf8427e_Z7deleteXP1X}.e65990f4969cec963a8cf25f2a7e0fa6_2" [label="2: Exit deleteX \n  " color=yellow style=filled]
 	
 
-"deleteX{d41d8cd98f00b204e9800998ecf8427e_Z7deleteXP1X}.e65990f4969cec963a8cf25f2a7e0fa6_1" [label="1: Start deleteX\nFormals:  x:class X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
+"deleteX{d41d8cd98f00b204e9800998ecf8427e_Z7deleteXP1X}.e65990f4969cec963a8cf25f2a7e0fa6_3" [label="3:  Call delete \n   n$0=*&x:class X* [line 14]\n  _fun___delete(n$0:class X*) [line 14]\n " shape="box"]
 	
 
-	 "deleteX{d41d8cd98f00b204e9800998ecf8427e_Z7deleteXP1X}.e65990f4969cec963a8cf25f2a7e0fa6_1" -> "deleteX{d41d8cd98f00b204e9800998ecf8427e_Z7deleteXP1X}.e65990f4969cec963a8cf25f2a7e0fa6_3" ;
+	 "deleteX{d41d8cd98f00b204e9800998ecf8427e_Z7deleteXP1X}.e65990f4969cec963a8cf25f2a7e0fa6_3" -> "deleteX{d41d8cd98f00b204e9800998ecf8427e_Z7deleteXP1X}.e65990f4969cec963a8cf25f2a7e0fa6_2" ;
 }

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

@@ -1,52 +1,52 @@
 /* @generated */
 digraph iCFG {
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" [label="4:  DeclStmt \n   *&t:int*=0 [line 24]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" [label="1: Start test\nFormals: \nLocals:  t:int* \n   DECLARE_LOCALS(&return,&t); [line 23]\n " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  Call _fun_destroy<int_*> \n   n$0=_fun_destroy<int_*>(&t:int**) [line 25]\n " shape="box"]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" [label="2: Exit test \n  " color=yellow style=filled]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  Call _fun_destroy<int_*> \n   n$0=_fun_destroy<int_*>(&t:int**) [line 25]\n " shape="box"]
 	
 
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" [label="1: Start test\nFormals: \nLocals:  t:int* \n   DECLARE_LOCALS(&return,&t); [line 23]\n " color=yellow style=filled]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" [label="4:  DeclStmt \n   *&t:int*=0 [line 24]\n " shape="box"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" ;
-"f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_5" [label="5:  DeclStmt \n   n$1=*&p:int* [line 12]\n  n$2=*n$1:int [line 12]\n  *&x:int=n$2 [line 12]\n " shape="box"]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
+"f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_1" [label="1: Start f\nFormals:  p:int*\nLocals:  x:int \n   DECLARE_LOCALS(&return,&x); [line 11]\n " color=yellow style=filled]
 	
 
-	 "f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_5" -> "f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_4" ;
-"f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_4" [label="4:  Call _fun___infer_skip_function \n   _fun___infer_skip_function() [line 13]\n " shape="box"]
+	 "f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_1" -> "f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_5" ;
+"f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_2" [label="2: Exit f \n  " color=yellow style=filled]
 	
 
-	 "f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_4" -> "f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_3" ;
 "f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 14]\n  *&return:int=n$0 [line 14]\n " shape="box"]
 	
 
 	 "f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_3" -> "f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_2" ;
-"f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_2" [label="2: Exit f \n  " color=yellow style=filled]
+"f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_4" [label="4:  Call _fun___infer_skip_function \n   _fun___infer_skip_function() [line 13]\n " shape="box"]
 	
 
-"f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_1" [label="1: Start f\nFormals:  p:int*\nLocals:  x:int \n   DECLARE_LOCALS(&return,&x); [line 11]\n " color=yellow style=filled]
+	 "f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_4" -> "f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_3" ;
+"f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_5" [label="5:  DeclStmt \n   n$1=*&p:int* [line 12]\n  n$2=*n$1:int [line 12]\n  *&x:int=n$2 [line 12]\n " shape="box"]
 	
 
-	 "f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_1" -> "f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_5" ;
-"destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_4" [label="4:  Call _fun___infer_skip_function \n   _fun___infer_skip_function() [line 19]\n " shape="box"]
+	 "f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_5" -> "f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_4" ;
+"destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_1" [label="1: Start destroy<int_*>\nFormals:  ptr:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
 	
 
-	 "destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_4" -> "destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_3" ;
-"destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_3" [label="3:  Return Stmt \n   *&return:int=0 [line 20]\n " shape="box"]
+	 "destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_1" -> "destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_4" ;
+"destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_2" [label="2: Exit destroy<int_*> \n  " color=yellow style=filled]
 	
 
-	 "destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_3" -> "destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_2" ;
-"destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_2" [label="2: Exit destroy<int_*> \n  " color=yellow style=filled]
+"destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_3" [label="3:  Return Stmt \n   *&return:int=0 [line 20]\n " shape="box"]
 	
 
-"destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_1" [label="1: Start destroy<int_*>\nFormals:  ptr:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
+	 "destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_3" -> "destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_2" ;
+"destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_4" [label="4:  Call _fun___infer_skip_function \n   _fun___infer_skip_function() [line 19]\n " shape="box"]
 	
 
-	 "destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_1" -> "destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_4" ;
+	 "destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_4" -> "destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_3" ;
 }

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

@@ -1,25 +1,25 @@
 /* @generated */
 digraph iCFG {
-"B_~B(_ZN1BD0Ev).9a30ff0f6f3a2cf1000c5ecdda36d53b_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class B* [line 20]\n  *n$0.f:int=1 [line 20]\n " shape="box"]
-	
-
-	 "B_~B(_ZN1BD0Ev).9a30ff0f6f3a2cf1000c5ecdda36d53b_3" -> "B_~B(_ZN1BD0Ev).9a30ff0f6f3a2cf1000c5ecdda36d53b_2" ;
-"B_~B(_ZN1BD0Ev).9a30ff0f6f3a2cf1000c5ecdda36d53b_2" [label="2: Exit B_~B \n  " color=yellow style=filled]
+"A_~A(_ZN1AD0Ev).8c02753d631046ed95b47845e91297b9_1" [label="1: Start A_~A\nFormals:  this:class A*\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
-"B_~B(_ZN1BD0Ev).9a30ff0f6f3a2cf1000c5ecdda36d53b_1" [label="1: Start B_~B\nFormals:  this:class B*\nLocals:  \n   DECLARE_LOCALS(&return); [line 20]\n " color=yellow style=filled]
+	 "A_~A(_ZN1AD0Ev).8c02753d631046ed95b47845e91297b9_1" -> "A_~A(_ZN1AD0Ev).8c02753d631046ed95b47845e91297b9_3" ;
+"A_~A(_ZN1AD0Ev).8c02753d631046ed95b47845e91297b9_2" [label="2: Exit A_~A \n  " color=yellow style=filled]
 	
 
-	 "B_~B(_ZN1BD0Ev).9a30ff0f6f3a2cf1000c5ecdda36d53b_1" -> "B_~B(_ZN1BD0Ev).9a30ff0f6f3a2cf1000c5ecdda36d53b_3" ;
 "A_~A(_ZN1AD0Ev).8c02753d631046ed95b47845e91297b9_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class A* [line 12]\n  *n$0.f:int=0 [line 12]\n " shape="box"]
 	
 
 	 "A_~A(_ZN1AD0Ev).8c02753d631046ed95b47845e91297b9_3" -> "A_~A(_ZN1AD0Ev).8c02753d631046ed95b47845e91297b9_2" ;
-"A_~A(_ZN1AD0Ev).8c02753d631046ed95b47845e91297b9_2" [label="2: Exit A_~A \n  " color=yellow style=filled]
+"B_~B(_ZN1BD0Ev).9a30ff0f6f3a2cf1000c5ecdda36d53b_1" [label="1: Start B_~B\nFormals:  this:class B*\nLocals:  \n   DECLARE_LOCALS(&return); [line 20]\n " color=yellow style=filled]
 	
 
-"A_~A(_ZN1AD0Ev).8c02753d631046ed95b47845e91297b9_1" [label="1: Start A_~A\nFormals:  this:class A*\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
+	 "B_~B(_ZN1BD0Ev).9a30ff0f6f3a2cf1000c5ecdda36d53b_1" -> "B_~B(_ZN1BD0Ev).9a30ff0f6f3a2cf1000c5ecdda36d53b_3" ;
+"B_~B(_ZN1BD0Ev).9a30ff0f6f3a2cf1000c5ecdda36d53b_2" [label="2: Exit B_~B \n  " color=yellow style=filled]
 	
 
-	 "A_~A(_ZN1AD0Ev).8c02753d631046ed95b47845e91297b9_1" -> "A_~A(_ZN1AD0Ev).8c02753d631046ed95b47845e91297b9_3" ;
+"B_~B(_ZN1BD0Ev).9a30ff0f6f3a2cf1000c5ecdda36d53b_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class B* [line 20]\n  *n$0.f:int=1 [line 20]\n " shape="box"]
+	
+
+	 "B_~B(_ZN1BD0Ev).9a30ff0f6f3a2cf1000c5ecdda36d53b_3" -> "B_~B(_ZN1BD0Ev).9a30ff0f6f3a2cf1000c5ecdda36d53b_2" ;
 }

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

@@ -1,65 +1,65 @@
 /* @generated */
 digraph iCFG {
-"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" [label="3:  DeclStmt \n   _fun_X_X(&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|!pod>$global:class X*) [line 13]\n " shape="box"]
+"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_1" [label="1: Start __infer_globals_initializer_global\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
 	
 
-	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_2" ;
+	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_1" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" ;
 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_2" [label="2: Exit __infer_globals_initializer_global \n  " color=yellow style=filled]
 	
 
-"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_1" [label="1: Start __infer_globals_initializer_global\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
+"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" [label="3:  DeclStmt \n   _fun_X_X(&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|!pod>$global:class X*) [line 13]\n " shape="box"]
 	
 
-	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_1" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" ;
-"X_X{_ZN1XC1ERKS_}.abc525d74d1815a6e1a874d1ed502de3_2" [label="2: Exit X_X \n  " color=yellow style=filled]
+	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_2" ;
+"__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_1" [label="1: Start __infer_globals_initializer_v\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
 	
 
-"X_X{_ZN1XC1ERKS_}.abc525d74d1815a6e1a874d1ed502de3_1" [label="1: Start X_X\nFormals:  this:class X* __param_0:class X&\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
+	 "__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_1" -> "__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_3" ;
+"__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_2" [label="2: Exit __infer_globals_initializer_v \n  " color=yellow style=filled]
 	
 
-	 "X_X{_ZN1XC1ERKS_}.abc525d74d1815a6e1a874d1ed502de3_1" -> "X_X{_ZN1XC1ERKS_}.abc525d74d1815a6e1a874d1ed502de3_2" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class X* [line 15]\n  _fun_X_X(&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|!pod>$global:class X*) [line 13]\n  _fun_X_X(n$0:class X*,&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|!pod>$global:class X&) [line 15]\n " shape="box"]
+"__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_3" [label="3:  DeclStmt \n   *&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp>$v:int=2 [line 17]\n " shape="box"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" [label="2: Exit test \n  " color=yellow style=filled]
+	 "__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_3" -> "__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_2" ;
+"test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_1" [label="1: Start test2\nFormals: \nLocals:  local:int \n   DECLARE_LOCALS(&return,&local); [line 19]\n " color=yellow style=filled]
 	
 
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" [label="1: Start test\nFormals:  __return_param:class X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
+	 "test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_1" -> "test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_4" ;
+"test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_2" [label="2: Exit test2 \n  " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
-"X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_2" [label="2: Exit X_X \n  " color=yellow style=filled]
+"test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_3" [label="3:  Return Stmt \n   *&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp>$v:int=2 [line 21]\n  n$0=*&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp>$v:int [line 21]\n  *&return:int=n$0 [line 21]\n " shape="box"]
 	
 
-"X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_1" [label="1: Start X_X\nFormals:  this:class X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
+	 "test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_3" -> "test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_2" ;
+"test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_4" [label="4:  DeclStmt \n   *&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp>$v:int=2 [line 20]\n  n$1=*&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp>$v:int [line 20]\n  *&local:int=n$1 [line 20]\n " shape="box"]
 	
 
-	 "X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_1" -> "X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_2" ;
-"__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_3" [label="3:  DeclStmt \n   *&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp>$v:int=2 [line 17]\n " shape="box"]
+	 "test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_4" -> "test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_3" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" [label="1: Start test\nFormals:  __return_param:class X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
-	 "__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_3" -> "__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_2" ;
-"__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_2" [label="2: Exit __infer_globals_initializer_v \n  " color=yellow style=filled]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_1" [label="1: Start __infer_globals_initializer_v\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class X* [line 15]\n  _fun_X_X(&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|!pod>$global:class X*) [line 13]\n  _fun_X_X(n$0:class X*,&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|!pod>$global:class X&) [line 15]\n " shape="box"]
 	
 
-	 "__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_1" -> "__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_3" ;
-"test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_4" [label="4:  DeclStmt \n   *&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp>$v:int=2 [line 20]\n  n$1=*&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp>$v:int [line 20]\n  *&local:int=n$1 [line 20]\n " shape="box"]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" ;
+"X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_1" [label="1: Start X_X\nFormals:  this:class X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
 	
 
-	 "test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_4" -> "test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_3" ;
-"test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_3" [label="3:  Return Stmt \n   *&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp>$v:int=2 [line 21]\n  n$0=*&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp>$v:int [line 21]\n  *&return:int=n$0 [line 21]\n " shape="box"]
+	 "X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_1" -> "X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_2" ;
+"X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_2" [label="2: Exit X_X \n  " color=yellow style=filled]
 	
 
-	 "test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_3" -> "test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_2" ;
-"test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_2" [label="2: Exit test2 \n  " color=yellow style=filled]
+"X_X{_ZN1XC1ERKS_}.abc525d74d1815a6e1a874d1ed502de3_1" [label="1: Start X_X\nFormals:  this:class X* __param_0:class X&\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
-"test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_1" [label="1: Start test2\nFormals: \nLocals:  local:int \n   DECLARE_LOCALS(&return,&local); [line 19]\n " color=yellow style=filled]
+	 "X_X{_ZN1XC1ERKS_}.abc525d74d1815a6e1a874d1ed502de3_1" -> "X_X{_ZN1XC1ERKS_}.abc525d74d1815a6e1a874d1ed502de3_2" ;
+"X_X{_ZN1XC1ERKS_}.abc525d74d1815a6e1a874d1ed502de3_2" [label="2: Exit X_X \n  " color=yellow style=filled]
 	
 
-	 "test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_1" -> "test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_4" ;
 }

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

@@ -1,67 +1,67 @@
 /* @generated */
 digraph iCFG {
-"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_8" [label="8:  DeclStmt \n   n$1=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 10]\n  *&#GB<codetoanalyze/cpp/frontend/globals/global_const2.cpp>$global:int=n$1 [line 10]\n " shape="box"]
-	
-
-	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_8" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_2" ;
-"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=3 [line 10]\n " shape="box"]
+"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_1" [label="1: Start __infer_globals_initializer_global\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 10]\n " color=yellow style=filled]
 	
 
-	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_7" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" ;
-"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=2 [line 10]\n " shape="box"]
+	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_1" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_4" ;
+	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_1" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_5" ;
+"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_2" [label="2: Exit __infer_globals_initializer_global \n  " color=yellow style=filled]
 	
 
-	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_6" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" ;
-"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 10]\n " shape="invhouse"]
+"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" [label="3: + \n  " ]
 	
 
-	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_5" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_7" ;
+	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_8" ;
 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 10]\n " shape="invhouse"]
 	
 
 	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_4" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_6" ;
-"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" [label="3: + \n  " ]
+"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 10]\n " shape="invhouse"]
 	
 
-	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_8" ;
-"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_2" [label="2: Exit __infer_globals_initializer_global \n  " color=yellow style=filled]
+	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_5" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_7" ;
+"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=2 [line 10]\n " shape="box"]
 	
 
-"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_1" [label="1: Start __infer_globals_initializer_global\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 10]\n " color=yellow style=filled]
+	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_6" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" ;
+"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=3 [line 10]\n " shape="box"]
 	
 
-	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_1" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_4" ;
-	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_1" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_5" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_8" [label="8:  Return Stmt \n   n$1=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 10]\n  *&#GB<codetoanalyze/cpp/frontend/globals/global_const2.cpp>$global:int=n$1 [line 11]\n  n$2=*&#GB<codetoanalyze/cpp/frontend/globals/global_const2.cpp>$global:int [line 11]\n  *&return:int=n$2 [line 11]\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   n$1=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 10]\n  *&#GB<codetoanalyze/cpp/frontend/globals/global_const2.cpp>$global:int=n$1 [line 10]\n " shape="box"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_8" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=3 [line 10]\n " shape="box"]
+	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_8" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_2" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" [label="1: Start test\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 11]\n " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=2 [line 10]\n " shape="box"]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" ;
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 10]\n " shape="invhouse"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3: + \n  " ]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" ;
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_8" ;
 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" [label="4: Prune (true branch) \n   PRUNE((1 != 0), true); [line 10]\n " shape="invhouse"]
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3: + \n  " ]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" [label="5: Prune (false branch) \n   PRUNE((1 == 0), false); [line 10]\n " shape="invhouse"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_8" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" [label="2: Exit test \n  " color=yellow style=filled]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=2 [line 10]\n " shape="box"]
 	
 
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" [label="1: Start test\nFormals: \nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 11]\n " color=yellow style=filled]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=3 [line 10]\n " shape="box"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" ;
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" ;
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_8" [label="8:  Return Stmt \n   n$1=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 10]\n  *&#GB<codetoanalyze/cpp/frontend/globals/global_const2.cpp>$global:int=n$1 [line 11]\n  n$2=*&#GB<codetoanalyze/cpp/frontend/globals/global_const2.cpp>$global:int [line 11]\n  *&return:int=n$2 [line 11]\n " shape="box"]
+	
+
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_8" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" ;
 }

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

@@ -1,25 +1,25 @@
 /* @generated */
 digraph iCFG {
-"__infer_globals_initializer_x.90ed5779794b6c6f0b00544949bb1047_3" [label="3:  DeclStmt \n   n$0=_fun_foo() [line 14]\n  *&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$x:int=(n$0 + 5) [line 14]\n " shape="box"]
+"__infer_globals_initializer_x.90ed5779794b6c6f0b00544949bb1047_1" [label="1: Start __infer_globals_initializer_x\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
 	
 
-	 "__infer_globals_initializer_x.90ed5779794b6c6f0b00544949bb1047_3" -> "__infer_globals_initializer_x.90ed5779794b6c6f0b00544949bb1047_2" ;
+	 "__infer_globals_initializer_x.90ed5779794b6c6f0b00544949bb1047_1" -> "__infer_globals_initializer_x.90ed5779794b6c6f0b00544949bb1047_3" ;
 "__infer_globals_initializer_x.90ed5779794b6c6f0b00544949bb1047_2" [label="2: Exit __infer_globals_initializer_x \n  " color=yellow style=filled]
 	
 
-"__infer_globals_initializer_x.90ed5779794b6c6f0b00544949bb1047_1" [label="1: Start __infer_globals_initializer_x\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
+"__infer_globals_initializer_x.90ed5779794b6c6f0b00544949bb1047_3" [label="3:  DeclStmt \n   n$0=_fun_foo() [line 14]\n  *&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$x:int=(n$0 + 5) [line 14]\n " shape="box"]
 	
 
-	 "__infer_globals_initializer_x.90ed5779794b6c6f0b00544949bb1047_1" -> "__infer_globals_initializer_x.90ed5779794b6c6f0b00544949bb1047_3" ;
-"__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" [label="3:  DeclStmt \n   n$0=*&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$x:int [line 15]\n  n$1=*&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$z:int [line 15]\n  *&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$y:int=((n$0 + n$1) + 1) [line 15]\n " shape="box"]
+	 "__infer_globals_initializer_x.90ed5779794b6c6f0b00544949bb1047_3" -> "__infer_globals_initializer_x.90ed5779794b6c6f0b00544949bb1047_2" ;
+"__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_1" [label="1: Start __infer_globals_initializer_y\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
-	 "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" -> "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_2" ;
+	 "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_1" -> "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" ;
 "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_2" [label="2: Exit __infer_globals_initializer_y \n  " color=yellow style=filled]
 	
 
-"__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_1" [label="1: Start __infer_globals_initializer_y\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
+"__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" [label="3:  DeclStmt \n   n$0=*&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$x:int [line 15]\n  n$1=*&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$z:int [line 15]\n  *&#GB<codetoanalyze/cpp/frontend/globals/initializer.cpp>$y:int=((n$0 + n$1) + 1) [line 15]\n " shape="box"]
 	
 
-	 "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_1" -> "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" ;
+	 "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" -> "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_2" ;
 }

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

@@ -1,25 +1,25 @@
 /* @generated */
 digraph iCFG {
-"div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 19]\n " shape="box"]
+"div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_1" [label="1: Start div0_fun\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
 	
 
-	 "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_3" -> "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_2" ;
+	 "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_1" -> "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_3" ;
 "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_2" [label="2: Exit div0_fun \n  " color=yellow style=filled]
 	
 
-"div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_1" [label="1: Start div0_fun\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
+"div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 19]\n " shape="box"]
 	
 
-	 "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_1" -> "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_3" ;
-"A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 11]\n " shape="box"]
+	 "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_3" -> "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_2" ;
+"A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_1" [label="1: Start A_div0\nFormals:  this:class A*\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
 	
 
-	 "A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_3" -> "A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_2" ;
+	 "A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_1" -> "A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_3" ;
 "A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_2" [label="2: Exit A_div0 \n  " color=yellow style=filled]
 	
 
-"A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_1" [label="1: Start A_div0\nFormals:  this:class A*\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
+"A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 11]\n " shape="box"]
 	
 
-	 "A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_1" -> "A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_3" ;
+	 "A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_3" -> "A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_2" ;
 }

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

@@ -1,135 +1,135 @@
 /* @generated */
 digraph iCFG {
-"div0_templ<A>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templI1AEiv}.3baadb3ba3ae535eebf13f0f9b178f91_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 23]\n " shape="box"]
+"div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_1" [label="1: Start div0_B_int\nFormals: \nLocals:  b:class B<int> \n   DECLARE_LOCALS(&return,&b); [line 13]\n " color=yellow style=filled]
 	
 
-	 "div0_templ<A>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templI1AEiv}.3baadb3ba3ae535eebf13f0f9b178f91_3" -> "div0_templ<A>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templI1AEiv}.3baadb3ba3ae535eebf13f0f9b178f91_2" ;
-"div0_templ<A>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templI1AEiv}.3baadb3ba3ae535eebf13f0f9b178f91_2" [label="2: Exit div0_templ<A> \n  " color=yellow style=filled]
+	 "div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_1" -> "div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_4" ;
+"div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_2" [label="2: Exit div0_B_int \n  " color=yellow style=filled]
 	
 
-"div0_templ<A>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templI1AEiv}.3baadb3ba3ae535eebf13f0f9b178f91_1" [label="1: Start div0_templ<A>\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 22]\n " color=yellow style=filled]
+"div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_3" [label="3:  Call _fun_B<int>_div0 \n   _=*&b:class B<int> [line 15]\n  n$1=_fun_B<int>_div0(&b:class B<int>&) [line 15]\n " shape="box"]
 	
 
-	 "div0_templ<A>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templI1AEiv}.3baadb3ba3ae535eebf13f0f9b178f91_1" -> "div0_templ<A>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templI1AEiv}.3baadb3ba3ae535eebf13f0f9b178f91_3" ;
-"div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 19]\n " shape="box"]
+	 "div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_3" -> "div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_2" ;
+"div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_4" [label="4:  DeclStmt \n   _fun_B<int>_B(&b:class B<int>*) [line 14]\n " shape="box"]
 	
 
-	 "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_3" -> "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_2" ;
-"div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_2" [label="2: Exit div0_fun \n  " color=yellow style=filled]
+	 "div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_4" -> "div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_3" ;
+"div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_1" [label="1: Start div0_B_A\nFormals: \nLocals:  b:class B<A> \n   DECLARE_LOCALS(&return,&b); [line 18]\n " color=yellow style=filled]
 	
 
-"div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_1" [label="1: Start div0_fun\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
+	 "div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_1" -> "div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_4" ;
+"div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_2" [label="2: Exit div0_B_A \n  " color=yellow style=filled]
 	
 
-	 "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_1" -> "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_3" ;
-"B<int>_B{_ZN1BIiEC1Ev}.0ea2ad6596256d0d6b6107dd3d2895ef_2" [label="2: Exit B<int>_B \n  " color=yellow style=filled]
+"div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_3" [label="3:  Call _fun_B<A>_div0 \n   _=*&b:class B<A> [line 20]\n  n$1=_fun_B<A>_div0(&b:class B<A>&) [line 20]\n " shape="box"]
 	
 
-"B<int>_B{_ZN1BIiEC1Ev}.0ea2ad6596256d0d6b6107dd3d2895ef_1" [label="1: Start B<int>_B\nFormals:  this:class B<int>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
+	 "div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_3" -> "div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_2" ;
+"div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_4" [label="4:  DeclStmt \n   _fun_B<A>_B(&b:class B<A>*) [line 19]\n " shape="box"]
 	
 
-	 "B<int>_B{_ZN1BIiEC1Ev}.0ea2ad6596256d0d6b6107dd3d2895ef_1" -> "B<int>_B{_ZN1BIiEC1Ev}.0ea2ad6596256d0d6b6107dd3d2895ef_2" ;
-"div0_templ_A{d41d8cd98f00b204e9800998ecf8427e_Z12div0_templ_Av}.fbdd336fe5f2a8f600ec90e39155757e_3" [label="3:  Call _fun_div0_templ<A> \n   n$0=_fun_div0_templ<A>() [line 25]\n " shape="box"]
+	 "div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_4" -> "div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_3" ;
+"div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_1" [label="1: Start div0_fun\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
 	
 
-	 "div0_templ_A{d41d8cd98f00b204e9800998ecf8427e_Z12div0_templ_Av}.fbdd336fe5f2a8f600ec90e39155757e_3" -> "div0_templ_A{d41d8cd98f00b204e9800998ecf8427e_Z12div0_templ_Av}.fbdd336fe5f2a8f600ec90e39155757e_2" ;
-"div0_templ_A{d41d8cd98f00b204e9800998ecf8427e_Z12div0_templ_Av}.fbdd336fe5f2a8f600ec90e39155757e_2" [label="2: Exit div0_templ_A \n  " color=yellow style=filled]
+	 "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_1" -> "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_3" ;
+"div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_2" [label="2: Exit div0_fun \n  " color=yellow style=filled]
 	
 
-"div0_templ_A{d41d8cd98f00b204e9800998ecf8427e_Z12div0_templ_Av}.fbdd336fe5f2a8f600ec90e39155757e_1" [label="1: Start div0_templ_A\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 25]\n " color=yellow style=filled]
+"div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 19]\n " shape="box"]
 	
 
-	 "div0_templ_A{d41d8cd98f00b204e9800998ecf8427e_Z12div0_templ_Av}.fbdd336fe5f2a8f600ec90e39155757e_1" -> "div0_templ_A{d41d8cd98f00b204e9800998ecf8427e_Z12div0_templ_Av}.fbdd336fe5f2a8f600ec90e39155757e_3" ;
-"B<A>_div0(_ZN1BI1AE4div0Ev).f18868f324b2038b2d87c90f3ffeeee3_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 16]\n " shape="box"]
+	 "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_3" -> "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_2" ;
+"div0_templ<A>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templI1AEiv}.3baadb3ba3ae535eebf13f0f9b178f91_1" [label="1: Start div0_templ<A>\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 22]\n " color=yellow style=filled]
 	
 
-	 "B<A>_div0(_ZN1BI1AE4div0Ev).f18868f324b2038b2d87c90f3ffeeee3_3" -> "B<A>_div0(_ZN1BI1AE4div0Ev).f18868f324b2038b2d87c90f3ffeeee3_2" ;
-"B<A>_div0(_ZN1BI1AE4div0Ev).f18868f324b2038b2d87c90f3ffeeee3_2" [label="2: Exit B<A>_div0 \n  " color=yellow style=filled]
+	 "div0_templ<A>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templI1AEiv}.3baadb3ba3ae535eebf13f0f9b178f91_1" -> "div0_templ<A>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templI1AEiv}.3baadb3ba3ae535eebf13f0f9b178f91_3" ;
+"div0_templ<A>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templI1AEiv}.3baadb3ba3ae535eebf13f0f9b178f91_2" [label="2: Exit div0_templ<A> \n  " color=yellow style=filled]
 	
 
-"B<A>_div0(_ZN1BI1AE4div0Ev).f18868f324b2038b2d87c90f3ffeeee3_1" [label="1: Start B<A>_div0\nFormals:  this:class B<A>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 16]\n " color=yellow style=filled]
+"div0_templ<A>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templI1AEiv}.3baadb3ba3ae535eebf13f0f9b178f91_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 23]\n " shape="box"]
 	
 
-	 "B<A>_div0(_ZN1BI1AE4div0Ev).f18868f324b2038b2d87c90f3ffeeee3_1" -> "B<A>_div0(_ZN1BI1AE4div0Ev).f18868f324b2038b2d87c90f3ffeeee3_3" ;
-"div0_templ_int{d41d8cd98f00b204e9800998ecf8427e_Z14div0_templ_intv}.c681b16aaa03c5a9e60ccab0486399d4_3" [label="3:  Call _fun_div0_templ<int> \n   n$0=_fun_div0_templ<int>() [line 23]\n " shape="box"]
+	 "div0_templ<A>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templI1AEiv}.3baadb3ba3ae535eebf13f0f9b178f91_3" -> "div0_templ<A>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templI1AEiv}.3baadb3ba3ae535eebf13f0f9b178f91_2" ;
+"div0_templ<int>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templIiEiv}.73e45abf615840e788a88f2dd5b933a1_1" [label="1: Start div0_templ<int>\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 22]\n " color=yellow style=filled]
 	
 
-	 "div0_templ_int{d41d8cd98f00b204e9800998ecf8427e_Z14div0_templ_intv}.c681b16aaa03c5a9e60ccab0486399d4_3" -> "div0_templ_int{d41d8cd98f00b204e9800998ecf8427e_Z14div0_templ_intv}.c681b16aaa03c5a9e60ccab0486399d4_2" ;
-"div0_templ_int{d41d8cd98f00b204e9800998ecf8427e_Z14div0_templ_intv}.c681b16aaa03c5a9e60ccab0486399d4_2" [label="2: Exit div0_templ_int \n  " color=yellow style=filled]
+	 "div0_templ<int>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templIiEiv}.73e45abf615840e788a88f2dd5b933a1_1" -> "div0_templ<int>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templIiEiv}.73e45abf615840e788a88f2dd5b933a1_3" ;
+"div0_templ<int>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templIiEiv}.73e45abf615840e788a88f2dd5b933a1_2" [label="2: Exit div0_templ<int> \n  " color=yellow style=filled]
 	
 
-"div0_templ_int{d41d8cd98f00b204e9800998ecf8427e_Z14div0_templ_intv}.c681b16aaa03c5a9e60ccab0486399d4_1" [label="1: Start div0_templ_int\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 23]\n " color=yellow style=filled]
+"div0_templ<int>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templIiEiv}.73e45abf615840e788a88f2dd5b933a1_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 23]\n " shape="box"]
 	
 
-	 "div0_templ_int{d41d8cd98f00b204e9800998ecf8427e_Z14div0_templ_intv}.c681b16aaa03c5a9e60ccab0486399d4_1" -> "div0_templ_int{d41d8cd98f00b204e9800998ecf8427e_Z14div0_templ_intv}.c681b16aaa03c5a9e60ccab0486399d4_3" ;
-"A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 11]\n " shape="box"]
+	 "div0_templ<int>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templIiEiv}.73e45abf615840e788a88f2dd5b933a1_3" -> "div0_templ<int>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templIiEiv}.73e45abf615840e788a88f2dd5b933a1_2" ;
+"div0_templ_int{d41d8cd98f00b204e9800998ecf8427e_Z14div0_templ_intv}.c681b16aaa03c5a9e60ccab0486399d4_1" [label="1: Start div0_templ_int\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 23]\n " color=yellow style=filled]
 	
 
-	 "A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_3" -> "A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_2" ;
-"A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_2" [label="2: Exit A_div0 \n  " color=yellow style=filled]
+	 "div0_templ_int{d41d8cd98f00b204e9800998ecf8427e_Z14div0_templ_intv}.c681b16aaa03c5a9e60ccab0486399d4_1" -> "div0_templ_int{d41d8cd98f00b204e9800998ecf8427e_Z14div0_templ_intv}.c681b16aaa03c5a9e60ccab0486399d4_3" ;
+"div0_templ_int{d41d8cd98f00b204e9800998ecf8427e_Z14div0_templ_intv}.c681b16aaa03c5a9e60ccab0486399d4_2" [label="2: Exit div0_templ_int \n  " color=yellow style=filled]
 	
 
-"A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_1" [label="1: Start A_div0\nFormals:  this:class A*\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
+"div0_templ_int{d41d8cd98f00b204e9800998ecf8427e_Z14div0_templ_intv}.c681b16aaa03c5a9e60ccab0486399d4_3" [label="3:  Call _fun_div0_templ<int> \n   n$0=_fun_div0_templ<int>() [line 23]\n " shape="box"]
 	
 
-	 "A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_1" -> "A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_3" ;
-"div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_4" [label="4:  DeclStmt \n   _fun_B<A>_B(&b:class B<A>*) [line 19]\n " shape="box"]
+	 "div0_templ_int{d41d8cd98f00b204e9800998ecf8427e_Z14div0_templ_intv}.c681b16aaa03c5a9e60ccab0486399d4_3" -> "div0_templ_int{d41d8cd98f00b204e9800998ecf8427e_Z14div0_templ_intv}.c681b16aaa03c5a9e60ccab0486399d4_2" ;
+"div0_templ_A{d41d8cd98f00b204e9800998ecf8427e_Z12div0_templ_Av}.fbdd336fe5f2a8f600ec90e39155757e_1" [label="1: Start div0_templ_A\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 25]\n " color=yellow style=filled]
 	
 
-	 "div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_4" -> "div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_3" ;
-"div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_3" [label="3:  Call _fun_B<A>_div0 \n   _=*&b:class B<A> [line 20]\n  n$1=_fun_B<A>_div0(&b:class B<A>&) [line 20]\n " shape="box"]
+	 "div0_templ_A{d41d8cd98f00b204e9800998ecf8427e_Z12div0_templ_Av}.fbdd336fe5f2a8f600ec90e39155757e_1" -> "div0_templ_A{d41d8cd98f00b204e9800998ecf8427e_Z12div0_templ_Av}.fbdd336fe5f2a8f600ec90e39155757e_3" ;
+"div0_templ_A{d41d8cd98f00b204e9800998ecf8427e_Z12div0_templ_Av}.fbdd336fe5f2a8f600ec90e39155757e_2" [label="2: Exit div0_templ_A \n  " color=yellow style=filled]
 	
 
-	 "div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_3" -> "div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_2" ;
-"div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_2" [label="2: Exit div0_B_A \n  " color=yellow style=filled]
+"div0_templ_A{d41d8cd98f00b204e9800998ecf8427e_Z12div0_templ_Av}.fbdd336fe5f2a8f600ec90e39155757e_3" [label="3:  Call _fun_div0_templ<A> \n   n$0=_fun_div0_templ<A>() [line 25]\n " shape="box"]
 	
 
-"div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_1" [label="1: Start div0_B_A\nFormals: \nLocals:  b:class B<A> \n   DECLARE_LOCALS(&return,&b); [line 18]\n " color=yellow style=filled]
+	 "div0_templ_A{d41d8cd98f00b204e9800998ecf8427e_Z12div0_templ_Av}.fbdd336fe5f2a8f600ec90e39155757e_3" -> "div0_templ_A{d41d8cd98f00b204e9800998ecf8427e_Z12div0_templ_Av}.fbdd336fe5f2a8f600ec90e39155757e_2" ;
+"A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_1" [label="1: Start A_div0\nFormals:  this:class A*\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
 	
 
-	 "div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_1" -> "div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_4" ;
-"div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_4" [label="4:  DeclStmt \n   _fun_B<int>_B(&b:class B<int>*) [line 14]\n " shape="box"]
+	 "A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_1" -> "A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_3" ;
+"A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_2" [label="2: Exit A_div0 \n  " color=yellow style=filled]
 	
 
-	 "div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_4" -> "div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_3" ;
-"div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_3" [label="3:  Call _fun_B<int>_div0 \n   _=*&b:class B<int> [line 15]\n  n$1=_fun_B<int>_div0(&b:class B<int>&) [line 15]\n " shape="box"]
+"A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 11]\n " shape="box"]
 	
 
-	 "div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_3" -> "div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_2" ;
-"div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_2" [label="2: Exit div0_B_int \n  " color=yellow style=filled]
+	 "A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_3" -> "A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_2" ;
+"B<A>_B{_ZN1BI1AEC1Ev}.8f5152d327f8fb16714da77a1cf709d7_1" [label="1: Start B<A>_B\nFormals:  this:class B<A>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
-"div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_1" [label="1: Start div0_B_int\nFormals: \nLocals:  b:class B<int> \n   DECLARE_LOCALS(&return,&b); [line 13]\n " color=yellow style=filled]
+	 "B<A>_B{_ZN1BI1AEC1Ev}.8f5152d327f8fb16714da77a1cf709d7_1" -> "B<A>_B{_ZN1BI1AEC1Ev}.8f5152d327f8fb16714da77a1cf709d7_2" ;
+"B<A>_B{_ZN1BI1AEC1Ev}.8f5152d327f8fb16714da77a1cf709d7_2" [label="2: Exit B<A>_B \n  " color=yellow style=filled]
 	
 
-	 "div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_1" -> "div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_4" ;
-"B<A>_B{_ZN1BI1AEC1Ev}.8f5152d327f8fb16714da77a1cf709d7_2" [label="2: Exit B<A>_B \n  " color=yellow style=filled]
+"B<A>_div0(_ZN1BI1AE4div0Ev).f18868f324b2038b2d87c90f3ffeeee3_1" [label="1: Start B<A>_div0\nFormals:  this:class B<A>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 16]\n " color=yellow style=filled]
 	
 
-"B<A>_B{_ZN1BI1AEC1Ev}.8f5152d327f8fb16714da77a1cf709d7_1" [label="1: Start B<A>_B\nFormals:  this:class B<A>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
+	 "B<A>_div0(_ZN1BI1AE4div0Ev).f18868f324b2038b2d87c90f3ffeeee3_1" -> "B<A>_div0(_ZN1BI1AE4div0Ev).f18868f324b2038b2d87c90f3ffeeee3_3" ;
+"B<A>_div0(_ZN1BI1AE4div0Ev).f18868f324b2038b2d87c90f3ffeeee3_2" [label="2: Exit B<A>_div0 \n  " color=yellow style=filled]
 	
 
-	 "B<A>_B{_ZN1BI1AEC1Ev}.8f5152d327f8fb16714da77a1cf709d7_1" -> "B<A>_B{_ZN1BI1AEC1Ev}.8f5152d327f8fb16714da77a1cf709d7_2" ;
-"div0_templ<int>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templIiEiv}.73e45abf615840e788a88f2dd5b933a1_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 23]\n " shape="box"]
+"B<A>_div0(_ZN1BI1AE4div0Ev).f18868f324b2038b2d87c90f3ffeeee3_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 16]\n " shape="box"]
 	
 
-	 "div0_templ<int>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templIiEiv}.73e45abf615840e788a88f2dd5b933a1_3" -> "div0_templ<int>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templIiEiv}.73e45abf615840e788a88f2dd5b933a1_2" ;
-"div0_templ<int>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templIiEiv}.73e45abf615840e788a88f2dd5b933a1_2" [label="2: Exit div0_templ<int> \n  " color=yellow style=filled]
+	 "B<A>_div0(_ZN1BI1AE4div0Ev).f18868f324b2038b2d87c90f3ffeeee3_3" -> "B<A>_div0(_ZN1BI1AE4div0Ev).f18868f324b2038b2d87c90f3ffeeee3_2" ;
+"B<int>_B{_ZN1BIiEC1Ev}.0ea2ad6596256d0d6b6107dd3d2895ef_1" [label="1: Start B<int>_B\nFormals:  this:class B<int>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
-"div0_templ<int>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templIiEiv}.73e45abf615840e788a88f2dd5b933a1_1" [label="1: Start div0_templ<int>\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 22]\n " color=yellow style=filled]
+	 "B<int>_B{_ZN1BIiEC1Ev}.0ea2ad6596256d0d6b6107dd3d2895ef_1" -> "B<int>_B{_ZN1BIiEC1Ev}.0ea2ad6596256d0d6b6107dd3d2895ef_2" ;
+"B<int>_B{_ZN1BIiEC1Ev}.0ea2ad6596256d0d6b6107dd3d2895ef_2" [label="2: Exit B<int>_B \n  " color=yellow style=filled]
 	
 
-	 "div0_templ<int>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templIiEiv}.73e45abf615840e788a88f2dd5b933a1_1" -> "div0_templ<int>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templIiEiv}.73e45abf615840e788a88f2dd5b933a1_3" ;
-"B<int>_div0(_ZN1BIiE4div0Ev).9551e764ca77ab3d3fd6584814575acf_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 16]\n " shape="box"]
+"B<int>_div0(_ZN1BIiE4div0Ev).9551e764ca77ab3d3fd6584814575acf_1" [label="1: Start B<int>_div0\nFormals:  this:class B<int>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 16]\n " color=yellow style=filled]
 	
 
-	 "B<int>_div0(_ZN1BIiE4div0Ev).9551e764ca77ab3d3fd6584814575acf_3" -> "B<int>_div0(_ZN1BIiE4div0Ev).9551e764ca77ab3d3fd6584814575acf_2" ;
+	 "B<int>_div0(_ZN1BIiE4div0Ev).9551e764ca77ab3d3fd6584814575acf_1" -> "B<int>_div0(_ZN1BIiE4div0Ev).9551e764ca77ab3d3fd6584814575acf_3" ;
 "B<int>_div0(_ZN1BIiE4div0Ev).9551e764ca77ab3d3fd6584814575acf_2" [label="2: Exit B<int>_div0 \n  " color=yellow style=filled]
 	
 
-"B<int>_div0(_ZN1BIiE4div0Ev).9551e764ca77ab3d3fd6584814575acf_1" [label="1: Start B<int>_div0\nFormals:  this:class B<int>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 16]\n " color=yellow style=filled]
+"B<int>_div0(_ZN1BIiE4div0Ev).9551e764ca77ab3d3fd6584814575acf_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 16]\n " shape="box"]
 	
 
-	 "B<int>_div0(_ZN1BIiE4div0Ev).9551e764ca77ab3d3fd6584814575acf_1" -> "B<int>_div0(_ZN1BIiE4div0Ev).9551e764ca77ab3d3fd6584814575acf_3" ;
+	 "B<int>_div0(_ZN1BIiE4div0Ev).9551e764ca77ab3d3fd6584814575acf_3" -> "B<int>_div0(_ZN1BIiE4div0Ev).9551e764ca77ab3d3fd6584814575acf_2" ;
 }

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

@@ -1,36 +1,36 @@
 /* @generated */
 digraph iCFG {
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_3" [label="3:  Return Stmt \n   n$0=*&a:class A* [line 17]\n  _=*n$0:class A [line 17]\n  n$2=_fun_A_meth_with_self(n$0:class A*,1:int,2:int) [line 17]\n  n$3=_fun_fun_with_self(10:int) [line 17]\n  *&return:int=(n$2 + n$3) [line 17]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_1" [label="1: Start test\nFormals:  a:class A*\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_2" ;
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_3" ;
 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_1" [label="1: Start test\nFormals:  a:class A*\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
-	
-
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_3" ;
-"A_meth_with_self(_ZN1A14meth_with_selfEii).3d68189dc22d8f38e7c0da9ff88e3d4d_3" [label="3:  Return Stmt \n   n$0=*&self:int [line 12]\n  n$1=*&b:int [line 12]\n  *&return:int=(n$0 + n$1) [line 12]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_3" [label="3:  Return Stmt \n   n$0=*&a:class A* [line 17]\n  _=*n$0:class A [line 17]\n  n$2=_fun_A_meth_with_self(n$0:class A*,1:int,2:int) [line 17]\n  n$3=_fun_fun_with_self(10:int) [line 17]\n  *&return:int=(n$2 + n$3) [line 17]\n " shape="box"]
 	
 
-	 "A_meth_with_self(_ZN1A14meth_with_selfEii).3d68189dc22d8f38e7c0da9ff88e3d4d_3" -> "A_meth_with_self(_ZN1A14meth_with_selfEii).3d68189dc22d8f38e7c0da9ff88e3d4d_2" ;
-"A_meth_with_self(_ZN1A14meth_with_selfEii).3d68189dc22d8f38e7c0da9ff88e3d4d_2" [label="2: Exit A_meth_with_self \n  " color=yellow style=filled]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_2" ;
+"fun_with_self{d41d8cd98f00b204e9800998ecf8427e_Z13fun_with_selfi}.233795f267cd90fecfceba5afd62aea4_1" [label="1: Start fun_with_self\nFormals:  self:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
-"A_meth_with_self(_ZN1A14meth_with_selfEii).3d68189dc22d8f38e7c0da9ff88e3d4d_1" [label="1: Start A_meth_with_self\nFormals:  this:class A* self:int b:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
+	 "fun_with_self{d41d8cd98f00b204e9800998ecf8427e_Z13fun_with_selfi}.233795f267cd90fecfceba5afd62aea4_1" -> "fun_with_self{d41d8cd98f00b204e9800998ecf8427e_Z13fun_with_selfi}.233795f267cd90fecfceba5afd62aea4_3" ;
+"fun_with_self{d41d8cd98f00b204e9800998ecf8427e_Z13fun_with_selfi}.233795f267cd90fecfceba5afd62aea4_2" [label="2: Exit fun_with_self \n  " color=yellow style=filled]
 	
 
-	 "A_meth_with_self(_ZN1A14meth_with_selfEii).3d68189dc22d8f38e7c0da9ff88e3d4d_1" -> "A_meth_with_self(_ZN1A14meth_with_selfEii).3d68189dc22d8f38e7c0da9ff88e3d4d_3" ;
 "fun_with_self{d41d8cd98f00b204e9800998ecf8427e_Z13fun_with_selfi}.233795f267cd90fecfceba5afd62aea4_3" [label="3:  Return Stmt \n   n$0=*&self:int [line 15]\n  *&return:int=n$0 [line 15]\n " shape="box"]
 	
 
 	 "fun_with_self{d41d8cd98f00b204e9800998ecf8427e_Z13fun_with_selfi}.233795f267cd90fecfceba5afd62aea4_3" -> "fun_with_self{d41d8cd98f00b204e9800998ecf8427e_Z13fun_with_selfi}.233795f267cd90fecfceba5afd62aea4_2" ;
-"fun_with_self{d41d8cd98f00b204e9800998ecf8427e_Z13fun_with_selfi}.233795f267cd90fecfceba5afd62aea4_2" [label="2: Exit fun_with_self \n  " color=yellow style=filled]
+"A_meth_with_self(_ZN1A14meth_with_selfEii).3d68189dc22d8f38e7c0da9ff88e3d4d_1" [label="1: Start A_meth_with_self\nFormals:  this:class A* self:int b:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
-"fun_with_self{d41d8cd98f00b204e9800998ecf8427e_Z13fun_with_selfi}.233795f267cd90fecfceba5afd62aea4_1" [label="1: Start fun_with_self\nFormals:  self:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
+	 "A_meth_with_self(_ZN1A14meth_with_selfEii).3d68189dc22d8f38e7c0da9ff88e3d4d_1" -> "A_meth_with_self(_ZN1A14meth_with_selfEii).3d68189dc22d8f38e7c0da9ff88e3d4d_3" ;
+"A_meth_with_self(_ZN1A14meth_with_selfEii).3d68189dc22d8f38e7c0da9ff88e3d4d_2" [label="2: Exit A_meth_with_self \n  " color=yellow style=filled]
 	
 
-	 "fun_with_self{d41d8cd98f00b204e9800998ecf8427e_Z13fun_with_selfi}.233795f267cd90fecfceba5afd62aea4_1" -> "fun_with_self{d41d8cd98f00b204e9800998ecf8427e_Z13fun_with_selfi}.233795f267cd90fecfceba5afd62aea4_3" ;
+"A_meth_with_self(_ZN1A14meth_with_selfEii).3d68189dc22d8f38e7c0da9ff88e3d4d_3" [label="3:  Return Stmt \n   n$0=*&self:int [line 12]\n  n$1=*&b:int [line 12]\n  *&return:int=(n$0 + n$1) [line 12]\n " shape="box"]
+	
+
+	 "A_meth_with_self(_ZN1A14meth_with_selfEii).3d68189dc22d8f38e7c0da9ff88e3d4d_3" -> "A_meth_with_self(_ZN1A14meth_with_selfEii).3d68189dc22d8f38e7c0da9ff88e3d4d_2" ;
 }

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

@@ -1,14 +1,14 @@
 /* @generated */
 digraph iCFG {
-"getPtr{d41d8cd98f00b204e9800998ecf8427e_Z6getPtrv}.be2c2699bd3a9fb6e2cd8fd002004d97_3" [label="3:  Return Stmt \n   *&return:int*=null [line 10]\n " shape="box"]
+"getPtr{d41d8cd98f00b204e9800998ecf8427e_Z6getPtrv}.be2c2699bd3a9fb6e2cd8fd002004d97_1" [label="1: Start getPtr\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
-	 "getPtr{d41d8cd98f00b204e9800998ecf8427e_Z6getPtrv}.be2c2699bd3a9fb6e2cd8fd002004d97_3" -> "getPtr{d41d8cd98f00b204e9800998ecf8427e_Z6getPtrv}.be2c2699bd3a9fb6e2cd8fd002004d97_2" ;
+	 "getPtr{d41d8cd98f00b204e9800998ecf8427e_Z6getPtrv}.be2c2699bd3a9fb6e2cd8fd002004d97_1" -> "getPtr{d41d8cd98f00b204e9800998ecf8427e_Z6getPtrv}.be2c2699bd3a9fb6e2cd8fd002004d97_3" ;
 "getPtr{d41d8cd98f00b204e9800998ecf8427e_Z6getPtrv}.be2c2699bd3a9fb6e2cd8fd002004d97_2" [label="2: Exit getPtr \n  " color=yellow style=filled]
 	
 
-"getPtr{d41d8cd98f00b204e9800998ecf8427e_Z6getPtrv}.be2c2699bd3a9fb6e2cd8fd002004d97_1" [label="1: Start getPtr\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
+"getPtr{d41d8cd98f00b204e9800998ecf8427e_Z6getPtrv}.be2c2699bd3a9fb6e2cd8fd002004d97_3" [label="3:  Return Stmt \n   *&return:int*=null [line 10]\n " shape="box"]
 	
 
-	 "getPtr{d41d8cd98f00b204e9800998ecf8427e_Z6getPtrv}.be2c2699bd3a9fb6e2cd8fd002004d97_1" -> "getPtr{d41d8cd98f00b204e9800998ecf8427e_Z6getPtrv}.be2c2699bd3a9fb6e2cd8fd002004d97_3" ;
+	 "getPtr{d41d8cd98f00b204e9800998ecf8427e_Z6getPtrv}.be2c2699bd3a9fb6e2cd8fd002004d97_3" -> "getPtr{d41d8cd98f00b204e9800998ecf8427e_Z6getPtrv}.be2c2699bd3a9fb6e2cd8fd002004d97_2" ;
 }

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

@@ -1,89 +1,89 @@
 /* @generated */
 digraph iCFG {
-"get<ENUM>{d41d8cd98f00b204e9800998ecf8427e_Z3getI4ENUMET_v}.4ed5a54b122c5ff8357f5fcc4523040d_3" [label="3:  Return Stmt \n   *&return:int=0 [line 14]\n " shape="box"]
+"get<ENUM>{d41d8cd98f00b204e9800998ecf8427e_Z3getI4ENUMET_v}.4ed5a54b122c5ff8357f5fcc4523040d_1" [label="1: Start get<ENUM>\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
 	
 
-	 "get<ENUM>{d41d8cd98f00b204e9800998ecf8427e_Z3getI4ENUMET_v}.4ed5a54b122c5ff8357f5fcc4523040d_3" -> "get<ENUM>{d41d8cd98f00b204e9800998ecf8427e_Z3getI4ENUMET_v}.4ed5a54b122c5ff8357f5fcc4523040d_2" ;
+	 "get<ENUM>{d41d8cd98f00b204e9800998ecf8427e_Z3getI4ENUMET_v}.4ed5a54b122c5ff8357f5fcc4523040d_1" -> "get<ENUM>{d41d8cd98f00b204e9800998ecf8427e_Z3getI4ENUMET_v}.4ed5a54b122c5ff8357f5fcc4523040d_3" ;
 "get<ENUM>{d41d8cd98f00b204e9800998ecf8427e_Z3getI4ENUMET_v}.4ed5a54b122c5ff8357f5fcc4523040d_2" [label="2: Exit get<ENUM> \n  " color=yellow style=filled]
 	
 
-"get<ENUM>{d41d8cd98f00b204e9800998ecf8427e_Z3getI4ENUMET_v}.4ed5a54b122c5ff8357f5fcc4523040d_1" [label="1: Start get<ENUM>\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
-	
-
-	 "get<ENUM>{d41d8cd98f00b204e9800998ecf8427e_Z3getI4ENUMET_v}.4ed5a54b122c5ff8357f5fcc4523040d_1" -> "get<ENUM>{d41d8cd98f00b204e9800998ecf8427e_Z3getI4ENUMET_v}.4ed5a54b122c5ff8357f5fcc4523040d_3" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_8" [label="8:  DeclStmt \n   n$3=_fun_get<int>() [line 18]\n  *&i:int=n$3 [line 18]\n " shape="box"]
+"get<ENUM>{d41d8cd98f00b204e9800998ecf8427e_Z3getI4ENUMET_v}.4ed5a54b122c5ff8357f5fcc4523040d_3" [label="3:  Return Stmt \n   *&return:int=0 [line 14]\n " shape="box"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_8" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" [label="7:  DeclStmt \n   n$2=_fun_get<float>() [line 19]\n  *&f:float=n$2 [line 19]\n " shape="box"]
+	 "get<ENUM>{d41d8cd98f00b204e9800998ecf8427e_Z3getI4ENUMET_v}.4ed5a54b122c5ff8357f5fcc4523040d_3" -> "get<ENUM>{d41d8cd98f00b204e9800998ecf8427e_Z3getI4ENUMET_v}.4ed5a54b122c5ff8357f5fcc4523040d_2" ;
+"get<float>{d41d8cd98f00b204e9800998ecf8427e_Z3getIfET_v}.bb4f7b931a0a779909d493eabb9016e3_1" [label="1: Start get<float>\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" [label="6:  DeclStmt \n   n$1=_fun_get<float_*>() [line 20]\n  *&fp:float*=n$1 [line 20]\n " shape="box"]
+	 "get<float>{d41d8cd98f00b204e9800998ecf8427e_Z3getIfET_v}.bb4f7b931a0a779909d493eabb9016e3_1" -> "get<float>{d41d8cd98f00b204e9800998ecf8427e_Z3getIfET_v}.bb4f7b931a0a779909d493eabb9016e3_3" ;
+"get<float>{d41d8cd98f00b204e9800998ecf8427e_Z3getIfET_v}.bb4f7b931a0a779909d493eabb9016e3_2" [label="2: Exit get<float> \n  " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" [label="5:  Call _fun_get<void> \n   _fun_get<void>() [line 21]\n " shape="box"]
+"get<float>{d41d8cd98f00b204e9800998ecf8427e_Z3getIfET_v}.bb4f7b931a0a779909d493eabb9016e3_3" [label="3:  Return Stmt \n   *&return:float=0.000000 [line 14]\n " shape="box"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" [label="4:  DeclStmt \n   n$0=_fun_get<ENUM>() [line 22]\n  *&x:int=n$0 [line 22]\n " shape="box"]
+	 "get<float>{d41d8cd98f00b204e9800998ecf8427e_Z3getIfET_v}.bb4f7b931a0a779909d493eabb9016e3_3" -> "get<float>{d41d8cd98f00b204e9800998ecf8427e_Z3getIfET_v}.bb4f7b931a0a779909d493eabb9016e3_2" ;
+"get<float_*>{d41d8cd98f00b204e9800998ecf8427e_Z3getIPfET_v}.a606f40b6a080a657eabc77950cf13fc_1" [label="1: Start get<float_*>\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  DeclStmt \n   *&f2:float=0.000000 [line 23]\n " shape="box"]
+	 "get<float_*>{d41d8cd98f00b204e9800998ecf8427e_Z3getIPfET_v}.a606f40b6a080a657eabc77950cf13fc_1" -> "get<float_*>{d41d8cd98f00b204e9800998ecf8427e_Z3getIPfET_v}.a606f40b6a080a657eabc77950cf13fc_3" ;
+"get<float_*>{d41d8cd98f00b204e9800998ecf8427e_Z3getIPfET_v}.a606f40b6a080a657eabc77950cf13fc_2" [label="2: Exit get<float_*> \n  " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" [label="2: Exit test \n  " color=yellow style=filled]
+"get<float_*>{d41d8cd98f00b204e9800998ecf8427e_Z3getIPfET_v}.a606f40b6a080a657eabc77950cf13fc_3" [label="3:  Return Stmt \n   *&return:float*=null [line 14]\n " shape="box"]
 	
 
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" [label="1: Start test\nFormals: \nLocals:  f2:float x:int fp:float* f:float i:int \n   DECLARE_LOCALS(&return,&f2,&x,&fp,&f,&i); [line 17]\n " color=yellow style=filled]
+	 "get<float_*>{d41d8cd98f00b204e9800998ecf8427e_Z3getIPfET_v}.a606f40b6a080a657eabc77950cf13fc_3" -> "get<float_*>{d41d8cd98f00b204e9800998ecf8427e_Z3getIPfET_v}.a606f40b6a080a657eabc77950cf13fc_2" ;
+"get<int>{d41d8cd98f00b204e9800998ecf8427e_Z3getIiET_v}.eacb77546e8cfdbecb90f4f20bd66823_1" [label="1: Start get<int>\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_8" ;
-"get<void>{d41d8cd98f00b204e9800998ecf8427e_Z3getIvET_v}.b0acbd5394d155b066384a6997a01a3b_3" [label="3:  Return Stmt \n   *&return:void=-1 [line 14]\n " shape="box"]
+	 "get<int>{d41d8cd98f00b204e9800998ecf8427e_Z3getIiET_v}.eacb77546e8cfdbecb90f4f20bd66823_1" -> "get<int>{d41d8cd98f00b204e9800998ecf8427e_Z3getIiET_v}.eacb77546e8cfdbecb90f4f20bd66823_3" ;
+"get<int>{d41d8cd98f00b204e9800998ecf8427e_Z3getIiET_v}.eacb77546e8cfdbecb90f4f20bd66823_2" [label="2: Exit get<int> \n  " color=yellow style=filled]
 	
 
-	 "get<void>{d41d8cd98f00b204e9800998ecf8427e_Z3getIvET_v}.b0acbd5394d155b066384a6997a01a3b_3" -> "get<void>{d41d8cd98f00b204e9800998ecf8427e_Z3getIvET_v}.b0acbd5394d155b066384a6997a01a3b_2" ;
-"get<void>{d41d8cd98f00b204e9800998ecf8427e_Z3getIvET_v}.b0acbd5394d155b066384a6997a01a3b_2" [label="2: Exit get<void> \n  " color=yellow style=filled]
+"get<int>{d41d8cd98f00b204e9800998ecf8427e_Z3getIiET_v}.eacb77546e8cfdbecb90f4f20bd66823_3" [label="3:  Return Stmt \n   *&return:int=0 [line 14]\n " shape="box"]
 	
 
+	 "get<int>{d41d8cd98f00b204e9800998ecf8427e_Z3getIiET_v}.eacb77546e8cfdbecb90f4f20bd66823_3" -> "get<int>{d41d8cd98f00b204e9800998ecf8427e_Z3getIiET_v}.eacb77546e8cfdbecb90f4f20bd66823_2" ;
 "get<void>{d41d8cd98f00b204e9800998ecf8427e_Z3getIvET_v}.b0acbd5394d155b066384a6997a01a3b_1" [label="1: Start get<void>\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
 	
 
 	 "get<void>{d41d8cd98f00b204e9800998ecf8427e_Z3getIvET_v}.b0acbd5394d155b066384a6997a01a3b_1" -> "get<void>{d41d8cd98f00b204e9800998ecf8427e_Z3getIvET_v}.b0acbd5394d155b066384a6997a01a3b_3" ;
-"get<float>{d41d8cd98f00b204e9800998ecf8427e_Z3getIfET_v}.bb4f7b931a0a779909d493eabb9016e3_3" [label="3:  Return Stmt \n   *&return:float=0.000000 [line 14]\n " shape="box"]
+"get<void>{d41d8cd98f00b204e9800998ecf8427e_Z3getIvET_v}.b0acbd5394d155b066384a6997a01a3b_2" [label="2: Exit get<void> \n  " color=yellow style=filled]
 	
 
-	 "get<float>{d41d8cd98f00b204e9800998ecf8427e_Z3getIfET_v}.bb4f7b931a0a779909d493eabb9016e3_3" -> "get<float>{d41d8cd98f00b204e9800998ecf8427e_Z3getIfET_v}.bb4f7b931a0a779909d493eabb9016e3_2" ;
-"get<float>{d41d8cd98f00b204e9800998ecf8427e_Z3getIfET_v}.bb4f7b931a0a779909d493eabb9016e3_2" [label="2: Exit get<float> \n  " color=yellow style=filled]
+"get<void>{d41d8cd98f00b204e9800998ecf8427e_Z3getIvET_v}.b0acbd5394d155b066384a6997a01a3b_3" [label="3:  Return Stmt \n   *&return:void=-1 [line 14]\n " shape="box"]
 	
 
-"get<float>{d41d8cd98f00b204e9800998ecf8427e_Z3getIfET_v}.bb4f7b931a0a779909d493eabb9016e3_1" [label="1: Start get<float>\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
+	 "get<void>{d41d8cd98f00b204e9800998ecf8427e_Z3getIvET_v}.b0acbd5394d155b066384a6997a01a3b_3" -> "get<void>{d41d8cd98f00b204e9800998ecf8427e_Z3getIvET_v}.b0acbd5394d155b066384a6997a01a3b_2" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" [label="1: Start test\nFormals: \nLocals:  f2:float x:int fp:float* f:float i:int \n   DECLARE_LOCALS(&return,&f2,&x,&fp,&f,&i); [line 17]\n " color=yellow style=filled]
 	
 
-	 "get<float>{d41d8cd98f00b204e9800998ecf8427e_Z3getIfET_v}.bb4f7b931a0a779909d493eabb9016e3_1" -> "get<float>{d41d8cd98f00b204e9800998ecf8427e_Z3getIfET_v}.bb4f7b931a0a779909d493eabb9016e3_3" ;
-"get<int>{d41d8cd98f00b204e9800998ecf8427e_Z3getIiET_v}.eacb77546e8cfdbecb90f4f20bd66823_3" [label="3:  Return Stmt \n   *&return:int=0 [line 14]\n " shape="box"]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_8" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-	 "get<int>{d41d8cd98f00b204e9800998ecf8427e_Z3getIiET_v}.eacb77546e8cfdbecb90f4f20bd66823_3" -> "get<int>{d41d8cd98f00b204e9800998ecf8427e_Z3getIiET_v}.eacb77546e8cfdbecb90f4f20bd66823_2" ;
-"get<int>{d41d8cd98f00b204e9800998ecf8427e_Z3getIiET_v}.eacb77546e8cfdbecb90f4f20bd66823_2" [label="2: Exit get<int> \n  " color=yellow style=filled]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  DeclStmt \n   *&f2:float=0.000000 [line 23]\n " shape="box"]
 	
 
-"get<int>{d41d8cd98f00b204e9800998ecf8427e_Z3getIiET_v}.eacb77546e8cfdbecb90f4f20bd66823_1" [label="1: Start get<int>\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" [label="4:  DeclStmt \n   n$0=_fun_get<ENUM>() [line 22]\n  *&x:int=n$0 [line 22]\n " shape="box"]
 	
 
-	 "get<int>{d41d8cd98f00b204e9800998ecf8427e_Z3getIiET_v}.eacb77546e8cfdbecb90f4f20bd66823_1" -> "get<int>{d41d8cd98f00b204e9800998ecf8427e_Z3getIiET_v}.eacb77546e8cfdbecb90f4f20bd66823_3" ;
-"get<float_*>{d41d8cd98f00b204e9800998ecf8427e_Z3getIPfET_v}.a606f40b6a080a657eabc77950cf13fc_3" [label="3:  Return Stmt \n   *&return:float*=null [line 14]\n " shape="box"]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" [label="5:  Call _fun_get<void> \n   _fun_get<void>() [line 21]\n " shape="box"]
 	
 
-	 "get<float_*>{d41d8cd98f00b204e9800998ecf8427e_Z3getIPfET_v}.a606f40b6a080a657eabc77950cf13fc_3" -> "get<float_*>{d41d8cd98f00b204e9800998ecf8427e_Z3getIPfET_v}.a606f40b6a080a657eabc77950cf13fc_2" ;
-"get<float_*>{d41d8cd98f00b204e9800998ecf8427e_Z3getIPfET_v}.a606f40b6a080a657eabc77950cf13fc_2" [label="2: Exit get<float_*> \n  " color=yellow style=filled]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" [label="6:  DeclStmt \n   n$1=_fun_get<float_*>() [line 20]\n  *&fp:float*=n$1 [line 20]\n " shape="box"]
 	
 
-"get<float_*>{d41d8cd98f00b204e9800998ecf8427e_Z3getIPfET_v}.a606f40b6a080a657eabc77950cf13fc_1" [label="1: Start get<float_*>\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" [label="7:  DeclStmt \n   n$2=_fun_get<float>() [line 19]\n  *&f:float=n$2 [line 19]\n " shape="box"]
 	
 
-	 "get<float_*>{d41d8cd98f00b204e9800998ecf8427e_Z3getIPfET_v}.a606f40b6a080a657eabc77950cf13fc_1" -> "get<float_*>{d41d8cd98f00b204e9800998ecf8427e_Z3getIPfET_v}.a606f40b6a080a657eabc77950cf13fc_3" ;
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_8" [label="8:  DeclStmt \n   n$3=_fun_get<int>() [line 18]\n  *&i:int=n$3 [line 18]\n " shape="box"]
+	
+
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_8" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" ;
 }

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

@@ -1,166 +1,166 @@
 /* @generated */
 digraph iCFG {
-"vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_6" [label="6:  Constructor Init \n   n$4=*&this:class vec* [line 24]\n  _fun_iterator_iterator(n$4.begin_:class iterator*) [line 24]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" [label="1: Start test\nFormals: \nLocals:  __end:class iterator 0$?%__sil_tmpSIL_materialize_temp__n$0:class iterator __begin:class iterator 0$?%__sil_tmpSIL_materialize_temp__n$4:class iterator 0$?%__sil_tmp__temp_return_n$9:class iterator 0$?%__sil_tmp__temp_construct_n$10:class iterator 0$?%__sil_tmp__temp_construct_n$11:class iterator temp:int value:int __range:class vec& vector:class vec \n   DECLARE_LOCALS(&return,&__end,&0$?%__sil_tmpSIL_materialize_temp__n$0,&__begin,&0$?%__sil_tmpSIL_materialize_temp__n$4,&0$?%__sil_tmp__temp_return_n$9,&0$?%__sil_tmp__temp_construct_n$10,&0$?%__sil_tmp__temp_construct_n$11,&temp,&value,&__range,&vector); [line 35]\n " color=yellow style=filled]
 	
 
-	 "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_6" -> "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_5" ;
-"vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_5" [label="5:  Constructor Init \n   n$3=*&this:class vec* [line 24]\n  _fun_iterator_iterator(n$3.end_:class iterator*) [line 24]\n " shape="box"]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_13" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-	 "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_5" -> "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_4" ;
-"vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:class vec* [line 25]\n  *n$2.begin_.val:int=0 [line 25]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3: + \n  " ]
 	
 
-	 "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_4" -> "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_3" ;
-"vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class vec* [line 26]\n  n$1=*&size:int [line 26]\n  *n$0.end_.val:int=n$1 [line 26]\n " shape="box"]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" [label="4:  DeclStmt \n   n$1=*&__range:class vec& [line 37]\n  _=*n$1:class vec [line 37]\n  _fun_vec_end(n$1:class vec&,&0$?%__sil_tmpSIL_materialize_temp__n$0:class iterator*) [line 37]\n  _fun_iterator_iterator(&__end:class iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$0:class iterator&) [line 37]\n " shape="box"]
 	
 
-	 "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_3" -> "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_2" ;
-"vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_2" [label="2: Exit vec_vec \n  " color=yellow style=filled]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" [label="5:  DeclStmt \n   n$5=*&__range:class vec& [line 37]\n  _=*n$5:class vec [line 37]\n  _fun_vec_begin(n$5:class vec&,&0$?%__sil_tmpSIL_materialize_temp__n$4:class iterator*) [line 37]\n  _fun_iterator_iterator(&__begin:class iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$4:class iterator&) [line 37]\n " shape="box"]
 	
 
-"vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_1" [label="1: Start vec_vec\nFormals:  this:class vec* size:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 24]\n " color=yellow style=filled]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" [label="6:  Call _fun_iterator_operator++ \n   _fun_iterator_operator++(&__begin:class iterator&,&0$?%__sil_tmp__temp_return_n$9:class iterator*) [line 37]\n " shape="box"]
 	
 
-	 "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_1" -> "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_6" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_13" [label="13:  DeclStmt \n   _fun_vec_vec(&vector:class vec*,10:int) [line 36]\n " shape="box"]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" [label="7:  Call _fun_operator!= \n   _fun_iterator_iterator(&0$?%__sil_tmp__temp_construct_n$10:class iterator*,&__begin:class iterator&) [line 37]\n  _fun_iterator_iterator(&0$?%__sil_tmp__temp_construct_n$11:class iterator*,&__end:class iterator&) [line 37]\n  n$12=_fun_operator!=(&0$?%__sil_tmp__temp_construct_n$10:class iterator,&0$?%__sil_tmp__temp_construct_n$11:class iterator) [line 37]\n " shape="box"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_13" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_12" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_12" [label="12:  DeclStmt \n   *&__range:class vec&=&vector [line 37]\n " shape="box"]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_8" ;
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_9" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_8" [label="8: Prune (true branch) \n   PRUNE((n$12 != 0), true); [line 37]\n " shape="invhouse"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_12" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_11" [label="11:  DeclStmt \n   n$15=_fun_iterator_operator*(&__begin:class iterator&) [line 37]\n  *&value:int=n$15 [line 37]\n " shape="box"]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_8" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_11" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_9" [label="9: Prune (false branch) \n   PRUNE((n$12 == 0), false); [line 37]\n " shape="invhouse"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_11" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_10" ;
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_9" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" ;
 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_10" [label="10:  DeclStmt \n   n$13=*&value:int [line 38]\n  n$14=*&value:int [line 38]\n  *&temp:int=((n$13 * n$14) + 10) [line 38]\n " shape="box"]
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_10" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_9" [label="9: Prune (false branch) \n   PRUNE((n$12 == 0), false); [line 37]\n " shape="invhouse"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_11" [label="11:  DeclStmt \n   n$15=_fun_iterator_operator*(&__begin:class iterator&) [line 37]\n  *&value:int=n$15 [line 37]\n " shape="box"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_9" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_8" [label="8: Prune (true branch) \n   PRUNE((n$12 != 0), true); [line 37]\n " shape="invhouse"]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_11" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_10" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_12" [label="12:  DeclStmt \n   *&__range:class vec&=&vector [line 37]\n " shape="box"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_8" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_11" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" [label="7:  Call _fun_operator!= \n   _fun_iterator_iterator(&0$?%__sil_tmp__temp_construct_n$10:class iterator*,&__begin:class iterator&) [line 37]\n  _fun_iterator_iterator(&0$?%__sil_tmp__temp_construct_n$11:class iterator*,&__end:class iterator&) [line 37]\n  n$12=_fun_operator!=(&0$?%__sil_tmp__temp_construct_n$10:class iterator,&0$?%__sil_tmp__temp_construct_n$11:class iterator) [line 37]\n " shape="box"]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_12" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_13" [label="13:  DeclStmt \n   _fun_vec_vec(&vector:class vec*,10:int) [line 36]\n " shape="box"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_8" ;
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_9" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" [label="6:  Call _fun_iterator_operator++ \n   _fun_iterator_operator++(&__begin:class iterator&,&0$?%__sil_tmp__temp_return_n$9:class iterator*) [line 37]\n " shape="box"]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_13" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_12" ;
+"operator!={d41d8cd98f00b204e9800998ecf8427e_Zne8iteratorS_}.f92125b8648f9224012c80de0debd540_1" [label="1: Start operator!=\nFormals:  i1:class iterator& i2:class iterator&\nLocals:  \n   DECLARE_LOCALS(&return); [line 21]\n " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" [label="5:  DeclStmt \n   n$5=*&__range:class vec& [line 37]\n  _=*n$5:class vec [line 37]\n  _fun_vec_begin(n$5:class vec&,&0$?%__sil_tmpSIL_materialize_temp__n$4:class iterator*) [line 37]\n  _fun_iterator_iterator(&__begin:class iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$4:class iterator&) [line 37]\n " shape="box"]
+	 "operator!={d41d8cd98f00b204e9800998ecf8427e_Zne8iteratorS_}.f92125b8648f9224012c80de0debd540_1" -> "operator!={d41d8cd98f00b204e9800998ecf8427e_Zne8iteratorS_}.f92125b8648f9224012c80de0debd540_3" ;
+"operator!={d41d8cd98f00b204e9800998ecf8427e_Zne8iteratorS_}.f92125b8648f9224012c80de0debd540_2" [label="2: Exit operator!= \n  " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" [label="4:  DeclStmt \n   n$1=*&__range:class vec& [line 37]\n  _=*n$1:class vec [line 37]\n  _fun_vec_end(n$1:class vec&,&0$?%__sil_tmpSIL_materialize_temp__n$0:class iterator*) [line 37]\n  _fun_iterator_iterator(&__end:class iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$0:class iterator&) [line 37]\n " shape="box"]
+"operator!={d41d8cd98f00b204e9800998ecf8427e_Zne8iteratorS_}.f92125b8648f9224012c80de0debd540_3" [label="3:  Return Stmt \n   n$0=*&i1:class iterator& [line 21]\n  n$1=*n$0.val:int [line 21]\n  n$2=*&i2:class iterator& [line 21]\n  n$3=*n$2.val:int [line 21]\n  *&return:_Bool=(n$1 != n$3) [line 21]\n " shape="box"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3: + \n  " ]
+	 "operator!={d41d8cd98f00b204e9800998ecf8427e_Zne8iteratorS_}.f92125b8648f9224012c80de0debd540_3" -> "operator!={d41d8cd98f00b204e9800998ecf8427e_Zne8iteratorS_}.f92125b8648f9224012c80de0debd540_2" ;
+"iterator_iterator{_ZN8iteratorC1Ev}.09b96b797de166c956fbed19c17323fc_1" [label="1: Start iterator_iterator\nFormals:  this:class iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" [label="2: Exit test \n  " color=yellow style=filled]
+	 "iterator_iterator{_ZN8iteratorC1Ev}.09b96b797de166c956fbed19c17323fc_1" -> "iterator_iterator{_ZN8iteratorC1Ev}.09b96b797de166c956fbed19c17323fc_2" ;
+"iterator_iterator{_ZN8iteratorC1Ev}.09b96b797de166c956fbed19c17323fc_2" [label="2: Exit iterator_iterator \n  " color=yellow style=filled]
 	
 
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" [label="1: Start test\nFormals: \nLocals:  __end:class iterator 0$?%__sil_tmpSIL_materialize_temp__n$0:class iterator __begin:class iterator 0$?%__sil_tmpSIL_materialize_temp__n$4:class iterator 0$?%__sil_tmp__temp_return_n$9:class iterator 0$?%__sil_tmp__temp_construct_n$10:class iterator 0$?%__sil_tmp__temp_construct_n$11:class iterator temp:int value:int __range:class vec& vector:class vec \n   DECLARE_LOCALS(&return,&__end,&0$?%__sil_tmpSIL_materialize_temp__n$0,&__begin,&0$?%__sil_tmpSIL_materialize_temp__n$4,&0$?%__sil_tmp__temp_return_n$9,&0$?%__sil_tmp__temp_construct_n$10,&0$?%__sil_tmp__temp_construct_n$11,&temp,&value,&__range,&vector); [line 35]\n " color=yellow style=filled]
+"iterator_operator*(_ZN8iteratordeEv).e460522f307f6432268293a6c37dd0aa_1" [label="1: Start iterator_operator*\nFormals:  this:class iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_13" ;
-"iterator_iterator{_ZN8iteratorC1Ev}.09b96b797de166c956fbed19c17323fc_2" [label="2: Exit iterator_iterator \n  " color=yellow style=filled]
+	 "iterator_operator*(_ZN8iteratordeEv).e460522f307f6432268293a6c37dd0aa_1" -> "iterator_operator*(_ZN8iteratordeEv).e460522f307f6432268293a6c37dd0aa_3" ;
+"iterator_operator*(_ZN8iteratordeEv).e460522f307f6432268293a6c37dd0aa_2" [label="2: Exit iterator_operator* \n  " color=yellow style=filled]
 	
 
-"iterator_iterator{_ZN8iteratorC1Ev}.09b96b797de166c956fbed19c17323fc_1" [label="1: Start iterator_iterator\nFormals:  this:class iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
+"iterator_operator*(_ZN8iteratordeEv).e460522f307f6432268293a6c37dd0aa_3" [label="3:  Return Stmt \n   n$0=*&this:class iterator* [line 18]\n  n$1=*n$0.val:int [line 18]\n  *&return:int=n$1 [line 18]\n " shape="box"]
 	
 
-	 "iterator_iterator{_ZN8iteratorC1Ev}.09b96b797de166c956fbed19c17323fc_1" -> "iterator_iterator{_ZN8iteratorC1Ev}.09b96b797de166c956fbed19c17323fc_2" ;
-"vec_end(_ZN3vec3endEv).10f3f6cacb54f275be62f732deacc51b_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class iterator* [line 29]\n  n$1=*&this:class vec* [line 29]\n  _fun_iterator_iterator(n$0:class iterator*,n$1.end_:class iterator&) [line 29]\n " shape="box"]
+	 "iterator_operator*(_ZN8iteratordeEv).e460522f307f6432268293a6c37dd0aa_3" -> "iterator_operator*(_ZN8iteratordeEv).e460522f307f6432268293a6c37dd0aa_2" ;
+"iterator_iterator{_ZN8iteratorC1EOS_}.ce89d5b0065e7c4158c49d59661dc5c1_1" [label="1: Start iterator_iterator\nFormals:  this:class iterator* __param_0:class iterator&\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
 	
 
-	 "vec_end(_ZN3vec3endEv).10f3f6cacb54f275be62f732deacc51b_3" -> "vec_end(_ZN3vec3endEv).10f3f6cacb54f275be62f732deacc51b_2" ;
-"vec_end(_ZN3vec3endEv).10f3f6cacb54f275be62f732deacc51b_2" [label="2: Exit vec_end \n  " color=yellow style=filled]
+	 "iterator_iterator{_ZN8iteratorC1EOS_}.ce89d5b0065e7c4158c49d59661dc5c1_1" -> "iterator_iterator{_ZN8iteratorC1EOS_}.ce89d5b0065e7c4158c49d59661dc5c1_3" ;
+"iterator_iterator{_ZN8iteratorC1EOS_}.ce89d5b0065e7c4158c49d59661dc5c1_2" [label="2: Exit iterator_iterator \n  " color=yellow style=filled]
 	
 
-"vec_end(_ZN3vec3endEv).10f3f6cacb54f275be62f732deacc51b_1" [label="1: Start vec_end\nFormals:  this:class vec* __return_param:class iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 29]\n " color=yellow style=filled]
+"iterator_iterator{_ZN8iteratorC1EOS_}.ce89d5b0065e7c4158c49d59661dc5c1_3" [label="3:  Constructor Init \n   n$0=*&this:class iterator* [line 11]\n  n$1=*&__param_0:class iterator& [line 11]\n  n$2=*n$1.val:int [line 11]\n  *n$0.val:int=n$2 [line 11]\n " shape="box"]
 	
 
-	 "vec_end(_ZN3vec3endEv).10f3f6cacb54f275be62f732deacc51b_1" -> "vec_end(_ZN3vec3endEv).10f3f6cacb54f275be62f732deacc51b_3" ;
-"iterator_operator++(_ZN8iteratorppEv).2e1161a14150ad94339284d7de16e655_4" [label="4:  BinaryOperatorStmt: AddAssign \n   n$2=*&this:class iterator* [line 14]\n  n$3=*n$2.val:int [line 14]\n  *n$2.val:int=(n$3 + 1) [line 14]\n " shape="box"]
+	 "iterator_iterator{_ZN8iteratorC1EOS_}.ce89d5b0065e7c4158c49d59661dc5c1_3" -> "iterator_iterator{_ZN8iteratorC1EOS_}.ce89d5b0065e7c4158c49d59661dc5c1_2" ;
+"iterator_iterator{_ZN8iteratorC1ERKS_}.fcda12fc9b260caa840e7342dd86ae6f_1" [label="1: Start iterator_iterator\nFormals:  this:class iterator* __param_0:class iterator&\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
 	
 
-	 "iterator_operator++(_ZN8iteratorppEv).2e1161a14150ad94339284d7de16e655_4" -> "iterator_operator++(_ZN8iteratorppEv).2e1161a14150ad94339284d7de16e655_3" ;
-"iterator_operator++(_ZN8iteratorppEv).2e1161a14150ad94339284d7de16e655_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class iterator* [line 15]\n  n$1=*&this:class iterator* [line 15]\n  _fun_iterator_iterator(n$0:class iterator*,n$1:class iterator&) [line 15]\n " shape="box"]
+	 "iterator_iterator{_ZN8iteratorC1ERKS_}.fcda12fc9b260caa840e7342dd86ae6f_1" -> "iterator_iterator{_ZN8iteratorC1ERKS_}.fcda12fc9b260caa840e7342dd86ae6f_3" ;
+"iterator_iterator{_ZN8iteratorC1ERKS_}.fcda12fc9b260caa840e7342dd86ae6f_2" [label="2: Exit iterator_iterator \n  " color=yellow style=filled]
 	
 
-	 "iterator_operator++(_ZN8iteratorppEv).2e1161a14150ad94339284d7de16e655_3" -> "iterator_operator++(_ZN8iteratorppEv).2e1161a14150ad94339284d7de16e655_2" ;
-"iterator_operator++(_ZN8iteratorppEv).2e1161a14150ad94339284d7de16e655_2" [label="2: Exit iterator_operator++ \n  " color=yellow style=filled]
+"iterator_iterator{_ZN8iteratorC1ERKS_}.fcda12fc9b260caa840e7342dd86ae6f_3" [label="3:  Constructor Init \n   n$0=*&this:class iterator* [line 11]\n  n$1=*&__param_0:class iterator& [line 11]\n  n$2=*n$1.val:int [line 11]\n  *n$0.val:int=n$2 [line 11]\n " shape="box"]
 	
 
+	 "iterator_iterator{_ZN8iteratorC1ERKS_}.fcda12fc9b260caa840e7342dd86ae6f_3" -> "iterator_iterator{_ZN8iteratorC1ERKS_}.fcda12fc9b260caa840e7342dd86ae6f_2" ;
 "iterator_operator++(_ZN8iteratorppEv).2e1161a14150ad94339284d7de16e655_1" [label="1: Start iterator_operator++\nFormals:  this:class iterator* __return_param:class iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
 	
 
 	 "iterator_operator++(_ZN8iteratorppEv).2e1161a14150ad94339284d7de16e655_1" -> "iterator_operator++(_ZN8iteratorppEv).2e1161a14150ad94339284d7de16e655_4" ;
-"iterator_iterator{_ZN8iteratorC1EOS_}.ce89d5b0065e7c4158c49d59661dc5c1_3" [label="3:  Constructor Init \n   n$0=*&this:class iterator* [line 11]\n  n$1=*&__param_0:class iterator& [line 11]\n  n$2=*n$1.val:int [line 11]\n  *n$0.val:int=n$2 [line 11]\n " shape="box"]
+"iterator_operator++(_ZN8iteratorppEv).2e1161a14150ad94339284d7de16e655_2" [label="2: Exit iterator_operator++ \n  " color=yellow style=filled]
 	
 
-	 "iterator_iterator{_ZN8iteratorC1EOS_}.ce89d5b0065e7c4158c49d59661dc5c1_3" -> "iterator_iterator{_ZN8iteratorC1EOS_}.ce89d5b0065e7c4158c49d59661dc5c1_2" ;
-"iterator_iterator{_ZN8iteratorC1EOS_}.ce89d5b0065e7c4158c49d59661dc5c1_2" [label="2: Exit iterator_iterator \n  " color=yellow style=filled]
+"iterator_operator++(_ZN8iteratorppEv).2e1161a14150ad94339284d7de16e655_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class iterator* [line 15]\n  n$1=*&this:class iterator* [line 15]\n  _fun_iterator_iterator(n$0:class iterator*,n$1:class iterator&) [line 15]\n " shape="box"]
 	
 
-"iterator_iterator{_ZN8iteratorC1EOS_}.ce89d5b0065e7c4158c49d59661dc5c1_1" [label="1: Start iterator_iterator\nFormals:  this:class iterator* __param_0:class iterator&\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
+	 "iterator_operator++(_ZN8iteratorppEv).2e1161a14150ad94339284d7de16e655_3" -> "iterator_operator++(_ZN8iteratorppEv).2e1161a14150ad94339284d7de16e655_2" ;
+"iterator_operator++(_ZN8iteratorppEv).2e1161a14150ad94339284d7de16e655_4" [label="4:  BinaryOperatorStmt: AddAssign \n   n$2=*&this:class iterator* [line 14]\n  n$3=*n$2.val:int [line 14]\n  *n$2.val:int=(n$3 + 1) [line 14]\n " shape="box"]
 	
 
-	 "iterator_iterator{_ZN8iteratorC1EOS_}.ce89d5b0065e7c4158c49d59661dc5c1_1" -> "iterator_iterator{_ZN8iteratorC1EOS_}.ce89d5b0065e7c4158c49d59661dc5c1_3" ;
-"vec_begin(_ZN3vec5beginEv).e886548e7d905cb0a20da338610da393_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class iterator* [line 28]\n  n$1=*&this:class vec* [line 28]\n  _fun_iterator_iterator(n$0:class iterator*,n$1.begin_:class iterator&) [line 28]\n " shape="box"]
+	 "iterator_operator++(_ZN8iteratorppEv).2e1161a14150ad94339284d7de16e655_4" -> "iterator_operator++(_ZN8iteratorppEv).2e1161a14150ad94339284d7de16e655_3" ;
+"vec_begin(_ZN3vec5beginEv).e886548e7d905cb0a20da338610da393_1" [label="1: Start vec_begin\nFormals:  this:class vec* __return_param:class iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 28]\n " color=yellow style=filled]
 	
 
-	 "vec_begin(_ZN3vec5beginEv).e886548e7d905cb0a20da338610da393_3" -> "vec_begin(_ZN3vec5beginEv).e886548e7d905cb0a20da338610da393_2" ;
+	 "vec_begin(_ZN3vec5beginEv).e886548e7d905cb0a20da338610da393_1" -> "vec_begin(_ZN3vec5beginEv).e886548e7d905cb0a20da338610da393_3" ;
 "vec_begin(_ZN3vec5beginEv).e886548e7d905cb0a20da338610da393_2" [label="2: Exit vec_begin \n  " color=yellow style=filled]
 	
 
-"vec_begin(_ZN3vec5beginEv).e886548e7d905cb0a20da338610da393_1" [label="1: Start vec_begin\nFormals:  this:class vec* __return_param:class iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 28]\n " color=yellow style=filled]
+"vec_begin(_ZN3vec5beginEv).e886548e7d905cb0a20da338610da393_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class iterator* [line 28]\n  n$1=*&this:class vec* [line 28]\n  _fun_iterator_iterator(n$0:class iterator*,n$1.begin_:class iterator&) [line 28]\n " shape="box"]
 	
 
-	 "vec_begin(_ZN3vec5beginEv).e886548e7d905cb0a20da338610da393_1" -> "vec_begin(_ZN3vec5beginEv).e886548e7d905cb0a20da338610da393_3" ;
-"operator!={d41d8cd98f00b204e9800998ecf8427e_Zne8iteratorS_}.f92125b8648f9224012c80de0debd540_3" [label="3:  Return Stmt \n   n$0=*&i1:class iterator& [line 21]\n  n$1=*n$0.val:int [line 21]\n  n$2=*&i2:class iterator& [line 21]\n  n$3=*n$2.val:int [line 21]\n  *&return:_Bool=(n$1 != n$3) [line 21]\n " shape="box"]
+	 "vec_begin(_ZN3vec5beginEv).e886548e7d905cb0a20da338610da393_3" -> "vec_begin(_ZN3vec5beginEv).e886548e7d905cb0a20da338610da393_2" ;
+"vec_end(_ZN3vec3endEv).10f3f6cacb54f275be62f732deacc51b_1" [label="1: Start vec_end\nFormals:  this:class vec* __return_param:class iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 29]\n " color=yellow style=filled]
 	
 
-	 "operator!={d41d8cd98f00b204e9800998ecf8427e_Zne8iteratorS_}.f92125b8648f9224012c80de0debd540_3" -> "operator!={d41d8cd98f00b204e9800998ecf8427e_Zne8iteratorS_}.f92125b8648f9224012c80de0debd540_2" ;
-"operator!={d41d8cd98f00b204e9800998ecf8427e_Zne8iteratorS_}.f92125b8648f9224012c80de0debd540_2" [label="2: Exit operator!= \n  " color=yellow style=filled]
+	 "vec_end(_ZN3vec3endEv).10f3f6cacb54f275be62f732deacc51b_1" -> "vec_end(_ZN3vec3endEv).10f3f6cacb54f275be62f732deacc51b_3" ;
+"vec_end(_ZN3vec3endEv).10f3f6cacb54f275be62f732deacc51b_2" [label="2: Exit vec_end \n  " color=yellow style=filled]
 	
 
-"operator!={d41d8cd98f00b204e9800998ecf8427e_Zne8iteratorS_}.f92125b8648f9224012c80de0debd540_1" [label="1: Start operator!=\nFormals:  i1:class iterator& i2:class iterator&\nLocals:  \n   DECLARE_LOCALS(&return); [line 21]\n " color=yellow style=filled]
+"vec_end(_ZN3vec3endEv).10f3f6cacb54f275be62f732deacc51b_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class iterator* [line 29]\n  n$1=*&this:class vec* [line 29]\n  _fun_iterator_iterator(n$0:class iterator*,n$1.end_:class iterator&) [line 29]\n " shape="box"]
 	
 
-	 "operator!={d41d8cd98f00b204e9800998ecf8427e_Zne8iteratorS_}.f92125b8648f9224012c80de0debd540_1" -> "operator!={d41d8cd98f00b204e9800998ecf8427e_Zne8iteratorS_}.f92125b8648f9224012c80de0debd540_3" ;
-"iterator_iterator{_ZN8iteratorC1ERKS_}.fcda12fc9b260caa840e7342dd86ae6f_3" [label="3:  Constructor Init \n   n$0=*&this:class iterator* [line 11]\n  n$1=*&__param_0:class iterator& [line 11]\n  n$2=*n$1.val:int [line 11]\n  *n$0.val:int=n$2 [line 11]\n " shape="box"]
+	 "vec_end(_ZN3vec3endEv).10f3f6cacb54f275be62f732deacc51b_3" -> "vec_end(_ZN3vec3endEv).10f3f6cacb54f275be62f732deacc51b_2" ;
+"vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_1" [label="1: Start vec_vec\nFormals:  this:class vec* size:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 24]\n " color=yellow style=filled]
 	
 
-	 "iterator_iterator{_ZN8iteratorC1ERKS_}.fcda12fc9b260caa840e7342dd86ae6f_3" -> "iterator_iterator{_ZN8iteratorC1ERKS_}.fcda12fc9b260caa840e7342dd86ae6f_2" ;
-"iterator_iterator{_ZN8iteratorC1ERKS_}.fcda12fc9b260caa840e7342dd86ae6f_2" [label="2: Exit iterator_iterator \n  " color=yellow style=filled]
+	 "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_1" -> "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_6" ;
+"vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_2" [label="2: Exit vec_vec \n  " color=yellow style=filled]
 	
 
-"iterator_iterator{_ZN8iteratorC1ERKS_}.fcda12fc9b260caa840e7342dd86ae6f_1" [label="1: Start iterator_iterator\nFormals:  this:class iterator* __param_0:class iterator&\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
+"vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class vec* [line 26]\n  n$1=*&size:int [line 26]\n  *n$0.end_.val:int=n$1 [line 26]\n " shape="box"]
 	
 
-	 "iterator_iterator{_ZN8iteratorC1ERKS_}.fcda12fc9b260caa840e7342dd86ae6f_1" -> "iterator_iterator{_ZN8iteratorC1ERKS_}.fcda12fc9b260caa840e7342dd86ae6f_3" ;
-"iterator_operator*(_ZN8iteratordeEv).e460522f307f6432268293a6c37dd0aa_3" [label="3:  Return Stmt \n   n$0=*&this:class iterator* [line 18]\n  n$1=*n$0.val:int [line 18]\n  *&return:int=n$1 [line 18]\n " shape="box"]
+	 "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_3" -> "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_2" ;
+"vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:class vec* [line 25]\n  *n$2.begin_.val:int=0 [line 25]\n " shape="box"]
 	
 
-	 "iterator_operator*(_ZN8iteratordeEv).e460522f307f6432268293a6c37dd0aa_3" -> "iterator_operator*(_ZN8iteratordeEv).e460522f307f6432268293a6c37dd0aa_2" ;
-"iterator_operator*(_ZN8iteratordeEv).e460522f307f6432268293a6c37dd0aa_2" [label="2: Exit iterator_operator* \n  " color=yellow style=filled]
+	 "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_4" -> "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_3" ;
+"vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_5" [label="5:  Constructor Init \n   n$3=*&this:class vec* [line 24]\n  _fun_iterator_iterator(n$3.end_:class iterator*) [line 24]\n " shape="box"]
 	
 
-"iterator_operator*(_ZN8iteratordeEv).e460522f307f6432268293a6c37dd0aa_1" [label="1: Start iterator_operator*\nFormals:  this:class iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
+	 "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_5" -> "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_4" ;
+"vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_6" [label="6:  Constructor Init \n   n$4=*&this:class vec* [line 24]\n  _fun_iterator_iterator(n$4.begin_:class iterator*) [line 24]\n " shape="box"]
 	
 
-	 "iterator_operator*(_ZN8iteratordeEv).e460522f307f6432268293a6c37dd0aa_1" -> "iterator_operator*(_ZN8iteratordeEv).e460522f307f6432268293a6c37dd0aa_3" ;
+	 "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_6" -> "vec_vec{_ZN3vecC1Ei}.9e908b65718ffa840e6e7c8520fe6d38_5" ;
 }

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

@@ -1,35 +1,35 @@
 /* @generated */
 digraph iCFG {
-"foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_8" [label="8:  Return Stmt \n   *&return:int=32 [line 12]\n " shape="box"]
+"foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_1" [label="1: Start foo\nFormals:  p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
-	 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_8" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_2" ;
-"foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_7" [label="7: Prune (false branch) \n   n$1=*n$0:int [line 11]\n  PRUNE((n$1 == 0), false); [line 11]\n " shape="invhouse"]
+	 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_1" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_5" ;
+"foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_2" [label="2: Exit foo \n  " color=yellow style=filled]
 	
 
-	 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_7" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_4" ;
-"foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_6" [label="6: Prune (true branch) \n   n$1=*n$0:int [line 11]\n  PRUNE((n$1 != 0), true); [line 11]\n " shape="invhouse"]
+"foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_3" [label="3:  Return Stmt \n   *&return:int=52 [line 14]\n " shape="box"]
 	
 
-	 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_6" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_8" ;
+	 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_3" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_2" ;
+"foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_4" [label="4: + \n  " ]
+	
+
+	 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_4" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_3" ;
 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_5" [label="5:  BinaryOperatorStmt: Assign \n   n$0=*&p:int* [line 11]\n  *n$0:int=0 [line 11]\n " shape="box"]
 	
 
 	 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_5" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_6" ;
 	 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_5" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_7" ;
-"foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_4" [label="4: + \n  " ]
-	
-
-	 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_4" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_3" ;
-"foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_3" [label="3:  Return Stmt \n   *&return:int=52 [line 14]\n " shape="box"]
+"foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_6" [label="6: Prune (true branch) \n   n$1=*n$0:int [line 11]\n  PRUNE((n$1 != 0), true); [line 11]\n " shape="invhouse"]
 	
 
-	 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_3" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_2" ;
-"foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_2" [label="2: Exit foo \n  " color=yellow style=filled]
+	 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_6" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_8" ;
+"foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_7" [label="7: Prune (false branch) \n   n$1=*n$0:int [line 11]\n  PRUNE((n$1 == 0), false); [line 11]\n " shape="invhouse"]
 	
 
-"foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_1" [label="1: Start foo\nFormals:  p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
+	 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_7" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_4" ;
+"foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_8" [label="8:  Return Stmt \n   *&return:int=32 [line 12]\n " shape="box"]
 	
 
-	 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_1" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_5" ;
+	 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_8" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_2" ;
 }

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

@@ -1,30 +1,30 @@
 /* @generated */
 digraph iCFG {
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" [label="7:  DeclStmt \n   *&a:int=3 [line 11]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" [label="1: Start test\nFormals: \nLocals:  e:int d:int c:int b:int a:int \n   DECLARE_LOCALS(&return,&e,&d,&c,&b,&a); [line 10]\n " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" [label="6:  DeclStmt \n   n$4=*&a:int [line 12]\n  *&a:int=(n$4 + 1) [line 12]\n  n$5=*&a:int [line 12]\n  *&b:int=n$5 [line 12]\n " shape="box"]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" [label="5:  DeclStmt \n   n$3=*&a:int [line 13]\n  *&a:int=(n$3 + 1) [line 13]\n  *&c:int=n$3 [line 13]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  DeclStmt \n   n$0=*&a:int [line 15]\n  *&a:int=(n$0 - 1) [line 15]\n  *&e:int=n$0 [line 15]\n " shape="box"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" ;
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" ;
 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" [label="4:  DeclStmt \n   n$1=*&a:int [line 14]\n  *&a:int=(n$1 - 1) [line 14]\n  n$2=*&a:int [line 14]\n  *&d:int=n$2 [line 14]\n " shape="box"]
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  DeclStmt \n   n$0=*&a:int [line 15]\n  *&a:int=(n$0 - 1) [line 15]\n  *&e:int=n$0 [line 15]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" [label="5:  DeclStmt \n   n$3=*&a:int [line 13]\n  *&a:int=(n$3 + 1) [line 13]\n  *&c:int=n$3 [line 13]\n " shape="box"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" [label="2: Exit test \n  " color=yellow style=filled]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" [label="6:  DeclStmt \n   n$4=*&a:int [line 12]\n  *&a:int=(n$4 + 1) [line 12]\n  n$5=*&a:int [line 12]\n  *&b:int=n$5 [line 12]\n " shape="box"]
 	
 
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" [label="1: Start test\nFormals: \nLocals:  e:int d:int c:int b:int a:int \n   DECLARE_LOCALS(&return,&e,&d,&c,&b,&a); [line 10]\n " color=yellow style=filled]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" [label="7:  DeclStmt \n   *&a:int=3 [line 11]\n " shape="box"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" ;
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" ;
 }

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

@@ -1,48 +1,48 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   n$3=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$x:class anonymous_struct_nestedoperators_union.cpp:10:1* [line 30]\n  *n$3.a:int=1 [line 30]\n " shape="box"]
+"__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_1" [label="1: Start __infer_globals_initializer_y\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   *&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.f:int=7 [line 31]\n " shape="box"]
+	 "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_1" -> "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" ;
+"__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_2" [label="2: Exit __infer_globals_initializer_y \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.f:int [line 32]\n  *&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.g.u:int=n$2 [line 32]\n " shape="box"]
+"__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" [label="3:  DeclStmt \n   _fun_anonymous_union_nestedoperators_union.cpp:15:1_(&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y:class anonymous_union_nestedoperators_union.cpp:15:1*) [line 25]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$x:class anonymous_struct_nestedoperators_union.cpp:10:1* [line 34]\n  n$1=*n$0.b:int [line 34]\n  *&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.g.w:int=n$1 [line 34]\n " shape="box"]
+	 "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" -> "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  l:int \n   DECLARE_LOCALS(&return,&l); [line 27]\n " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 35]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
+"main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"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]\n " shape="box"]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  l:int \n   DECLARE_LOCALS(&return,&l); [line 27]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$x:class anonymous_struct_nestedoperators_union.cpp:10:1* [line 34]\n  n$1=*n$0.b:int [line 34]\n  *&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.g.w:int=n$1 [line 34]\n " shape="box"]
 	
 
-	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"anonymous_union_nestedoperators_union.cpp:15:1_{_ZN3$_0C1Ev}.a368a0a38a33cffb4fbe8f478ecc70a9_2" [label="2: Exit anonymous_union_nestedoperators_union.cpp:15:1_ \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.f:int [line 32]\n  *&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.g.u:int=n$2 [line 32]\n " shape="box"]
 	
 
-"anonymous_union_nestedoperators_union.cpp:15:1_{_ZN3$_0C1Ev}.a368a0a38a33cffb4fbe8f478ecc70a9_1" [label="1: Start anonymous_union_nestedoperators_union.cpp:15:1_\nFormals:  this:class anonymous_union_nestedoperators_union.cpp:15:1*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   *&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y.f:int=7 [line 31]\n " shape="box"]
 	
 
-	 "anonymous_union_nestedoperators_union.cpp:15:1_{_ZN3$_0C1Ev}.a368a0a38a33cffb4fbe8f478ecc70a9_1" -> "anonymous_union_nestedoperators_union.cpp:15:1_{_ZN3$_0C1Ev}.a368a0a38a33cffb4fbe8f478ecc70a9_2" ;
-"__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" [label="3:  DeclStmt \n   _fun_anonymous_union_nestedoperators_union.cpp:15:1_(&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$y:class anonymous_union_nestedoperators_union.cpp:15:1*) [line 25]\n " shape="box"]
+	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   n$3=*&#GB<codetoanalyze/cpp/frontend/nestedoperators/union.cpp>$x:class anonymous_struct_nestedoperators_union.cpp:10:1* [line 30]\n  *n$3.a:int=1 [line 30]\n " shape="box"]
 	
 
-	 "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" -> "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_2" ;
-"__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_2" [label="2: Exit __infer_globals_initializer_y \n  " color=yellow style=filled]
+	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
+"anonymous_union_nestedoperators_union.cpp:15:1_{_ZN3$_0C1Ev}.a368a0a38a33cffb4fbe8f478ecc70a9_1" [label="1: Start anonymous_union_nestedoperators_union.cpp:15:1_\nFormals:  this:class anonymous_union_nestedoperators_union.cpp:15:1*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
-"__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_1" [label="1: Start __infer_globals_initializer_y\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
+	 "anonymous_union_nestedoperators_union.cpp:15:1_{_ZN3$_0C1Ev}.a368a0a38a33cffb4fbe8f478ecc70a9_1" -> "anonymous_union_nestedoperators_union.cpp:15:1_{_ZN3$_0C1Ev}.a368a0a38a33cffb4fbe8f478ecc70a9_2" ;
+"anonymous_union_nestedoperators_union.cpp:15:1_{_ZN3$_0C1Ev}.a368a0a38a33cffb4fbe8f478ecc70a9_2" [label="2: Exit anonymous_union_nestedoperators_union.cpp:15:1_ \n  " color=yellow style=filled]
 	
 
-	 "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_1" -> "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" ;
 }

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

@@ -1,358 +1,358 @@
 /* @generated */
 digraph iCFG {
-"TranslateAsPtr<int>_operator*(_ZN14TranslateAsPtrIiEdeEv).6e33a6aa14a0cca60ad03c9c8323478d_2" [label="2: Exit TranslateAsPtr<int>_operator* \n  " color=yellow style=filled]
+"derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_1" [label="1: Start derefFirstArg_null_deref\nFormals: \nLocals:  a:int \n   DECLARE_LOCALS(&return,&a); [line 37]\n " color=yellow style=filled]
 	
 
-"TranslateAsPtr<int>_operator*(_ZN14TranslateAsPtrIiEdeEv).6e33a6aa14a0cca60ad03c9c8323478d_1" [label="1: Start TranslateAsPtr<int>_operator*\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 81]\n " color=yellow style=filled]
+	 "derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_1" -> "derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_4" ;
+"derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_2" [label="2: Exit derefFirstArg_null_deref \n  " color=yellow style=filled]
 	
 
-	 "TranslateAsPtr<int>_operator*(_ZN14TranslateAsPtrIiEdeEv).6e33a6aa14a0cca60ad03c9c8323478d_1" -> "TranslateAsPtr<int>_operator*(_ZN14TranslateAsPtrIiEdeEv).6e33a6aa14a0cca60ad03c9c8323478d_2" ;
-"TranslateAsPtr<int>_setPtr(_ZN14TranslateAsPtrIiE6setPtrEPi).a5d7880acc84c7e32bc96cbed0a1e739_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:int** [line 86]\n  n$1=*&v:int* [line 86]\n  *n$0:void*=n$1 [line 86]\n " shape="box"]
+"derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_3" [label="3:  Return Stmt \n   n$0=*null:int* [line 39]\n  *&return:int=n$0 [line 39]\n " shape="box"]
 	
 
-	 "TranslateAsPtr<int>_setPtr(_ZN14TranslateAsPtrIiE6setPtrEPi).a5d7880acc84c7e32bc96cbed0a1e739_3" -> "TranslateAsPtr<int>_setPtr(_ZN14TranslateAsPtrIiE6setPtrEPi).a5d7880acc84c7e32bc96cbed0a1e739_2" ;
-"TranslateAsPtr<int>_setPtr(_ZN14TranslateAsPtrIiE6setPtrEPi).a5d7880acc84c7e32bc96cbed0a1e739_2" [label="2: Exit TranslateAsPtr<int>_setPtr \n  " color=yellow style=filled]
+	 "derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_3" -> "derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_2" ;
+"derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_4" [label="4:  DeclStmt \n   *&a:int=0 [line 38]\n " shape="box"]
 	
 
-"TranslateAsPtr<int>_setPtr(_ZN14TranslateAsPtrIiE6setPtrEPi).a5d7880acc84c7e32bc96cbed0a1e739_1" [label="1: Start TranslateAsPtr<int>_setPtr\nFormals:  this:int** v:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 86]\n " color=yellow style=filled]
+	 "derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_4" -> "derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_3" ;
+"derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_1" [label="1: Start derefFirstArg_ok_deref\nFormals: \nLocals:  a:int \n   DECLARE_LOCALS(&return,&a); [line 42]\n " color=yellow style=filled]
 	
 
-	 "TranslateAsPtr<int>_setPtr(_ZN14TranslateAsPtrIiE6setPtrEPi).a5d7880acc84c7e32bc96cbed0a1e739_1" -> "TranslateAsPtr<int>_setPtr(_ZN14TranslateAsPtrIiE6setPtrEPi).a5d7880acc84c7e32bc96cbed0a1e739_3" ;
-"getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_5" [label="5:  DeclStmt \n   _fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 96]\n  n$4=*&t:int* [line 96]\n " shape="box"]
+	 "derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_1" -> "derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_4" ;
+"derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_2" [label="2: Exit derefFirstArg_ok_deref \n  " color=yellow style=filled]
 	
 
-	 "getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_5" -> "getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_4" ;
-"getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 97]\n  _fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 97]\n " shape="box"]
+"derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 44]\n  *&return:int=n$0 [line 44]\n " shape="box"]
 	
 
-	 "getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_4" -> "getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_3" ;
-"getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_3" [label="3:  Return Stmt \n   _=*&t:int* [line 98]\n  n$1=*&t:int*& [line 98]\n  n$2=*n$1:int [line 98]\n  *&return:int=n$2 [line 98]\n " shape="box"]
+	 "derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_3" -> "derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_2" ;
+"derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_4" [label="4:  DeclStmt \n   *&a:int=0 [line 43]\n " shape="box"]
 	
 
-	 "getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_3" -> "getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_2" ;
-"getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_2" [label="2: Exit getPtr_null_deref2 \n  " color=yellow style=filled]
+	 "derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_4" -> "derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_3" ;
+"derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_1" [label="1: Start derefFirstArg2_null_deref\nFormals: \nLocals:  a:int \n   DECLARE_LOCALS(&return,&a); [line 47]\n " color=yellow style=filled]
 	
 
-"getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_1" [label="1: Start getPtr_null_deref2\nFormals: \nLocals:  t:int* \n   DECLARE_LOCALS(&return,&t); [line 95]\n " color=yellow style=filled]
+	 "derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_1" -> "derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_4" ;
+"derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_2" [label="2: Exit derefFirstArg2_null_deref \n  " color=yellow style=filled]
 	
 
-	 "getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_1" -> "getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_5" ;
-"getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_5" [label="5:  DeclStmt \n   _fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 134]\n  n$4=*&t:int* [line 134]\n " shape="box"]
+"derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_3" [label="3:  Return Stmt \n   n$0=*null:int* [line 49]\n  *&return:int=n$0 [line 49]\n " shape="box"]
 	
 
-	 "getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_5" -> "getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_4" ;
-"getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 135]\n  _fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 135]\n " shape="box"]
+	 "derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_3" -> "derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_2" ;
+"derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_4" [label="4:  DeclStmt \n   *&a:int=0 [line 48]\n " shape="box"]
 	
 
-	 "getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_4" -> "getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_3" ;
-"getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_3" [label="3:  Return Stmt \n   _=*&t:int* [line 136]\n  n$1=*&t:int*& [line 136]\n  n$2=*n$1:int* [line 136]\n  *&return:int=n$2 [line 136]\n " shape="box"]
+	 "derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_4" -> "derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_3" ;
+"derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_1" [label="1: Start derefFirstArg2_ok_deref\nFormals: \nLocals:  a:int \n   DECLARE_LOCALS(&return,&a); [line 52]\n " color=yellow style=filled]
 	
 
-	 "getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_3" -> "getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_2" ;
-"getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_2" [label="2: Exit getRef_null_deref2 \n  " color=yellow style=filled]
+	 "derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_1" -> "derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_4" ;
+"derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_2" [label="2: Exit derefFirstArg2_ok_deref \n  " color=yellow style=filled]
 	
 
-"getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_1" [label="1: Start getRef_null_deref2\nFormals: \nLocals:  t:int* \n   DECLARE_LOCALS(&return,&t); [line 133]\n " color=yellow style=filled]
+"derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 54]\n  *&return:int=n$0 [line 54]\n " shape="box"]
 	
 
-	 "getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_1" -> "getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_5" ;
-"operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_5" [label="5:  DeclStmt \n   _fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 122]\n  n$4=*&t:int* [line 122]\n " shape="box"]
+	 "derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_3" -> "derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_2" ;
+"derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_4" [label="4:  DeclStmt \n   *&a:int=0 [line 53]\n " shape="box"]
 	
 
-	 "operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_5" -> "operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_4" ;
-"operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 123]\n  _fun_TranslateAsPtr<int>_setPtr(&t:int*&,&a:int*) [line 123]\n " shape="box"]
+	 "derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_4" -> "derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_3" ;
+"derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_1" [label="1: Start derefFirstArg3_ok_deref\nFormals: \nLocals:  a:int \n   DECLARE_LOCALS(&return,&a); [line 57]\n " color=yellow style=filled]
 	
 
-	 "operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_4" -> "operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_3" ;
-"operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_3" [label="3:  Return Stmt \n   _=*&t:int* [line 124]\n  n$1=*&t:int*& [line 124]\n  n$2=*n$1:int* [line 124]\n  *&return:int=n$2 [line 124]\n " shape="box"]
+	 "derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_1" -> "derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_4" ;
+"derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_2" [label="2: Exit derefFirstArg3_ok_deref \n  " color=yellow style=filled]
 	
 
-	 "operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_3" -> "operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_2" ;
-"operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_2" [label="2: Exit operator_star_ok_deref \n  " color=yellow style=filled]
+"derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_3" [label="3:  Return Stmt \n   n$0=_fun_derefFirstArg3(null:int*,&a:int*) [line 59]\n  *&return:int=n$0 [line 59]\n " shape="box"]
 	
 
-"operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_1" [label="1: Start operator_star_ok_deref\nFormals: \nLocals:  t:int* a:int \n   DECLARE_LOCALS(&return,&t,&a); [line 120]\n " color=yellow style=filled]
+	 "derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_3" -> "derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_2" ;
+"derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_4" [label="4:  DeclStmt \n   *&a:int=0 [line 58]\n " shape="box"]
 	
 
-	 "operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_1" -> "operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_5" ;
-"derefFirstArg2{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg2PiS_}.d4966e65f3ff2cb5da0b76036244bf9c_3" [label="3:  Return Stmt \n   n$0=*&b:int* [line 26]\n  n$1=*n$0:int [line 26]\n  *&return:int=n$1 [line 26]\n " shape="box"]
+	 "derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_4" -> "derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_3" ;
+"derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_1" [label="1: Start derefFirstArg3_null_deref\nFormals: \nLocals:  a:int \n   DECLARE_LOCALS(&return,&a); [line 62]\n " color=yellow style=filled]
 	
 
-	 "derefFirstArg2{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg2PiS_}.d4966e65f3ff2cb5da0b76036244bf9c_3" -> "derefFirstArg2{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg2PiS_}.d4966e65f3ff2cb5da0b76036244bf9c_2" ;
-"derefFirstArg2{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg2PiS_}.d4966e65f3ff2cb5da0b76036244bf9c_2" [label="2: Exit derefFirstArg2 \n  " color=yellow style=filled]
+	 "derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_1" -> "derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_4" ;
+"derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_2" [label="2: Exit derefFirstArg3_null_deref \n  " color=yellow style=filled]
 	
 
-"derefFirstArg2{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg2PiS_}.d4966e65f3ff2cb5da0b76036244bf9c_1" [label="1: Start derefFirstArg2\nFormals:  a:int* b:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 22]\n " color=yellow style=filled]
+"derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_3" [label="3:  Return Stmt \n   n$0=_fun_derefFirstArg3(&a:int*,null:int*) [line 64]\n  *&return:int=n$0 [line 64]\n " shape="box"]
 	
 
-	 "derefFirstArg2{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg2PiS_}.d4966e65f3ff2cb5da0b76036244bf9c_1" -> "derefFirstArg2{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg2PiS_}.d4966e65f3ff2cb5da0b76036244bf9c_3" ;
-"TranslateAsPtr<int>_getRef(_ZN14TranslateAsPtrIiE6getRefEii).b3ec3ec67e954fbf2f0bf9bd5bd7a502_2" [label="2: Exit TranslateAsPtr<int>_getRef \n  " color=yellow style=filled]
+	 "derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_3" -> "derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_2" ;
+"derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_4" [label="4:  DeclStmt \n   *&a:int=0 [line 63]\n " shape="box"]
 	
 
-"TranslateAsPtr<int>_getRef(_ZN14TranslateAsPtrIiE6getRefEii).b3ec3ec67e954fbf2f0bf9bd5bd7a502_1" [label="1: Start TranslateAsPtr<int>_getRef\nFormals:  this:int** a:int b:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 83]\n " color=yellow style=filled]
+	 "derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_4" -> "derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_3" ;
+"getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_1" [label="1: Start getPtr_null_deref1\nFormals: \nLocals:  t:int* \n   DECLARE_LOCALS(&return,&t); [line 89]\n " color=yellow style=filled]
 	
 
-	 "TranslateAsPtr<int>_getRef(_ZN14TranslateAsPtrIiE6getRefEii).b3ec3ec67e954fbf2f0bf9bd5bd7a502_1" -> "TranslateAsPtr<int>_getRef(_ZN14TranslateAsPtrIiE6getRefEii).b3ec3ec67e954fbf2f0bf9bd5bd7a502_2" ;
-"TranslateAsPtr<int>_TranslateAsPtr{_ZN14TranslateAsPtrIiEC1EPi}.5f550e6a31f09c70f2bf53349616a244_3" [label="3:  Call _fun_TranslateAsPtr<int>_setPtr \n   n$0=*&this:int** [line 76]\n  _=*n$0:int* [line 76]\n  n$2=*&t:int* [line 76]\n  _fun_TranslateAsPtr<int>_setPtr(n$0:int**,n$2:int*) [line 76]\n " shape="box"]
+	 "getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_1" -> "getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_5" ;
+"getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_2" [label="2: Exit getPtr_null_deref1 \n  " color=yellow style=filled]
 	
 
-	 "TranslateAsPtr<int>_TranslateAsPtr{_ZN14TranslateAsPtrIiEC1EPi}.5f550e6a31f09c70f2bf53349616a244_3" -> "TranslateAsPtr<int>_TranslateAsPtr{_ZN14TranslateAsPtrIiEC1EPi}.5f550e6a31f09c70f2bf53349616a244_2" ;
-"TranslateAsPtr<int>_TranslateAsPtr{_ZN14TranslateAsPtrIiEC1EPi}.5f550e6a31f09c70f2bf53349616a244_2" [label="2: Exit TranslateAsPtr<int>_TranslateAsPtr \n  " color=yellow style=filled]
+"getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_3" [label="3:  Return Stmt \n   _=*&t:int* [line 92]\n  n$1=*&t:int*& [line 92]\n  n$2=*n$1:int [line 92]\n  *&return:int=n$2 [line 92]\n " shape="box"]
 	
 
-"TranslateAsPtr<int>_TranslateAsPtr{_ZN14TranslateAsPtrIiEC1EPi}.5f550e6a31f09c70f2bf53349616a244_1" [label="1: Start TranslateAsPtr<int>_TranslateAsPtr\nFormals:  this:int** t:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 76]\n " color=yellow style=filled]
+	 "getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_3" -> "getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_2" ;
+"getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 91]\n  _fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 91]\n " shape="box"]
 	
 
-	 "TranslateAsPtr<int>_TranslateAsPtr{_ZN14TranslateAsPtrIiEC1EPi}.5f550e6a31f09c70f2bf53349616a244_1" -> "TranslateAsPtr<int>_TranslateAsPtr{_ZN14TranslateAsPtrIiEC1EPi}.5f550e6a31f09c70f2bf53349616a244_3" ;
-"derefFirstArg3{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg3PiS_}.c22270a8b45f207485450ebff7826470_3" [label="3:  Return Stmt \n   n$0=*&b:int* [line 33]\n  n$1=*n$0:int [line 33]\n  *&return:int=n$1 [line 33]\n " shape="box"]
+	 "getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_4" -> "getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_3" ;
+"getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_5" [label="5:  DeclStmt \n   _fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 90]\n  n$4=*&t:int* [line 90]\n " shape="box"]
 	
 
-	 "derefFirstArg3{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg3PiS_}.c22270a8b45f207485450ebff7826470_3" -> "derefFirstArg3{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg3PiS_}.c22270a8b45f207485450ebff7826470_2" ;
-"derefFirstArg3{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg3PiS_}.c22270a8b45f207485450ebff7826470_2" [label="2: Exit derefFirstArg3 \n  " color=yellow style=filled]
+	 "getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_5" -> "getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_4" ;
+"getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_1" [label="1: Start getPtr_null_deref2\nFormals: \nLocals:  t:int* \n   DECLARE_LOCALS(&return,&t); [line 95]\n " color=yellow style=filled]
 	
 
-"derefFirstArg3{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg3PiS_}.c22270a8b45f207485450ebff7826470_1" [label="1: Start derefFirstArg3\nFormals:  a:int* b:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 31]\n " color=yellow style=filled]
+	 "getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_1" -> "getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_5" ;
+"getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_2" [label="2: Exit getPtr_null_deref2 \n  " color=yellow style=filled]
 	
 
-	 "derefFirstArg3{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg3PiS_}.c22270a8b45f207485450ebff7826470_1" -> "derefFirstArg3{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg3PiS_}.c22270a8b45f207485450ebff7826470_3" ;
-"operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_5" [label="5:  DeclStmt \n   _fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 115]\n  n$4=*&t:int* [line 115]\n " shape="box"]
+"getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_3" [label="3:  Return Stmt \n   _=*&t:int* [line 98]\n  n$1=*&t:int*& [line 98]\n  n$2=*n$1:int [line 98]\n  *&return:int=n$2 [line 98]\n " shape="box"]
 	
 
-	 "operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_5" -> "operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_4" ;
-"operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 116]\n  _fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 116]\n " shape="box"]
+	 "getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_3" -> "getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_2" ;
+"getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 97]\n  _fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 97]\n " shape="box"]
 	
 
-	 "operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_4" -> "operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_3" ;
-"operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_3" [label="3:  Return Stmt \n   _=*&t:int* [line 117]\n  n$1=*&t:int*& [line 117]\n  n$2=*n$1:int* [line 117]\n  *&return:int=n$2 [line 117]\n " shape="box"]
+	 "getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_4" -> "getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_3" ;
+"getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_5" [label="5:  DeclStmt \n   _fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 96]\n  n$4=*&t:int* [line 96]\n " shape="box"]
 	
 
-	 "operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_3" -> "operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_2" ;
-"operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_2" [label="2: Exit operator_star_null_deref2 \n  " color=yellow style=filled]
+	 "getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_5" -> "getPtr_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref2v}.c0658f9bf55154f40aa7887ee5e9c67d_4" ;
+"getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_1" [label="1: Start getPtr_ok_deref\nFormals: \nLocals:  t:int* a:int \n   DECLARE_LOCALS(&return,&t,&a); [line 101]\n " color=yellow style=filled]
 	
 
-"operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_1" [label="1: Start operator_star_null_deref2\nFormals: \nLocals:  t:int* \n   DECLARE_LOCALS(&return,&t); [line 114]\n " color=yellow style=filled]
+	 "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_1" -> "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_6" ;
+"getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_2" [label="2: Exit getPtr_ok_deref \n  " color=yellow style=filled]
 	
 
-	 "operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_1" -> "operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_5" ;
-"TranslateAsPtr<int>_getPtr(_ZN14TranslateAsPtrIiE6getPtrEv).e9818cf7d486bf17e4505936e74fd8cf_2" [label="2: Exit TranslateAsPtr<int>_getPtr \n  " color=yellow style=filled]
+"getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_3" [label="3:  Return Stmt \n   _=*&t:int* [line 105]\n  n$1=*&t:int*& [line 105]\n  n$2=*n$1:int [line 105]\n  *&return:int=n$2 [line 105]\n " shape="box"]
 	
 
-"TranslateAsPtr<int>_getPtr(_ZN14TranslateAsPtrIiE6getPtrEv).e9818cf7d486bf17e4505936e74fd8cf_1" [label="1: Start TranslateAsPtr<int>_getPtr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 78]\n " color=yellow style=filled]
+	 "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_3" -> "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_2" ;
+"getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 104]\n  _fun_TranslateAsPtr<int>_setPtr(&t:int*&,&a:int*) [line 104]\n " shape="box"]
 	
 
-	 "TranslateAsPtr<int>_getPtr(_ZN14TranslateAsPtrIiE6getPtrEv).e9818cf7d486bf17e4505936e74fd8cf_1" -> "TranslateAsPtr<int>_getPtr(_ZN14TranslateAsPtrIiE6getPtrEv).e9818cf7d486bf17e4505936e74fd8cf_2" ;
-"derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_4" [label="4:  DeclStmt \n   *&a:int=0 [line 63]\n " shape="box"]
+	 "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_4" -> "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_3" ;
+"getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_5" [label="5:  DeclStmt \n   _fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 103]\n  n$4=*&t:int* [line 103]\n " shape="box"]
 	
 
-	 "derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_4" -> "derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_3" ;
-"derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_3" [label="3:  Return Stmt \n   n$0=_fun_derefFirstArg3(&a:int*,null:int*) [line 64]\n  *&return:int=n$0 [line 64]\n " shape="box"]
+	 "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_5" -> "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_4" ;
+"getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_6" [label="6:  DeclStmt \n   *&a:int=0 [line 102]\n " shape="box"]
 	
 
-	 "derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_3" -> "derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_2" ;
-"derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_2" [label="2: Exit derefFirstArg3_null_deref \n  " color=yellow style=filled]
+	 "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_6" -> "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_5" ;
+"operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_1" [label="1: Start operator_star_null_deref1\nFormals: \nLocals:  t:int* \n   DECLARE_LOCALS(&return,&t); [line 108]\n " color=yellow style=filled]
 	
 
-"derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_1" [label="1: Start derefFirstArg3_null_deref\nFormals: \nLocals:  a:int \n   DECLARE_LOCALS(&return,&a); [line 62]\n " color=yellow style=filled]
+	 "operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_1" -> "operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_5" ;
+"operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_2" [label="2: Exit operator_star_null_deref1 \n  " color=yellow style=filled]
 	
 
-	 "derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_1" -> "derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_4" ;
-"getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_5" [label="5:  DeclStmt \n   _fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 128]\n  n$4=*&t:int* [line 128]\n " shape="box"]
+"operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_3" [label="3:  Return Stmt \n   n$0=*&t:int*& [line 111]\n  n$1=*n$0:int* [line 111]\n  *&return:int=n$1 [line 111]\n " shape="box"]
 	
 
-	 "getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_5" -> "getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_4" ;
-"getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 129]\n  _fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 129]\n " shape="box"]
+	 "operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_3" -> "operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_2" ;
+"operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 110]\n  _fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 110]\n " shape="box"]
 	
 
-	 "getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_4" -> "getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_3" ;
-"getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_3" [label="3:  Return Stmt \n   _=*&t:int* [line 130]\n  n$1=*&t:int*& [line 130]\n  n$2=*n$1:int* [line 130]\n  *&return:int=n$2 [line 130]\n " shape="box"]
+	 "operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_4" -> "operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_3" ;
+"operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_5" [label="5:  DeclStmt \n   _fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 109]\n  n$3=*&t:int* [line 109]\n " shape="box"]
 	
 
-	 "getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_3" -> "getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_2" ;
-"getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_2" [label="2: Exit getRef_null_deref1 \n  " color=yellow style=filled]
+	 "operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_5" -> "operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_4" ;
+"operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_1" [label="1: Start operator_star_null_deref2\nFormals: \nLocals:  t:int* \n   DECLARE_LOCALS(&return,&t); [line 114]\n " color=yellow style=filled]
 	
 
-"getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_1" [label="1: Start getRef_null_deref1\nFormals: \nLocals:  t:int* \n   DECLARE_LOCALS(&return,&t); [line 127]\n " color=yellow style=filled]
+	 "operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_1" -> "operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_5" ;
+"operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_2" [label="2: Exit operator_star_null_deref2 \n  " color=yellow style=filled]
 	
 
-	 "getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_1" -> "getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_5" ;
-"derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_4" [label="4:  DeclStmt \n   *&a:int=0 [line 38]\n " shape="box"]
+"operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_3" [label="3:  Return Stmt \n   _=*&t:int* [line 117]\n  n$1=*&t:int*& [line 117]\n  n$2=*n$1:int* [line 117]\n  *&return:int=n$2 [line 117]\n " shape="box"]
 	
 
-	 "derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_4" -> "derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_3" ;
-"derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_3" [label="3:  Return Stmt \n   n$0=*null:int* [line 39]\n  *&return:int=n$0 [line 39]\n " shape="box"]
+	 "operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_3" -> "operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_2" ;
+"operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 116]\n  _fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 116]\n " shape="box"]
 	
 
-	 "derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_3" -> "derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_2" ;
-"derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_2" [label="2: Exit derefFirstArg_null_deref \n  " color=yellow style=filled]
+	 "operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_4" -> "operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_3" ;
+"operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_5" [label="5:  DeclStmt \n   _fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 115]\n  n$4=*&t:int* [line 115]\n " shape="box"]
 	
 
-"derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_1" [label="1: Start derefFirstArg_null_deref\nFormals: \nLocals:  a:int \n   DECLARE_LOCALS(&return,&a); [line 37]\n " color=yellow style=filled]
+	 "operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_5" -> "operator_star_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref2v}.5dff5fc29e89a752d52014e07a143b0d_4" ;
+"operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_1" [label="1: Start operator_star_ok_deref\nFormals: \nLocals:  t:int* a:int \n   DECLARE_LOCALS(&return,&t,&a); [line 120]\n " color=yellow style=filled]
 	
 
-	 "derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_1" -> "derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_4" ;
-"operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_5" [label="5:  DeclStmt \n   _fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 109]\n  n$3=*&t:int* [line 109]\n " shape="box"]
+	 "operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_1" -> "operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_5" ;
+"operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_2" [label="2: Exit operator_star_ok_deref \n  " color=yellow style=filled]
 	
 
-	 "operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_5" -> "operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_4" ;
-"operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 110]\n  _fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 110]\n " shape="box"]
+"operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_3" [label="3:  Return Stmt \n   _=*&t:int* [line 124]\n  n$1=*&t:int*& [line 124]\n  n$2=*n$1:int* [line 124]\n  *&return:int=n$2 [line 124]\n " shape="box"]
 	
 
-	 "operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_4" -> "operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_3" ;
-"operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_3" [label="3:  Return Stmt \n   n$0=*&t:int*& [line 111]\n  n$1=*n$0:int* [line 111]\n  *&return:int=n$1 [line 111]\n " shape="box"]
+	 "operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_3" -> "operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_2" ;
+"operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 123]\n  _fun_TranslateAsPtr<int>_setPtr(&t:int*&,&a:int*) [line 123]\n " shape="box"]
 	
 
-	 "operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_3" -> "operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_2" ;
-"operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_2" [label="2: Exit operator_star_null_deref1 \n  " color=yellow style=filled]
+	 "operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_4" -> "operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_3" ;
+"operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_5" [label="5:  DeclStmt \n   _fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 122]\n  n$4=*&t:int* [line 122]\n " shape="box"]
 	
 
-"operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_1" [label="1: Start operator_star_null_deref1\nFormals: \nLocals:  t:int* \n   DECLARE_LOCALS(&return,&t); [line 108]\n " color=yellow style=filled]
+	 "operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_5" -> "operator_star_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22operator_star_ok_derefv}.fddf0680fb971d2f1a70bb3c9074d811_4" ;
+"getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_1" [label="1: Start getRef_null_deref1\nFormals: \nLocals:  t:int* \n   DECLARE_LOCALS(&return,&t); [line 127]\n " color=yellow style=filled]
 	
 
-	 "operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_1" -> "operator_star_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z25operator_star_null_deref1v}.768771cba782263aea8d94a1dbaadafa_5" ;
-"TranslateAsPtr<int>_getRef(_ZN14TranslateAsPtrIiE6getRefEv).73b28e0b78502fc4a5ab3085d7c47bc7_2" [label="2: Exit TranslateAsPtr<int>_getRef \n  " color=yellow style=filled]
+	 "getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_1" -> "getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_5" ;
+"getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_2" [label="2: Exit getRef_null_deref1 \n  " color=yellow style=filled]
 	
 
-"TranslateAsPtr<int>_getRef(_ZN14TranslateAsPtrIiE6getRefEv).73b28e0b78502fc4a5ab3085d7c47bc7_1" [label="1: Start TranslateAsPtr<int>_getRef\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 82]\n " color=yellow style=filled]
+"getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_3" [label="3:  Return Stmt \n   _=*&t:int* [line 130]\n  n$1=*&t:int*& [line 130]\n  n$2=*n$1:int* [line 130]\n  *&return:int=n$2 [line 130]\n " shape="box"]
 	
 
-	 "TranslateAsPtr<int>_getRef(_ZN14TranslateAsPtrIiE6getRefEv).73b28e0b78502fc4a5ab3085d7c47bc7_1" -> "TranslateAsPtr<int>_getRef(_ZN14TranslateAsPtrIiE6getRefEv).73b28e0b78502fc4a5ab3085d7c47bc7_2" ;
-"derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_4" [label="4:  DeclStmt \n   *&a:int=0 [line 48]\n " shape="box"]
+	 "getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_3" -> "getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_2" ;
+"getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 129]\n  _fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 129]\n " shape="box"]
 	
 
-	 "derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_4" -> "derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_3" ;
-"derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_3" [label="3:  Return Stmt \n   n$0=*null:int* [line 49]\n  *&return:int=n$0 [line 49]\n " shape="box"]
+	 "getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_4" -> "getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_3" ;
+"getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_5" [label="5:  DeclStmt \n   _fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 128]\n  n$4=*&t:int* [line 128]\n " shape="box"]
 	
 
-	 "derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_3" -> "derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_2" ;
-"derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_2" [label="2: Exit derefFirstArg2_null_deref \n  " color=yellow style=filled]
+	 "getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_5" -> "getRef_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref1v}.122119e932803230e14664a05f8e9bc1_4" ;
+"getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_1" [label="1: Start getRef_null_deref2\nFormals: \nLocals:  t:int* \n   DECLARE_LOCALS(&return,&t); [line 133]\n " color=yellow style=filled]
 	
 
-"derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_1" [label="1: Start derefFirstArg2_null_deref\nFormals: \nLocals:  a:int \n   DECLARE_LOCALS(&return,&a); [line 47]\n " color=yellow style=filled]
+	 "getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_1" -> "getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_5" ;
+"getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_2" [label="2: Exit getRef_null_deref2 \n  " color=yellow style=filled]
 	
 
-	 "derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_1" -> "derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_4" ;
-"getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_6" [label="6:  DeclStmt \n   *&a:int=0 [line 140]\n " shape="box"]
+"getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_3" [label="3:  Return Stmt \n   _=*&t:int* [line 136]\n  n$1=*&t:int*& [line 136]\n  n$2=*n$1:int* [line 136]\n  *&return:int=n$2 [line 136]\n " shape="box"]
 	
 
-	 "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_6" -> "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_5" ;
-"getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_5" [label="5:  DeclStmt \n   _fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 141]\n  n$4=*&t:int* [line 141]\n " shape="box"]
+	 "getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_3" -> "getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_2" ;
+"getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 135]\n  _fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 135]\n " shape="box"]
 	
 
-	 "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_5" -> "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_4" ;
-"getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 142]\n  _fun_TranslateAsPtr<int>_setPtr(&t:int*&,&a:int*) [line 142]\n " shape="box"]
+	 "getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_4" -> "getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_3" ;
+"getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_5" [label="5:  DeclStmt \n   _fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 134]\n  n$4=*&t:int* [line 134]\n " shape="box"]
 	
 
-	 "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_4" -> "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_3" ;
-"getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_3" [label="3:  Return Stmt \n   _=*&t:int* [line 143]\n  n$1=*&t:int*& [line 143]\n  n$2=*n$1:int* [line 143]\n  *&return:int=n$2 [line 143]\n " shape="box"]
+	 "getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_5" -> "getRef_null_deref2{d41d8cd98f00b204e9800998ecf8427e_Z18getRef_null_deref2v}.9ffcde6f39df65a7c54071cb9a9ddd2d_4" ;
+"getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_1" [label="1: Start getRef_ok_deref\nFormals: \nLocals:  t:int* a:int \n   DECLARE_LOCALS(&return,&t,&a); [line 139]\n " color=yellow style=filled]
 	
 
-	 "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_3" -> "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_2" ;
+	 "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_1" -> "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_6" ;
 "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_2" [label="2: Exit getRef_ok_deref \n  " color=yellow style=filled]
 	
 
-"getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_1" [label="1: Start getRef_ok_deref\nFormals: \nLocals:  t:int* a:int \n   DECLARE_LOCALS(&return,&t,&a); [line 139]\n " color=yellow style=filled]
+"getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_3" [label="3:  Return Stmt \n   _=*&t:int* [line 143]\n  n$1=*&t:int*& [line 143]\n  n$2=*n$1:int* [line 143]\n  *&return:int=n$2 [line 143]\n " shape="box"]
 	
 
-	 "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_1" -> "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_6" ;
-"derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_4" [label="4:  DeclStmt \n   *&a:int=0 [line 43]\n " shape="box"]
+	 "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_3" -> "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_2" ;
+"getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 142]\n  _fun_TranslateAsPtr<int>_setPtr(&t:int*&,&a:int*) [line 142]\n " shape="box"]
 	
 
-	 "derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_4" -> "derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_3" ;
-"derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 44]\n  *&return:int=n$0 [line 44]\n " shape="box"]
+	 "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_4" -> "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_3" ;
+"getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_5" [label="5:  DeclStmt \n   _fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 141]\n  n$4=*&t:int* [line 141]\n " shape="box"]
 	
 
-	 "derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_3" -> "derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_2" ;
-"derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_2" [label="2: Exit derefFirstArg_ok_deref \n  " color=yellow style=filled]
+	 "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_5" -> "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_4" ;
+"getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_6" [label="6:  DeclStmt \n   *&a:int=0 [line 140]\n " shape="box"]
 	
 
-"derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_1" [label="1: Start derefFirstArg_ok_deref\nFormals: \nLocals:  a:int \n   DECLARE_LOCALS(&return,&a); [line 42]\n " color=yellow style=filled]
+	 "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_6" -> "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_5" ;
+"derefFirstArg{d41d8cd98f00b204e9800998ecf8427e_Z13derefFirstArgPiS_}.b2938b7664e69c1046eb0d5c68f18fd4_1" [label="1: Start derefFirstArg\nFormals:  a:int* b:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
 	
 
-	 "derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_1" -> "derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_4" ;
-"getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_5" [label="5:  DeclStmt \n   _fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 90]\n  n$4=*&t:int* [line 90]\n " shape="box"]
+	 "derefFirstArg{d41d8cd98f00b204e9800998ecf8427e_Z13derefFirstArgPiS_}.b2938b7664e69c1046eb0d5c68f18fd4_1" -> "derefFirstArg{d41d8cd98f00b204e9800998ecf8427e_Z13derefFirstArgPiS_}.b2938b7664e69c1046eb0d5c68f18fd4_2" ;
+"derefFirstArg{d41d8cd98f00b204e9800998ecf8427e_Z13derefFirstArgPiS_}.b2938b7664e69c1046eb0d5c68f18fd4_2" [label="2: Exit derefFirstArg \n  " color=yellow style=filled]
 	
 
-	 "getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_5" -> "getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_4" ;
-"getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 91]\n  _fun_TranslateAsPtr<int>_setPtr(&t:int*&,null:int*) [line 91]\n " shape="box"]
+"derefFirstArg2{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg2PiS_}.d4966e65f3ff2cb5da0b76036244bf9c_1" [label="1: Start derefFirstArg2\nFormals:  a:int* b:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 22]\n " color=yellow style=filled]
 	
 
-	 "getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_4" -> "getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_3" ;
-"getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_3" [label="3:  Return Stmt \n   _=*&t:int* [line 92]\n  n$1=*&t:int*& [line 92]\n  n$2=*n$1:int [line 92]\n  *&return:int=n$2 [line 92]\n " shape="box"]
+	 "derefFirstArg2{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg2PiS_}.d4966e65f3ff2cb5da0b76036244bf9c_1" -> "derefFirstArg2{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg2PiS_}.d4966e65f3ff2cb5da0b76036244bf9c_3" ;
+"derefFirstArg2{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg2PiS_}.d4966e65f3ff2cb5da0b76036244bf9c_2" [label="2: Exit derefFirstArg2 \n  " color=yellow style=filled]
 	
 
-	 "getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_3" -> "getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_2" ;
-"getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_2" [label="2: Exit getPtr_null_deref1 \n  " color=yellow style=filled]
+"derefFirstArg2{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg2PiS_}.d4966e65f3ff2cb5da0b76036244bf9c_3" [label="3:  Return Stmt \n   n$0=*&b:int* [line 26]\n  n$1=*n$0:int [line 26]\n  *&return:int=n$1 [line 26]\n " shape="box"]
 	
 
-"getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_1" [label="1: Start getPtr_null_deref1\nFormals: \nLocals:  t:int* \n   DECLARE_LOCALS(&return,&t); [line 89]\n " color=yellow style=filled]
+	 "derefFirstArg2{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg2PiS_}.d4966e65f3ff2cb5da0b76036244bf9c_3" -> "derefFirstArg2{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg2PiS_}.d4966e65f3ff2cb5da0b76036244bf9c_2" ;
+"derefFirstArg3{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg3PiS_}.c22270a8b45f207485450ebff7826470_1" [label="1: Start derefFirstArg3\nFormals:  a:int* b:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 31]\n " color=yellow style=filled]
 	
 
-	 "getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_1" -> "getPtr_null_deref1{d41d8cd98f00b204e9800998ecf8427e_Z18getPtr_null_deref1v}.ca0bcbfa30cc9f3486057a2fbf4c0a43_5" ;
-"derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_4" [label="4:  DeclStmt \n   *&a:int=0 [line 53]\n " shape="box"]
+	 "derefFirstArg3{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg3PiS_}.c22270a8b45f207485450ebff7826470_1" -> "derefFirstArg3{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg3PiS_}.c22270a8b45f207485450ebff7826470_3" ;
+"derefFirstArg3{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg3PiS_}.c22270a8b45f207485450ebff7826470_2" [label="2: Exit derefFirstArg3 \n  " color=yellow style=filled]
 	
 
-	 "derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_4" -> "derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_3" ;
-"derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_3" [label="3:  Return Stmt \n   n$0=*&a:int* [line 54]\n  *&return:int=n$0 [line 54]\n " shape="box"]
+"derefFirstArg3{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg3PiS_}.c22270a8b45f207485450ebff7826470_3" [label="3:  Return Stmt \n   n$0=*&b:int* [line 33]\n  n$1=*n$0:int [line 33]\n  *&return:int=n$1 [line 33]\n " shape="box"]
 	
 
-	 "derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_3" -> "derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_2" ;
-"derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_2" [label="2: Exit derefFirstArg2_ok_deref \n  " color=yellow style=filled]
+	 "derefFirstArg3{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg3PiS_}.c22270a8b45f207485450ebff7826470_3" -> "derefFirstArg3{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg3PiS_}.c22270a8b45f207485450ebff7826470_2" ;
+"TranslateAsPtr<int>_getPtr(_ZN14TranslateAsPtrIiE6getPtrEv).e9818cf7d486bf17e4505936e74fd8cf_1" [label="1: Start TranslateAsPtr<int>_getPtr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 78]\n " color=yellow style=filled]
 	
 
-"derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_1" [label="1: Start derefFirstArg2_ok_deref\nFormals: \nLocals:  a:int \n   DECLARE_LOCALS(&return,&a); [line 52]\n " color=yellow style=filled]
+	 "TranslateAsPtr<int>_getPtr(_ZN14TranslateAsPtrIiE6getPtrEv).e9818cf7d486bf17e4505936e74fd8cf_1" -> "TranslateAsPtr<int>_getPtr(_ZN14TranslateAsPtrIiE6getPtrEv).e9818cf7d486bf17e4505936e74fd8cf_2" ;
+"TranslateAsPtr<int>_getPtr(_ZN14TranslateAsPtrIiE6getPtrEv).e9818cf7d486bf17e4505936e74fd8cf_2" [label="2: Exit TranslateAsPtr<int>_getPtr \n  " color=yellow style=filled]
 	
 
-	 "derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_1" -> "derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_4" ;
-"getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_6" [label="6:  DeclStmt \n   *&a:int=0 [line 102]\n " shape="box"]
+"TranslateAsPtr<int>_operator*(_ZN14TranslateAsPtrIiEdeEv).6e33a6aa14a0cca60ad03c9c8323478d_1" [label="1: Start TranslateAsPtr<int>_operator*\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 81]\n " color=yellow style=filled]
 	
 
-	 "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_6" -> "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_5" ;
-"getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_5" [label="5:  DeclStmt \n   _fun_TranslateAsPtr<int>_TranslateAsPtr(&t:int**,null:int*) [line 103]\n  n$4=*&t:int* [line 103]\n " shape="box"]
+	 "TranslateAsPtr<int>_operator*(_ZN14TranslateAsPtrIiEdeEv).6e33a6aa14a0cca60ad03c9c8323478d_1" -> "TranslateAsPtr<int>_operator*(_ZN14TranslateAsPtrIiEdeEv).6e33a6aa14a0cca60ad03c9c8323478d_2" ;
+"TranslateAsPtr<int>_operator*(_ZN14TranslateAsPtrIiEdeEv).6e33a6aa14a0cca60ad03c9c8323478d_2" [label="2: Exit TranslateAsPtr<int>_operator* \n  " color=yellow style=filled]
 	
 
-	 "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_5" -> "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_4" ;
-"getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_4" [label="4:  Call _fun_TranslateAsPtr<int>_setPtr \n   _=*&t:int* [line 104]\n  _fun_TranslateAsPtr<int>_setPtr(&t:int*&,&a:int*) [line 104]\n " shape="box"]
+"TranslateAsPtr<int>_getRef(_ZN14TranslateAsPtrIiE6getRefEv).73b28e0b78502fc4a5ab3085d7c47bc7_1" [label="1: Start TranslateAsPtr<int>_getRef\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 82]\n " color=yellow style=filled]
 	
 
-	 "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_4" -> "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_3" ;
-"getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_3" [label="3:  Return Stmt \n   _=*&t:int* [line 105]\n  n$1=*&t:int*& [line 105]\n  n$2=*n$1:int [line 105]\n  *&return:int=n$2 [line 105]\n " shape="box"]
+	 "TranslateAsPtr<int>_getRef(_ZN14TranslateAsPtrIiE6getRefEv).73b28e0b78502fc4a5ab3085d7c47bc7_1" -> "TranslateAsPtr<int>_getRef(_ZN14TranslateAsPtrIiE6getRefEv).73b28e0b78502fc4a5ab3085d7c47bc7_2" ;
+"TranslateAsPtr<int>_getRef(_ZN14TranslateAsPtrIiE6getRefEv).73b28e0b78502fc4a5ab3085d7c47bc7_2" [label="2: Exit TranslateAsPtr<int>_getRef \n  " color=yellow style=filled]
 	
 
-	 "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_3" -> "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_2" ;
-"getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_2" [label="2: Exit getPtr_ok_deref \n  " color=yellow style=filled]
+"TranslateAsPtr<int>_getPtr(_ZN14TranslateAsPtrIiE6getPtrEii).b601a0b5470955664a78e673fb9687c0_1" [label="1: Start TranslateAsPtr<int>_getPtr\nFormals:  this:int** a:int b:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 79]\n " color=yellow style=filled]
 	
 
-"getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_1" [label="1: Start getPtr_ok_deref\nFormals: \nLocals:  t:int* a:int \n   DECLARE_LOCALS(&return,&t,&a); [line 101]\n " color=yellow style=filled]
+	 "TranslateAsPtr<int>_getPtr(_ZN14TranslateAsPtrIiE6getPtrEii).b601a0b5470955664a78e673fb9687c0_1" -> "TranslateAsPtr<int>_getPtr(_ZN14TranslateAsPtrIiE6getPtrEii).b601a0b5470955664a78e673fb9687c0_2" ;
+"TranslateAsPtr<int>_getPtr(_ZN14TranslateAsPtrIiE6getPtrEii).b601a0b5470955664a78e673fb9687c0_2" [label="2: Exit TranslateAsPtr<int>_getPtr \n  " color=yellow style=filled]
 	
 
-	 "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_1" -> "getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_6" ;
-"TranslateAsPtr<int>_getPtr(_ZN14TranslateAsPtrIiE6getPtrEii).b601a0b5470955664a78e673fb9687c0_2" [label="2: Exit TranslateAsPtr<int>_getPtr \n  " color=yellow style=filled]
+"TranslateAsPtr<int>_getRef(_ZN14TranslateAsPtrIiE6getRefEii).b3ec3ec67e954fbf2f0bf9bd5bd7a502_1" [label="1: Start TranslateAsPtr<int>_getRef\nFormals:  this:int** a:int b:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 83]\n " color=yellow style=filled]
 	
 
-"TranslateAsPtr<int>_getPtr(_ZN14TranslateAsPtrIiE6getPtrEii).b601a0b5470955664a78e673fb9687c0_1" [label="1: Start TranslateAsPtr<int>_getPtr\nFormals:  this:int** a:int b:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 79]\n " color=yellow style=filled]
+	 "TranslateAsPtr<int>_getRef(_ZN14TranslateAsPtrIiE6getRefEii).b3ec3ec67e954fbf2f0bf9bd5bd7a502_1" -> "TranslateAsPtr<int>_getRef(_ZN14TranslateAsPtrIiE6getRefEii).b3ec3ec67e954fbf2f0bf9bd5bd7a502_2" ;
+"TranslateAsPtr<int>_getRef(_ZN14TranslateAsPtrIiE6getRefEii).b3ec3ec67e954fbf2f0bf9bd5bd7a502_2" [label="2: Exit TranslateAsPtr<int>_getRef \n  " color=yellow style=filled]
 	
 
-	 "TranslateAsPtr<int>_getPtr(_ZN14TranslateAsPtrIiE6getPtrEii).b601a0b5470955664a78e673fb9687c0_1" -> "TranslateAsPtr<int>_getPtr(_ZN14TranslateAsPtrIiE6getPtrEii).b601a0b5470955664a78e673fb9687c0_2" ;
-"derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_4" [label="4:  DeclStmt \n   *&a:int=0 [line 58]\n " shape="box"]
+"TranslateAsPtr<int>_TranslateAsPtr{_ZN14TranslateAsPtrIiEC1EPi}.5f550e6a31f09c70f2bf53349616a244_1" [label="1: Start TranslateAsPtr<int>_TranslateAsPtr\nFormals:  this:int** t:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 76]\n " color=yellow style=filled]
 	
 
-	 "derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_4" -> "derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_3" ;
-"derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_3" [label="3:  Return Stmt \n   n$0=_fun_derefFirstArg3(null:int*,&a:int*) [line 59]\n  *&return:int=n$0 [line 59]\n " shape="box"]
+	 "TranslateAsPtr<int>_TranslateAsPtr{_ZN14TranslateAsPtrIiEC1EPi}.5f550e6a31f09c70f2bf53349616a244_1" -> "TranslateAsPtr<int>_TranslateAsPtr{_ZN14TranslateAsPtrIiEC1EPi}.5f550e6a31f09c70f2bf53349616a244_3" ;
+"TranslateAsPtr<int>_TranslateAsPtr{_ZN14TranslateAsPtrIiEC1EPi}.5f550e6a31f09c70f2bf53349616a244_2" [label="2: Exit TranslateAsPtr<int>_TranslateAsPtr \n  " color=yellow style=filled]
 	
 
-	 "derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_3" -> "derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_2" ;
-"derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_2" [label="2: Exit derefFirstArg3_ok_deref \n  " color=yellow style=filled]
+"TranslateAsPtr<int>_TranslateAsPtr{_ZN14TranslateAsPtrIiEC1EPi}.5f550e6a31f09c70f2bf53349616a244_3" [label="3:  Call _fun_TranslateAsPtr<int>_setPtr \n   n$0=*&this:int** [line 76]\n  _=*n$0:int* [line 76]\n  n$2=*&t:int* [line 76]\n  _fun_TranslateAsPtr<int>_setPtr(n$0:int**,n$2:int*) [line 76]\n " shape="box"]
 	
 
-"derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_1" [label="1: Start derefFirstArg3_ok_deref\nFormals: \nLocals:  a:int \n   DECLARE_LOCALS(&return,&a); [line 57]\n " color=yellow style=filled]
+	 "TranslateAsPtr<int>_TranslateAsPtr{_ZN14TranslateAsPtrIiEC1EPi}.5f550e6a31f09c70f2bf53349616a244_3" -> "TranslateAsPtr<int>_TranslateAsPtr{_ZN14TranslateAsPtrIiEC1EPi}.5f550e6a31f09c70f2bf53349616a244_2" ;
+"TranslateAsPtr<int>_setPtr(_ZN14TranslateAsPtrIiE6setPtrEPi).a5d7880acc84c7e32bc96cbed0a1e739_1" [label="1: Start TranslateAsPtr<int>_setPtr\nFormals:  this:int** v:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 86]\n " color=yellow style=filled]
 	
 
-	 "derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_1" -> "derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_4" ;
-"derefFirstArg{d41d8cd98f00b204e9800998ecf8427e_Z13derefFirstArgPiS_}.b2938b7664e69c1046eb0d5c68f18fd4_2" [label="2: Exit derefFirstArg \n  " color=yellow style=filled]
+	 "TranslateAsPtr<int>_setPtr(_ZN14TranslateAsPtrIiE6setPtrEPi).a5d7880acc84c7e32bc96cbed0a1e739_1" -> "TranslateAsPtr<int>_setPtr(_ZN14TranslateAsPtrIiE6setPtrEPi).a5d7880acc84c7e32bc96cbed0a1e739_3" ;
+"TranslateAsPtr<int>_setPtr(_ZN14TranslateAsPtrIiE6setPtrEPi).a5d7880acc84c7e32bc96cbed0a1e739_2" [label="2: Exit TranslateAsPtr<int>_setPtr \n  " color=yellow style=filled]
 	
 
-"derefFirstArg{d41d8cd98f00b204e9800998ecf8427e_Z13derefFirstArgPiS_}.b2938b7664e69c1046eb0d5c68f18fd4_1" [label="1: Start derefFirstArg\nFormals:  a:int* b:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
+"TranslateAsPtr<int>_setPtr(_ZN14TranslateAsPtrIiE6setPtrEPi).a5d7880acc84c7e32bc96cbed0a1e739_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:int** [line 86]\n  n$1=*&v:int* [line 86]\n  *n$0:void*=n$1 [line 86]\n " shape="box"]
 	
 
-	 "derefFirstArg{d41d8cd98f00b204e9800998ecf8427e_Z13derefFirstArgPiS_}.b2938b7664e69c1046eb0d5c68f18fd4_1" -> "derefFirstArg{d41d8cd98f00b204e9800998ecf8427e_Z13derefFirstArgPiS_}.b2938b7664e69c1046eb0d5c68f18fd4_2" ;
+	 "TranslateAsPtr<int>_setPtr(_ZN14TranslateAsPtrIiE6setPtrEPi).a5d7880acc84c7e32bc96cbed0a1e739_3" -> "TranslateAsPtr<int>_setPtr(_ZN14TranslateAsPtrIiE6setPtrEPi).a5d7880acc84c7e32bc96cbed0a1e739_2" ;
 }

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

@@ -1,134 +1,134 @@
 /* @generated */
 digraph iCFG {
-"binary_conditional::X_X{_ZN18binary_conditional1XC1EOS0_}.4bd5b5f6d082e3a4895874a95aa2bc28_2" [label="2: Exit binary_conditional::X_X \n  " color=yellow style=filled]
+"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_1" [label="1: Start binary_conditional::binaryConditional\nFormals: \nLocals:  x:class binary_conditional::X 0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X 0$?%__sil_tmpSIL_temp_conditional___n$2:class binary_conditional::X 0$?%__sil_tmpSIL_materialize_temp__n$4:class binary_conditional::X a:class binary_conditional::X \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_materialize_temp__n$0,&0$?%__sil_tmpSIL_temp_conditional___n$2,&0$?%__sil_tmpSIL_materialize_temp__n$4,&a); [line 22]\n " color=yellow style=filled]
 	
 
-"binary_conditional::X_X{_ZN18binary_conditional1XC1EOS0_}.4bd5b5f6d082e3a4895874a95aa2bc28_1" [label="1: Start binary_conditional::X_X\nFormals:  this:class binary_conditional::X* __param_0:class binary_conditional::X&\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
+	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_1" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_11" ;
+"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_2" [label="2: Exit binary_conditional::binaryConditional \n  " color=yellow style=filled]
 	
 
-	 "binary_conditional::X_X{_ZN18binary_conditional1XC1EOS0_}.4bd5b5f6d082e3a4895874a95aa2bc28_1" -> "binary_conditional::X_X{_ZN18binary_conditional1XC1EOS0_}.4bd5b5f6d082e3a4895874a95aa2bc28_2" ;
-"binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_4" [label="4:  DeclStmt \n   _fun_binary_conditional::X_X(&x:class binary_conditional::X*) [line 17]\n " shape="box"]
+"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_3" [label="3: + \n  " ]
 	
 
-	 "binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_4" -> "binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_3" ;
-"binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class binary_conditional::X* [line 18]\n  _fun_binary_conditional::X_X(n$0:class binary_conditional::X*,&x:class binary_conditional::X&) [line 18]\n " shape="box"]
+	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_3" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_10" ;
+"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_4" [label="4:  Call _fun_binary_conditional::X_operator_bool \n   n$3=_fun_binary_conditional::X_operator_bool(&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X&) [line 24]\n " shape="box"]
 	
 
-	 "binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_3" -> "binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_2" ;
-"binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_2" [label="2: Exit binary_conditional::getX \n  " color=yellow style=filled]
+	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_4" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_5" ;
+	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_4" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_6" ;
+"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_5" [label="5: Prune (true branch) \n   PRUNE((n$3 != 0), true); [line 24]\n " shape="invhouse"]
 	
 
-"binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_1" [label="1: Start binary_conditional::getX\nFormals:  __return_param:class binary_conditional::X*\nLocals:  x:class binary_conditional::X \n   DECLARE_LOCALS(&return,&x); [line 16]\n " color=yellow style=filled]
+	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_5" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_7" ;
+"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_6" [label="6: Prune (false branch) \n   PRUNE((n$3 == 0), false); [line 24]\n " shape="invhouse"]
 	
 
-	 "binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_1" -> "binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_4" ;
-"binary_conditional::X_X{_ZN18binary_conditional1XC1Ev}.8b205ac1bfab1089a003718675527bf2_2" [label="2: Exit binary_conditional::X_X \n  " color=yellow style=filled]
+	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_6" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_8" ;
+"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_materialize_temp__n$4:class binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$0 [line 24]\n  _fun_binary_conditional::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$4:class binary_conditional::X&) [line 24]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$2:class binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$0 [line 24]\n " shape="box"]
 	
 
-"binary_conditional::X_X{_ZN18binary_conditional1XC1Ev}.8b205ac1bfab1089a003718675527bf2_1" [label="1: Start binary_conditional::X_X\nFormals:  this:class binary_conditional::X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
+	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_7" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_3" ;
+"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_8" [label="8:  ConditinalStmt Branch \n   _fun_binary_conditional::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X*,&a:class binary_conditional::X&) [line 24]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$2:class binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$0 [line 24]\n " shape="box"]
 	
 
-	 "binary_conditional::X_X{_ZN18binary_conditional1XC1Ev}.8b205ac1bfab1089a003718675527bf2_1" -> "binary_conditional::X_X{_ZN18binary_conditional1XC1Ev}.8b205ac1bfab1089a003718675527bf2_2" ;
-"binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_10" [label="10:  DeclStmt \n   _fun_binary_conditional::X_X(&a:class binary_conditional::X*) [line 28]\n " shape="box"]
+	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_8" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_3" ;
+"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_9" [label="9:  BinaryConditinalStmt Init \n   _fun_binary_conditional::getX(&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X*) [line 24]\n " shape="box"]
 	
 
-	 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_10" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_4" ;
-"binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_9" [label="9:  DeclStmt \n   n$7=*&0$?%__sil_tmpSIL_temp_conditional___n$1:class binary_conditional::X [line 29]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X=n$7 [line 29]\n  _fun_binary_conditional::X_X(&x:class binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X&) [line 29]\n " shape="box"]
+	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_9" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_4" ;
+"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_10" [label="10:  DeclStmt \n   n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$2:class binary_conditional::X [line 24]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X=n$5 [line 24]\n  _fun_binary_conditional::X_X(&x:class binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X&) [line 24]\n " shape="box"]
 	
 
-	 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_9" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_2" ;
-"binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_8" [label="8:  ConditinalStmt Branch \n   _fun_binary_conditional::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X*,&a:class binary_conditional::X&) [line 29]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:class binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$0 [line 29]\n " shape="box"]
+	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_10" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_2" ;
+"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_11" [label="11:  DeclStmt \n   _fun_binary_conditional::X_X(&a:class binary_conditional::X*) [line 23]\n " shape="box"]
 	
 
-	 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_8" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_3" ;
-"binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_7" [label="7:  ConditinalStmt Branch \n   _fun_binary_conditional::getX(&0$?%__sil_tmpSIL_materialize_temp__n$5:class binary_conditional::X*) [line 29]\n  _fun_binary_conditional::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$5:class binary_conditional::X&) [line 29]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:class binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$0 [line 29]\n " shape="box"]
+	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_11" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_9" ;
+"binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_1" [label="1: Start binary_conditional::conditional\nFormals: \nLocals:  x:class binary_conditional::X 0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X 0$?%__sil_tmpSIL_temp_conditional___n$1:class binary_conditional::X 0$?%__sil_tmp__temp_return_n$3:class binary_conditional::X 0$?%__sil_tmpSIL_materialize_temp__n$5:class binary_conditional::X a:class binary_conditional::X \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_materialize_temp__n$0,&0$?%__sil_tmpSIL_temp_conditional___n$1,&0$?%__sil_tmp__temp_return_n$3,&0$?%__sil_tmpSIL_materialize_temp__n$5,&a); [line 27]\n " color=yellow style=filled]
 	
 
-	 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_7" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_3" ;
-"binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_6" [label="6: Prune (false branch) \n   PRUNE((n$4 == 0), false); [line 29]\n " shape="invhouse"]
+	 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_1" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_10" ;
+"binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_2" [label="2: Exit binary_conditional::conditional \n  " color=yellow style=filled]
 	
 
-	 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_6" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_8" ;
-"binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_5" [label="5: Prune (true branch) \n   PRUNE((n$4 != 0), true); [line 29]\n " shape="invhouse"]
+"binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_3" [label="3: + \n  " ]
 	
 
-	 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_5" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_7" ;
+	 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_3" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_9" ;
 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_4" [label="4:  Call _fun_binary_conditional::X_operator_bool \n   _fun_binary_conditional::getX(&0$?%__sil_tmp__temp_return_n$3:class binary_conditional::X*) [line 29]\n  n$4=_fun_binary_conditional::X_operator_bool(&0$?%__sil_tmp__temp_return_n$3:class binary_conditional::X&) [line 29]\n " shape="box"]
 	
 
 	 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_4" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_5" ;
 	 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_4" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_6" ;
-"binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_3" [label="3: + \n  " ]
+"binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_5" [label="5: Prune (true branch) \n   PRUNE((n$4 != 0), true); [line 29]\n " shape="invhouse"]
 	
 
-	 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_3" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_9" ;
-"binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_2" [label="2: Exit binary_conditional::conditional \n  " color=yellow style=filled]
+	 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_5" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_7" ;
+"binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_6" [label="6: Prune (false branch) \n   PRUNE((n$4 == 0), false); [line 29]\n " shape="invhouse"]
 	
 
-"binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_1" [label="1: Start binary_conditional::conditional\nFormals: \nLocals:  x:class binary_conditional::X 0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X 0$?%__sil_tmpSIL_temp_conditional___n$1:class binary_conditional::X 0$?%__sil_tmp__temp_return_n$3:class binary_conditional::X 0$?%__sil_tmpSIL_materialize_temp__n$5:class binary_conditional::X a:class binary_conditional::X \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_materialize_temp__n$0,&0$?%__sil_tmpSIL_temp_conditional___n$1,&0$?%__sil_tmp__temp_return_n$3,&0$?%__sil_tmpSIL_materialize_temp__n$5,&a); [line 27]\n " color=yellow style=filled]
+	 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_6" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_8" ;
+"binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_7" [label="7:  ConditinalStmt Branch \n   _fun_binary_conditional::getX(&0$?%__sil_tmpSIL_materialize_temp__n$5:class binary_conditional::X*) [line 29]\n  _fun_binary_conditional::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$5:class binary_conditional::X&) [line 29]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:class binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$0 [line 29]\n " shape="box"]
 	
 
-	 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_1" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_10" ;
-"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_11" [label="11:  DeclStmt \n   _fun_binary_conditional::X_X(&a:class binary_conditional::X*) [line 23]\n " shape="box"]
+	 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_7" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_3" ;
+"binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_8" [label="8:  ConditinalStmt Branch \n   _fun_binary_conditional::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X*,&a:class binary_conditional::X&) [line 29]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:class binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$0 [line 29]\n " shape="box"]
 	
 
-	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_11" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_9" ;
-"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_10" [label="10:  DeclStmt \n   n$5=*&0$?%__sil_tmpSIL_temp_conditional___n$2:class binary_conditional::X [line 24]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X=n$5 [line 24]\n  _fun_binary_conditional::X_X(&x:class binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X&) [line 24]\n " shape="box"]
+	 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_8" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_3" ;
+"binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_9" [label="9:  DeclStmt \n   n$7=*&0$?%__sil_tmpSIL_temp_conditional___n$1:class binary_conditional::X [line 29]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X=n$7 [line 29]\n  _fun_binary_conditional::X_X(&x:class binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X&) [line 29]\n " shape="box"]
 	
 
-	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_10" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_2" ;
-"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_9" [label="9:  BinaryConditinalStmt Init \n   _fun_binary_conditional::getX(&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X*) [line 24]\n " shape="box"]
+	 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_9" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_2" ;
+"binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_10" [label="10:  DeclStmt \n   _fun_binary_conditional::X_X(&a:class binary_conditional::X*) [line 28]\n " shape="box"]
 	
 
-	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_9" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_4" ;
-"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_8" [label="8:  ConditinalStmt Branch \n   _fun_binary_conditional::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X*,&a:class binary_conditional::X&) [line 24]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$2:class binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$0 [line 24]\n " shape="box"]
+	 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_10" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_4" ;
+"binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_1" [label="1: Start binary_conditional::getX\nFormals:  __return_param:class binary_conditional::X*\nLocals:  x:class binary_conditional::X \n   DECLARE_LOCALS(&return,&x); [line 16]\n " color=yellow style=filled]
 	
 
-	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_8" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_3" ;
-"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_materialize_temp__n$4:class binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$0 [line 24]\n  _fun_binary_conditional::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X*,&0$?%__sil_tmpSIL_materialize_temp__n$4:class binary_conditional::X&) [line 24]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$2:class binary_conditional::X=&0$?%__sil_tmpSIL_materialize_temp__n$0 [line 24]\n " shape="box"]
+	 "binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_1" -> "binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_4" ;
+"binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_2" [label="2: Exit binary_conditional::getX \n  " color=yellow style=filled]
 	
 
-	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_7" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_3" ;
-"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_6" [label="6: Prune (false branch) \n   PRUNE((n$3 == 0), false); [line 24]\n " shape="invhouse"]
+"binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class binary_conditional::X* [line 18]\n  _fun_binary_conditional::X_X(n$0:class binary_conditional::X*,&x:class binary_conditional::X&) [line 18]\n " shape="box"]
 	
 
-	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_6" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_8" ;
-"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_5" [label="5: Prune (true branch) \n   PRUNE((n$3 != 0), true); [line 24]\n " shape="invhouse"]
+	 "binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_3" -> "binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_2" ;
+"binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_4" [label="4:  DeclStmt \n   _fun_binary_conditional::X_X(&x:class binary_conditional::X*) [line 17]\n " shape="box"]
 	
 
-	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_5" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_7" ;
-"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_4" [label="4:  Call _fun_binary_conditional::X_operator_bool \n   n$3=_fun_binary_conditional::X_operator_bool(&0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X&) [line 24]\n " shape="box"]
+	 "binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_4" -> "binary_conditional::getX{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional4getXEv}.1a31099193fd0f833e07c4796d3b0f85_3" ;
+"binary_conditional::X_X{_ZN18binary_conditional1XC1Ev}.8b205ac1bfab1089a003718675527bf2_1" [label="1: Start binary_conditional::X_X\nFormals:  this:class binary_conditional::X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
-	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_4" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_5" ;
-	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_4" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_6" ;
-"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_3" [label="3: + \n  " ]
+	 "binary_conditional::X_X{_ZN18binary_conditional1XC1Ev}.8b205ac1bfab1089a003718675527bf2_1" -> "binary_conditional::X_X{_ZN18binary_conditional1XC1Ev}.8b205ac1bfab1089a003718675527bf2_2" ;
+"binary_conditional::X_X{_ZN18binary_conditional1XC1Ev}.8b205ac1bfab1089a003718675527bf2_2" [label="2: Exit binary_conditional::X_X \n  " color=yellow style=filled]
 	
 
-	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_3" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_10" ;
-"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_2" [label="2: Exit binary_conditional::binaryConditional \n  " color=yellow style=filled]
+"binary_conditional::X_operator_bool(_ZN18binary_conditional1XcvbEv).ac4783c70fd7f052bb11fb683aec2300_1" [label="1: Start binary_conditional::X_operator_bool\nFormals:  this:class binary_conditional::X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
 	
 
-"binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_1" [label="1: Start binary_conditional::binaryConditional\nFormals: \nLocals:  x:class binary_conditional::X 0$?%__sil_tmpSIL_materialize_temp__n$0:class binary_conditional::X 0$?%__sil_tmpSIL_temp_conditional___n$2:class binary_conditional::X 0$?%__sil_tmpSIL_materialize_temp__n$4:class binary_conditional::X a:class binary_conditional::X \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_materialize_temp__n$0,&0$?%__sil_tmpSIL_temp_conditional___n$2,&0$?%__sil_tmpSIL_materialize_temp__n$4,&a); [line 22]\n " color=yellow style=filled]
+	 "binary_conditional::X_operator_bool(_ZN18binary_conditional1XcvbEv).ac4783c70fd7f052bb11fb683aec2300_1" -> "binary_conditional::X_operator_bool(_ZN18binary_conditional1XcvbEv).ac4783c70fd7f052bb11fb683aec2300_3" ;
+"binary_conditional::X_operator_bool(_ZN18binary_conditional1XcvbEv).ac4783c70fd7f052bb11fb683aec2300_2" [label="2: Exit binary_conditional::X_operator_bool \n  " color=yellow style=filled]
 	
 
-	 "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_1" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_11" ;
 "binary_conditional::X_operator_bool(_ZN18binary_conditional1XcvbEv).ac4783c70fd7f052bb11fb683aec2300_3" [label="3:  Return Stmt \n   *&return:_Bool=1 [line 13]\n " shape="box"]
 	
 
 	 "binary_conditional::X_operator_bool(_ZN18binary_conditional1XcvbEv).ac4783c70fd7f052bb11fb683aec2300_3" -> "binary_conditional::X_operator_bool(_ZN18binary_conditional1XcvbEv).ac4783c70fd7f052bb11fb683aec2300_2" ;
-"binary_conditional::X_operator_bool(_ZN18binary_conditional1XcvbEv).ac4783c70fd7f052bb11fb683aec2300_2" [label="2: Exit binary_conditional::X_operator_bool \n  " color=yellow style=filled]
-	
-
-"binary_conditional::X_operator_bool(_ZN18binary_conditional1XcvbEv).ac4783c70fd7f052bb11fb683aec2300_1" [label="1: Start binary_conditional::X_operator_bool\nFormals:  this:class binary_conditional::X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
+"binary_conditional::X_X{_ZN18binary_conditional1XC1EOS0_}.4bd5b5f6d082e3a4895874a95aa2bc28_1" [label="1: Start binary_conditional::X_X\nFormals:  this:class binary_conditional::X* __param_0:class binary_conditional::X&\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
-	 "binary_conditional::X_operator_bool(_ZN18binary_conditional1XcvbEv).ac4783c70fd7f052bb11fb683aec2300_1" -> "binary_conditional::X_operator_bool(_ZN18binary_conditional1XcvbEv).ac4783c70fd7f052bb11fb683aec2300_3" ;
-"binary_conditional::X_X{_ZN18binary_conditional1XC1ERKS0_}.0e1cd4b0d7172e9f75221a1b50d4832a_2" [label="2: Exit binary_conditional::X_X \n  " color=yellow style=filled]
+	 "binary_conditional::X_X{_ZN18binary_conditional1XC1EOS0_}.4bd5b5f6d082e3a4895874a95aa2bc28_1" -> "binary_conditional::X_X{_ZN18binary_conditional1XC1EOS0_}.4bd5b5f6d082e3a4895874a95aa2bc28_2" ;
+"binary_conditional::X_X{_ZN18binary_conditional1XC1EOS0_}.4bd5b5f6d082e3a4895874a95aa2bc28_2" [label="2: Exit binary_conditional::X_X \n  " color=yellow style=filled]
 	
 
 "binary_conditional::X_X{_ZN18binary_conditional1XC1ERKS0_}.0e1cd4b0d7172e9f75221a1b50d4832a_1" [label="1: Start binary_conditional::X_X\nFormals:  this:class binary_conditional::X* __param_0:class binary_conditional::X&\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
 	 "binary_conditional::X_X{_ZN18binary_conditional1XC1ERKS0_}.0e1cd4b0d7172e9f75221a1b50d4832a_1" -> "binary_conditional::X_X{_ZN18binary_conditional1XC1ERKS0_}.0e1cd4b0d7172e9f75221a1b50d4832a_2" ;
+"binary_conditional::X_X{_ZN18binary_conditional1XC1ERKS0_}.0e1cd4b0d7172e9f75221a1b50d4832a_2" [label="2: Exit binary_conditional::X_X \n  " color=yellow style=filled]
+	
+
 }

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

@@ -1,255 +1,255 @@
 /* @generated */
 digraph iCFG {
-"div1_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div1_assign_conditionalv}.92f869873008e2be38561a2db0cbf69c_3" [label="3:  Return Stmt \n   n$0=_fun_assign_conditional(1:int) [line 43]\n  *&return:int=(1 / n$0) [line 43]\n " shape="box"]
+"div0_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_lvaluev}.33971c4fb1631ae7849c0b6e9319d4ed_1" [label="1: Start div0_choose_lvalue\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 33]\n " color=yellow style=filled]
 	
 
-	 "div1_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div1_assign_conditionalv}.92f869873008e2be38561a2db0cbf69c_3" -> "div1_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div1_assign_conditionalv}.92f869873008e2be38561a2db0cbf69c_2" ;
-"div1_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div1_assign_conditionalv}.92f869873008e2be38561a2db0cbf69c_2" [label="2: Exit div1_assign_conditional \n  " color=yellow style=filled]
+	 "div0_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_lvaluev}.33971c4fb1631ae7849c0b6e9319d4ed_1" -> "div0_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_lvaluev}.33971c4fb1631ae7849c0b6e9319d4ed_3" ;
+"div0_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_lvaluev}.33971c4fb1631ae7849c0b6e9319d4ed_2" [label="2: Exit div0_choose_lvalue \n  " color=yellow style=filled]
 	
 
-"div1_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div1_assign_conditionalv}.92f869873008e2be38561a2db0cbf69c_1" [label="1: Start div1_assign_conditional\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 43]\n " color=yellow style=filled]
+"div0_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_lvaluev}.33971c4fb1631ae7849c0b6e9319d4ed_3" [label="3:  Return Stmt \n   n$0=_fun_choose_lvalue(1:int) [line 33]\n  *&return:int=(1 / n$0) [line 33]\n " shape="box"]
 	
 
-	 "div1_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div1_assign_conditionalv}.92f869873008e2be38561a2db0cbf69c_1" -> "div1_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div1_assign_conditionalv}.92f869873008e2be38561a2db0cbf69c_3" ;
-"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_11" [label="11:  DeclStmt \n   *&v1:int=0 [line 11]\n " shape="box"]
+	 "div0_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_lvaluev}.33971c4fb1631ae7849c0b6e9319d4ed_3" -> "div0_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_lvaluev}.33971c4fb1631ae7849c0b6e9319d4ed_2" ;
+"div1_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_lvaluev}.946cb482a75d8e7dcce087e5daa1e2a4_1" [label="1: Start div1_choose_lvalue\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 35]\n " color=yellow style=filled]
 	
 
-	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_11" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_10" ;
-"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_10" [label="10:  DeclStmt \n   *&v2:int=1 [line 11]\n " shape="box"]
+	 "div1_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_lvaluev}.946cb482a75d8e7dcce087e5daa1e2a4_1" -> "div1_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_lvaluev}.946cb482a75d8e7dcce087e5daa1e2a4_3" ;
+"div1_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_lvaluev}.946cb482a75d8e7dcce087e5daa1e2a4_2" [label="2: Exit div1_choose_lvalue \n  " color=yellow style=filled]
 	
 
-	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_10" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_5" ;
-	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_10" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_6" ;
-"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_9" [label="9:  DeclStmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int& [line 12]\n  n$4=*n$3:int [line 12]\n  *&v3:int=n$4 [line 12]\n " shape="box"]
+"div1_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_lvaluev}.946cb482a75d8e7dcce087e5daa1e2a4_3" [label="3:  Return Stmt \n   n$0=_fun_choose_lvalue(0:int) [line 35]\n  *&return:int=(1 / n$0) [line 35]\n " shape="box"]
 	
 
-	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_9" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_3" ;
-"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int&=&v2 [line 12]\n " shape="box"]
+	 "div1_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_lvaluev}.946cb482a75d8e7dcce087e5daa1e2a4_3" -> "div1_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_lvaluev}.946cb482a75d8e7dcce087e5daa1e2a4_2" ;
+"div0_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_rvaluev}.659babbaece0692d30930dde0b8bc14b_1" [label="1: Start div0_choose_rvalue\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 37]\n " color=yellow style=filled]
 	
 
-	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_8" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_4" ;
-"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int&=&v1 [line 12]\n " shape="box"]
+	 "div0_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_rvaluev}.659babbaece0692d30930dde0b8bc14b_1" -> "div0_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_rvaluev}.659babbaece0692d30930dde0b8bc14b_3" ;
+"div0_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_rvaluev}.659babbaece0692d30930dde0b8bc14b_2" [label="2: Exit div0_choose_rvalue \n  " color=yellow style=filled]
 	
 
-	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_7" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_4" ;
-"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_6" [label="6: Prune (false branch) \n   n$2=*&a:int [line 12]\n  PRUNE((n$2 == 0), false); [line 12]\n " shape="invhouse"]
+"div0_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_rvaluev}.659babbaece0692d30930dde0b8bc14b_3" [label="3:  Return Stmt \n   n$0=_fun_choose_rvalue(1:int) [line 37]\n  *&return:int=(1 / n$0) [line 37]\n " shape="box"]
 	
 
-	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_6" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_8" ;
-"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_5" [label="5: Prune (true branch) \n   n$2=*&a:int [line 12]\n  PRUNE((n$2 != 0), true); [line 12]\n " shape="invhouse"]
+	 "div0_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_rvaluev}.659babbaece0692d30930dde0b8bc14b_3" -> "div0_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_rvaluev}.659babbaece0692d30930dde0b8bc14b_2" ;
+"div1_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_rvaluev}.fef13b1fcbaa224805a1550f767822a9_1" [label="1: Start div1_choose_rvalue\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 39]\n " color=yellow style=filled]
 	
 
-	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_5" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_7" ;
-"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_4" [label="4: + \n  " ]
+	 "div1_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_rvaluev}.fef13b1fcbaa224805a1550f767822a9_1" -> "div1_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_rvaluev}.fef13b1fcbaa224805a1550f767822a9_3" ;
+"div1_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_rvaluev}.fef13b1fcbaa224805a1550f767822a9_2" [label="2: Exit div1_choose_rvalue \n  " color=yellow style=filled]
 	
 
-	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_4" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_9" ;
-"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_3" [label="3:  Return Stmt \n   n$0=*&v3:int [line 13]\n  *&return:int=n$0 [line 13]\n " shape="box"]
+"div1_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_rvaluev}.fef13b1fcbaa224805a1550f767822a9_3" [label="3:  Return Stmt \n   n$0=_fun_choose_rvalue(0:int) [line 39]\n  *&return:int=(1 / n$0) [line 39]\n " shape="box"]
 	
 
-	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_3" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_2" ;
-"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_2" [label="2: Exit choose_lvalue \n  " color=yellow style=filled]
+	 "div1_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_rvaluev}.fef13b1fcbaa224805a1550f767822a9_3" -> "div1_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_rvaluev}.fef13b1fcbaa224805a1550f767822a9_2" ;
+"div0_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div0_assign_conditionalv}.e27c458f48e2fd3eb2c37a500947ad83_1" [label="1: Start div0_assign_conditional\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 41]\n " color=yellow style=filled]
 	
 
-"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_1" [label="1: Start choose_lvalue\nFormals:  a:int\nLocals:  v3:int 0$?%__sil_tmpSIL_temp_conditional___n$1:int& v2:int v1:int \n   DECLARE_LOCALS(&return,&v3,&0$?%__sil_tmpSIL_temp_conditional___n$1,&v2,&v1); [line 10]\n " color=yellow style=filled]
+	 "div0_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div0_assign_conditionalv}.e27c458f48e2fd3eb2c37a500947ad83_1" -> "div0_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div0_assign_conditionalv}.e27c458f48e2fd3eb2c37a500947ad83_3" ;
+"div0_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div0_assign_conditionalv}.e27c458f48e2fd3eb2c37a500947ad83_2" [label="2: Exit div0_assign_conditional \n  " color=yellow style=filled]
 	
 
-	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_1" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_11" ;
-"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_11" [label="11:  DeclStmt \n   *&v1:int=0 [line 23]\n " shape="box"]
+"div0_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div0_assign_conditionalv}.e27c458f48e2fd3eb2c37a500947ad83_3" [label="3:  Return Stmt \n   n$0=_fun_assign_conditional(0:int) [line 41]\n  *&return:int=(1 / n$0) [line 41]\n " shape="box"]
 	
 
-	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_11" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_10" ;
-"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_10" [label="10:  DeclStmt \n   *&v2:int=0 [line 23]\n " shape="box"]
+	 "div0_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div0_assign_conditionalv}.e27c458f48e2fd3eb2c37a500947ad83_3" -> "div0_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div0_assign_conditionalv}.e27c458f48e2fd3eb2c37a500947ad83_2" ;
+"div1_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div1_assign_conditionalv}.92f869873008e2be38561a2db0cbf69c_1" [label="1: Start div1_assign_conditional\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 43]\n " color=yellow style=filled]
 	
 
-	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_10" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_5" ;
-	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_10" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_6" ;
-"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_9" [label="9:  BinaryOperatorStmt: Assign \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int& [line 24]\n  *n$3:int=1 [line 24]\n " shape="box"]
+	 "div1_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div1_assign_conditionalv}.92f869873008e2be38561a2db0cbf69c_1" -> "div1_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div1_assign_conditionalv}.92f869873008e2be38561a2db0cbf69c_3" ;
+"div1_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div1_assign_conditionalv}.92f869873008e2be38561a2db0cbf69c_2" [label="2: Exit div1_assign_conditional \n  " color=yellow style=filled]
 	
 
-	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_9" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_3" ;
-"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int&=&v2 [line 24]\n " shape="box"]
+"div1_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div1_assign_conditionalv}.92f869873008e2be38561a2db0cbf69c_3" [label="3:  Return Stmt \n   n$0=_fun_assign_conditional(1:int) [line 43]\n  *&return:int=(1 / n$0) [line 43]\n " shape="box"]
 	
 
-	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_8" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_4" ;
-"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int&=&v1 [line 24]\n " shape="box"]
+	 "div1_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div1_assign_conditionalv}.92f869873008e2be38561a2db0cbf69c_3" -> "div1_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div1_assign_conditionalv}.92f869873008e2be38561a2db0cbf69c_2" ;
+"div0_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div0_temp_lvaluev}.d905fe7f39ce34b39ca169929ea65e7d_1" [label="1: Start div0_temp_lvalue\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 45]\n " color=yellow style=filled]
 	
 
-	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_7" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_4" ;
-"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_6" [label="6: Prune (false branch) \n   n$2=*&a:int [line 24]\n  PRUNE((n$2 == 0), false); [line 24]\n " shape="invhouse"]
+	 "div0_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div0_temp_lvaluev}.d905fe7f39ce34b39ca169929ea65e7d_1" -> "div0_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div0_temp_lvaluev}.d905fe7f39ce34b39ca169929ea65e7d_3" ;
+"div0_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div0_temp_lvaluev}.d905fe7f39ce34b39ca169929ea65e7d_2" [label="2: Exit div0_temp_lvalue \n  " color=yellow style=filled]
 	
 
-	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_6" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_8" ;
-"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_5" [label="5: Prune (true branch) \n   n$2=*&a:int [line 24]\n  PRUNE((n$2 != 0), true); [line 24]\n " shape="invhouse"]
+"div0_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div0_temp_lvaluev}.d905fe7f39ce34b39ca169929ea65e7d_3" [label="3:  Return Stmt \n   n$0=_fun_div_temp_lvalue(1:int,0:int) [line 45]\n  *&return:int=n$0 [line 45]\n " shape="box"]
 	
 
-	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_5" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_7" ;
-"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_4" [label="4: + \n  " ]
+	 "div0_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div0_temp_lvaluev}.d905fe7f39ce34b39ca169929ea65e7d_3" -> "div0_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div0_temp_lvaluev}.d905fe7f39ce34b39ca169929ea65e7d_2" ;
+"div1_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div1_temp_lvaluev}.3b77e4a6c86c90b394ed42389d225e28_1" [label="1: Start div1_temp_lvalue\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 47]\n " color=yellow style=filled]
 	
 
-	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_4" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_9" ;
-"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_3" [label="3:  Return Stmt \n   n$0=*&v1:int [line 25]\n  *&return:int=n$0 [line 25]\n " shape="box"]
+	 "div1_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div1_temp_lvaluev}.3b77e4a6c86c90b394ed42389d225e28_1" -> "div1_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div1_temp_lvaluev}.3b77e4a6c86c90b394ed42389d225e28_3" ;
+"div1_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div1_temp_lvaluev}.3b77e4a6c86c90b394ed42389d225e28_2" [label="2: Exit div1_temp_lvalue \n  " color=yellow style=filled]
 	
 
-	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_3" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_2" ;
-"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_2" [label="2: Exit assign_conditional \n  " color=yellow style=filled]
+"div1_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div1_temp_lvaluev}.3b77e4a6c86c90b394ed42389d225e28_3" [label="3:  Return Stmt \n   n$0=_fun_div_temp_lvalue(0:int,1:int) [line 47]\n  *&return:int=n$0 [line 47]\n " shape="box"]
 	
 
-"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_1" [label="1: Start assign_conditional\nFormals:  a:int\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$1:int& v2:int v1:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$1,&v2,&v1); [line 22]\n " color=yellow style=filled]
+	 "div1_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div1_temp_lvaluev}.3b77e4a6c86c90b394ed42389d225e28_3" -> "div1_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div1_temp_lvaluev}.3b77e4a6c86c90b394ed42389d225e28_2" ;
+"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_1" [label="1: Start choose_lvalue\nFormals:  a:int\nLocals:  v3:int 0$?%__sil_tmpSIL_temp_conditional___n$1:int& v2:int v1:int \n   DECLARE_LOCALS(&return,&v3,&0$?%__sil_tmpSIL_temp_conditional___n$1,&v2,&v1); [line 10]\n " color=yellow style=filled]
 	
 
-	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_1" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_11" ;
-"div1_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div1_temp_lvaluev}.3b77e4a6c86c90b394ed42389d225e28_3" [label="3:  Return Stmt \n   n$0=_fun_div_temp_lvalue(0:int,1:int) [line 47]\n  *&return:int=n$0 [line 47]\n " shape="box"]
+	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_1" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_11" ;
+"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_2" [label="2: Exit choose_lvalue \n  " color=yellow style=filled]
 	
 
-	 "div1_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div1_temp_lvaluev}.3b77e4a6c86c90b394ed42389d225e28_3" -> "div1_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div1_temp_lvaluev}.3b77e4a6c86c90b394ed42389d225e28_2" ;
-"div1_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div1_temp_lvaluev}.3b77e4a6c86c90b394ed42389d225e28_2" [label="2: Exit div1_temp_lvalue \n  " color=yellow style=filled]
+"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_3" [label="3:  Return Stmt \n   n$0=*&v3:int [line 13]\n  *&return:int=n$0 [line 13]\n " shape="box"]
 	
 
-"div1_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div1_temp_lvaluev}.3b77e4a6c86c90b394ed42389d225e28_1" [label="1: Start div1_temp_lvalue\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 47]\n " color=yellow style=filled]
+	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_3" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_2" ;
+"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_4" [label="4: + \n  " ]
 	
 
-	 "div1_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div1_temp_lvaluev}.3b77e4a6c86c90b394ed42389d225e28_1" -> "div1_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div1_temp_lvaluev}.3b77e4a6c86c90b394ed42389d225e28_3" ;
-"div0_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div0_assign_conditionalv}.e27c458f48e2fd3eb2c37a500947ad83_3" [label="3:  Return Stmt \n   n$0=_fun_assign_conditional(0:int) [line 41]\n  *&return:int=(1 / n$0) [line 41]\n " shape="box"]
+	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_4" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_9" ;
+"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_5" [label="5: Prune (true branch) \n   n$2=*&a:int [line 12]\n  PRUNE((n$2 != 0), true); [line 12]\n " shape="invhouse"]
 	
 
-	 "div0_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div0_assign_conditionalv}.e27c458f48e2fd3eb2c37a500947ad83_3" -> "div0_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div0_assign_conditionalv}.e27c458f48e2fd3eb2c37a500947ad83_2" ;
-"div0_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div0_assign_conditionalv}.e27c458f48e2fd3eb2c37a500947ad83_2" [label="2: Exit div0_assign_conditional \n  " color=yellow style=filled]
+	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_5" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_7" ;
+"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_6" [label="6: Prune (false branch) \n   n$2=*&a:int [line 12]\n  PRUNE((n$2 == 0), false); [line 12]\n " shape="invhouse"]
 	
 
-"div0_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div0_assign_conditionalv}.e27c458f48e2fd3eb2c37a500947ad83_1" [label="1: Start div0_assign_conditional\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 41]\n " color=yellow style=filled]
+	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_6" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_8" ;
+"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int&=&v1 [line 12]\n " shape="box"]
 	
 
-	 "div0_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div0_assign_conditionalv}.e27c458f48e2fd3eb2c37a500947ad83_1" -> "div0_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div0_assign_conditionalv}.e27c458f48e2fd3eb2c37a500947ad83_3" ;
-"div0_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_rvaluev}.659babbaece0692d30930dde0b8bc14b_3" [label="3:  Return Stmt \n   n$0=_fun_choose_rvalue(1:int) [line 37]\n  *&return:int=(1 / n$0) [line 37]\n " shape="box"]
+	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_7" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_4" ;
+"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int&=&v2 [line 12]\n " shape="box"]
 	
 
-	 "div0_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_rvaluev}.659babbaece0692d30930dde0b8bc14b_3" -> "div0_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_rvaluev}.659babbaece0692d30930dde0b8bc14b_2" ;
-"div0_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_rvaluev}.659babbaece0692d30930dde0b8bc14b_2" [label="2: Exit div0_choose_rvalue \n  " color=yellow style=filled]
+	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_8" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_4" ;
+"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_9" [label="9:  DeclStmt \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int& [line 12]\n  n$4=*n$3:int [line 12]\n  *&v3:int=n$4 [line 12]\n " shape="box"]
 	
 
-"div0_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_rvaluev}.659babbaece0692d30930dde0b8bc14b_1" [label="1: Start div0_choose_rvalue\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 37]\n " color=yellow style=filled]
+	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_9" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_3" ;
+"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_10" [label="10:  DeclStmt \n   *&v2:int=1 [line 11]\n " shape="box"]
 	
 
-	 "div0_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_rvaluev}.659babbaece0692d30930dde0b8bc14b_1" -> "div0_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_rvaluev}.659babbaece0692d30930dde0b8bc14b_3" ;
-"div1_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_lvaluev}.946cb482a75d8e7dcce087e5daa1e2a4_3" [label="3:  Return Stmt \n   n$0=_fun_choose_lvalue(0:int) [line 35]\n  *&return:int=(1 / n$0) [line 35]\n " shape="box"]
+	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_10" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_5" ;
+	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_10" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_6" ;
+"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_11" [label="11:  DeclStmt \n   *&v1:int=0 [line 11]\n " shape="box"]
 	
 
-	 "div1_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_lvaluev}.946cb482a75d8e7dcce087e5daa1e2a4_3" -> "div1_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_lvaluev}.946cb482a75d8e7dcce087e5daa1e2a4_2" ;
-"div1_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_lvaluev}.946cb482a75d8e7dcce087e5daa1e2a4_2" [label="2: Exit div1_choose_lvalue \n  " color=yellow style=filled]
+	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_11" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_10" ;
+"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_1" [label="1: Start choose_rvalue\nFormals:  a:int\nLocals:  v3:int 0$?%__sil_tmpSIL_temp_conditional___n$1:int v1:int \n   DECLARE_LOCALS(&return,&v3,&0$?%__sil_tmpSIL_temp_conditional___n$1,&v1); [line 16]\n " color=yellow style=filled]
 	
 
-"div1_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_lvaluev}.946cb482a75d8e7dcce087e5daa1e2a4_1" [label="1: Start div1_choose_lvalue\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 35]\n " color=yellow style=filled]
+	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_1" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_10" ;
+"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_2" [label="2: Exit choose_rvalue \n  " color=yellow style=filled]
 	
 
-	 "div1_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_lvaluev}.946cb482a75d8e7dcce087e5daa1e2a4_1" -> "div1_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_lvaluev}.946cb482a75d8e7dcce087e5daa1e2a4_3" ;
-"div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_9" [label="9:  DeclStmt \n   n$6=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 29]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$2:int=n$6 [line 29]\n  *&r:int&=&0$?%__sil_tmpSIL_materialize_temp__n$2 [line 29]\n " shape="box"]
+"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_3" [label="3:  Return Stmt \n   n$0=*&v3:int [line 19]\n  *&return:int=n$0 [line 19]\n " shape="box"]
 	
 
-	 "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_9" -> "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_3" ;
-"div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 29]\n " shape="box"]
+	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_3" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_2" ;
+"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_4" [label="4: + \n  " ]
 	
 
-	 "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_8" -> "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_4" ;
-"div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_7" [label="7:  ConditinalStmt Branch \n   n$5=*&b:int [line 29]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=n$5 [line 29]\n " shape="box"]
+	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_4" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_9" ;
+"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_5" [label="5: Prune (true branch) \n   n$2=*&a:int [line 18]\n  PRUNE((n$2 != 0), true); [line 18]\n " shape="invhouse"]
 	
 
-	 "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_7" -> "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_4" ;
-"div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_6" [label="6: Prune (false branch) \n   n$4=*&a:int [line 29]\n  PRUNE((n$4 == 0), false); [line 29]\n " shape="invhouse"]
+	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_5" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_7" ;
+"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_6" [label="6: Prune (false branch) \n   n$2=*&a:int [line 18]\n  PRUNE((n$2 == 0), false); [line 18]\n " shape="invhouse"]
 	
 
-	 "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_6" -> "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_8" ;
-"div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_5" [label="5: Prune (true branch) \n   n$4=*&a:int [line 29]\n  PRUNE((n$4 != 0), true); [line 29]\n " shape="invhouse"]
+	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_6" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_8" ;
+"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_7" [label="7:  ConditinalStmt Branch \n   n$3=*&v1:int [line 18]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$3 [line 18]\n " shape="box"]
 	
 
-	 "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_5" -> "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_7" ;
-"div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_4" [label="4: + \n  " ]
+	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_7" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_4" ;
+"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 18]\n " shape="box"]
 	
 
-	 "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_4" -> "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_9" ;
-"div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_3" [label="3:  Return Stmt \n   n$0=*&r:int& [line 30]\n  n$1=*n$0:int [line 30]\n  *&return:int=(1 / n$1) [line 30]\n " shape="box"]
+	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_8" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_4" ;
+"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_9" [label="9:  DeclStmt \n   n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 18]\n  *&v3:int=n$4 [line 18]\n " shape="box"]
 	
 
-	 "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_3" -> "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_2" ;
-"div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_2" [label="2: Exit div_temp_lvalue \n  " color=yellow style=filled]
+	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_9" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_3" ;
+"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_10" [label="10:  DeclStmt \n   *&v1:int=0 [line 17]\n " shape="box"]
 	
 
-"div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_1" [label="1: Start div_temp_lvalue\nFormals:  a:int b:int\nLocals:  r:int& 0$?%__sil_tmpSIL_materialize_temp__n$2:int 0$?%__sil_tmpSIL_temp_conditional___n$3:int \n   DECLARE_LOCALS(&return,&r,&0$?%__sil_tmpSIL_materialize_temp__n$2,&0$?%__sil_tmpSIL_temp_conditional___n$3); [line 28]\n " color=yellow style=filled]
+	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_10" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_5" ;
+	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_10" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_6" ;
+"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_1" [label="1: Start assign_conditional\nFormals:  a:int\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$1:int& v2:int v1:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$1,&v2,&v1); [line 22]\n " color=yellow style=filled]
 	
 
-	 "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_1" -> "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_5" ;
-	 "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_1" -> "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_6" ;
-"div0_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div0_temp_lvaluev}.d905fe7f39ce34b39ca169929ea65e7d_3" [label="3:  Return Stmt \n   n$0=_fun_div_temp_lvalue(1:int,0:int) [line 45]\n  *&return:int=n$0 [line 45]\n " shape="box"]
+	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_1" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_11" ;
+"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_2" [label="2: Exit assign_conditional \n  " color=yellow style=filled]
 	
 
-	 "div0_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div0_temp_lvaluev}.d905fe7f39ce34b39ca169929ea65e7d_3" -> "div0_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div0_temp_lvaluev}.d905fe7f39ce34b39ca169929ea65e7d_2" ;
-"div0_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div0_temp_lvaluev}.d905fe7f39ce34b39ca169929ea65e7d_2" [label="2: Exit div0_temp_lvalue \n  " color=yellow style=filled]
+"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_3" [label="3:  Return Stmt \n   n$0=*&v1:int [line 25]\n  *&return:int=n$0 [line 25]\n " shape="box"]
 	
 
-"div0_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div0_temp_lvaluev}.d905fe7f39ce34b39ca169929ea65e7d_1" [label="1: Start div0_temp_lvalue\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 45]\n " color=yellow style=filled]
+	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_3" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_2" ;
+"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_4" [label="4: + \n  " ]
 	
 
-	 "div0_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div0_temp_lvaluev}.d905fe7f39ce34b39ca169929ea65e7d_1" -> "div0_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div0_temp_lvaluev}.d905fe7f39ce34b39ca169929ea65e7d_3" ;
-"div0_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_lvaluev}.33971c4fb1631ae7849c0b6e9319d4ed_3" [label="3:  Return Stmt \n   n$0=_fun_choose_lvalue(1:int) [line 33]\n  *&return:int=(1 / n$0) [line 33]\n " shape="box"]
+	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_4" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_9" ;
+"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_5" [label="5: Prune (true branch) \n   n$2=*&a:int [line 24]\n  PRUNE((n$2 != 0), true); [line 24]\n " shape="invhouse"]
 	
 
-	 "div0_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_lvaluev}.33971c4fb1631ae7849c0b6e9319d4ed_3" -> "div0_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_lvaluev}.33971c4fb1631ae7849c0b6e9319d4ed_2" ;
-"div0_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_lvaluev}.33971c4fb1631ae7849c0b6e9319d4ed_2" [label="2: Exit div0_choose_lvalue \n  " color=yellow style=filled]
+	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_5" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_7" ;
+"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_6" [label="6: Prune (false branch) \n   n$2=*&a:int [line 24]\n  PRUNE((n$2 == 0), false); [line 24]\n " shape="invhouse"]
 	
 
-"div0_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_lvaluev}.33971c4fb1631ae7849c0b6e9319d4ed_1" [label="1: Start div0_choose_lvalue\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 33]\n " color=yellow style=filled]
+	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_6" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_8" ;
+"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int&=&v1 [line 24]\n " shape="box"]
 	
 
-	 "div0_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_lvaluev}.33971c4fb1631ae7849c0b6e9319d4ed_1" -> "div0_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_lvaluev}.33971c4fb1631ae7849c0b6e9319d4ed_3" ;
-"div1_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_rvaluev}.fef13b1fcbaa224805a1550f767822a9_3" [label="3:  Return Stmt \n   n$0=_fun_choose_rvalue(0:int) [line 39]\n  *&return:int=(1 / n$0) [line 39]\n " shape="box"]
+	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_7" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_4" ;
+"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int&=&v2 [line 24]\n " shape="box"]
 	
 
-	 "div1_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_rvaluev}.fef13b1fcbaa224805a1550f767822a9_3" -> "div1_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_rvaluev}.fef13b1fcbaa224805a1550f767822a9_2" ;
-"div1_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_rvaluev}.fef13b1fcbaa224805a1550f767822a9_2" [label="2: Exit div1_choose_rvalue \n  " color=yellow style=filled]
+	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_8" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_4" ;
+"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_9" [label="9:  BinaryOperatorStmt: Assign \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int& [line 24]\n  *n$3:int=1 [line 24]\n " shape="box"]
 	
 
-"div1_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_rvaluev}.fef13b1fcbaa224805a1550f767822a9_1" [label="1: Start div1_choose_rvalue\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 39]\n " color=yellow style=filled]
+	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_9" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_3" ;
+"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_10" [label="10:  DeclStmt \n   *&v2:int=0 [line 23]\n " shape="box"]
 	
 
-	 "div1_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_rvaluev}.fef13b1fcbaa224805a1550f767822a9_1" -> "div1_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_rvaluev}.fef13b1fcbaa224805a1550f767822a9_3" ;
-"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_10" [label="10:  DeclStmt \n   *&v1:int=0 [line 17]\n " shape="box"]
+	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_10" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_5" ;
+	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_10" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_6" ;
+"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_11" [label="11:  DeclStmt \n   *&v1:int=0 [line 23]\n " shape="box"]
 	
 
-	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_10" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_5" ;
-	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_10" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_6" ;
-"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_9" [label="9:  DeclStmt \n   n$4=*&0$?%__sil_tmpSIL_temp_conditional___n$1:int [line 18]\n  *&v3:int=n$4 [line 18]\n " shape="box"]
+	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_11" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_10" ;
+"div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_1" [label="1: Start div_temp_lvalue\nFormals:  a:int b:int\nLocals:  r:int& 0$?%__sil_tmpSIL_materialize_temp__n$2:int 0$?%__sil_tmpSIL_temp_conditional___n$3:int \n   DECLARE_LOCALS(&return,&r,&0$?%__sil_tmpSIL_materialize_temp__n$2,&0$?%__sil_tmpSIL_temp_conditional___n$3); [line 28]\n " color=yellow style=filled]
 	
 
-	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_9" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_3" ;
-"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 18]\n " shape="box"]
+	 "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_1" -> "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_5" ;
+	 "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_1" -> "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_6" ;
+"div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_2" [label="2: Exit div_temp_lvalue \n  " color=yellow style=filled]
 	
 
-	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_8" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_4" ;
-"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_7" [label="7:  ConditinalStmt Branch \n   n$3=*&v1:int [line 18]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$3 [line 18]\n " shape="box"]
+"div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_3" [label="3:  Return Stmt \n   n$0=*&r:int& [line 30]\n  n$1=*n$0:int [line 30]\n  *&return:int=(1 / n$1) [line 30]\n " shape="box"]
 	
 
-	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_7" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_4" ;
-"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_6" [label="6: Prune (false branch) \n   n$2=*&a:int [line 18]\n  PRUNE((n$2 == 0), false); [line 18]\n " shape="invhouse"]
+	 "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_3" -> "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_2" ;
+"div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_4" [label="4: + \n  " ]
 	
 
-	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_6" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_8" ;
-"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_5" [label="5: Prune (true branch) \n   n$2=*&a:int [line 18]\n  PRUNE((n$2 != 0), true); [line 18]\n " shape="invhouse"]
+	 "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_4" -> "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_9" ;
+"div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_5" [label="5: Prune (true branch) \n   n$4=*&a:int [line 29]\n  PRUNE((n$4 != 0), true); [line 29]\n " shape="invhouse"]
 	
 
-	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_5" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_7" ;
-"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_4" [label="4: + \n  " ]
+	 "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_5" -> "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_7" ;
+"div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_6" [label="6: Prune (false branch) \n   n$4=*&a:int [line 29]\n  PRUNE((n$4 == 0), false); [line 29]\n " shape="invhouse"]
 	
 
-	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_4" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_9" ;
-"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_3" [label="3:  Return Stmt \n   n$0=*&v3:int [line 19]\n  *&return:int=n$0 [line 19]\n " shape="box"]
+	 "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_6" -> "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_8" ;
+"div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_7" [label="7:  ConditinalStmt Branch \n   n$5=*&b:int [line 29]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=n$5 [line 29]\n " shape="box"]
 	
 
-	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_3" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_2" ;
-"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_2" [label="2: Exit choose_rvalue \n  " color=yellow style=filled]
+	 "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_7" -> "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_4" ;
+"div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 29]\n " shape="box"]
 	
 
-"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_1" [label="1: Start choose_rvalue\nFormals:  a:int\nLocals:  v3:int 0$?%__sil_tmpSIL_temp_conditional___n$1:int v1:int \n   DECLARE_LOCALS(&return,&v3,&0$?%__sil_tmpSIL_temp_conditional___n$1,&v1); [line 16]\n " color=yellow style=filled]
+	 "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_8" -> "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_4" ;
+"div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_9" [label="9:  DeclStmt \n   n$6=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 29]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$2:int=n$6 [line 29]\n  *&r:int&=&0$?%__sil_tmpSIL_materialize_temp__n$2 [line 29]\n " shape="box"]
 	
 
-	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_1" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_10" ;
+	 "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_9" -> "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_3" ;
 }

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

@@ -1,118 +1,118 @@
 /* @generated */
 digraph iCFG {
-"Z_Z{_ZN1ZC1Ev}.e5db815c377ac8d89bbc83caf274d4d3_2" [label="2: Exit Z_Z \n  " color=yellow style=filled]
-	
-
-"Z_Z{_ZN1ZC1Ev}.e5db815c377ac8d89bbc83caf274d4d3_1" [label="1: Start Z_Z\nFormals:  this:class Z*\nLocals:  \n   DECLARE_LOCALS(&return); [line 27]\n " color=yellow style=filled]
+"array_of_person{d41d8cd98f00b204e9800998ecf8427e_Z15array_of_personv}.5e6676e141cccf7b269a7c471feae769_1" [label="1: Start array_of_person\nFormals: \nLocals:  arr:class Person[10] 0$?%__sil_tmpSIL_materialize_temp__n$1:class Person 0$?%__sil_tmpSIL_materialize_temp__n$2:class Person 0$?%__sil_tmpSIL_materialize_temp__n$3:class Person \n   DECLARE_LOCALS(&return,&arr,&0$?%__sil_tmpSIL_materialize_temp__n$1,&0$?%__sil_tmpSIL_materialize_temp__n$2,&0$?%__sil_tmpSIL_materialize_temp__n$3); [line 17]\n " color=yellow style=filled]
 	
 
-	 "Z_Z{_ZN1ZC1Ev}.e5db815c377ac8d89bbc83caf274d4d3_1" -> "Z_Z{_ZN1ZC1Ev}.e5db815c377ac8d89bbc83caf274d4d3_2" ;
-"array_of_person{d41d8cd98f00b204e9800998ecf8427e_Z15array_of_personv}.5e6676e141cccf7b269a7c471feae769_4" [label="4:  DeclStmt \n   _fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$3:class Person*) [line 18]\n  _fun_Person_Person(&arr[0]:class Person*,&0$?%__sil_tmpSIL_materialize_temp__n$3:class Person&) [line 18]\n  _fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$2:class Person*) [line 18]\n  _fun_Person_Person(&arr[1]:class Person*,&0$?%__sil_tmpSIL_materialize_temp__n$2:class Person&) [line 18]\n  _fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$1:class Person*) [line 18]\n  _fun_Person_Person(&arr[2]:class Person*,&0$?%__sil_tmpSIL_materialize_temp__n$1:class Person&) [line 18]\n " shape="box"]
+	 "array_of_person{d41d8cd98f00b204e9800998ecf8427e_Z15array_of_personv}.5e6676e141cccf7b269a7c471feae769_1" -> "array_of_person{d41d8cd98f00b204e9800998ecf8427e_Z15array_of_personv}.5e6676e141cccf7b269a7c471feae769_4" ;
+"array_of_person{d41d8cd98f00b204e9800998ecf8427e_Z15array_of_personv}.5e6676e141cccf7b269a7c471feae769_2" [label="2: Exit array_of_person \n  " color=yellow style=filled]
 	
 
-	 "array_of_person{d41d8cd98f00b204e9800998ecf8427e_Z15array_of_personv}.5e6676e141cccf7b269a7c471feae769_4" -> "array_of_person{d41d8cd98f00b204e9800998ecf8427e_Z15array_of_personv}.5e6676e141cccf7b269a7c471feae769_3" ;
 "array_of_person{d41d8cd98f00b204e9800998ecf8427e_Z15array_of_personv}.5e6676e141cccf7b269a7c471feae769_3" [label="3:  Return Stmt \n   n$0=*&arr[0].x:int [line 19]\n  *&return:int=n$0 [line 19]\n " shape="box"]
 	
 
 	 "array_of_person{d41d8cd98f00b204e9800998ecf8427e_Z15array_of_personv}.5e6676e141cccf7b269a7c471feae769_3" -> "array_of_person{d41d8cd98f00b204e9800998ecf8427e_Z15array_of_personv}.5e6676e141cccf7b269a7c471feae769_2" ;
-"array_of_person{d41d8cd98f00b204e9800998ecf8427e_Z15array_of_personv}.5e6676e141cccf7b269a7c471feae769_2" [label="2: Exit array_of_person \n  " color=yellow style=filled]
+"array_of_person{d41d8cd98f00b204e9800998ecf8427e_Z15array_of_personv}.5e6676e141cccf7b269a7c471feae769_4" [label="4:  DeclStmt \n   _fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$3:class Person*) [line 18]\n  _fun_Person_Person(&arr[0]:class Person*,&0$?%__sil_tmpSIL_materialize_temp__n$3:class Person&) [line 18]\n  _fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$2:class Person*) [line 18]\n  _fun_Person_Person(&arr[1]:class Person*,&0$?%__sil_tmpSIL_materialize_temp__n$2:class Person&) [line 18]\n  _fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$1:class Person*) [line 18]\n  _fun_Person_Person(&arr[2]:class Person*,&0$?%__sil_tmpSIL_materialize_temp__n$1:class Person&) [line 18]\n " shape="box"]
 	
 
-"array_of_person{d41d8cd98f00b204e9800998ecf8427e_Z15array_of_personv}.5e6676e141cccf7b269a7c471feae769_1" [label="1: Start array_of_person\nFormals: \nLocals:  arr:class Person[10] 0$?%__sil_tmpSIL_materialize_temp__n$1:class Person 0$?%__sil_tmpSIL_materialize_temp__n$2:class Person 0$?%__sil_tmpSIL_materialize_temp__n$3:class Person \n   DECLARE_LOCALS(&return,&arr,&0$?%__sil_tmpSIL_materialize_temp__n$1,&0$?%__sil_tmpSIL_materialize_temp__n$2,&0$?%__sil_tmpSIL_materialize_temp__n$3); [line 17]\n " color=yellow style=filled]
+	 "array_of_person{d41d8cd98f00b204e9800998ecf8427e_Z15array_of_personv}.5e6676e141cccf7b269a7c471feae769_4" -> "array_of_person{d41d8cd98f00b204e9800998ecf8427e_Z15array_of_personv}.5e6676e141cccf7b269a7c471feae769_3" ;
+"matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_Z16matrix_of_personv}.42bf08ed339376ba5c4530035307761f_1" [label="1: Start matrix_of_person\nFormals: \nLocals:  arr:class Person[2][2] 0$?%__sil_tmpSIL_materialize_temp__n$1:class Person 0$?%__sil_tmpSIL_materialize_temp__n$2:class Person 0$?%__sil_tmpSIL_materialize_temp__n$3:class Person 0$?%__sil_tmpSIL_materialize_temp__n$4:class Person \n   DECLARE_LOCALS(&return,&arr,&0$?%__sil_tmpSIL_materialize_temp__n$1,&0$?%__sil_tmpSIL_materialize_temp__n$2,&0$?%__sil_tmpSIL_materialize_temp__n$3,&0$?%__sil_tmpSIL_materialize_temp__n$4); [line 22]\n " color=yellow style=filled]
 	
 
-	 "array_of_person{d41d8cd98f00b204e9800998ecf8427e_Z15array_of_personv}.5e6676e141cccf7b269a7c471feae769_1" -> "array_of_person{d41d8cd98f00b204e9800998ecf8427e_Z15array_of_personv}.5e6676e141cccf7b269a7c471feae769_4" ;
-"Person_Person{_ZN6PersonC1Ev}.eae7ac90d0b106ac1ffce8f205a2d898_2" [label="2: Exit Person_Person \n  " color=yellow style=filled]
+	 "matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_Z16matrix_of_personv}.42bf08ed339376ba5c4530035307761f_1" -> "matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_Z16matrix_of_personv}.42bf08ed339376ba5c4530035307761f_4" ;
+"matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_Z16matrix_of_personv}.42bf08ed339376ba5c4530035307761f_2" [label="2: Exit matrix_of_person \n  " color=yellow style=filled]
 	
 
-"Person_Person{_ZN6PersonC1Ev}.eae7ac90d0b106ac1ffce8f205a2d898_1" [label="1: Start Person_Person\nFormals:  this:class Person*\nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
+"matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_Z16matrix_of_personv}.42bf08ed339376ba5c4530035307761f_3" [label="3:  Return Stmt \n   n$0=*&arr[0][1].x:int [line 24]\n  *&return:int=n$0 [line 24]\n " shape="box"]
 	
 
-	 "Person_Person{_ZN6PersonC1Ev}.eae7ac90d0b106ac1ffce8f205a2d898_1" -> "Person_Person{_ZN6PersonC1Ev}.eae7ac90d0b106ac1ffce8f205a2d898_2" ;
+	 "matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_Z16matrix_of_personv}.42bf08ed339376ba5c4530035307761f_3" -> "matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_Z16matrix_of_personv}.42bf08ed339376ba5c4530035307761f_2" ;
 "matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_Z16matrix_of_personv}.42bf08ed339376ba5c4530035307761f_4" [label="4:  DeclStmt \n   _fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$4:class Person*) [line 23]\n  _fun_Person_Person(&arr[0][0]:class Person*,&0$?%__sil_tmpSIL_materialize_temp__n$4:class Person&) [line 23]\n  _fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$3:class Person*) [line 23]\n  _fun_Person_Person(&arr[0][1]:class Person*,&0$?%__sil_tmpSIL_materialize_temp__n$3:class Person&) [line 23]\n  _fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$2:class Person*) [line 23]\n  _fun_Person_Person(&arr[1][0]:class Person*,&0$?%__sil_tmpSIL_materialize_temp__n$2:class Person&) [line 23]\n  _fun_Person_Person(&0$?%__sil_tmpSIL_materialize_temp__n$1:class Person*) [line 23]\n  _fun_Person_Person(&arr[1][1]:class Person*,&0$?%__sil_tmpSIL_materialize_temp__n$1:class Person&) [line 23]\n " shape="box"]
 	
 
 	 "matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_Z16matrix_of_personv}.42bf08ed339376ba5c4530035307761f_4" -> "matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_Z16matrix_of_personv}.42bf08ed339376ba5c4530035307761f_3" ;
-"matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_Z16matrix_of_personv}.42bf08ed339376ba5c4530035307761f_3" [label="3:  Return Stmt \n   n$0=*&arr[0][1].x:int [line 24]\n  *&return:int=n$0 [line 24]\n " shape="box"]
+"initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_1" [label="1: Start initialization_c_style\nFormals: \nLocals:  z2:class Z z:class Z[2] \n   DECLARE_LOCALS(&return,&z2,&z); [line 32]\n " color=yellow style=filled]
 	
 
-	 "matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_Z16matrix_of_personv}.42bf08ed339376ba5c4530035307761f_3" -> "matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_Z16matrix_of_personv}.42bf08ed339376ba5c4530035307761f_2" ;
-"matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_Z16matrix_of_personv}.42bf08ed339376ba5c4530035307761f_2" [label="2: Exit matrix_of_person \n  " color=yellow style=filled]
+	 "initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_1" -> "initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_4" ;
+"initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_2" [label="2: Exit initialization_c_style \n  " color=yellow style=filled]
 	
 
-"matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_Z16matrix_of_personv}.42bf08ed339376ba5c4530035307761f_1" [label="1: Start matrix_of_person\nFormals: \nLocals:  arr:class Person[2][2] 0$?%__sil_tmpSIL_materialize_temp__n$1:class Person 0$?%__sil_tmpSIL_materialize_temp__n$2:class Person 0$?%__sil_tmpSIL_materialize_temp__n$3:class Person 0$?%__sil_tmpSIL_materialize_temp__n$4:class Person \n   DECLARE_LOCALS(&return,&arr,&0$?%__sil_tmpSIL_materialize_temp__n$1,&0$?%__sil_tmpSIL_materialize_temp__n$2,&0$?%__sil_tmpSIL_materialize_temp__n$3,&0$?%__sil_tmpSIL_materialize_temp__n$4); [line 22]\n " color=yellow style=filled]
+"initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_3" [label="3:  DeclStmt \n   _fun_Z_Z(&z2:class Z*) [line 34]\n " shape="box"]
 	
 
-	 "matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_Z16matrix_of_personv}.42bf08ed339376ba5c4530035307761f_1" -> "matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_Z16matrix_of_personv}.42bf08ed339376ba5c4530035307761f_4" ;
-"Person_Person{_ZN6PersonC1EOS_}.6d4e3106e5a54c5fcbdd4905bee9b887_3" [label="3:  Constructor Init \n   n$0=*&this:class Person* [line 10]\n  n$1=*&__param_0:class Person& [line 10]\n  n$2=*n$1.x:int [line 10]\n  *n$0.x:int=n$2 [line 10]\n " shape="box"]
+	 "initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_3" -> "initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_2" ;
+"initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_4" [label="4:  DeclStmt \n   *&z[0].a:int=1 [line 33]\n  *&z[0].b:int=2 [line 33]\n  *&z[1].a:int=2 [line 33]\n  *&z[1].b:int=3 [line 33]\n " shape="box"]
 	
 
-	 "Person_Person{_ZN6PersonC1EOS_}.6d4e3106e5a54c5fcbdd4905bee9b887_3" -> "Person_Person{_ZN6PersonC1EOS_}.6d4e3106e5a54c5fcbdd4905bee9b887_2" ;
-"Person_Person{_ZN6PersonC1EOS_}.6d4e3106e5a54c5fcbdd4905bee9b887_2" [label="2: Exit Person_Person \n  " color=yellow style=filled]
+	 "initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_4" -> "initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_3" ;
+"initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_1" [label="1: Start initialization_mixed_styles_not_handled_correctly\nFormals: \nLocals:  z2:class Z z:class Z[2] old:class Z \n   DECLARE_LOCALS(&return,&z2,&z,&old); [line 39]\n " color=yellow style=filled]
 	
 
-"Person_Person{_ZN6PersonC1EOS_}.6d4e3106e5a54c5fcbdd4905bee9b887_1" [label="1: Start Person_Person\nFormals:  this:class Person* __param_0:class Person&\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
+	 "initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_1" -> "initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_5" ;
+"initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_2" [label="2: Exit initialization_mixed_styles_not_handled_correctly \n  " color=yellow style=filled]
 	
 
-	 "Person_Person{_ZN6PersonC1EOS_}.6d4e3106e5a54c5fcbdd4905bee9b887_1" -> "Person_Person{_ZN6PersonC1EOS_}.6d4e3106e5a54c5fcbdd4905bee9b887_3" ;
-"Person_Person{_ZN6PersonC1Ei}.2819442115554db893a15b95877c8b8d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class Person* [line 12]\n  n$1=*&i:int [line 12]\n  *n$0.x:int=n$1 [line 12]\n " shape="box"]
+"initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_3" [label="3:  DeclStmt \n   _fun_Z_Z(&z2:class Z*) [line 42]\n " shape="box"]
 	
 
-	 "Person_Person{_ZN6PersonC1Ei}.2819442115554db893a15b95877c8b8d_3" -> "Person_Person{_ZN6PersonC1Ei}.2819442115554db893a15b95877c8b8d_2" ;
-"Person_Person{_ZN6PersonC1Ei}.2819442115554db893a15b95877c8b8d_2" [label="2: Exit Person_Person \n  " color=yellow style=filled]
+	 "initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_3" -> "initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_2" ;
+"initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_4" [label="4:  DeclStmt \n   _fun_Z_Z(&z[1]:class Z*,&old:class Z&) [line 41]\n " shape="box"]
 	
 
-"Person_Person{_ZN6PersonC1Ei}.2819442115554db893a15b95877c8b8d_1" [label="1: Start Person_Person\nFormals:  this:class Person* i:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
+	 "initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_4" -> "initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_3" ;
+"initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_5" [label="5:  DeclStmt \n   _fun_Z_Z(&old:class Z*) [line 40]\n " shape="box"]
 	
 
-	 "Person_Person{_ZN6PersonC1Ei}.2819442115554db893a15b95877c8b8d_1" -> "Person_Person{_ZN6PersonC1Ei}.2819442115554db893a15b95877c8b8d_3" ;
-"Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_4" [label="4:  Constructor Init \n   n$3=*&this:class Z* [line 27]\n  n$4=*&__param_0:class Z& [line 27]\n  n$5=*n$4.a:int [line 27]\n  *n$3.a:int=n$5 [line 27]\n " shape="box"]
+	 "initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_5" -> "initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_4" ;
+"Person_Person{_ZN6PersonC1Ev}.eae7ac90d0b106ac1ffce8f205a2d898_1" [label="1: Start Person_Person\nFormals:  this:class Person*\nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
 	
 
-	 "Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_4" -> "Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_3" ;
-"Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_3" [label="3:  Constructor Init \n   n$0=*&this:class Z* [line 27]\n  n$1=*&__param_0:class Z& [line 27]\n  n$2=*n$1.b:int [line 27]\n  *n$0.b:int=n$2 [line 27]\n " shape="box"]
+	 "Person_Person{_ZN6PersonC1Ev}.eae7ac90d0b106ac1ffce8f205a2d898_1" -> "Person_Person{_ZN6PersonC1Ev}.eae7ac90d0b106ac1ffce8f205a2d898_2" ;
+"Person_Person{_ZN6PersonC1Ev}.eae7ac90d0b106ac1ffce8f205a2d898_2" [label="2: Exit Person_Person \n  " color=yellow style=filled]
 	
 
-	 "Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_3" -> "Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_2" ;
-"Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_2" [label="2: Exit Z_Z \n  " color=yellow style=filled]
+"Person_Person{_ZN6PersonC1EOS_}.6d4e3106e5a54c5fcbdd4905bee9b887_1" [label="1: Start Person_Person\nFormals:  this:class Person* __param_0:class Person&\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
-"Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_1" [label="1: Start Z_Z\nFormals:  this:class Z* __param_0:class Z&\nLocals:  \n   DECLARE_LOCALS(&return); [line 27]\n " color=yellow style=filled]
+	 "Person_Person{_ZN6PersonC1EOS_}.6d4e3106e5a54c5fcbdd4905bee9b887_1" -> "Person_Person{_ZN6PersonC1EOS_}.6d4e3106e5a54c5fcbdd4905bee9b887_3" ;
+"Person_Person{_ZN6PersonC1EOS_}.6d4e3106e5a54c5fcbdd4905bee9b887_2" [label="2: Exit Person_Person \n  " color=yellow style=filled]
 	
 
-	 "Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_1" -> "Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_4" ;
-"initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_4" [label="4:  DeclStmt \n   *&z[0].a:int=1 [line 33]\n  *&z[0].b:int=2 [line 33]\n  *&z[1].a:int=2 [line 33]\n  *&z[1].b:int=3 [line 33]\n " shape="box"]
+"Person_Person{_ZN6PersonC1EOS_}.6d4e3106e5a54c5fcbdd4905bee9b887_3" [label="3:  Constructor Init \n   n$0=*&this:class Person* [line 10]\n  n$1=*&__param_0:class Person& [line 10]\n  n$2=*n$1.x:int [line 10]\n  *n$0.x:int=n$2 [line 10]\n " shape="box"]
 	
 
-	 "initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_4" -> "initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_3" ;
-"initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_3" [label="3:  DeclStmt \n   _fun_Z_Z(&z2:class Z*) [line 34]\n " shape="box"]
+	 "Person_Person{_ZN6PersonC1EOS_}.6d4e3106e5a54c5fcbdd4905bee9b887_3" -> "Person_Person{_ZN6PersonC1EOS_}.6d4e3106e5a54c5fcbdd4905bee9b887_2" ;
+"Person_Person{_ZN6PersonC1Ei}.2819442115554db893a15b95877c8b8d_1" [label="1: Start Person_Person\nFormals:  this:class Person* i:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
-	 "initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_3" -> "initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_2" ;
-"initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_2" [label="2: Exit initialization_c_style \n  " color=yellow style=filled]
+	 "Person_Person{_ZN6PersonC1Ei}.2819442115554db893a15b95877c8b8d_1" -> "Person_Person{_ZN6PersonC1Ei}.2819442115554db893a15b95877c8b8d_3" ;
+"Person_Person{_ZN6PersonC1Ei}.2819442115554db893a15b95877c8b8d_2" [label="2: Exit Person_Person \n  " color=yellow style=filled]
 	
 
-"initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_1" [label="1: Start initialization_c_style\nFormals: \nLocals:  z2:class Z z:class Z[2] \n   DECLARE_LOCALS(&return,&z2,&z); [line 32]\n " color=yellow style=filled]
+"Person_Person{_ZN6PersonC1Ei}.2819442115554db893a15b95877c8b8d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class Person* [line 12]\n  n$1=*&i:int [line 12]\n  *n$0.x:int=n$1 [line 12]\n " shape="box"]
 	
 
-	 "initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_1" -> "initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_4" ;
-"initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_5" [label="5:  DeclStmt \n   _fun_Z_Z(&old:class Z*) [line 40]\n " shape="box"]
+	 "Person_Person{_ZN6PersonC1Ei}.2819442115554db893a15b95877c8b8d_3" -> "Person_Person{_ZN6PersonC1Ei}.2819442115554db893a15b95877c8b8d_2" ;
+"Z_Z{_ZN1ZC1Ev}.e5db815c377ac8d89bbc83caf274d4d3_1" [label="1: Start Z_Z\nFormals:  this:class Z*\nLocals:  \n   DECLARE_LOCALS(&return); [line 27]\n " color=yellow style=filled]
 	
 
-	 "initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_5" -> "initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_4" ;
-"initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_4" [label="4:  DeclStmt \n   _fun_Z_Z(&z[1]:class Z*,&old:class Z&) [line 41]\n " shape="box"]
+	 "Z_Z{_ZN1ZC1Ev}.e5db815c377ac8d89bbc83caf274d4d3_1" -> "Z_Z{_ZN1ZC1Ev}.e5db815c377ac8d89bbc83caf274d4d3_2" ;
+"Z_Z{_ZN1ZC1Ev}.e5db815c377ac8d89bbc83caf274d4d3_2" [label="2: Exit Z_Z \n  " color=yellow style=filled]
 	
 
-	 "initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_4" -> "initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_3" ;
-"initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_3" [label="3:  DeclStmt \n   _fun_Z_Z(&z2:class Z*) [line 42]\n " shape="box"]
+"Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_1" [label="1: Start Z_Z\nFormals:  this:class Z* __param_0:class Z&\nLocals:  \n   DECLARE_LOCALS(&return); [line 27]\n " color=yellow style=filled]
 	
 
-	 "initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_3" -> "initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_2" ;
-"initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_2" [label="2: Exit initialization_mixed_styles_not_handled_correctly \n  " color=yellow style=filled]
+	 "Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_1" -> "Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_4" ;
+"Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_2" [label="2: Exit Z_Z \n  " color=yellow style=filled]
 	
 
-"initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_1" [label="1: Start initialization_mixed_styles_not_handled_correctly\nFormals: \nLocals:  z2:class Z z:class Z[2] old:class Z \n   DECLARE_LOCALS(&return,&z2,&z,&old); [line 39]\n " color=yellow style=filled]
+"Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_3" [label="3:  Constructor Init \n   n$0=*&this:class Z* [line 27]\n  n$1=*&__param_0:class Z& [line 27]\n  n$2=*n$1.b:int [line 27]\n  *n$0.b:int=n$2 [line 27]\n " shape="box"]
 	
 
-	 "initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_1" -> "initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_5" ;
+	 "Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_3" -> "Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_2" ;
+"Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_4" [label="4:  Constructor Init \n   n$3=*&this:class Z* [line 27]\n  n$4=*&__param_0:class Z& [line 27]\n  n$5=*n$4.a:int [line 27]\n  *n$3.a:int=n$5 [line 27]\n " shape="box"]
+	
+
+	 "Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_4" -> "Z_Z{_ZN1ZC1ERKS_}.123cfb51e40551ce9740cbf4b98a93b1_3" ;
 }

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

@@ -1,44 +1,44 @@
 /* @generated */
 digraph iCFG {
-"X_div(_ZN1X3divEv).e2d15d5b7aaa55937ca9796dca90c373_3" [label="3:  Return Stmt \n   n$0=*&this:class X* [line 15]\n  n$1=*n$0.f:int [line 15]\n  *&return:int=(1 / n$1) [line 15]\n " shape="box"]
-	
-
-	 "X_div(_ZN1X3divEv).e2d15d5b7aaa55937ca9796dca90c373_3" -> "X_div(_ZN1X3divEv).e2d15d5b7aaa55937ca9796dca90c373_2" ;
-"X_div(_ZN1X3divEv).e2d15d5b7aaa55937ca9796dca90c373_2" [label="2: Exit X_div \n  " color=yellow style=filled]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" [label="1: Start test\nFormals: \nLocals:  x3:class X x2:class X x1:class X \n   DECLARE_LOCALS(&return,&x3,&x2,&x1); [line 20]\n " color=yellow style=filled]
 	
 
-"X_div(_ZN1X3divEv).e2d15d5b7aaa55937ca9796dca90c373_1" [label="1: Start X_div\nFormals:  this:class X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" ;
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-	 "X_div(_ZN1X3divEv).e2d15d5b7aaa55937ca9796dca90c373_1" -> "X_div(_ZN1X3divEv).e2d15d5b7aaa55937ca9796dca90c373_3" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" [label="5:  DeclStmt \n   _fun_X_X(&x1:class X*,0:int,0:int) [line 21]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  DeclStmt \n   _fun_X_X(&x3:class X*,0:int,1:int) [line 23]\n " shape="box"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" ;
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" ;
 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" [label="4:  DeclStmt \n   _fun_X_X(&x2:class X*,1:int,0:int) [line 22]\n " shape="box"]
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  DeclStmt \n   _fun_X_X(&x3:class X*,0:int,1:int) [line 23]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" [label="5:  DeclStmt \n   _fun_X_X(&x1:class X*,0:int,0:int) [line 21]\n " shape="box"]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" [label="2: Exit test \n  " color=yellow style=filled]
+	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" ;
+"X_div(_ZN1X3divEv).e2d15d5b7aaa55937ca9796dca90c373_1" [label="1: Start X_div\nFormals:  this:class X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" [label="1: Start test\nFormals: \nLocals:  x3:class X x2:class X x1:class X \n   DECLARE_LOCALS(&return,&x3,&x2,&x1); [line 20]\n " color=yellow style=filled]
+	 "X_div(_ZN1X3divEv).e2d15d5b7aaa55937ca9796dca90c373_1" -> "X_div(_ZN1X3divEv).e2d15d5b7aaa55937ca9796dca90c373_3" ;
+"X_div(_ZN1X3divEv).e2d15d5b7aaa55937ca9796dca90c373_2" [label="2: Exit X_div \n  " color=yellow style=filled]
 	
 
-	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" ;
-"X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class X* [line 18]\n  n$1=*&a:int [line 18]\n  n$2=*&b:int [line 18]\n  *n$0.f:int=(n$1 + n$2) [line 18]\n " shape="box"]
+"X_div(_ZN1X3divEv).e2d15d5b7aaa55937ca9796dca90c373_3" [label="3:  Return Stmt \n   n$0=*&this:class X* [line 15]\n  n$1=*n$0.f:int [line 15]\n  *&return:int=(1 / n$1) [line 15]\n " shape="box"]
 	
 
-	 "X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_3" -> "X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_2" ;
+	 "X_div(_ZN1X3divEv).e2d15d5b7aaa55937ca9796dca90c373_3" -> "X_div(_ZN1X3divEv).e2d15d5b7aaa55937ca9796dca90c373_2" ;
+"X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_1" [label="1: Start X_X\nFormals:  this:class X* a:int b:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
+	
+
+	 "X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_1" -> "X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_3" ;
 "X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_2" [label="2: Exit X_X \n  " color=yellow style=filled]
 	
 
-"X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_1" [label="1: Start X_X\nFormals:  this:class X* a:int b:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
+"X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class X* [line 18]\n  n$1=*&a:int [line 18]\n  n$2=*&b:int [line 18]\n  *n$0.f:int=(n$1 + n$2) [line 18]\n " shape="box"]
 	
 
-	 "X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_1" -> "X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_3" ;
+	 "X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_3" -> "X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_2" ;
 }

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

@@ -1,169 +1,169 @@
 /* @generated */
 digraph iCFG {
-"f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_4" [label="4:  DeclStmt \n   _fun_B_B(&b:class B*,0:int) [line 33]\n " shape="box"]
+"f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_1" [label="1: Start f2_div0\nFormals: \nLocals:  b:class B \n   DECLARE_LOCALS(&return,&b); [line 27]\n " color=yellow style=filled]
 	
 
-	 "f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_4" -> "f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_3" ;
-"f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_3" [label="3:  Return Stmt \n   n$0=*&b.f:int [line 34]\n  *&return:int=(1 / n$0) [line 34]\n " shape="box"]
+	 "f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_1" -> "f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_4" ;
+"f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_2" [label="2: Exit f2_div0 \n  " color=yellow style=filled]
 	
 
-	 "f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_3" -> "f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_2" ;
-"f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_2" [label="2: Exit f_div0 \n  " color=yellow style=filled]
+"f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_3" [label="3:  Return Stmt \n   n$0=*&b.f2:int [line 29]\n  *&return:int=(1 / n$0) [line 29]\n " shape="box"]
 	
 
-"f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_1" [label="1: Start f_div0\nFormals: \nLocals:  b:class B \n   DECLARE_LOCALS(&return,&b); [line 32]\n " color=yellow style=filled]
+	 "f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_3" -> "f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_2" ;
+"f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_4" [label="4:  DeclStmt \n   _fun_B_B(&b:class B*,0:int) [line 28]\n " shape="box"]
 	
 
-	 "f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_1" -> "f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_4" ;
-"delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_5" [label="5:  DeclStmt \n   _fun_B_B(&b:class B*,-1:int,0:int) [line 49]\n " shape="box"]
+	 "f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_4" -> "f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_3" ;
+"f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_1" [label="1: Start f_div0\nFormals: \nLocals:  b:class B \n   DECLARE_LOCALS(&return,&b); [line 32]\n " color=yellow style=filled]
 	
 
-	 "delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_5" -> "delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_4" ;
-"delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_4" [label="4:  DeclStmt \n   n$1=*&b.f:int [line 50]\n  *&v:int=(1 / n$1) [line 50]\n " shape="box"]
+	 "f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_1" -> "f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_4" ;
+"f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_2" [label="2: Exit f_div0 \n  " color=yellow style=filled]
 	
 
-	 "delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_4" -> "delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_3" ;
-"delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_3" [label="3:  Return Stmt \n   n$0=*&b.f2:int [line 51]\n  *&return:int=(1 / n$0) [line 51]\n " shape="box"]
+"f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_3" [label="3:  Return Stmt \n   n$0=*&b.f:int [line 34]\n  *&return:int=(1 / n$0) [line 34]\n " shape="box"]
 	
 
-	 "delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_3" -> "delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_2" ;
-"delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_2" [label="2: Exit delegate_constr_f2_div0 \n  " color=yellow style=filled]
+	 "f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_3" -> "f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_2" ;
+"f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_4" [label="4:  DeclStmt \n   _fun_B_B(&b:class B*,0:int) [line 33]\n " shape="box"]
 	
 
-"delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_1" [label="1: Start delegate_constr_f2_div0\nFormals: \nLocals:  v:int b:class B \n   DECLARE_LOCALS(&return,&v,&b); [line 48]\n " color=yellow style=filled]
+	 "f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_4" -> "f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_3" ;
+"t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_1" [label="1: Start t_div0\nFormals: \nLocals:  b:class B \n   DECLARE_LOCALS(&return,&b); [line 37]\n " color=yellow style=filled]
 	
 
-	 "delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_1" -> "delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_5" ;
-"B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_4" [label="4:  Constructor Init \n   n$2=*&this:class B* [line 24]\n  n$3=*&a:int [line 24]\n  n$4=*&b:int [line 24]\n  _fun_B_B(n$2:class B*,(n$3 + n$4):int) [line 24]\n " shape="box"]
+	 "t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_1" -> "t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_4" ;
+"t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_2" [label="2: Exit t_div0 \n  " color=yellow style=filled]
 	
 
-	 "B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_4" -> "B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_3" ;
-"B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class B* [line 24]\n  n$1=*&b:int [line 24]\n  *n$0.f2:int=n$1 [line 24]\n " shape="box"]
+"t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_3" [label="3:  Return Stmt \n   n$0=*&b.t.v:int [line 39]\n  *&return:int=(1 / n$0) [line 39]\n " shape="box"]
 	
 
-	 "B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_3" -> "B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_2" ;
-"B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_2" [label="2: Exit B_B \n  " color=yellow style=filled]
+	 "t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_3" -> "t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_2" ;
+"t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_4" [label="4:  DeclStmt \n   _fun_B_B(&b:class B*,0:int) [line 38]\n " shape="box"]
 	
 
-"B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_1" [label="1: Start B_B\nFormals:  this:class B* a:int b:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 24]\n " color=yellow style=filled]
+	 "t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_4" -> "t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_3" ;
+"delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_1" [label="1: Start delegate_constr_f_div0\nFormals: \nLocals:  v:int b:class B \n   DECLARE_LOCALS(&return,&v,&b); [line 42]\n " color=yellow style=filled]
 	
 
-	 "B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_1" -> "B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_4" ;
-"A_A{_ZN1AC1Ei}.8bf754e28d859fc3223ff4eaddf03699_3" [label="3:  Constructor Init \n   n$0=*&this:class A* [line 12]\n  n$1=*&f:int [line 12]\n  *n$0.f:int=n$1 [line 12]\n " shape="box"]
+	 "delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_1" -> "delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_5" ;
+"delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_2" [label="2: Exit delegate_constr_f_div0 \n  " color=yellow style=filled]
 	
 
-	 "A_A{_ZN1AC1Ei}.8bf754e28d859fc3223ff4eaddf03699_3" -> "A_A{_ZN1AC1Ei}.8bf754e28d859fc3223ff4eaddf03699_2" ;
-"A_A{_ZN1AC1Ei}.8bf754e28d859fc3223ff4eaddf03699_2" [label="2: Exit A_A \n  " color=yellow style=filled]
+"delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_3" [label="3:  Return Stmt \n   n$0=*&b.f:int [line 45]\n  *&return:int=(1 / n$0) [line 45]\n " shape="box"]
 	
 
-"A_A{_ZN1AC1Ei}.8bf754e28d859fc3223ff4eaddf03699_1" [label="1: Start A_A\nFormals:  this:class A* f:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
+	 "delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_3" -> "delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_2" ;
+"delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_4" [label="4:  DeclStmt \n   n$1=*&b.f2:int [line 44]\n  *&v:int=(1 / n$1) [line 44]\n " shape="box"]
 	
 
-	 "A_A{_ZN1AC1Ei}.8bf754e28d859fc3223ff4eaddf03699_1" -> "A_A{_ZN1AC1Ei}.8bf754e28d859fc3223ff4eaddf03699_3" ;
-"f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_7" [label="7:  DeclStmt \n   _fun_B_B(&b:class B*,1:int) [line 55]\n " shape="box"]
+	 "delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_4" -> "delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_3" ;
+"delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_5" [label="5:  DeclStmt \n   _fun_B_B(&b:class B*,-1:int,1:int) [line 43]\n " shape="box"]
 	
 
-	 "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_7" -> "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_6" ;
-"f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_6" [label="6:  DeclStmt \n   n$4=*&b.f:int [line 56]\n  *&v:int=(1 / n$4) [line 56]\n " shape="box"]
+	 "delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_5" -> "delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_4" ;
+"delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_1" [label="1: Start delegate_constr_f2_div0\nFormals: \nLocals:  v:int b:class B \n   DECLARE_LOCALS(&return,&v,&b); [line 48]\n " color=yellow style=filled]
 	
 
-	 "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_6" -> "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_5" ;
-"f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_5" [label="5:  DeclStmt \n   n$3=*&b.f2:int [line 57]\n  *&v2:int=(1 / n$3) [line 57]\n " shape="box"]
+	 "delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_1" -> "delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_5" ;
+"delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_2" [label="2: Exit delegate_constr_f2_div0 \n  " color=yellow style=filled]
 	
 
-	 "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_5" -> "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_4" ;
-"f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_4" [label="4:  DeclStmt \n   n$2=*&b.t.v:int [line 58]\n  *&v3:int=(1 / n$2) [line 58]\n " shape="box"]
+"delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_3" [label="3:  Return Stmt \n   n$0=*&b.f2:int [line 51]\n  *&return:int=(1 / n$0) [line 51]\n " shape="box"]
 	
 
-	 "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_4" -> "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_3" ;
-"f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_3" [label="3:  Return Stmt \n   n$0=*&v:int [line 59]\n  n$1=*&v2:int [line 59]\n  *&return:int=(n$0 + n$1) [line 59]\n " shape="box"]
+	 "delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_3" -> "delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_2" ;
+"delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_4" [label="4:  DeclStmt \n   n$1=*&b.f:int [line 50]\n  *&v:int=(1 / n$1) [line 50]\n " shape="box"]
 	
 
-	 "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_3" -> "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_2" ;
-"f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_2" [label="2: Exit f_f2_div1 \n  " color=yellow style=filled]
+	 "delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_4" -> "delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_3" ;
+"delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_5" [label="5:  DeclStmt \n   _fun_B_B(&b:class B*,-1:int,0:int) [line 49]\n " shape="box"]
 	
 
+	 "delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_5" -> "delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_4" ;
 "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_1" [label="1: Start f_f2_div1\nFormals: \nLocals:  v3:int v2:int v:int b:class B \n   DECLARE_LOCALS(&return,&v3,&v2,&v,&b); [line 54]\n " color=yellow style=filled]
 	
 
 	 "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_1" -> "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_7" ;
-"t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_4" [label="4:  DeclStmt \n   _fun_B_B(&b:class B*,0:int) [line 38]\n " shape="box"]
+"f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_2" [label="2: Exit f_f2_div1 \n  " color=yellow style=filled]
 	
 
-	 "t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_4" -> "t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_3" ;
-"t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_3" [label="3:  Return Stmt \n   n$0=*&b.t.v:int [line 39]\n  *&return:int=(1 / n$0) [line 39]\n " shape="box"]
+"f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_3" [label="3:  Return Stmt \n   n$0=*&v:int [line 59]\n  n$1=*&v2:int [line 59]\n  *&return:int=(n$0 + n$1) [line 59]\n " shape="box"]
 	
 
-	 "t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_3" -> "t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_2" ;
-"t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_2" [label="2: Exit t_div0 \n  " color=yellow style=filled]
+	 "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_3" -> "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_2" ;
+"f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_4" [label="4:  DeclStmt \n   n$2=*&b.t.v:int [line 58]\n  *&v3:int=(1 / n$2) [line 58]\n " shape="box"]
 	
 
-"t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_1" [label="1: Start t_div0\nFormals: \nLocals:  b:class B \n   DECLARE_LOCALS(&return,&b); [line 37]\n " color=yellow style=filled]
+	 "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_4" -> "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_3" ;
+"f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_5" [label="5:  DeclStmt \n   n$3=*&b.f2:int [line 57]\n  *&v2:int=(1 / n$3) [line 57]\n " shape="box"]
 	
 
-	 "t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_1" -> "t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_4" ;
-"B::T_T{_ZN1B1TC1Ei}.b06afec76600b2b680497c48b5885068_3" [label="3:  Constructor Init \n   n$0=*&this:class B::T* [line 18]\n  n$1=*&v:int [line 18]\n  *n$0.v:int=n$1 [line 18]\n " shape="box"]
+	 "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_5" -> "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_4" ;
+"f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_6" [label="6:  DeclStmt \n   n$4=*&b.f:int [line 56]\n  *&v:int=(1 / n$4) [line 56]\n " shape="box"]
 	
 
-	 "B::T_T{_ZN1B1TC1Ei}.b06afec76600b2b680497c48b5885068_3" -> "B::T_T{_ZN1B1TC1Ei}.b06afec76600b2b680497c48b5885068_2" ;
-"B::T_T{_ZN1B1TC1Ei}.b06afec76600b2b680497c48b5885068_2" [label="2: Exit B::T_T \n  " color=yellow style=filled]
+	 "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_6" -> "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_5" ;
+"f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_7" [label="7:  DeclStmt \n   _fun_B_B(&b:class B*,1:int) [line 55]\n " shape="box"]
 	
 
-"B::T_T{_ZN1B1TC1Ei}.b06afec76600b2b680497c48b5885068_1" [label="1: Start B::T_T\nFormals:  this:class B::T* v:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
+	 "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_7" -> "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_6" ;
+"A_A{_ZN1AC1Ei}.8bf754e28d859fc3223ff4eaddf03699_1" [label="1: Start A_A\nFormals:  this:class A* f:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
-	 "B::T_T{_ZN1B1TC1Ei}.b06afec76600b2b680497c48b5885068_1" -> "B::T_T{_ZN1B1TC1Ei}.b06afec76600b2b680497c48b5885068_3" ;
-"f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_4" [label="4:  DeclStmt \n   _fun_B_B(&b:class B*,0:int) [line 28]\n " shape="box"]
+	 "A_A{_ZN1AC1Ei}.8bf754e28d859fc3223ff4eaddf03699_1" -> "A_A{_ZN1AC1Ei}.8bf754e28d859fc3223ff4eaddf03699_3" ;
+"A_A{_ZN1AC1Ei}.8bf754e28d859fc3223ff4eaddf03699_2" [label="2: Exit A_A \n  " color=yellow style=filled]
 	
 
-	 "f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_4" -> "f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_3" ;
-"f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_3" [label="3:  Return Stmt \n   n$0=*&b.f2:int [line 29]\n  *&return:int=(1 / n$0) [line 29]\n " shape="box"]
+"A_A{_ZN1AC1Ei}.8bf754e28d859fc3223ff4eaddf03699_3" [label="3:  Constructor Init \n   n$0=*&this:class A* [line 12]\n  n$1=*&f:int [line 12]\n  *n$0.f:int=n$1 [line 12]\n " shape="box"]
 	
 
-	 "f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_3" -> "f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_2" ;
-"f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_2" [label="2: Exit f2_div0 \n  " color=yellow style=filled]
+	 "A_A{_ZN1AC1Ei}.8bf754e28d859fc3223ff4eaddf03699_3" -> "A_A{_ZN1AC1Ei}.8bf754e28d859fc3223ff4eaddf03699_2" ;
+"B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_1" [label="1: Start B_B\nFormals:  this:class B* a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 22]\n " color=yellow style=filled]
 	
 
-"f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_1" [label="1: Start f2_div0\nFormals: \nLocals:  b:class B \n   DECLARE_LOCALS(&return,&b); [line 27]\n " color=yellow style=filled]
+	 "B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_1" -> "B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_5" ;
+"B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_2" [label="2: Exit B_B \n  " color=yellow style=filled]
 	
 
-	 "f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_1" -> "f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_4" ;
-"delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_5" [label="5:  DeclStmt \n   _fun_B_B(&b:class B*,-1:int,1:int) [line 43]\n " shape="box"]
+"B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_3" [label="3:  Constructor Init \n   n$0=*&this:class B* [line 22]\n  n$1=*&a:int [line 22]\n  _fun_B::T_T(n$0.t:class B::T*,n$1:int) [line 22]\n " shape="box"]
 	
 
-	 "delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_5" -> "delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_4" ;
-"delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_4" [label="4:  DeclStmt \n   n$1=*&b.f2:int [line 44]\n  *&v:int=(1 / n$1) [line 44]\n " shape="box"]
+	 "B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_3" -> "B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_2" ;
+"B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_4" [label="4:  Constructor Init \n   n$2=*&this:class B* [line 22]\n  n$3=*&a:int [line 22]\n  *n$2.f2:int=n$3 [line 22]\n " shape="box"]
 	
 
-	 "delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_4" -> "delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_3" ;
-"delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_3" [label="3:  Return Stmt \n   n$0=*&b.f:int [line 45]\n  *&return:int=(1 / n$0) [line 45]\n " shape="box"]
+	 "B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_4" -> "B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_3" ;
+"B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_5" [label="5:  Constructor Init \n   n$4=*&this:class B* [line 22]\n  n$5=*&a:int [line 22]\n  _fun_A_A(n$4:class B*,n$5:int) [line 22]\n " shape="box"]
 	
 
-	 "delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_3" -> "delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_2" ;
-"delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_2" [label="2: Exit delegate_constr_f_div0 \n  " color=yellow style=filled]
+	 "B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_5" -> "B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_4" ;
+"B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_1" [label="1: Start B_B\nFormals:  this:class B* a:int b:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 24]\n " color=yellow style=filled]
 	
 
-"delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_1" [label="1: Start delegate_constr_f_div0\nFormals: \nLocals:  v:int b:class B \n   DECLARE_LOCALS(&return,&v,&b); [line 42]\n " color=yellow style=filled]
+	 "B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_1" -> "B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_4" ;
+"B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_2" [label="2: Exit B_B \n  " color=yellow style=filled]
 	
 
-	 "delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_1" -> "delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_5" ;
-"B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_5" [label="5:  Constructor Init \n   n$4=*&this:class B* [line 22]\n  n$5=*&a:int [line 22]\n  _fun_A_A(n$4:class B*,n$5:int) [line 22]\n " shape="box"]
+"B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class B* [line 24]\n  n$1=*&b:int [line 24]\n  *n$0.f2:int=n$1 [line 24]\n " shape="box"]
 	
 
-	 "B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_5" -> "B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_4" ;
-"B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_4" [label="4:  Constructor Init \n   n$2=*&this:class B* [line 22]\n  n$3=*&a:int [line 22]\n  *n$2.f2:int=n$3 [line 22]\n " shape="box"]
+	 "B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_3" -> "B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_2" ;
+"B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_4" [label="4:  Constructor Init \n   n$2=*&this:class B* [line 24]\n  n$3=*&a:int [line 24]\n  n$4=*&b:int [line 24]\n  _fun_B_B(n$2:class B*,(n$3 + n$4):int) [line 24]\n " shape="box"]
 	
 
-	 "B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_4" -> "B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_3" ;
-"B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_3" [label="3:  Constructor Init \n   n$0=*&this:class B* [line 22]\n  n$1=*&a:int [line 22]\n  _fun_B::T_T(n$0.t:class B::T*,n$1:int) [line 22]\n " shape="box"]
+	 "B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_4" -> "B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_3" ;
+"B::T_T{_ZN1B1TC1Ei}.b06afec76600b2b680497c48b5885068_1" [label="1: Start B::T_T\nFormals:  this:class B::T* v:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
 	
 
-	 "B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_3" -> "B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_2" ;
-"B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_2" [label="2: Exit B_B \n  " color=yellow style=filled]
+	 "B::T_T{_ZN1B1TC1Ei}.b06afec76600b2b680497c48b5885068_1" -> "B::T_T{_ZN1B1TC1Ei}.b06afec76600b2b680497c48b5885068_3" ;
+"B::T_T{_ZN1B1TC1Ei}.b06afec76600b2b680497c48b5885068_2" [label="2: Exit B::T_T \n  " color=yellow style=filled]
 	
 
-"B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_1" [label="1: Start B_B\nFormals:  this:class B* a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 22]\n " color=yellow style=filled]
+"B::T_T{_ZN1B1TC1Ei}.b06afec76600b2b680497c48b5885068_3" [label="3:  Constructor Init \n   n$0=*&this:class B::T* [line 18]\n  n$1=*&v:int [line 18]\n  *n$0.v:int=n$1 [line 18]\n " shape="box"]
 	
 
-	 "B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_1" -> "B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_5" ;
+	 "B::T_T{_ZN1B1TC1Ei}.b06afec76600b2b680497c48b5885068_3" -> "B::T_T{_ZN1B1TC1Ei}.b06afec76600b2b680497c48b5885068_2" ;
 }