[backend] eliminate phantom spaces in printing of types

Summary: These are dangerous if you are trying to compare a type to a string, and they're also unsightly.

Reviewed By: jvillard

Differential Revision: D4189956

fbshipit-source-id: 14ce127

infer/src/IR/Typ.re

@@ -239,39 +239,28 @@ let array_sensitive_compare t1 t2 =>
   };
 
 
-/** Pretty print a type declaration.
+/** Pretty print a type with all the details, using the C syntax. */
-    pp_base prints the variable for a declaration, or can be skip to print only the type */
+let rec pp_full pe f =>
-let rec pp_decl pe pp_base f =>
   fun
-  | Tstruct tname => F.fprintf f "%s %a" (Typename.to_string tname) pp_base ()
+  | Tstruct tname => F.fprintf f "%s" (Typename.to_string tname)
-  | Tint ik => F.fprintf f "%s %a" (ikind_to_string ik) pp_base ()
+  | Tint ik => F.fprintf f "%s" (ikind_to_string ik)
-  | Tfloat fk => F.fprintf f "%s %a" (fkind_to_string fk) pp_base ()
+  | Tfloat fk => F.fprintf f "%s" (fkind_to_string fk)
-  | Tvoid => F.fprintf f "void %a" pp_base ()
+  | Tvoid => F.fprintf f "void"
-  | Tfun false => F.fprintf f "_fn_ %a" pp_base ()
+  | Tfun false => F.fprintf f "_fn_"
-  | Tfun true => F.fprintf f "_fn_noreturn_ %a" pp_base ()
+  | Tfun true => F.fprintf f "_fn_noreturn_"
-  | Tptr ((Tarray _ | Tfun _) as typ) pk => {
+  | Tptr ((Tarray _ | Tfun _) as typ) pk =>
-      let pp_base' fmt () => F.fprintf fmt "(%s%a)" (ptr_kind_string pk) pp_base ();
+    F.fprintf f "%a(%s)" (pp_full pe) typ (ptr_kind_string pk)
-      pp_decl pe pp_base' f typ
+  | Tptr typ pk => F.fprintf f "%a%s" (pp_full pe) typ (ptr_kind_string pk)
-    }
-  | Tptr typ pk => {
-      let pp_base' fmt () => F.fprintf fmt "%s%a" (ptr_kind_string pk) pp_base ();
-      pp_decl pe pp_base' f typ
-    }
   | Tarray typ static_len => {
       let pp_array_static_len fmt => (
         fun
         | Some static_len => IntLit.pp fmt static_len
         | None => F.fprintf fmt "_"
       );
-      let pp_base' fmt () => F.fprintf fmt "%a[%a]" pp_base () pp_array_static_len static_len;
+      F.fprintf f "%a[%a]" (pp_full pe) typ pp_array_static_len static_len
-      pp_decl pe pp_base' f typ
     };
 
 
-/** Pretty print a type with all the details, using the C syntax. */
-let pp_full pe => pp_decl pe (fun _ () => ());
-
-
 /** Pretty print a type. Do nothing by default. */
 let pp pe f te =>
   if Config.print_types {

infer/src/IR/Typ.rei

@@ -95,11 +95,6 @@ let array_sensitive_compare: t => t => int;
 let equal: t => t => bool;
 
 
-/** [pp_decl pe pp_base f typ] pretty prints a type declaration.
-    pp_base prints the variable for a declaration, or can be skip to print only the type */
-let pp_decl: printenv => (F.formatter => unit => unit) => F.formatter => t => unit;
-
-
 /** Pretty print a type with all the details. */
 let pp_full: printenv => F.formatter => t => unit;
 

infer/src/backend/specs.ml

@@ -424,15 +424,17 @@ let get_signature summary =
   let s = ref "" in
   IList.iter
     (fun (p, typ) ->
-       let pp_name f () = F.fprintf f "%a" Mangled.pp p in
+       let pp f () = F.fprintf f "%a %a" (Typ.pp_full pe_text) typ Mangled.pp p in
-       let pp f () = Typ.pp_decl pe_text pp_name f typ in
        let decl = pp_to_string pp () in
        s := if !s = "" then decl else !s ^ ", " ^ decl)
     summary.attributes.ProcAttributes.formals;
-  let pp_procname f () = F.fprintf f "%a"
-      Procname.pp summary.attributes.ProcAttributes.proc_name in
   let pp f () =
-    Typ.pp_decl pe_text pp_procname f summary.attributes.ProcAttributes.ret_type in
+    F.fprintf
+      f
+      "%a %a"
+      (Typ.pp_full pe_text)
+      summary.attributes.ProcAttributes.ret_type
+      Procname.pp summary.attributes.ProcAttributes.proc_name in
   let decl = pp_to_string pp () in
   decl ^ "(" ^ !s ^ ")"
 

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

@@ -1,88 +1,88 @@
 /* @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" [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" [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"]
+"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_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]
 	
 
-"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_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_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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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_7" [label="7:  Call _fun_internal::fun \n   n$3=_fun_internal::fun(1:int ) [line 18]\n " shape="box"]
+"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" [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"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  Call _fun_external::fun \n   n$1=_fun_external::fun(1:int) [line 20]\n " shape="box"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \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]
+"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]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"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" [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" ;
 "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_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" [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>_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" [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_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_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_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_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_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" ;

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

@@ -1,88 +1,88 @@
 /* @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" [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" [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"]
+"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_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]
 	
 
-"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_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_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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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_7" [label="7:  Call _fun_internal::fun \n   n$3=_fun_internal::fun(1:int ) [line 18]\n " shape="box"]
+"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" [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"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  Call _fun_external::fun \n   n$1=_fun_external::fun(1:int) [line 20]\n " shape="box"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \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]
+"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]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"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" [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" ;
 "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_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" [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>_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" [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_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_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_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_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_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" ;

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

@@ -1,88 +1,88 @@
 /* @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" [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" [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"]
+"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_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]
 	
 
-"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_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_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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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_7" [label="7:  Call _fun_internal::fun \n   n$3=_fun_internal::fun(1:int ) [line 18]\n " shape="box"]
+"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" [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"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  Call _fun_external::fun \n   n$1=_fun_external::fun(1:int) [line 20]\n " shape="box"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \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]
+"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]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"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" [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" ;
 "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_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" [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>_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" [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_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_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_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_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_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" ;

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

@@ -1,88 +1,88 @@
 /* @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" [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" [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"]
+"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_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]
 	
 
-"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_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_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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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_7" [label="7:  Call _fun_internal::fun \n   n$3=_fun_internal::fun(1:int ) [line 18]\n " shape="box"]
+"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" [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"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  Call _fun_external::fun \n   n$1=_fun_external::fun(1:int) [line 20]\n " shape="box"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \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]
+"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]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"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" [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" ;
 "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_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" [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>_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" [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_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_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_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_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_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_1" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev}.2e163b5142d39d575d5eeb568316078d_4" ;

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

@@ -1,54 +1,54 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   *&x:double =1.000000 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   *&x:double=1.000000 [line 11]\n " shape="box"]
 	
 
 	 "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_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_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_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_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_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_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_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_11" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   *&b:int =1 [line 16]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   *&b:int=1 [line 16]\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_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_9" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"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" [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_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_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_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_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_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_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_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_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int =0 [line 23]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 23]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,25 +1,25 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  DeclStmt \n   *&#GB<arithmetic/int_const.c>$main_kDuration:int =3 [line 17]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  DeclStmt \n   *&#GB<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_5" [label="5:  DeclStmt \n   *&large_int:int=9223372036854775807 [line 19]\n " shape="box"]
 	
 
 	 "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_4" [label="4:  DeclStmt \n   *&overflow_int:int=n$0 [line 20]\n " shape="box"]
 	
 
 	 "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" [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_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_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_1" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;

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

@@ -1,14 +1,14 @@
 /* @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_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_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_bool.e953d6477eaaeafaa430423a26fbaac9_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 14]\n " shape="box"]
 	
 
 	 "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_bool.e953d6477eaaeafaa430423a26fbaac9_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 14]\n " shape="box"]
 	
 
 	 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_6" -> "neg_bool.e953d6477eaaeafaa430423a26fbaac9_3" ;
@@ -27,20 +27,20 @@ digraph iCFG {
 "neg_bool.e953d6477eaaeafaa430423a26fbaac9_2" [label="2: Exit neg_bool \n  " color=yellow style=filled]
 	
 
-"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" [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_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_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" [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_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int =0 [line 12]\n " shape="box"]
+"neg_char.53ef6b31d84386046a4728d1c45b5f7a_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 12]\n " shape="box"]
 	
 
 	 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_6" -> "neg_char.53ef6b31d84386046a4728d1c45b5f7a_3" ;
@@ -59,20 +59,20 @@ digraph iCFG {
 "neg_char.53ef6b31d84386046a4728d1c45b5f7a_2" [label="2: Exit neg_char \n  " color=yellow style=filled]
 	
 
-"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_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_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_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_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_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 10]\n " shape="box"]
 	
 
 	 "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_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 10]\n " shape="box"]
 	
 
 	 "neg_int.2aa25aca565c41dd997912d11504462c_6" -> "neg_int.2aa25aca565c41dd997912d11504462c_3" ;
@@ -91,7 +91,7 @@ digraph iCFG {
 "neg_int.2aa25aca565c41dd997912d11504462c_2" [label="2: Exit neg_int \n  " color=yellow style=filled]
 	
 
-"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_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_1" -> "neg_int.2aa25aca565c41dd997912d11504462c_4" ;

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

@@ -1,14 +1,14 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&x:int =2 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&x:int=2 [line 11]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   *&z:int =3 [line 12]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   *&z:int=3 [line 12]\n " shape="box"]
 	
 
 	 "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" [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" ;

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

@@ -1,61 +1,61 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   *&x:int =1 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   *&x:int=1 [line 11]\n " shape="box"]
 	
 
 	 "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_14" [label="14:  BinaryOperatorStmt: Assign \n   n$12=*&x:int [line 14]\n  *&y:int=~n$12 [line 14]\n " shape="box"]
 	
 
 	 "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_13" [label="13:  BinaryOperatorStmt: Assign \n   n$11=*&x:int [line 15]\n  *&y:int=-n$11 [line 15]\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_12" [label="12:  BinaryOperatorStmt: Assign \n   n$10=*&x:int [line 16]\n  *&y:int=n$10 [line 16]\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_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_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_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_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_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_9" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"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" [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_7" [label="7:  BinaryOperatorStmt: Assign \n   *&b:int*=&a [line 27]\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_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_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_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_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_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&a:int [line 30]\n  *&a:int=n$0 [line 30]\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_3" [label="3:  Return Stmt \n   *&return:int=0 [line 32]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"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_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_1" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;

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

@@ -1,13 +1,13 @@
 /* @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_3" [label="3:  Return Stmt \n   n$0=*&e:_Bool [line 12]\n  *&return:_Bool=n$0 [line 12]\n " shape="box"]
 	
 
 	 "revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_3" -> "revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_2" ;
 "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_1" [label="1: Start revert\nFormals:  e:_Bool\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
 	 "revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_1" -> "revert.4bc48a3c9ac7468d2d5d1a6fb5f87654_3" ;

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

@@ -1,10 +1,10 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   *&x:int =3 [line 13]\n " shape="box"]
+"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_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_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -18,7 +18,7 @@ digraph iCFG {
 "check.0ba4439ee9a46d9d9f14c60f88f45f87_2" [label="2: Exit check \n  " color=yellow style=filled]
 	
 
-"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" [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" ;

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

@@ -1,10 +1,10 @@
 /* @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_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_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int =0 [line 22]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 22]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -15,14 +15,14 @@ digraph iCFG {
 	
 
 	 "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"]
+"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_3" -> "sum.1d623b89683f9ce4e074de1676d12416_2" ;
 "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_1" [label="1: Start sum\nFormals:  a:int b:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 25]\n " color=yellow style=filled]
 	
 
 	 "sum.1d623b89683f9ce4e074de1676d12416_1" -> "sum.1d623b89683f9ce4e074de1676d12416_3" ;

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

@@ -1,18 +1,18 @@
 /* @generated */
 digraph iCFG {
-"comma_1.bafaed8336991f5a2e612ee2580c1506_6" [label="6:  DeclStmt \n   *&a:int =9 [line 11]\n " shape="box"]
+"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_5" [label="5:  DeclStmt \n   *&b:int=7 [line 11]\n " shape="box"]
 	
 
 	 "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_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_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" [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" ;
@@ -23,19 +23,19 @@ digraph iCFG {
 	
 
 	 "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_2.aa5fd44d8dfe78041d816bb9ce86a85f_6" [label="6:  DeclStmt \n   *&a:int=9 [line 17]\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_2.aa5fd44d8dfe78041d816bb9ce86a85f_5" [label="5:  DeclStmt \n   *&b:int=7 [line 17]\n " shape="box"]
 	
 
 	 "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_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_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" [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" ;
@@ -46,23 +46,23 @@ digraph iCFG {
 	
 
 	 "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_3.94b9d12e6a2f1dbb384d21928d4e092d_7" [label="7:  DeclStmt \n   *&a:int=9 [line 23]\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_3.94b9d12e6a2f1dbb384d21928d4e092d_6" [label="6:  DeclStmt \n   *&b:int=7 [line 23]\n " shape="box"]
 	
 
 	 "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_5" [label="5:  DeclStmt \n   *&c:int=3 [line 23]\n " shape="box"]
 	
 
 	 "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_5" -> "comma_3.94b9d12e6a2f1dbb384d21928d4e092d_4" ;
-"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" [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_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" ;

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

@@ -1,10 +1,10 @@
 /* @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_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_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_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_18" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_17" ;
@@ -12,15 +12,15 @@ digraph iCFG {
 	
 
 	 "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_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_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_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_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_14" [label="14:  UnaryOperator \n   n$11=*&p:int** [line 13]\n " shape="box"]
 	
 
 	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_14" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_15" ;
@@ -29,15 +29,15 @@ digraph iCFG {
 	
 
 	 "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_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_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_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_11" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_9" ;
-"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" [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" ;
@@ -46,20 +46,20 @@ digraph iCFG {
 	
 
 	 "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_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_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_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_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_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_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_5" [label="5:  UnaryOperator \n   n$0=*&p:int** [line 17]\n " shape="box"]
 	
 
 	 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_5" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_6" ;
@@ -74,7 +74,7 @@ digraph iCFG {
 "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_2" [label="2: Exit dereference_in_array_access \n  " color=yellow style=filled]
 	
 
-"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_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_1" -> "dereference_in_array_access.d3133bf0c1bc11000c355c50d0fbb3c0_18" ;

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

@@ -1,15 +1,15 @@
 /* @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_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_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_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_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_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_46" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_43" ;
@@ -25,16 +25,16 @@ digraph iCFG {
 	
 
 	 "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_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_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_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_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_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_40" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_37" ;
@@ -50,16 +50,16 @@ digraph iCFG {
 	
 
 	 "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_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_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_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_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_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_34" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_31" ;
@@ -75,11 +75,11 @@ digraph iCFG {
 	
 
 	 "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_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_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_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_29" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_26" ;
@@ -96,16 +96,16 @@ digraph iCFG {
 
 	 "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_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" [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" [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_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_23" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_20" ;
@@ -121,16 +121,16 @@ digraph iCFG {
 	
 
 	 "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_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_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_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_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_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_17" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_14" ;
@@ -146,15 +146,15 @@ digraph iCFG {
 	
 
 	 "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_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_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_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_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_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_11" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_8" ;
@@ -170,11 +170,11 @@ digraph iCFG {
 	
 
 	 "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_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_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_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_6" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_3" ;
@@ -194,7 +194,7 @@ digraph iCFG {
 "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_2" [label="2: Exit binop_with_side_effects \n  " color=yellow style=filled]
 	
 
-"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_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_1" -> "binop_with_side_effects.9cbc0255c95bd7e0ccf9d7a826fa2a2d_44" ;

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

@@ -1,11 +1,11 @@
 /* @generated */
 digraph iCFG {
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_37" [label="37:  DeclStmt \n   *&x:int =5 [line 11]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_37" [label="37:  DeclStmt \n   *&x:int=5 [line 11]\n " shape="box"]
 	
 
 	 "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_36" [label="36:  BinaryOperatorStmt: Assign \n   *&x:int=0 [line 13]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_36" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_30" ;
@@ -17,7 +17,7 @@ digraph iCFG {
 	
 
 	 "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_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_33" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_34" ;
@@ -34,21 +34,21 @@ digraph iCFG {
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_30" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_29" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_29" [label="29:  DeclStmt \n   *&y:int =19 [line 15]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_29" [label="29:  DeclStmt \n   *&y:int=19 [line 15]\n " shape="box"]
 	
 
 	 "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_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_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_27" [label="27:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=2 [line 16]\n " shape="box"]
 	
 
 	 "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_26" [label="26:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=1 [line 16]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_26" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_20" ;
@@ -60,7 +60,7 @@ digraph iCFG {
 	
 
 	 "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_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_23" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_24" ;
@@ -77,20 +77,20 @@ digraph iCFG {
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_20" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_28" ;
-"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" [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_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_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_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=2 [line 17]\n " shape="box"]
 	
 
 	 "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_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 17]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_16" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_13" ;
@@ -106,7 +106,7 @@ digraph iCFG {
 	
 
 	 "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_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 17]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_12" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_9" ;
@@ -123,15 +123,15 @@ digraph iCFG {
 	
 
 	 "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_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_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_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 18]\n " shape="box"]
 	
 
 	 "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_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 18]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_6" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" ;
@@ -154,16 +154,16 @@ digraph iCFG {
 	
 
 	 "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"]
+"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_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_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_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_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_19" -> "bar.37b51d194a7513e45b56f6524f2d51f2_15" ;
@@ -175,7 +175,7 @@ digraph iCFG {
 	
 
 	 "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_16" [label="16:  BinaryOperatorStmt: GT \n   *&x:int=1 [line 23]\n  n$6=*&x:int [line 23]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_16" -> "bar.37b51d194a7513e45b56f6524f2d51f2_17" ;
@@ -184,15 +184,15 @@ digraph iCFG {
 	
 
 	 "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_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_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_13" [label="13:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [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_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_12" -> "bar.37b51d194a7513e45b56f6524f2d51f2_3" ;
@@ -209,11 +209,11 @@ digraph iCFG {
 
 	 "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_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=2 [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_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 24]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_7" -> "bar.37b51d194a7513e45b56f6524f2d51f2_4" ;

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

@@ -1,6 +1,6 @@
 /* @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"]
+"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" ;
@@ -9,11 +9,11 @@ digraph iCFG {
 
 	 "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"]
+"test3.8ad8757baa8564dc136c1e07507f4a98_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 22]\n " shape="box"]
 	
 
 	 "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"]
+"test3.8ad8757baa8564dc136c1e07507f4a98_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$1 [line 22]\n " shape="box"]
 	
 
 	 "test3.8ad8757baa8564dc136c1e07507f4a98_7" -> "test3.8ad8757baa8564dc136c1e07507f4a98_4" ;
@@ -29,18 +29,18 @@ digraph iCFG {
 	
 
 	 "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"]
+"test3.8ad8757baa8564dc136c1e07507f4a98_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 23]\n  *&return:int=n$0 [line 23]\n " shape="box"]
 	
 
 	 "test3.8ad8757baa8564dc136c1e07507f4a98_3" -> "test3.8ad8757baa8564dc136c1e07507f4a98_2" ;
 "test3.8ad8757baa8564dc136c1e07507f4a98_2" [label="2: Exit test3 \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]
+"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]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "test5.e3d704f3542b44a621ebed70dc0efe13_9" -> "test5.e3d704f3542b44a621ebed70dc0efe13_2" ;
@@ -49,11 +49,11 @@ digraph iCFG {
 
 	 "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"]
+"test5.e3d704f3542b44a621ebed70dc0efe13_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 28]\n " shape="box"]
 	
 
 	 "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"]
+"test5.e3d704f3542b44a621ebed70dc0efe13_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$0 [line 28]\n " shape="box"]
 	
 
 	 "test5.e3d704f3542b44a621ebed70dc0efe13_6" -> "test5.e3d704f3542b44a621ebed70dc0efe13_3" ;
@@ -72,11 +72,11 @@ digraph iCFG {
 "test5.e3d704f3542b44a621ebed70dc0efe13_2" [label="2: Exit test5 \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]
+"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]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "test4.86985e105f79b95d6bc918fb45ec7727_9" -> "test4.86985e105f79b95d6bc918fb45ec7727_2" ;
@@ -85,11 +85,11 @@ digraph iCFG {
 
 	 "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"]
+"test4.86985e105f79b95d6bc918fb45ec7727_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 26]\n " shape="box"]
 	
 
 	 "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"]
+"test4.86985e105f79b95d6bc918fb45ec7727_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=n$0 [line 26]\n " shape="box"]
 	
 
 	 "test4.86985e105f79b95d6bc918fb45ec7727_6" -> "test4.86985e105f79b95d6bc918fb45ec7727_3" ;
@@ -108,30 +108,30 @@ digraph iCFG {
 "test4.86985e105f79b95d6bc918fb45ec7727_2" [label="2: Exit test4 \n  " color=yellow style=filled]
 	
 
-"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" [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"]
+"test2.ad0234829205b9033196ba818f7a872b_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 12]\n  *&return:int=n$0 [line 12]\n " shape="box"]
 	
 
 	 "test2.ad0234829205b9033196ba818f7a872b_3" -> "test2.ad0234829205b9033196ba818f7a872b_2" ;
 "test2.ad0234829205b9033196ba818f7a872b_2" [label="2: Exit test2 \n  " color=yellow style=filled]
 	
 
-"test2.ad0234829205b9033196ba818f7a872b_1" [label="1: Start test2\nFormals:  x:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
+"test2.ad0234829205b9033196ba818f7a872b_1" [label="1: Start test2\nFormals:  x:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"test1.5a105e8b9d40e1329780d62ea2265d8a_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 17]\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"]
+"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"]
 	
 
 	 "test1.5a105e8b9d40e1329780d62ea2265d8a_7" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_4" ;
@@ -147,32 +147,32 @@ digraph iCFG {
 	
 
 	 "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"]
+"test1.5a105e8b9d40e1329780d62ea2265d8a_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 18]\n  *&return:int=n$0 [line 18]\n " shape="box"]
 	
 
 	 "test1.5a105e8b9d40e1329780d62ea2265d8a_3" -> "test1.5a105e8b9d40e1329780d62ea2265d8a_2" ;
 "test1.5a105e8b9d40e1329780d62ea2265d8a_2" [label="2: Exit test1 \n  " color=yellow style=filled]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"test7.b04083e53e242626595e2b8ea327e525_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=2 [line 35]\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"]
+"test7.b04083e53e242626595e2b8ea327e525_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=n$1 [line 35]\n " shape="box"]
 	
 
 	 "test7.b04083e53e242626595e2b8ea327e525_6" -> "test7.b04083e53e242626595e2b8ea327e525_3" ;
@@ -191,19 +191,19 @@ digraph iCFG {
 "test7.b04083e53e242626595e2b8ea327e525_2" [label="2: Exit test7 \n  " color=yellow style=filled]
 	
 
-"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" [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" ;
-"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"]
+"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"]
 	
 
 	 "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"]
+"test6.4cfad7076129962ee70c36839a1e3e15_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=0 [line 31]\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"]
+"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"]
 	
 
 	 "test6.4cfad7076129962ee70c36839a1e3e15_7" -> "test6.4cfad7076129962ee70c36839a1e3e15_4" ;
@@ -219,27 +219,27 @@ digraph iCFG {
 	
 
 	 "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" [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_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_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"]
+"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"]
 	
 
 	 "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"]
+"test.098f6bcd4621d373cade4e832627b4f6_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 14]\n " shape="box"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_6" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;
@@ -258,7 +258,7 @@ digraph iCFG {
 "test.098f6bcd4621d373cade4e832627b4f6_2" [label="2: Exit test \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]
+"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]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_1" -> "test.098f6bcd4621d373cade4e832627b4f6_4" ;

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

@@ -1,14 +1,14 @@
 /* @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_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_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_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_22" [label="22:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=3 [line 15]\n " shape="box"]
 	
 
 	 "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_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_21" [label="21:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=3 [line 15]\n " shape="box"]
 	
 
 	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_21" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_18" ;
@@ -24,11 +24,11 @@ digraph iCFG {
 	
 
 	 "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_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=2 [line 15]\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_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=2 [line 15]\n " shape="box"]
 	
 
 	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_16" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_13" ;
@@ -45,11 +45,11 @@ digraph iCFG {
 
 	 "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_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 15]\n " shape="box"]
 	
 
 	 "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_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 15]\n " shape="box"]
 	
 
 	 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_11" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_8" ;
@@ -66,11 +66,11 @@ digraph iCFG {
 
 	 "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" [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_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_6" -> "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_3" ;
@@ -90,20 +90,20 @@ digraph iCFG {
 "fun_ifthenelse2.d4d0fea4695ba22ddab12e33d11e81f2_2" [label="2: Exit fun_ifthenelse2 \n  " color=yellow style=filled]
 	
 
-"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_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_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_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" ;
-"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int =3 [line 20]\n " shape="box"]
+"fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 20]\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_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 20]\n " shape="box"]
 	
 
 	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_16" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_13" ;
@@ -119,11 +119,11 @@ digraph iCFG {
 	
 
 	 "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_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 20]\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_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=1 [line 20]\n " shape="box"]
 	
 
 	 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_11" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_8" ;
@@ -140,11 +140,11 @@ digraph iCFG {
 
 	 "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_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_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_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_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_6" -> "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_3" ;
@@ -164,20 +164,20 @@ digraph iCFG {
 "fun_ifthenelse4.2a63e61081ad44f4f9aca9d47562827d_2" [label="2: Exit fun_ifthenelse4 \n  " color=yellow style=filled]
 	
 
-"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_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_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_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_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_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [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_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 18]\n " shape="box"]
 	
 
 	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_16" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_13" ;
@@ -193,11 +193,11 @@ digraph iCFG {
 	
 
 	 "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_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=2 [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_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$2:int=2 [line 18]\n " shape="box"]
 	
 
 	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_11" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_8" ;
@@ -214,11 +214,11 @@ digraph iCFG {
 
 	 "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_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 18]\n " shape="box"]
 	
 
 	 "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_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 18]\n " shape="box"]
 	
 
 	 "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_6" -> "fun_ifthenelse3.c62f5c24a34473fea151d2d63cdc87c6_3" ;
@@ -243,15 +243,15 @@ digraph iCFG {
 
 	 "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_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_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_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_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_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_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_6" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_3" ;
@@ -270,7 +270,7 @@ digraph iCFG {
 "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_2" [label="2: Exit fun_ifthenelse1 \n  " color=yellow style=filled]
 	
 
-"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_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_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_1" -> "fun_ifthenelse1.6d810dc9f25b2ded52969d35a73b5fb3_4" ;

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

@@ -1,10 +1,10 @@
 /* @generated */
 digraph iCFG {
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_12" [label="12:  BinaryOperatorStmt: Assign \n   *&x:int *=32 [line 17]\n " shape="box"]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_12" [label="12:  BinaryOperatorStmt: Assign \n   *&x:int*=32 [line 17]\n " shape="box"]
 	
 
 	 "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"]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_11" [label="11:  BinaryOperatorStmt: Assign \n   *&x:int*=17 [line 15]\n " shape="box"]
 	
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_11" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_3" ;
@@ -16,7 +16,7 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_8" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_9" ;
@@ -29,7 +29,7 @@ digraph iCFG {
 	
 
 	 "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"]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_5" [label="5:  BinaryOperatorStmt: EQ \n   n$0=*&x:int* [line 14]\n " shape="box"]
 	
 
 	 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_5" -> "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_6" ;
@@ -45,15 +45,15 @@ digraph iCFG {
 "shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_2" [label="2: Exit shortcircuit_or \n  " color=yellow style=filled]
 	
 
-"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_1" [label="1: Start shortcircuit_or\nFormals:  x:int *\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
+"shortcircuit_or.5845fe75b89f8af7ec1944cd207962af_1" [label="1: Start shortcircuit_or\nFormals:  x:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_20" [label="20:  BinaryOperatorStmt: Assign \n   *&x:int*=17 [line 23]\n " shape="box"]
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_20" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_3" ;
@@ -65,11 +65,11 @@ digraph iCFG {
 	
 
 	 "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"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 22]\n " shape="box"]
 	
 
 	 "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"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=0 [line 22]\n " shape="box"]
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_16" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_12" ;
@@ -81,7 +81,7 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_13" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_14" ;
@@ -99,19 +99,19 @@ digraph iCFG {
 	
 
 	 "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"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_9" [label="9:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 22]\n " shape="box"]
 	
 
 	 "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"]
+"shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 22]\n " shape="box"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_6" -> "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_8" ;
@@ -131,16 +131,16 @@ digraph iCFG {
 "shortcircuit_and.10f9635d805ff3bd29dfc80b8f8d12da_2" [label="2: Exit shortcircuit_and \n  " color=yellow style=filled]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"test_loop.254a9d372f8f45542e409771135b9322_27" [label="27:  BinaryOperatorStmt: Assign \n   *&block_size:char*=0 [line 38]\n " shape="box"]
 	
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_27" -> "test_loop.254a9d372f8f45542e409771135b9322_3" ;
@@ -152,11 +152,11 @@ digraph iCFG {
 	
 
 	 "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"]
+"test_loop.254a9d372f8f45542e409771135b9322_24" [label="24:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=1 [line 37]\n " shape="box"]
 	
 
 	 "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"]
+"test_loop.254a9d372f8f45542e409771135b9322_23" [label="23:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=0 [line 37]\n " shape="box"]
 	
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_23" -> "test_loop.254a9d372f8f45542e409771135b9322_19" ;
@@ -168,7 +168,7 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_20" -> "test_loop.254a9d372f8f45542e409771135b9322_21" ;
@@ -186,11 +186,11 @@ digraph iCFG {
 	
 
 	 "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"]
+"test_loop.254a9d372f8f45542e409771135b9322_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 36]\n " shape="box"]
 	
 
 	 "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"]
+"test_loop.254a9d372f8f45542e409771135b9322_15" [label="15:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=0 [line 36]\n " shape="box"]
 	
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_15" -> "test_loop.254a9d372f8f45542e409771135b9322_11" ;
@@ -202,7 +202,7 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_12" -> "test_loop.254a9d372f8f45542e409771135b9322_13" ;
@@ -220,19 +220,19 @@ digraph iCFG {
 	
 
 	 "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"]
+"test_loop.254a9d372f8f45542e409771135b9322_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 36]\n " shape="box"]
 	
 
 	 "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"]
+"test_loop.254a9d372f8f45542e409771135b9322_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 36]\n " shape="box"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_5" -> "test_loop.254a9d372f8f45542e409771135b9322_7" ;
@@ -249,16 +249,16 @@ digraph iCFG {
 "test_loop.254a9d372f8f45542e409771135b9322_2" [label="2: Exit test_loop \n  " color=yellow style=filled]
 	
 
-"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]
+"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]
 	
 
 	 "test_loop.254a9d372f8f45542e409771135b9322_1" -> "test_loop.254a9d372f8f45542e409771135b9322_28" ;
-"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" [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"]
+"main.fad58de7366495db4650cfefac2fcd61_33" [label="33:  BinaryOperatorStmt: Assign \n   *&block_size:char*=0 [line 53]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_33" -> "main.fad58de7366495db4650cfefac2fcd61_29" ;
@@ -270,7 +270,7 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_30" -> "main.fad58de7366495db4650cfefac2fcd61_31" ;
@@ -279,7 +279,7 @@ digraph iCFG {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_29" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_28" [label="28:  BinaryOperatorStmt: Assign \n   *&block_size:char *=0 [line 50]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_28" [label="28:  BinaryOperatorStmt: Assign \n   *&block_size:char*=0 [line 50]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_28" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -291,11 +291,11 @@ digraph iCFG {
 	
 
 	 "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"]
+"main.fad58de7366495db4650cfefac2fcd61_25" [label="25:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=1 [line 49]\n " shape="box"]
 	
 
 	 "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"]
+"main.fad58de7366495db4650cfefac2fcd61_24" [label="24:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=0 [line 49]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_24" -> "main.fad58de7366495db4650cfefac2fcd61_20" ;
@@ -307,7 +307,7 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_21" -> "main.fad58de7366495db4650cfefac2fcd61_22" ;
@@ -325,11 +325,11 @@ digraph iCFG {
 	
 
 	 "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"]
+"main.fad58de7366495db4650cfefac2fcd61_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 49]\n " shape="box"]
 	
 
 	 "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"]
+"main.fad58de7366495db4650cfefac2fcd61_16" [label="16:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=0 [line 49]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_16" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
@@ -341,7 +341,7 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
@@ -359,19 +359,19 @@ digraph iCFG {
 	
 
 	 "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"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 49]\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"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 49]\n " shape="box"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
@@ -384,14 +384,14 @@ digraph iCFG {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int =0 [line 56]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 56]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"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]
+"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]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_34" ;

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

@@ -1,14 +1,14 @@
 /* @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" [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"]
+"neg.f24c2c15b9d03797c6874986a8d19516_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 29]\n " shape="box"]
 	
 
 	 "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"]
+"neg.f24c2c15b9d03797c6874986a8d19516_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 29]\n " shape="box"]
 	
 
 	 "neg.f24c2c15b9d03797c6874986a8d19516_6" -> "neg.f24c2c15b9d03797c6874986a8d19516_3" ;
@@ -27,16 +27,16 @@ digraph iCFG {
 "neg.f24c2c15b9d03797c6874986a8d19516_2" [label="2: Exit neg \n  " color=yellow style=filled]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_14" [label="14:  Return Stmt \n   *&return:int=0 [line 25]\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"]
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_13" [label="13:  Return Stmt \n   *&return:int=1 [line 23]\n " shape="box"]
 	
 
 	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_13" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_2" ;
@@ -48,16 +48,16 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"baz.73feffa4b7f6bb68e44cf984c85f6e88_9" [label="9:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 22]\n " shape="box"]
 	
 
 	 "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_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 22]\n " shape="box"]
 	
 
 	 "baz.73feffa4b7f6bb68e44cf984c85f6e88_8" -> "baz.73feffa4b7f6bb68e44cf984c85f6e88_5" ;
@@ -84,27 +84,27 @@ digraph iCFG {
 "baz.73feffa4b7f6bb68e44cf984c85f6e88_2" [label="2: Exit baz \n  " color=yellow style=filled]
 	
 
-"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_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_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"]
+"identity.ff483d1ff591898a9942916050d2ca3f_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 10]\n  *&return:int=n$0 [line 10]\n " shape="box"]
 	
 
 	 "identity.ff483d1ff591898a9942916050d2ca3f_3" -> "identity.ff483d1ff591898a9942916050d2ca3f_2" ;
 "identity.ff483d1ff591898a9942916050d2ca3f_2" [label="2: Exit identity \n  " color=yellow style=filled]
 	
 
-"identity.ff483d1ff591898a9942916050d2ca3f_1" [label="1: Start identity\nFormals:  x:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
+"identity.ff483d1ff591898a9942916050d2ca3f_1" [label="1: Start identity\nFormals:  x:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
 	 "identity.ff483d1ff591898a9942916050d2ca3f_1" -> "identity.ff483d1ff591898a9942916050d2ca3f_3" ;
-"bar.37b51d194a7513e45b56f6524f2d51f2_9" [label="9:  Return Stmt \n   *&return:int =0 [line 16]\n " shape="box"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_9" [label="9:  Return Stmt \n   *&return:int=0 [line 16]\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"]
+"bar.37b51d194a7513e45b56f6524f2d51f2_8" [label="8:  Return Stmt \n   *&return:int=1 [line 14]\n " shape="box"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_8" -> "bar.37b51d194a7513e45b56f6524f2d51f2_2" ;
@@ -116,7 +116,7 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_5" -> "bar.37b51d194a7513e45b56f6524f2d51f2_6" ;
@@ -132,7 +132,7 @@ digraph iCFG {
 "bar.37b51d194a7513e45b56f6524f2d51f2_2" [label="2: Exit bar \n  " color=yellow style=filled]
 	
 
-"bar.37b51d194a7513e45b56f6524f2d51f2_1" [label="1: Start bar\nFormals:  x:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
+"bar.37b51d194a7513e45b56f6524f2d51f2_1" [label="1: Start bar\nFormals:  x:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
 	 "bar.37b51d194a7513e45b56f6524f2d51f2_1" -> "bar.37b51d194a7513e45b56f6524f2d51f2_5" ;

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

@@ -1,14 +1,14 @@
 /* @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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_6" -> "access_field_in_ife_branch.09235b723e846eb21b7cc76cb004f032_3" ;
@@ -32,15 +32,15 @@ digraph iCFG {
 
 	 "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"]
+"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" ;
-"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" [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_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int =2 [line 20]\n " shape="box"]
+"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"]
 	
 
 	 "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_6" -> "call_ife_then_access_field.b6f399d1a50b93c2421854974cd226e3_3" ;
@@ -64,15 +64,15 @@ digraph iCFG {
 
 	 "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_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_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_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_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_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_6" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_3" ;
@@ -91,7 +91,7 @@ digraph iCFG {
 "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_2" [label="2: Exit ife_then_access_field \n  " color=yellow style=filled]
 	
 
-"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_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_1" -> "ife_then_access_field.314daa5b993f0f569c257230f350e2e2_4" ;

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

@@ -1,20 +1,20 @@
 /* @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" [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_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_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_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_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_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_23" -> "preincrement.db7c6523f16e1ab3058057cee6614472_20" ;
@@ -30,16 +30,16 @@ digraph iCFG {
 	
 
 	 "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_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_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_18" [label="18:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=7 [line 17]\n " shape="box"]
 	
 
 	 "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_17" [label="17:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$8:int=3 [line 17]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_17" -> "preincrement.db7c6523f16e1ab3058057cee6614472_14" ;
@@ -55,15 +55,15 @@ digraph iCFG {
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_14" -> "preincrement.db7c6523f16e1ab3058057cee6614472_19" ;
-"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" [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_12" [label="12:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=7 [line 18]\n " shape="box"]
 	
 
 	 "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_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=3 [line 18]\n " shape="box"]
 	
 
 	 "preincrement.db7c6523f16e1ab3058057cee6614472_11" -> "preincrement.db7c6523f16e1ab3058057cee6614472_8" ;
@@ -79,11 +79,11 @@ digraph iCFG {
 	
 
 	 "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_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_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_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_6" -> "preincrement.db7c6523f16e1ab3058057cee6614472_3" ;
@@ -103,7 +103,7 @@ digraph iCFG {
 "preincrement.db7c6523f16e1ab3058057cee6614472_2" [label="2: Exit preincrement \n  " color=yellow style=filled]
 	
 
-"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_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_1" -> "preincrement.db7c6523f16e1ab3058057cee6614472_26" ;

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

@@ -1,15 +1,15 @@
 /* @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" [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_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_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_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_18" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_15" ;
@@ -25,16 +25,16 @@ digraph iCFG {
 	
 
 	 "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_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_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_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_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_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_12" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_9" ;
@@ -50,15 +50,15 @@ digraph iCFG {
 	
 
 	 "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_8" [label="8:  UnaryOperator \n   n$3=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int* [line 16]\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_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_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_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_6" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_3" ;
@@ -77,7 +77,7 @@ digraph iCFG {
 "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_2" [label="2: Exit dereference_ifthenelse \n  " color=yellow style=filled]
 	
 
-"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_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_1" -> "dereference_ifthenelse.aa3447116ff03cffc729c06c91821cdc_16" ;

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

@@ -1,26 +1,26 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   *&today:int =0 [line 22]\n " shape="box"]
+"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_7" [label="7:  BinaryOperatorStmt: Assign \n   *&today:int=1 [line 23]\n " shape="box"]
 	
 
 	 "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_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_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   *&today:int =(2 + 1) [line 25]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   *&today:int=(2 + 1) [line 25]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   *&i:int =(2 + (2 - 0)) [line 26]\n " shape="box"]
+"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_3" [label="3:  Return Stmt \n   *&return:int=0 [line 27]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,10 +1,10 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   *&option1:int =(1 << 0) [line 16]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   *&option1:int=(1 << 0) [line 16]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   *&option2:int =(1 << 1) [line 17]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   *&option2:int=(1 << 1) [line 17]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,18 +1,18 @@
 /* @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" [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_test.100f3583adf0259001be6c944828c44a_10" [label="10:  DeclStmt \n   *&foo_a:int=0 [line 24]\n " shape="box"]
 	
 
 	 "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_test.100f3583adf0259001be6c944828c44a_9" [label="9:  Return Stmt \n   *&return:int=0 [line 28]\n " shape="box"]
 	
 
 	 "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_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_test.100f3583adf0259001be6c944828c44a_8" -> "other_enum_test.100f3583adf0259001be6c944828c44a_2" ;
@@ -44,31 +44,31 @@ digraph iCFG {
 	
 
 	 "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_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_main.572f04969b0ade4902dd1faf86fac461_8" [label="8:  DeclStmt \n   *&foo_b:int =1 [line 14]\n " shape="box"]
+"other_enum_main.572f04969b0ade4902dd1faf86fac461_8" [label="8:  DeclStmt \n   *&foo_b:int=1 [line 14]\n " shape="box"]
 	
 
 	 "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_main.572f04969b0ade4902dd1faf86fac461_7" [label="7:  DeclStmt \n   *&foo_c:int=10 [line 15]\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_main.572f04969b0ade4902dd1faf86fac461_6" [label="6:  DeclStmt \n   *&foo_d:int=11 [line 16]\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_main.572f04969b0ade4902dd1faf86fac461_5" [label="5:  DeclStmt \n   *&foo_e:int=1 [line 17]\n " shape="box"]
 	
 
 	 "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_main.572f04969b0ade4902dd1faf86fac461_4" [label="4:  DeclStmt \n   *&foo_f:int=2 [line 18]\n " shape="box"]
 	
 
 	 "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_main.572f04969b0ade4902dd1faf86fac461_3" [label="3:  DeclStmt \n   *&foo_g:int=(2 + 10) [line 19]\n " shape="box"]
 	
 
 	 "other_enum_main.572f04969b0ade4902dd1faf86fac461_3" -> "other_enum_main.572f04969b0ade4902dd1faf86fac461_2" ;

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

@@ -1,6 +1,6 @@
 /* @generated */
 digraph iCFG {
-"getValue.faa0c7b1433b0c97fcdc15fa47c8180f_3" [label="3:  Return Stmt \n   *&return:int =2 [line 12]\n " shape="box"]
+"getValue.faa0c7b1433b0c97fcdc15fa47c8180f_3" [label="3:  Return Stmt \n   *&return:int=2 [line 12]\n " shape="box"]
 	
 
 	 "getValue.faa0c7b1433b0c97fcdc15fa47c8180f_3" -> "getValue.faa0c7b1433b0c97fcdc15fa47c8180f_2" ;
@@ -11,7 +11,7 @@ digraph iCFG {
 	
 
 	 "getValue.faa0c7b1433b0c97fcdc15fa47c8180f_1" -> "getValue.faa0c7b1433b0c97fcdc15fa47c8180f_3" ;
-"g0.8ac829e3bb8338d74cfb45ebe834d8e1_12" [label="12:  DeclStmt \n   *&a:int =0 [line 15]\n " shape="box"]
+"g0.8ac829e3bb8338d74cfb45ebe834d8e1_12" [label="12:  DeclStmt \n   *&a:int=0 [line 15]\n " shape="box"]
 	
 
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_12" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_9" ;
@@ -44,11 +44,11 @@ digraph iCFG {
 	
 
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_5" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_4" ;
-"g0.8ac829e3bb8338d74cfb45ebe834d8e1_4" [label="4:  BinaryOperatorStmt: Assign \n   *&a:int =1 [line 22]\n " shape="box"]
+"g0.8ac829e3bb8338d74cfb45ebe834d8e1_4" [label="4:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 22]\n " shape="box"]
 	
 
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_4" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_3" ;
-"g0.8ac829e3bb8338d74cfb45ebe834d8e1_3" [label="3:  Return Stmt \n   *&return:int =1 [line 23]\n " shape="box"]
+"g0.8ac829e3bb8338d74cfb45ebe834d8e1_3" [label="3:  Return Stmt \n   *&return:int=1 [line 23]\n " shape="box"]
 	
 
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_3" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_2" ;
@@ -59,11 +59,11 @@ digraph iCFG {
 	
 
 	 "g0.8ac829e3bb8338d74cfb45ebe834d8e1_1" -> "g0.8ac829e3bb8338d74cfb45ebe834d8e1_12" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_34" [label="34:  DeclStmt \n   *&a:int =0 [line 38]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_34" [label="34:  DeclStmt \n   *&a:int=0 [line 38]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_34" -> "g2.e1c80488853d86ab9d6decfe30d8930f_14" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_33" [label="33:  BinaryOperatorStmt: Assign \n   *&a:int =1 [line 40]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_33" [label="33:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 40]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_33" -> "g2.e1c80488853d86ab9d6decfe30d8930f_26" ;
@@ -75,11 +75,11 @@ digraph iCFG {
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_31" -> "g2.e1c80488853d86ab9d6decfe30d8930f_5" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_30" [label="30:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int =1 [line 42]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_30" [label="30:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=1 [line 42]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_30" -> "g2.e1c80488853d86ab9d6decfe30d8930f_25" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_29" [label="29:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int =0 [line 42]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_29" [label="29:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=0 [line 42]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_29" -> "g2.e1c80488853d86ab9d6decfe30d8930f_25" ;
@@ -113,11 +113,11 @@ digraph iCFG {
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_22" -> "g2.e1c80488853d86ab9d6decfe30d8930f_8" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_21" [label="21:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int =1 [line 44]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_21" [label="21:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 44]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_21" -> "g2.e1c80488853d86ab9d6decfe30d8930f_16" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_20" [label="20:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int =0 [line 44]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_20" [label="20:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=0 [line 44]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_20" -> "g2.e1c80488853d86ab9d6decfe30d8930f_16" ;
@@ -164,7 +164,7 @@ digraph iCFG {
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_10" -> "g2.e1c80488853d86ab9d6decfe30d8930f_9" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_9" [label="9:  Return Stmt \n   *&return:int =0 [line 48]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_9" [label="9:  Return Stmt \n   *&return:int=0 [line 48]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_9" -> "g2.e1c80488853d86ab9d6decfe30d8930f_2" ;
@@ -172,11 +172,11 @@ digraph iCFG {
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_8" -> "g2.e1c80488853d86ab9d6decfe30d8930f_7" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_7" [label="7:  BinaryOperatorStmt: Assign \n   *&a:int =2 [line 51]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_7" [label="7:  BinaryOperatorStmt: Assign \n   *&a:int=2 [line 51]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_7" -> "g2.e1c80488853d86ab9d6decfe30d8930f_6" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_6" [label="6:  Return Stmt \n   *&return:int =2 [line 52]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_6" [label="6:  Return Stmt \n   *&return:int=2 [line 52]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_6" -> "g2.e1c80488853d86ab9d6decfe30d8930f_2" ;
@@ -184,11 +184,11 @@ digraph iCFG {
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_5" -> "g2.e1c80488853d86ab9d6decfe30d8930f_4" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_4" [label="4:  BinaryOperatorStmt: Assign \n   *&a:int =3 [line 55]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_4" [label="4:  BinaryOperatorStmt: Assign \n   *&a:int=3 [line 55]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_4" -> "g2.e1c80488853d86ab9d6decfe30d8930f_3" ;
-"g2.e1c80488853d86ab9d6decfe30d8930f_3" [label="3:  Return Stmt \n   *&return:int =1 [line 56]\n " shape="box"]
+"g2.e1c80488853d86ab9d6decfe30d8930f_3" [label="3:  Return Stmt \n   *&return:int=1 [line 56]\n " shape="box"]
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_3" -> "g2.e1c80488853d86ab9d6decfe30d8930f_2" ;
@@ -199,7 +199,7 @@ digraph iCFG {
 	
 
 	 "g2.e1c80488853d86ab9d6decfe30d8930f_1" -> "g2.e1c80488853d86ab9d6decfe30d8930f_34" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_34" [label="34:  Call _fun_printf \n   n$10=_fun_printf(\"B\\n\":char *) [line 61]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_34" [label="34:  Call _fun_printf \n   n$10=_fun_printf(\"B\\n\":char*) [line 61]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_34" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_27" ;
@@ -211,11 +211,11 @@ digraph iCFG {
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_32" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_5" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_31" [label="31:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int =1 [line 63]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_31" [label="31:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=1 [line 63]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_31" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_26" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_30" [label="30:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int =0 [line 63]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_30" [label="30:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=0 [line 63]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_30" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_26" ;
@@ -249,11 +249,11 @@ digraph iCFG {
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_23" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_8" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_22" [label="22:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int =1 [line 65]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_22" [label="22:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=1 [line 65]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_22" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_17" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_21" [label="21:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int =0 [line 65]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_21" [label="21:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=0 [line 65]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_21" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_17" ;
@@ -300,11 +300,11 @@ digraph iCFG {
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_11" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_10" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_10" [label="10:  Call _fun_printf \n   n$2=_fun_printf(\"g3\\n\":char *) [line 69]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_10" [label="10:  Call _fun_printf \n   n$2=_fun_printf(\"g3\\n\":char*) [line 69]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_10" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_9" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_9" [label="9:  Return Stmt \n   *&return:int =0 [line 70]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_9" [label="9:  Return Stmt \n   *&return:int=0 [line 70]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_9" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_2" ;
@@ -312,11 +312,11 @@ digraph iCFG {
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_8" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_7" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_7" [label="7:  DeclStmt \n   *&a:int =2 [line 73]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_7" [label="7:  DeclStmt \n   *&a:int=2 [line 73]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_7" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_6" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_6" [label="6:  Call _fun_printf \n   n$1=_fun_printf(\"A\\n\":char *) [line 74]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_6" [label="6:  Call _fun_printf \n   n$1=_fun_printf(\"A\\n\":char*) [line 74]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_6" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_5" ;
@@ -324,11 +324,11 @@ digraph iCFG {
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_5" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_4" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"exit\\n\":char *) [line 77]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"exit\\n\":char*) [line 77]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_4" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_3" ;
-"g3.8a9fd7dfda802921fdc4079f9a528ce8_3" [label="3:  Return Stmt \n   *&return:int =1 [line 78]\n " shape="box"]
+"g3.8a9fd7dfda802921fdc4079f9a528ce8_3" [label="3:  Return Stmt \n   *&return:int=1 [line 78]\n " shape="box"]
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_3" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_2" ;
@@ -339,7 +339,7 @@ digraph iCFG {
 	
 
 	 "g3.8a9fd7dfda802921fdc4079f9a528ce8_1" -> "g3.8a9fd7dfda802921fdc4079f9a528ce8_15" ;
-"g1.0120a4f9196a5f9eb9f523f31f914da7_11" [label="11:  DeclStmt \n   *&a:int =0 [line 27]\n " shape="box"]
+"g1.0120a4f9196a5f9eb9f523f31f914da7_11" [label="11:  DeclStmt \n   *&a:int=0 [line 27]\n " shape="box"]
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_11" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_8" ;
@@ -360,7 +360,7 @@ digraph iCFG {
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_7" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_6" ;
-"g1.0120a4f9196a5f9eb9f523f31f914da7_6" [label="6:  Return Stmt \n   *&return:int =0 [line 30]\n " shape="box"]
+"g1.0120a4f9196a5f9eb9f523f31f914da7_6" [label="6:  Return Stmt \n   *&return:int=0 [line 30]\n " shape="box"]
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_6" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_2" ;
@@ -368,11 +368,11 @@ digraph iCFG {
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_5" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_4" ;
-"g1.0120a4f9196a5f9eb9f523f31f914da7_4" [label="4:  BinaryOperatorStmt: Assign \n   *&a:int =1 [line 33]\n " shape="box"]
+"g1.0120a4f9196a5f9eb9f523f31f914da7_4" [label="4:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 33]\n " shape="box"]
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_4" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_3" ;
-"g1.0120a4f9196a5f9eb9f523f31f914da7_3" [label="3:  Return Stmt \n   *&return:int =1 [line 34]\n " shape="box"]
+"g1.0120a4f9196a5f9eb9f523f31f914da7_3" [label="3:  Return Stmt \n   *&return:int=1 [line 34]\n " shape="box"]
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_3" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_2" ;
@@ -383,7 +383,7 @@ digraph iCFG {
 	
 
 	 "g1.0120a4f9196a5f9eb9f523f31f914da7_1" -> "g1.0120a4f9196a5f9eb9f523f31f914da7_11" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_32" [label="32:  Call _fun_printf \n   n$9=_fun_printf(\"B\\n\":char *) [line 126]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_32" [label="32:  Call _fun_printf \n   n$9=_fun_printf(\"B\\n\":char*) [line 126]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_32" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_25" ;
@@ -395,11 +395,11 @@ digraph iCFG {
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_30" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_5" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_29" [label="29:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int =1 [line 128]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_29" [label="29:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=1 [line 128]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_29" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_24" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_28" [label="28:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int =0 [line 128]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_28" [label="28:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=0 [line 128]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_28" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_24" ;
@@ -433,11 +433,11 @@ digraph iCFG {
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_21" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_3" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_20" [label="20:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int =1 [line 130]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_20" [label="20:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 130]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_20" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_15" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_19" [label="19:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int =0 [line 130]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_19" [label="19:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=0 [line 130]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_19" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_15" ;
@@ -484,15 +484,15 @@ digraph iCFG {
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_9" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_5" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_8" [label="8:  DeclStmt \n   *&a:int =2 [line 137]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_8" [label="8:  DeclStmt \n   *&a:int=2 [line 137]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_8" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_7" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_7" [label="7:  Call _fun_printf \n   n$1=_fun_printf(\"A\\n\":char *) [line 138]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_7" [label="7:  Call _fun_printf \n   n$1=_fun_printf(\"A\\n\":char*) [line 138]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_7" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_6" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_6" [label="6:  Return Stmt \n   *&return:int =1 [line 140]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_6" [label="6:  Return Stmt \n   *&return:int=1 [line 140]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_6" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_2" ;
@@ -500,7 +500,7 @@ digraph iCFG {
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_5" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_4" ;
-"g6.4a4314ef967aad20a9e7c423bc16e39c_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"exit\\n\":char *) [line 142]\n " shape="box"]
+"g6.4a4314ef967aad20a9e7c423bc16e39c_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"exit\\n\":char*) [line 142]\n " shape="box"]
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_4" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_3" ;
@@ -515,7 +515,7 @@ digraph iCFG {
 	
 
 	 "g6.4a4314ef967aad20a9e7c423bc16e39c_1" -> "g6.4a4314ef967aad20a9e7c423bc16e39c_13" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_32" [label="32:  Call _fun_printf \n   n$9=_fun_printf(\"B\\n\":char *) [line 104]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_32" [label="32:  Call _fun_printf \n   n$9=_fun_printf(\"B\\n\":char*) [line 104]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_32" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_25" ;
@@ -527,11 +527,11 @@ digraph iCFG {
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_30" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_5" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_29" [label="29:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int =1 [line 106]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_29" [label="29:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=1 [line 106]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_29" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_24" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_28" [label="28:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int =0 [line 106]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_28" [label="28:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=0 [line 106]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_28" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_24" ;
@@ -565,11 +565,11 @@ digraph iCFG {
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_21" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_3" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_20" [label="20:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int =1 [line 108]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_20" [label="20:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=1 [line 108]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_20" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_15" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_19" [label="19:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int =0 [line 108]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_19" [label="19:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=0 [line 108]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_19" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_15" ;
@@ -616,15 +616,15 @@ digraph iCFG {
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_9" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_5" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_8" [label="8:  DeclStmt \n   *&a:int =2 [line 115]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_8" [label="8:  DeclStmt \n   *&a:int=2 [line 115]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_8" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_7" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_7" [label="7:  Call _fun_printf \n   n$1=_fun_printf(\"A\\n\":char *) [line 116]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_7" [label="7:  Call _fun_printf \n   n$1=_fun_printf(\"A\\n\":char*) [line 116]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_7" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_6" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_6" [label="6:  Return Stmt \n   *&return:int =1 [line 117]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_6" [label="6:  Return Stmt \n   *&return:int=1 [line 117]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_6" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_2" ;
@@ -632,7 +632,7 @@ digraph iCFG {
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_5" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_4" ;
-"g5.37c965a8d6d7bec292c7b11ff315d9ea_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"exit\\n\":char *) [line 120]\n " shape="box"]
+"g5.37c965a8d6d7bec292c7b11ff315d9ea_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"exit\\n\":char*) [line 120]\n " shape="box"]
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_4" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_3" ;
@@ -647,7 +647,7 @@ digraph iCFG {
 	
 
 	 "g5.37c965a8d6d7bec292c7b11ff315d9ea_1" -> "g5.37c965a8d6d7bec292c7b11ff315d9ea_13" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_33" [label="33:  Call _fun_printf \n   n$10=_fun_printf(\"B\\n\":char *) [line 83]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_33" [label="33:  Call _fun_printf \n   n$10=_fun_printf(\"B\\n\":char*) [line 83]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_33" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_26" ;
@@ -659,11 +659,11 @@ digraph iCFG {
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_31" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_5" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_30" [label="30:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int =1 [line 85]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_30" [label="30:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=1 [line 85]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_30" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_25" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_29" [label="29:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int =0 [line 85]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_29" [label="29:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$7:int=0 [line 85]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_29" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_25" ;
@@ -697,11 +697,11 @@ digraph iCFG {
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_22" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_8" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_21" [label="21:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int =1 [line 87]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_21" [label="21:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=1 [line 87]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_21" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_16" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_20" [label="20:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int =0 [line 87]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_20" [label="20:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$4:int=0 [line 87]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_20" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_16" ;
@@ -748,7 +748,7 @@ digraph iCFG {
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_10" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_9" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_9" [label="9:  Call _fun_printf \n   n$2=_fun_printf(\"g4\\n\":char *) [line 91]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_9" [label="9:  Call _fun_printf \n   n$2=_fun_printf(\"g4\\n\":char*) [line 91]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_9" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_8" ;
@@ -756,11 +756,11 @@ digraph iCFG {
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_8" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_7" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_7" [label="7:  DeclStmt \n   *&a:int =2 [line 94]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_7" [label="7:  DeclStmt \n   *&a:int=2 [line 94]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_7" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_6" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_6" [label="6:  Call _fun_printf \n   n$1=_fun_printf(\"A\\n\":char *) [line 95]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_6" [label="6:  Call _fun_printf \n   n$1=_fun_printf(\"A\\n\":char*) [line 95]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_6" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_5" ;
@@ -768,11 +768,11 @@ digraph iCFG {
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_5" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_4" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"exit\\n\":char *) [line 98]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"exit\\n\":char*) [line 98]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_4" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_3" ;
-"g4.b0b5c8f28ad7834e70a958a8882fa59a_3" [label="3:  Return Stmt \n   *&return:int =1 [line 99]\n " shape="box"]
+"g4.b0b5c8f28ad7834e70a958a8882fa59a_3" [label="3:  Return Stmt \n   *&return:int=1 [line 99]\n " shape="box"]
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_3" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_2" ;
@@ -783,23 +783,23 @@ digraph iCFG {
 	
 
 	 "g4.b0b5c8f28ad7834e70a958a8882fa59a_1" -> "g4.b0b5c8f28ad7834e70a958a8882fa59a_14" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_29" [label="29:  DeclStmt \n   *&i:int =0 [line 147]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_29" [label="29:  DeclStmt \n   *&i:int=0 [line 147]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_29" -> "g7.727bb92f57c3951d11695a52c92c2b0c_28" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_28" [label="28:  DeclStmt \n   *&j:int =0 [line 147]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_28" [label="28:  DeclStmt \n   *&j:int=0 [line 147]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_28" -> "g7.727bb92f57c3951d11695a52c92c2b0c_27" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_27" [label="27:  DeclStmt \n   *&k:int =0 [line 147]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_27" [label="27:  DeclStmt \n   *&k:int=0 [line 147]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_27" -> "g7.727bb92f57c3951d11695a52c92c2b0c_9" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_26" [label="26:  DeclStmt \n   n$7=*&i:int  [line 151]\n  n$8=*&j:int  [line 151]\n  n$9=*&k:int  [line 151]\n  *&v:int =((n$7 + n$8) + n$9) [line 151]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_26" [label="26:  DeclStmt \n   n$7=*&i:int [line 151]\n  n$8=*&j:int [line 151]\n  n$9=*&k:int [line 151]\n  *&v:int=((n$7 + n$8) + n$9) [line 151]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_26" -> "g7.727bb92f57c3951d11695a52c92c2b0c_22" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_25" [label="25:  Call _fun_printf \n   n$6=_fun_printf(\"wow\\n\":char *) [line 155]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_25" [label="25:  Call _fun_printf \n   n$6=_fun_printf(\"wow\\n\":char*) [line 155]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_25" -> "g7.727bb92f57c3951d11695a52c92c2b0c_5" ;
@@ -875,7 +875,7 @@ digraph iCFG {
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_8" -> "g7.727bb92f57c3951d11695a52c92c2b0c_7" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_7" [label="7:  Call _fun_printf \n   n$1=_fun_printf(\"out!\\n\":char *) [line 162]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_7" [label="7:  Call _fun_printf \n   n$1=_fun_printf(\"out!\\n\":char*) [line 162]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_7" -> "g7.727bb92f57c3951d11695a52c92c2b0c_6" ;
@@ -887,11 +887,11 @@ digraph iCFG {
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_5" -> "g7.727bb92f57c3951d11695a52c92c2b0c_4" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"terminating!\\n\":char *) [line 165]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"terminating!\\n\":char*) [line 165]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_4" -> "g7.727bb92f57c3951d11695a52c92c2b0c_3" ;
-"g7.727bb92f57c3951d11695a52c92c2b0c_3" [label="3:  Return Stmt \n   *&return:int =2 [line 166]\n " shape="box"]
+"g7.727bb92f57c3951d11695a52c92c2b0c_3" [label="3:  Return Stmt \n   *&return:int=2 [line 166]\n " shape="box"]
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_3" -> "g7.727bb92f57c3951d11695a52c92c2b0c_2" ;
@@ -902,15 +902,15 @@ digraph iCFG {
 	
 
 	 "g7.727bb92f57c3951d11695a52c92c2b0c_1" -> "g7.727bb92f57c3951d11695a52c92c2b0c_29" ;
-"g8.c98b82371573afc08575815d90f5eac4_32" [label="32:  DeclStmt \n   *&i:int =0 [line 170]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_32" [label="32:  DeclStmt \n   *&i:int=0 [line 170]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_32" -> "g8.c98b82371573afc08575815d90f5eac4_31" ;
-"g8.c98b82371573afc08575815d90f5eac4_31" [label="31:  DeclStmt \n   *&j:int =0 [line 170]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_31" [label="31:  DeclStmt \n   *&j:int=0 [line 170]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_31" -> "g8.c98b82371573afc08575815d90f5eac4_30" ;
-"g8.c98b82371573afc08575815d90f5eac4_30" [label="30:  DeclStmt \n   *&k:int =0 [line 170]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_30" [label="30:  DeclStmt \n   *&k:int=0 [line 170]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_30" -> "g8.c98b82371573afc08575815d90f5eac4_28" ;
@@ -927,7 +927,7 @@ digraph iCFG {
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_27" -> "g8.c98b82371573afc08575815d90f5eac4_8" ;
-"g8.c98b82371573afc08575815d90f5eac4_26" [label="26:  DeclStmt \n   n$7=*&i:int  [line 176]\n  n$8=*&j:int  [line 176]\n  n$9=*&k:int  [line 176]\n  *&v:int =((n$7 + n$8) + n$9) [line 176]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_26" [label="26:  DeclStmt \n   n$7=*&i:int [line 176]\n  n$8=*&j:int [line 176]\n  n$9=*&k:int [line 176]\n  *&v:int=((n$7 + n$8) + n$9) [line 176]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_26" -> "g8.c98b82371573afc08575815d90f5eac4_21" ;
@@ -935,7 +935,7 @@ digraph iCFG {
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_25" -> "g8.c98b82371573afc08575815d90f5eac4_24" ;
-"g8.c98b82371573afc08575815d90f5eac4_24" [label="24:  Call _fun_printf \n   n$6=_fun_printf(\"wow\\n\":char *) [line 179]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_24" [label="24:  Call _fun_printf \n   n$6=_fun_printf(\"wow\\n\":char*) [line 179]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_24" -> "g8.c98b82371573afc08575815d90f5eac4_20" ;
@@ -1011,7 +1011,7 @@ digraph iCFG {
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_7" -> "g8.c98b82371573afc08575815d90f5eac4_6" ;
-"g8.c98b82371573afc08575815d90f5eac4_6" [label="6:  Call _fun_printf \n   n$1=_fun_printf(\"out!\\n\":char *) [line 186]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_6" [label="6:  Call _fun_printf \n   n$1=_fun_printf(\"out!\\n\":char*) [line 186]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_6" -> "g8.c98b82371573afc08575815d90f5eac4_5" ;
@@ -1019,18 +1019,18 @@ digraph iCFG {
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_5" -> "g8.c98b82371573afc08575815d90f5eac4_4" ;
-"g8.c98b82371573afc08575815d90f5eac4_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"terminating!\\n\":char *) [line 188]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_4" [label="4:  Call _fun_printf \n   n$0=_fun_printf(\"terminating!\\n\":char*) [line 188]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_4" -> "g8.c98b82371573afc08575815d90f5eac4_3" ;
-"g8.c98b82371573afc08575815d90f5eac4_3" [label="3:  Return Stmt \n   *&return:int =2 [line 189]\n " shape="box"]
+"g8.c98b82371573afc08575815d90f5eac4_3" [label="3:  Return Stmt \n   *&return:int=2 [line 189]\n " shape="box"]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_3" -> "g8.c98b82371573afc08575815d90f5eac4_2" ;
 "g8.c98b82371573afc08575815d90f5eac4_2" [label="2: Exit g8 \n  " color=yellow style=filled]
 	
 
-"g8.c98b82371573afc08575815d90f5eac4_1" [label="1: Start g8\nFormals:  q:int \nLocals:  v:int  k:int  j:int  i:int  \n   DECLARE_LOCALS(&return,&v,&k,&j,&i); [line 169]\n " color=yellow style=filled]
+"g8.c98b82371573afc08575815d90f5eac4_1" [label="1: Start g8\nFormals:  q:int\nLocals:  v:int k:int j:int i:int \n   DECLARE_LOCALS(&return,&v,&k,&j,&i); [line 169]\n " color=yellow style=filled]
 	
 
 	 "g8.c98b82371573afc08575815d90f5eac4_1" -> "g8.c98b82371573afc08575815d90f5eac4_32" ;

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

@@ -1,13 +1,13 @@
 /* @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_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_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  a:int [2][3] z:int  \n   DECLARE_LOCALS(&return,&a,&z); [line 10]\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_1" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;

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

@@ -1,10 +1,10 @@
 /* @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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_3" -> "init_with_compound_literal.745ef6cf3c32f7f18974c2c4fc6a8c9c_2" ;
@@ -15,7 +15,7 @@ digraph iCFG {
 	
 
 	 "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"]
+"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" ;

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

@@ -1,10 +1,10 @@
 /* @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"]
+"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" ;
-"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"]
+"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"]
 	
 
 	 "implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_3" -> "implicit_expr_set_correctly.dcfe49f71ad24e86323cbad97b1a70fe_2" ;
@@ -15,7 +15,7 @@ digraph iCFG {
 	
 
 	 "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" [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" ;
@@ -26,7 +26,7 @@ digraph iCFG {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_3" [label="3:  Return Stmt \n   *&return:int =5 [line 15]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_3" [label="3:  Return Stmt \n   *&return:int=5 [line 15]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_2" ;
@@ -37,26 +37,26 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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" [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" [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"]
+"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"]
 	
 
 	 "field_set_correctly.b8d9a4294a85d24818c312a099420dce_3" -> "field_set_correctly.b8d9a4294a85d24818c312a099420dce_2" ;

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

@@ -1,14 +1,14 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   *&a:int =10 [line 11]\n " shape="box"]
+"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_9" [label="9:  DeclStmt \n   *&b:int=0 [line 12]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   *&a:int =1 [line 14]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 14]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
@@ -29,7 +29,7 @@ digraph iCFG {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int =0 [line 17]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 17]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,14 +1,14 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   *&a:int =10 [line 11]\n " shape="box"]
+"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_9" [label="9:  DeclStmt \n   *&b:int=0 [line 12]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   *&a:int =1 [line 14]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 14]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
@@ -20,7 +20,7 @@ digraph iCFG {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"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" [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" ;
@@ -29,7 +29,7 @@ digraph iCFG {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int =0 [line 17]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 17]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,18 +1,18 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   *&a:int =10 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   *&a:int=10 [line 11]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
-"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  DeclStmt \n   *&b:int =0 [line 12]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  DeclStmt \n   *&b:int=0 [line 12]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  BinaryOperatorStmt: Assign \n   *&a:int =1 [line 14]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_13" [label="13:  BinaryOperatorStmt: Assign \n   *&a:int=1 [line 14]\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_12" [label="12:  BinaryOperatorStmt: Assign \n   *&a:int=2 [line 16]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
@@ -50,7 +50,7 @@ digraph iCFG {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_13" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int =0 [line 20]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 20]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,14 +1,14 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  DeclStmt \n   *&j:int =0 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_12" [label="12:  DeclStmt \n   *&j:int=0 [line 11]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_12" -> "main.fad58de7366495db4650cfefac2fcd61_11" ;
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   *&i:int =0 [line 12]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   *&i:int=0 [line 12]\n " shape="box"]
 	
 
 	 "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_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_10" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
@@ -20,16 +20,16 @@ digraph iCFG {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"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" [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" [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_5" [label="5:  DeclStmt \n   *&b:int=3 [line 13]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -37,7 +37,7 @@ digraph iCFG {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_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 16]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,10 +1,10 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_17" [label="17:  DeclStmt \n   *&k:int =0 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_17" [label="17:  DeclStmt \n   *&k:int=0 [line 11]\n " shape="box"]
 	
 
 	 "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_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_16" -> "main.fad58de7366495db4650cfefac2fcd61_12" ;
@@ -21,11 +21,11 @@ digraph iCFG {
 
 	 "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_12" [label="12:  UnaryOperator \n   n$3=*&j:int [line 13]\n  *&j:int=(n$3 + 1) [line 13]\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_11" [label="11:  DeclStmt \n   *&j:int=0 [line 13]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_11" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
@@ -46,11 +46,11 @@ digraph iCFG {
 
 	 "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_6" [label="6:  UnaryOperator \n   n$1=*&i:int [line 12]\n  *&i:int=(n$1 + 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_5" [label="5:  DeclStmt \n   *&i:int=0 [line 12]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -58,7 +58,7 @@ digraph iCFG {
 	
 
 	 "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_3" [label="3:  Return Stmt \n   n$0=*&k:int [line 17]\n  *&return:int=n$0 [line 17]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,10 +1,10 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_10" [label="10:  DeclStmt \n   *&j:int =0 [line 11]\n " shape="box"]
+"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_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_9" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
@@ -16,11 +16,11 @@ digraph iCFG {
 	
 
 	 "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_6" [label="6:  UnaryOperator \n   n$0=*&b:int [line 12]\n  *&b:int=(n$0 + 1) [line 12]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&b:int =0 [line 12]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&b:int=0 [line 12]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -29,7 +29,7 @@ digraph iCFG {
 
 	 "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_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,10 +1,10 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&j:int =0 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&j:int=0 [line 11]\n " shape="box"]
 	
 
 	 "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_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_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -16,7 +16,7 @@ digraph iCFG {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&b:int =0 [line 12]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&b:int=0 [line 12]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -25,7 +25,7 @@ digraph iCFG {
 
 	 "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_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,6 +1,6 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  DeclStmt \n   *&d:int =0 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  DeclStmt \n   *&d:int=0 [line 11]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
@@ -12,7 +12,7 @@ digraph iCFG {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   *&d:int =0 [line 12]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   *&d:int=0 [line 12]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -21,7 +21,7 @@ digraph iCFG {
 
 	 "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_3" [label="3:  Return Stmt \n   *&return:int=0 [line 14]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,10 +1,10 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_8" [label="8:  DeclStmt \n   *&i:int =0 [line 11]\n " shape="box"]
+"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_7" [label="7:  UnaryOperator \n   n$0=*&i:int [line 13]\n  *&i:int=(n$0 + 1) [line 13]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -21,7 +21,7 @@ digraph iCFG {
 
 	 "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_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,10 +1,10 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   *&j:int =0 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_11" [label="11:  DeclStmt \n   *&j:int=0 [line 11]\n " shape="box"]
 	
 
 	 "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_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_10" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
@@ -21,11 +21,11 @@ digraph iCFG {
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
-"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" [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_5" [label="5:  DeclStmt \n   *&i:int=0 [line 12]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -33,7 +33,7 @@ digraph iCFG {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int =0 [line 15]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,10 +1,10 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   *&k:int =0 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   *&k:int=0 [line 11]\n " shape="box"]
 	
 
 	 "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_14" [label="14:  UnaryOperator \n   n$4=*&k:int [line 14]\n  *&k:int=(n$4 + 1) [line 14]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_14" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
@@ -38,11 +38,11 @@ digraph iCFG {
 
 	 "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_6" [label="6:  UnaryOperator \n   n$1=*&i:int [line 12]\n  *&i:int=(n$1 + 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_5" [label="5:  DeclStmt \n   *&i:int=0 [line 12]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -50,7 +50,7 @@ digraph iCFG {
 	
 
 	 "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_3" [label="3:  Return Stmt \n   n$0=*&k:int [line 17]\n  *&return:int=n$0 [line 17]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,10 +1,10 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&i:int =0 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&i:int=0 [line 11]\n " shape="box"]
 	
 
 	 "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_8" [label="8:  UnaryOperator \n   n$1=*&i:int [line 13]\n  *&i:int=(n$1 + 1) [line 13]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -25,7 +25,7 @@ digraph iCFG {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int =0 [line 15]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,10 +1,10 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&i:int =0 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&i:int=0 [line 11]\n " shape="box"]
 	
 
 	 "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_8" [label="8:  UnaryOperator \n   n$1=*&i:int [line 13]\n  *&i:int=(n$1 + 1) [line 13]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_8" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
@@ -16,7 +16,7 @@ digraph iCFG {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_8" ;
-"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" [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" ;
@@ -25,7 +25,7 @@ digraph iCFG {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int =0 [line 15]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,14 +1,14 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   *&i:int =0 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_15" [label="15:  DeclStmt \n   *&i:int=0 [line 11]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_15" -> "main.fad58de7366495db4650cfefac2fcd61_14" ;
-"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  DeclStmt \n   *&k:int =0 [line 12]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_14" [label="14:  DeclStmt \n   *&k:int=0 [line 12]\n " shape="box"]
 	
 
 	 "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_13" [label="13:  UnaryOperator \n   n$3=*&k:int [line 15]\n  *&k:int=(n$3 + 1) [line 15]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_13" -> "main.fad58de7366495db4650cfefac2fcd61_9" ;
@@ -29,7 +29,7 @@ digraph iCFG {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_9" -> "main.fad58de7366495db4650cfefac2fcd61_10" ;
-"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" [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" ;
@@ -50,7 +50,7 @@ digraph iCFG {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int =0 [line 19]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 19]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -13,7 +13,7 @@ digraph iCFG {
 
 	 "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" [label="3:  Return Stmt \n   *&return:int=0 [line 13]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,10 +1,10 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_19" [label="19:  DeclStmt \n   *&x:int =0 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_19" [label="19:  DeclStmt \n   *&x:int=0 [line 11]\n " shape="box"]
 	
 
 	 "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_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_18" -> "main.fad58de7366495db4650cfefac2fcd61_15" ;
@@ -68,7 +68,7 @@ digraph iCFG {
 
 	 "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_3" [label="3:  Return Stmt \n   *&return:int=0 [line 23]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,6 +1,6 @@
 /* @generated */
 digraph iCFG {
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_8" [label="8:  Return Stmt \n   *&return:int =32 [line 12]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_8" [label="8:  Return Stmt \n   *&return:int=32 [line 12]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_8" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_2" ;
@@ -12,7 +12,7 @@ digraph iCFG {
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_6" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_8" ;
-"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" [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" ;
@@ -21,14 +21,14 @@ digraph iCFG {
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_4" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" ;
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_3" [label="3:  Return Stmt \n   *&return:int =52 [line 14]\n " shape="box"]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_3" [label="3:  Return Stmt \n   *&return:int=52 [line 14]\n " shape="box"]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_3" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_2" ;
 "foo.acbd18db4cc2f85cedef654fccc4a4d8_2" [label="2: Exit foo \n  " color=yellow style=filled]
 	
 
-"foo.acbd18db4cc2f85cedef654fccc4a4d8_1" [label="1: Start foo\nFormals:  p:int *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
+"foo.acbd18db4cc2f85cedef654fccc4a4d8_1" [label="1: Start foo\nFormals:  p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
 	 "foo.acbd18db4cc2f85cedef654fccc4a4d8_1" -> "foo.acbd18db4cc2f85cedef654fccc4a4d8_5" ;

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

@@ -1,6 +1,6 @@
 /* @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_8" [label="8:  Return Stmt \n   *&return:int=32 [line 12]\n " shape="box"]
 	
 
 	 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_8" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_2" ;
@@ -12,7 +12,7 @@ digraph iCFG {
 	
 
 	 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_6" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_8" ;
-"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" [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" ;
@@ -21,14 +21,14 @@ digraph iCFG {
 	
 
 	 "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_3" [label="3:  Return Stmt \n   *&return:int=52 [line 14]\n " shape="box"]
 	
 
 	 "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_1" [label="1: Start foo\nFormals:  p:int *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
+"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_1" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3fooPi}.9b69b91953f97044466d1dd6c3d24e80_5" ;

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

@@ -1,22 +1,22 @@
 /* @generated */
 digraph iCFG {
-"test.098f6bcd4621d373cade4e832627b4f6_7" [label="7:  DeclStmt \n   *&a:int =3 [line 11]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_7" [label="7:  DeclStmt \n   *&a:int=3 [line 11]\n " shape="box"]
 	
 
 	 "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_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_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_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_5" -> "test.098f6bcd4621d373cade4e832627b4f6_4" ;
-"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" [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_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_3" -> "test.098f6bcd4621d373cade4e832627b4f6_2" ;

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

@@ -1,22 +1,22 @@
 /* @generated */
 digraph iCFG {
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" [label="7:  DeclStmt \n   *&a:int =3 [line 11]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_7" [label="7:  DeclStmt \n   *&a:int=3 [line 11]\n " shape="box"]
 	
 
 	 "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_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_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_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_5" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" ;
-"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" [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_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_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" ;

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

@@ -1,14 +1,14 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&y:int =3 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&y:int=3 [line 11]\n " shape="box"]
 	
 
 	 "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_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_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int =0 [line 17]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 17]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -19,14 +19,14 @@ digraph iCFG {
 	
 
 	 "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"]
+"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_3" -> "test.098f6bcd4621d373cade4e832627b4f6_2" ;
 "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_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_1" -> "test.098f6bcd4621d373cade4e832627b4f6_3" ;

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

@@ -1,30 +1,30 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&x:double =1.000000 [line 11]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_9" [label="9:  DeclStmt \n   *&x:double=1.000000 [line 11]\n " shape="box"]
 	
 
 	 "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_8" [label="8:  BinaryOperatorStmt: Assign \n   n$11=*&s:double [line 13]\n  *&x:double=n$11 [line 13]\n " shape="box"]
 	
 
 	 "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_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_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_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_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"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" [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_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_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int =0 [line 18]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 18]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,22 +1,22 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   n$3=*&#GB<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_7" [label="7:  BinaryOperatorStmt: Assign \n   n$3=*&#GB<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_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   *&#GB<nestedoperators/union.c>$y.f:int =7 [line 33]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   *&#GB<nestedoperators/union.c>$y.f:int=7 [line 33]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=*&#GB<nestedoperators/union.c>$y.f:int  [line 34]\n  *&#GB<nestedoperators/union.c>$y.g.u:int =n$2 [line 34]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=*&#GB<nestedoperators/union.c>$y.f:int [line 34]\n  *&#GB<nestedoperators/union.c>$y.g.u:int=n$2 [line 34]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&#GB<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<nestedoperators/union.c>$y.g.w:int =n$1 [line 36]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&#GB<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<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_3" [label="3:  Return Stmt \n   *&return:int=0 [line 37]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;

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

@@ -1,22 +1,22 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   n$3=*&#GB<nestedoperators/union.cpp>$x:class anonymous_struct_nestedoperators_union.cpp:12:1 * [line 32]\n  *n$3.a:int =1 [line 32]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_7" [label="7:  BinaryOperatorStmt: Assign \n   n$3=*&#GB<nestedoperators/union.cpp>$x:class anonymous_struct_nestedoperators_union.cpp:12:1* [line 32]\n  *n$3.a:int=1 [line 32]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   *&#GB<nestedoperators/union.cpp>$y.f:int =7 [line 33]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_6" [label="6:  BinaryOperatorStmt: Assign \n   *&#GB<nestedoperators/union.cpp>$y.f:int=7 [line 33]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_6" -> "main.fad58de7366495db4650cfefac2fcd61_5" ;
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=*&#GB<nestedoperators/union.cpp>$y.f:int  [line 34]\n  *&#GB<nestedoperators/union.cpp>$y.g.u:int =n$2 [line 34]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  BinaryOperatorStmt: Assign \n   n$2=*&#GB<nestedoperators/union.cpp>$y.f:int [line 34]\n  *&#GB<nestedoperators/union.cpp>$y.g.u:int=n$2 [line 34]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_4" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&#GB<nestedoperators/union.cpp>$x:class anonymous_struct_nestedoperators_union.cpp:12:1 * [line 36]\n  n$1=*n$0.b:int  [line 36]\n  *&#GB<nestedoperators/union.cpp>$y.g.w:int =n$1 [line 36]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&#GB<nestedoperators/union.cpp>$x:class anonymous_struct_nestedoperators_union.cpp:12:1* [line 36]\n  n$1=*n$0.b:int [line 36]\n  *&#GB<nestedoperators/union.cpp>$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_3" [label="3:  Return Stmt \n   *&return:int=0 [line 37]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -30,11 +30,11 @@ digraph iCFG {
 "anonymous_union_nestedoperators_union.cpp:17:1_{_ZN3$_0C1Ev}.7872f3ad68b4dcc7dc45fed509da0ae0_2" [label="2: Exit anonymous_union_nestedoperators_union.cpp:17:1_ \n  " color=yellow style=filled]
 	
 
-"anonymous_union_nestedoperators_union.cpp:17:1_{_ZN3$_0C1Ev}.7872f3ad68b4dcc7dc45fed509da0ae0_1" [label="1: Start anonymous_union_nestedoperators_union.cpp:17:1_\nFormals:  this:class anonymous_union_nestedoperators_union.cpp:17:1 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
+"anonymous_union_nestedoperators_union.cpp:17:1_{_ZN3$_0C1Ev}.7872f3ad68b4dcc7dc45fed509da0ae0_1" [label="1: Start anonymous_union_nestedoperators_union.cpp:17:1_\nFormals:  this:class anonymous_union_nestedoperators_union.cpp:17:1*\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
 	
 
 	 "anonymous_union_nestedoperators_union.cpp:17:1_{_ZN3$_0C1Ev}.7872f3ad68b4dcc7dc45fed509da0ae0_1" -> "anonymous_union_nestedoperators_union.cpp:17:1_{_ZN3$_0C1Ev}.7872f3ad68b4dcc7dc45fed509da0ae0_2" ;
-"__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" [label="3:  DeclStmt \n   _fun_anonymous_union_nestedoperators_union.cpp:17:1_(&#GB<nestedoperators/union.cpp>$y:class anonymous_union_nestedoperators_union.cpp:17:1 *) [line 27]\n " shape="box"]
+"__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" [label="3:  DeclStmt \n   _fun_anonymous_union_nestedoperators_union.cpp:17:1_(&#GB<nestedoperators/union.cpp>$y:class anonymous_union_nestedoperators_union.cpp:17:1*) [line 27]\n " shape="box"]
 	
 
 	 "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" -> "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_2" ;

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

@@ -1,14 +1,14 @@
 /* @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" [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_9" [label="9:  Return Stmt \n   *&return:int=(4 / 0) [line 23]\n " shape="box"]
 	
 
 	 "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_8" [label="8:  Return Stmt \n   *&return:int=(9 / 0) [line 21]\n " shape="box"]
 	
 
 	 "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_8" -> "test_offsetof_expr.8f3e634fd0f68dff5e4bfedc8f65a55f_2" ;

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

@@ -1,6 +1,6 @@
 /* @generated */
 digraph iCFG {
-"getValue.faa0c7b1433b0c97fcdc15fa47c8180f_3" [label="3:  Return Stmt \n   *&return:int =1 [line 137]\n " shape="box"]
+"getValue.faa0c7b1433b0c97fcdc15fa47c8180f_3" [label="3:  Return Stmt \n   *&return:int=1 [line 137]\n " shape="box"]
 	
 
 	 "getValue.faa0c7b1433b0c97fcdc15fa47c8180f_3" -> "getValue.faa0c7b1433b0c97fcdc15fa47c8180f_2" ;
@@ -11,7 +11,7 @@ digraph iCFG {
 	
 
 	 "getValue.faa0c7b1433b0c97fcdc15fa47c8180f_1" -> "getValue.faa0c7b1433b0c97fcdc15fa47c8180f_3" ;
-"m9.5bbb291cc1e38a051365ee9edb7cbd14_5" [label="5:  DeclStmt \n   *&value:int =0 [line 180]\n " shape="box"]
+"m9.5bbb291cc1e38a051365ee9edb7cbd14_5" [label="5:  DeclStmt \n   *&value:int=0 [line 180]\n " shape="box"]
 	
 
 	 "m9.5bbb291cc1e38a051365ee9edb7cbd14_5" -> "m9.5bbb291cc1e38a051365ee9edb7cbd14_4" ;
@@ -19,7 +19,7 @@ digraph iCFG {
 	
 
 	 "m9.5bbb291cc1e38a051365ee9edb7cbd14_4" -> "m9.5bbb291cc1e38a051365ee9edb7cbd14_3" ;
-"m9.5bbb291cc1e38a051365ee9edb7cbd14_3" [label="3:  Return Stmt \n   *&return:int =0 [line 182]\n " shape="box"]
+"m9.5bbb291cc1e38a051365ee9edb7cbd14_3" [label="3:  Return Stmt \n   *&return:int=0 [line 182]\n " shape="box"]
 	
 
 	 "m9.5bbb291cc1e38a051365ee9edb7cbd14_3" -> "m9.5bbb291cc1e38a051365ee9edb7cbd14_2" ;
@@ -30,7 +30,7 @@ digraph iCFG {
 	
 
 	 "m9.5bbb291cc1e38a051365ee9edb7cbd14_1" -> "m9.5bbb291cc1e38a051365ee9edb7cbd14_5" ;
-"m8.980b79c2a71b9bcc117e08a990b5b332_29" [label="29:  DeclStmt \n   *&value:int =0 [line 158]\n " shape="box"]
+"m8.980b79c2a71b9bcc117e08a990b5b332_29" [label="29:  DeclStmt \n   *&value:int=0 [line 158]\n " shape="box"]
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_29" -> "m8.980b79c2a71b9bcc117e08a990b5b332_4" ;
@@ -43,11 +43,11 @@ digraph iCFG {
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_27" -> "m8.980b79c2a71b9bcc117e08a990b5b332_26" ;
-"m8.980b79c2a71b9bcc117e08a990b5b332_26" [label="26:  Call _fun_printf \n   n$5=_fun_printf(\"(0)HELLO WORLD!\":char *) [line 162]\n " shape="box"]
+"m8.980b79c2a71b9bcc117e08a990b5b332_26" [label="26:  Call _fun_printf \n   n$5=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 162]\n " shape="box"]
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_26" -> "m8.980b79c2a71b9bcc117e08a990b5b332_25" ;
-"m8.980b79c2a71b9bcc117e08a990b5b332_25" [label="25:  Return Stmt \n   *&return:int =0 [line 163]\n " shape="box"]
+"m8.980b79c2a71b9bcc117e08a990b5b332_25" [label="25:  Return Stmt \n   *&return:int=0 [line 163]\n " shape="box"]
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_25" -> "m8.980b79c2a71b9bcc117e08a990b5b332_2" ;
@@ -60,15 +60,15 @@ digraph iCFG {
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_23" -> "m8.980b79c2a71b9bcc117e08a990b5b332_22" ;
-"m8.980b79c2a71b9bcc117e08a990b5b332_22" [label="22:  DeclStmt \n   *&something:int =1 [line 165]\n " shape="box"]
+"m8.980b79c2a71b9bcc117e08a990b5b332_22" [label="22:  DeclStmt \n   *&something:int=1 [line 165]\n " shape="box"]
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_22" -> "m8.980b79c2a71b9bcc117e08a990b5b332_21" ;
-"m8.980b79c2a71b9bcc117e08a990b5b332_21" [label="21:  UnaryOperator \n   n$4=*&something:int  [line 166]\n  *&something:int =(n$4 + 1) [line 166]\n " shape="box"]
+"m8.980b79c2a71b9bcc117e08a990b5b332_21" [label="21:  UnaryOperator \n   n$4=*&something:int [line 166]\n  *&something:int=(n$4 + 1) [line 166]\n " shape="box"]
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_21" -> "m8.980b79c2a71b9bcc117e08a990b5b332_4" ;
-"m8.980b79c2a71b9bcc117e08a990b5b332_20" [label="20:  DeclStmt \n   *&z:int =9 [line 169]\n " shape="box"]
+"m8.980b79c2a71b9bcc117e08a990b5b332_20" [label="20:  DeclStmt \n   *&z:int=9 [line 169]\n " shape="box"]
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_20" -> "m8.980b79c2a71b9bcc117e08a990b5b332_8" ;
@@ -94,11 +94,11 @@ digraph iCFG {
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_15" -> "m8.980b79c2a71b9bcc117e08a990b5b332_27" ;
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_15" -> "m8.980b79c2a71b9bcc117e08a990b5b332_28" ;
-"m8.980b79c2a71b9bcc117e08a990b5b332_14" [label="14:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int =2 [line 160]\n " shape="box"]
+"m8.980b79c2a71b9bcc117e08a990b5b332_14" [label="14:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=2 [line 160]\n " shape="box"]
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_14" -> "m8.980b79c2a71b9bcc117e08a990b5b332_9" ;
-"m8.980b79c2a71b9bcc117e08a990b5b332_13" [label="13:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int =1 [line 160]\n " shape="box"]
+"m8.980b79c2a71b9bcc117e08a990b5b332_13" [label="13:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$1:int=1 [line 160]\n " shape="box"]
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_13" -> "m8.980b79c2a71b9bcc117e08a990b5b332_9" ;
@@ -119,7 +119,7 @@ digraph iCFG {
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_9" -> "m8.980b79c2a71b9bcc117e08a990b5b332_15" ;
-"m8.980b79c2a71b9bcc117e08a990b5b332_8" [label="8:  DeclStmt \n   *&a:int =0 [line 174]\n " shape="box"]
+"m8.980b79c2a71b9bcc117e08a990b5b332_8" [label="8:  DeclStmt \n   *&a:int=0 [line 174]\n " shape="box"]
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_8" -> "m8.980b79c2a71b9bcc117e08a990b5b332_4" ;
@@ -140,7 +140,7 @@ digraph iCFG {
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_4" -> "m8.980b79c2a71b9bcc117e08a990b5b332_5" ;
-"m8.980b79c2a71b9bcc117e08a990b5b332_3" [label="3:  Return Stmt \n   *&return:int =0 [line 176]\n " shape="box"]
+"m8.980b79c2a71b9bcc117e08a990b5b332_3" [label="3:  Return Stmt \n   *&return:int=0 [line 176]\n " shape="box"]
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_3" -> "m8.980b79c2a71b9bcc117e08a990b5b332_2" ;
@@ -151,7 +151,7 @@ digraph iCFG {
 	
 
 	 "m8.980b79c2a71b9bcc117e08a990b5b332_1" -> "m8.980b79c2a71b9bcc117e08a990b5b332_29" ;
-"m6.36604411a85db2bd9e97e22bfb5b692d_23" [label="23:  DeclStmt \n   *&value:int =0 [line 120]\n " shape="box"]
+"m6.36604411a85db2bd9e97e22bfb5b692d_23" [label="23:  DeclStmt \n   *&value:int=0 [line 120]\n " shape="box"]
 	
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_23" -> "m6.36604411a85db2bd9e97e22bfb5b692d_5" ;
@@ -164,7 +164,7 @@ digraph iCFG {
 	
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_21" -> "m6.36604411a85db2bd9e97e22bfb5b692d_20" ;
-"m6.36604411a85db2bd9e97e22bfb5b692d_20" [label="20:  Call _fun_printf \n   n$4=_fun_printf(\"(0)HELLO WORLD!\":char *) [line 123]\n " shape="box"]
+"m6.36604411a85db2bd9e97e22bfb5b692d_20" [label="20:  Call _fun_printf \n   n$4=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 123]\n " shape="box"]
 	
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_20" -> "m6.36604411a85db2bd9e97e22bfb5b692d_3" ;
@@ -177,15 +177,15 @@ digraph iCFG {
 	
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_18" -> "m6.36604411a85db2bd9e97e22bfb5b692d_17" ;
-"m6.36604411a85db2bd9e97e22bfb5b692d_17" [label="17:  DeclStmt \n   *&something:int =1 [line 126]\n " shape="box"]
+"m6.36604411a85db2bd9e97e22bfb5b692d_17" [label="17:  DeclStmt \n   *&something:int=1 [line 126]\n " shape="box"]
 	
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_17" -> "m6.36604411a85db2bd9e97e22bfb5b692d_16" ;
-"m6.36604411a85db2bd9e97e22bfb5b692d_16" [label="16:  UnaryOperator \n   n$3=*&something:int  [line 127]\n  *&something:int =(n$3 + 1) [line 127]\n " shape="box"]
+"m6.36604411a85db2bd9e97e22bfb5b692d_16" [label="16:  UnaryOperator \n   n$3=*&something:int [line 127]\n  *&something:int=(n$3 + 1) [line 127]\n " shape="box"]
 	
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_16" -> "m6.36604411a85db2bd9e97e22bfb5b692d_3" ;
-"m6.36604411a85db2bd9e97e22bfb5b692d_15" [label="15:  DeclStmt \n   *&z:int =9 [line 129]\n " shape="box"]
+"m6.36604411a85db2bd9e97e22bfb5b692d_15" [label="15:  DeclStmt \n   *&z:int=9 [line 129]\n " shape="box"]
 	
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_15" -> "m6.36604411a85db2bd9e97e22bfb5b692d_3" ;
@@ -211,11 +211,11 @@ digraph iCFG {
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_10" -> "m6.36604411a85db2bd9e97e22bfb5b692d_21" ;
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_10" -> "m6.36604411a85db2bd9e97e22bfb5b692d_22" ;
-"m6.36604411a85db2bd9e97e22bfb5b692d_9" [label="9:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int =0 [line 121]\n " shape="box"]
+"m6.36604411a85db2bd9e97e22bfb5b692d_9" [label="9:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=0 [line 121]\n " shape="box"]
 	
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_9" -> "m6.36604411a85db2bd9e97e22bfb5b692d_4" ;
-"m6.36604411a85db2bd9e97e22bfb5b692d_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int =1 [line 121]\n " shape="box"]
+"m6.36604411a85db2bd9e97e22bfb5b692d_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=1 [line 121]\n " shape="box"]
 	
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_8" -> "m6.36604411a85db2bd9e97e22bfb5b692d_4" ;
@@ -236,7 +236,7 @@ digraph iCFG {
 	
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_4" -> "m6.36604411a85db2bd9e97e22bfb5b692d_10" ;
-"m6.36604411a85db2bd9e97e22bfb5b692d_3" [label="3:  Return Stmt \n   *&return:int =0 [line 134]\n " shape="box"]
+"m6.36604411a85db2bd9e97e22bfb5b692d_3" [label="3:  Return Stmt \n   *&return:int=0 [line 134]\n " shape="box"]
 	
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_3" -> "m6.36604411a85db2bd9e97e22bfb5b692d_2" ;
@@ -247,7 +247,7 @@ digraph iCFG {
 	
 
 	 "m6.36604411a85db2bd9e97e22bfb5b692d_1" -> "m6.36604411a85db2bd9e97e22bfb5b692d_23" ;
-"m11.c4534fe0ca256b331e9a3f14fe17229d_14" [label="14:  DeclStmt \n   *&value:int =0 [line 192]\n " shape="box"]
+"m11.c4534fe0ca256b331e9a3f14fe17229d_14" [label="14:  DeclStmt \n   *&value:int=0 [line 192]\n " shape="box"]
 	
 
 	 "m11.c4534fe0ca256b331e9a3f14fe17229d_14" -> "m11.c4534fe0ca256b331e9a3f14fe17229d_5" ;
@@ -259,20 +259,20 @@ digraph iCFG {
 	
 
 	 "m11.c4534fe0ca256b331e9a3f14fe17229d_12" -> "m11.c4534fe0ca256b331e9a3f14fe17229d_11" ;
-"m11.c4534fe0ca256b331e9a3f14fe17229d_11" [label="11:  Call _fun_printf \n   n$4=_fun_printf(\"(0)HELLO WORLD!\":char *) [line 195]\n " shape="box"]
+"m11.c4534fe0ca256b331e9a3f14fe17229d_11" [label="11:  Call _fun_printf \n   n$4=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 195]\n " shape="box"]
 	
 
 	 "m11.c4534fe0ca256b331e9a3f14fe17229d_11" -> "m11.c4534fe0ca256b331e9a3f14fe17229d_3" ;
-"m11.c4534fe0ca256b331e9a3f14fe17229d_10" [label="10:  Switch_stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int  [line 193]\n  *&value:int =n$2 [line 193]\n  n$3=*&value:int  [line 193]\n " shape="box"]
+"m11.c4534fe0ca256b331e9a3f14fe17229d_10" [label="10:  Switch_stmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 193]\n  *&value:int=n$2 [line 193]\n  n$3=*&value:int [line 193]\n " shape="box"]
 	
 
 	 "m11.c4534fe0ca256b331e9a3f14fe17229d_10" -> "m11.c4534fe0ca256b331e9a3f14fe17229d_12" ;
 	 "m11.c4534fe0ca256b331e9a3f14fe17229d_10" -> "m11.c4534fe0ca256b331e9a3f14fe17229d_13" ;
-"m11.c4534fe0ca256b331e9a3f14fe17229d_9" [label="9:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int =9 [line 193]\n " shape="box"]
+"m11.c4534fe0ca256b331e9a3f14fe17229d_9" [label="9:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=9 [line 193]\n " shape="box"]
 	
 
 	 "m11.c4534fe0ca256b331e9a3f14fe17229d_9" -> "m11.c4534fe0ca256b331e9a3f14fe17229d_4" ;
-"m11.c4534fe0ca256b331e9a3f14fe17229d_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int =7 [line 193]\n " shape="box"]
+"m11.c4534fe0ca256b331e9a3f14fe17229d_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=7 [line 193]\n " shape="box"]
 	
 
 	 "m11.c4534fe0ca256b331e9a3f14fe17229d_8" -> "m11.c4534fe0ca256b331e9a3f14fe17229d_4" ;
@@ -293,7 +293,7 @@ digraph iCFG {
 	
 
 	 "m11.c4534fe0ca256b331e9a3f14fe17229d_4" -> "m11.c4534fe0ca256b331e9a3f14fe17229d_10" ;
-"m11.c4534fe0ca256b331e9a3f14fe17229d_3" [label="3:  Return Stmt \n   *&return:int =0 [line 197]\n " shape="box"]
+"m11.c4534fe0ca256b331e9a3f14fe17229d_3" [label="3:  Return Stmt \n   *&return:int=0 [line 197]\n " shape="box"]
 	
 
 	 "m11.c4534fe0ca256b331e9a3f14fe17229d_3" -> "m11.c4534fe0ca256b331e9a3f14fe17229d_2" ;
@@ -304,19 +304,19 @@ digraph iCFG {
 	
 
 	 "m11.c4534fe0ca256b331e9a3f14fe17229d_1" -> "m11.c4534fe0ca256b331e9a3f14fe17229d_14" ;
-"m1.ae7be26cdaa742ca148068d5ac90eaca_23" [label="23:  DeclStmt \n   *&value:int =0 [line 13]\n " shape="box"]
+"m1.ae7be26cdaa742ca148068d5ac90eaca_23" [label="23:  DeclStmt \n   *&value:int=0 [line 13]\n " shape="box"]
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_23" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_4" ;
-"m1.ae7be26cdaa742ca148068d5ac90eaca_22" [label="22:  DeclStmt \n   *&x:int =1 [line 16]\n " shape="box"]
+"m1.ae7be26cdaa742ca148068d5ac90eaca_22" [label="22:  DeclStmt \n   *&x:int=1 [line 16]\n " shape="box"]
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_22" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_21" ;
-"m1.ae7be26cdaa742ca148068d5ac90eaca_21" [label="21:  Call _fun_printf \n   n$7=_fun_printf(\"(out)HELLO WORLD!\":char *) [line 17]\n " shape="box"]
+"m1.ae7be26cdaa742ca148068d5ac90eaca_21" [label="21:  Call _fun_printf \n   n$7=_fun_printf(\"(out)HELLO WORLD!\":char*) [line 17]\n " shape="box"]
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_21" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_20" ;
-"m1.ae7be26cdaa742ca148068d5ac90eaca_20" [label="20:  BinaryOperatorStmt: Assign \n   n$6=*&value:int  [line 18]\n  *&x:int =(n$6 + 1) [line 18]\n " shape="box"]
+"m1.ae7be26cdaa742ca148068d5ac90eaca_20" [label="20:  BinaryOperatorStmt: Assign \n   n$6=*&value:int [line 18]\n  *&x:int=(n$6 + 1) [line 18]\n " shape="box"]
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_20" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_17" ;
@@ -329,7 +329,7 @@ digraph iCFG {
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_18" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_17" ;
-"m1.ae7be26cdaa742ca148068d5ac90eaca_17" [label="17:  Call _fun_printf \n   n$5=_fun_printf(\"(0)HELLO WORLD!\":char *) [line 20]\n " shape="box"]
+"m1.ae7be26cdaa742ca148068d5ac90eaca_17" [label="17:  Call _fun_printf \n   n$5=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 20]\n " shape="box"]
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_17" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_8" ;
@@ -342,7 +342,7 @@ digraph iCFG {
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_15" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_14" ;
-"m1.ae7be26cdaa742ca148068d5ac90eaca_14" [label="14:  Call _fun_printf \n   n$4=_fun_printf(\"(1)HELLO WORLD!\":char *) [line 23]\n " shape="box"]
+"m1.ae7be26cdaa742ca148068d5ac90eaca_14" [label="14:  Call _fun_printf \n   n$4=_fun_printf(\"(1)HELLO WORLD!\":char*) [line 23]\n " shape="box"]
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_14" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_4" ;
@@ -354,7 +354,7 @@ digraph iCFG {
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_12" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_11" ;
-"m1.ae7be26cdaa742ca148068d5ac90eaca_11" [label="11:  Call _fun_printf \n   n$3=_fun_printf(\"(2/def)HELLO WORLD!\":char *) [line 27]\n " shape="box"]
+"m1.ae7be26cdaa742ca148068d5ac90eaca_11" [label="11:  Call _fun_printf \n   n$3=_fun_printf(\"(2/def)HELLO WORLD!\":char*) [line 27]\n " shape="box"]
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_11" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_4" ;
@@ -367,7 +367,7 @@ digraph iCFG {
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_9" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_18" ;
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_9" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_19" ;
-"m1.ae7be26cdaa742ca148068d5ac90eaca_8" [label="8:  Call _fun_printf \n   n$1=_fun_printf(\"(after_switch)HELLO WORLD!\":char *) [line 30]\n " shape="box"]
+"m1.ae7be26cdaa742ca148068d5ac90eaca_8" [label="8:  Call _fun_printf \n   n$1=_fun_printf(\"(after_switch)HELLO WORLD!\":char*) [line 30]\n " shape="box"]
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_8" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_4" ;
@@ -388,7 +388,7 @@ digraph iCFG {
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_4" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_5" ;
-"m1.ae7be26cdaa742ca148068d5ac90eaca_3" [label="3:  Return Stmt \n   *&return:int =0 [line 32]\n " shape="box"]
+"m1.ae7be26cdaa742ca148068d5ac90eaca_3" [label="3:  Return Stmt \n   *&return:int=0 [line 32]\n " shape="box"]
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_3" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_2" ;
@@ -399,15 +399,15 @@ digraph iCFG {
 	
 
 	 "m1.ae7be26cdaa742ca148068d5ac90eaca_1" -> "m1.ae7be26cdaa742ca148068d5ac90eaca_23" ;
-"m10.e66050aa5d0a7e0ecb49429ea4b0a32b_5" [label="5:  DeclStmt \n   *&value:int =0 [line 186]\n " shape="box"]
+"m10.e66050aa5d0a7e0ecb49429ea4b0a32b_5" [label="5:  DeclStmt \n   *&value:int=0 [line 186]\n " shape="box"]
 	
 
 	 "m10.e66050aa5d0a7e0ecb49429ea4b0a32b_5" -> "m10.e66050aa5d0a7e0ecb49429ea4b0a32b_4" ;
-"m10.e66050aa5d0a7e0ecb49429ea4b0a32b_4" [label="4:  Switch_stmt \n   *&value:int =7 [line 187]\n  n$0=*&value:int  [line 187]\n " shape="box"]
+"m10.e66050aa5d0a7e0ecb49429ea4b0a32b_4" [label="4:  Switch_stmt \n   *&value:int=7 [line 187]\n  n$0=*&value:int [line 187]\n " shape="box"]
 	
 
 	 "m10.e66050aa5d0a7e0ecb49429ea4b0a32b_4" -> "m10.e66050aa5d0a7e0ecb49429ea4b0a32b_3" ;
-"m10.e66050aa5d0a7e0ecb49429ea4b0a32b_3" [label="3:  Return Stmt \n   *&return:int =0 [line 188]\n " shape="box"]
+"m10.e66050aa5d0a7e0ecb49429ea4b0a32b_3" [label="3:  Return Stmt \n   *&return:int=0 [line 188]\n " shape="box"]
 	
 
 	 "m10.e66050aa5d0a7e0ecb49429ea4b0a32b_3" -> "m10.e66050aa5d0a7e0ecb49429ea4b0a32b_2" ;
@@ -418,7 +418,7 @@ digraph iCFG {
 	
 
 	 "m10.e66050aa5d0a7e0ecb49429ea4b0a32b_1" -> "m10.e66050aa5d0a7e0ecb49429ea4b0a32b_5" ;
-"m7.0449904fbf32607bf8ce5c26823dbc29_17" [label="17:  DeclStmt \n   *&value:int =0 [line 140]\n " shape="box"]
+"m7.0449904fbf32607bf8ce5c26823dbc29_17" [label="17:  DeclStmt \n   *&value:int=0 [line 140]\n " shape="box"]
 	
 
 	 "m7.0449904fbf32607bf8ce5c26823dbc29_17" -> "m7.0449904fbf32607bf8ce5c26823dbc29_4" ;
@@ -431,7 +431,7 @@ digraph iCFG {
 	
 
 	 "m7.0449904fbf32607bf8ce5c26823dbc29_15" -> "m7.0449904fbf32607bf8ce5c26823dbc29_14" ;
-"m7.0449904fbf32607bf8ce5c26823dbc29_14" [label="14:  Call _fun_printf \n   n$2=_fun_printf(\"(0)HELLO WORLD!\":char *) [line 143]\n " shape="box"]
+"m7.0449904fbf32607bf8ce5c26823dbc29_14" [label="14:  Call _fun_printf \n   n$2=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 143]\n " shape="box"]
 	
 
 	 "m7.0449904fbf32607bf8ce5c26823dbc29_14" -> "m7.0449904fbf32607bf8ce5c26823dbc29_3" ;
@@ -444,15 +444,15 @@ digraph iCFG {
 	
 
 	 "m7.0449904fbf32607bf8ce5c26823dbc29_12" -> "m7.0449904fbf32607bf8ce5c26823dbc29_11" ;
-"m7.0449904fbf32607bf8ce5c26823dbc29_11" [label="11:  DeclStmt \n   *&something:int =1 [line 146]\n " shape="box"]
+"m7.0449904fbf32607bf8ce5c26823dbc29_11" [label="11:  DeclStmt \n   *&something:int=1 [line 146]\n " shape="box"]
 	
 
 	 "m7.0449904fbf32607bf8ce5c26823dbc29_11" -> "m7.0449904fbf32607bf8ce5c26823dbc29_10" ;
-"m7.0449904fbf32607bf8ce5c26823dbc29_10" [label="10:  UnaryOperator \n   n$1=*&something:int  [line 147]\n  *&something:int =(n$1 + 1) [line 147]\n " shape="box"]
+"m7.0449904fbf32607bf8ce5c26823dbc29_10" [label="10:  UnaryOperator \n   n$1=*&something:int [line 147]\n  *&something:int=(n$1 + 1) [line 147]\n " shape="box"]
 	
 
 	 "m7.0449904fbf32607bf8ce5c26823dbc29_10" -> "m7.0449904fbf32607bf8ce5c26823dbc29_3" ;
-"m7.0449904fbf32607bf8ce5c26823dbc29_9" [label="9:  DeclStmt \n   *&z:int =9 [line 149]\n " shape="box"]
+"m7.0449904fbf32607bf8ce5c26823dbc29_9" [label="9:  DeclStmt \n   *&z:int=9 [line 149]\n " shape="box"]
 	
 
 	 "m7.0449904fbf32607bf8ce5c26823dbc29_9" -> "m7.0449904fbf32607bf8ce5c26823dbc29_3" ;
@@ -478,7 +478,7 @@ digraph iCFG {
 
 	 "m7.0449904fbf32607bf8ce5c26823dbc29_4" -> "m7.0449904fbf32607bf8ce5c26823dbc29_15" ;
 	 "m7.0449904fbf32607bf8ce5c26823dbc29_4" -> "m7.0449904fbf32607bf8ce5c26823dbc29_16" ;
-"m7.0449904fbf32607bf8ce5c26823dbc29_3" [label="3:  Return Stmt \n   *&return:int =0 [line 154]\n " shape="box"]
+"m7.0449904fbf32607bf8ce5c26823dbc29_3" [label="3:  Return Stmt \n   *&return:int=0 [line 154]\n " shape="box"]
 	
 
 	 "m7.0449904fbf32607bf8ce5c26823dbc29_3" -> "m7.0449904fbf32607bf8ce5c26823dbc29_2" ;
@@ -489,19 +489,19 @@ digraph iCFG {
 	
 
 	 "m7.0449904fbf32607bf8ce5c26823dbc29_1" -> "m7.0449904fbf32607bf8ce5c26823dbc29_17" ;
-"m4.fd6b6fc9220b72d21683ae8e4f50a210_22" [label="22:  DeclStmt \n   *&value:int =0 [line 79]\n " shape="box"]
+"m4.fd6b6fc9220b72d21683ae8e4f50a210_22" [label="22:  DeclStmt \n   *&value:int=0 [line 79]\n " shape="box"]
 	
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_22" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_4" ;
-"m4.fd6b6fc9220b72d21683ae8e4f50a210_21" [label="21:  DeclStmt \n   *&x:int =1 [line 81]\n " shape="box"]
+"m4.fd6b6fc9220b72d21683ae8e4f50a210_21" [label="21:  DeclStmt \n   *&x:int=1 [line 81]\n " shape="box"]
 	
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_21" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_20" ;
-"m4.fd6b6fc9220b72d21683ae8e4f50a210_20" [label="20:  Call _fun_printf \n   n$4=_fun_printf(\"(out)HELLO WORLD!\":char *) [line 82]\n " shape="box"]
+"m4.fd6b6fc9220b72d21683ae8e4f50a210_20" [label="20:  Call _fun_printf \n   n$4=_fun_printf(\"(out)HELLO WORLD!\":char*) [line 82]\n " shape="box"]
 	
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_20" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_19" ;
-"m4.fd6b6fc9220b72d21683ae8e4f50a210_19" [label="19:  BinaryOperatorStmt: Assign \n   n$3=*&value:int  [line 83]\n  *&x:int =(n$3 + 1) [line 83]\n " shape="box"]
+"m4.fd6b6fc9220b72d21683ae8e4f50a210_19" [label="19:  BinaryOperatorStmt: Assign \n   n$3=*&value:int [line 83]\n  *&x:int=(n$3 + 1) [line 83]\n " shape="box"]
 	
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_19" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_16" ;
@@ -514,11 +514,11 @@ digraph iCFG {
 	
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_17" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_16" ;
-"m4.fd6b6fc9220b72d21683ae8e4f50a210_16" [label="16:  Call _fun_printf \n   n$2=_fun_printf(\"(0)HELLO WORLD!\":char *) [line 85]\n " shape="box"]
+"m4.fd6b6fc9220b72d21683ae8e4f50a210_16" [label="16:  Call _fun_printf \n   n$2=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 85]\n " shape="box"]
 	
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_16" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_3" ;
-"m4.fd6b6fc9220b72d21683ae8e4f50a210_15" [label="15:  DeclStmt \n   *&z:int =9 [line 87]\n " shape="box"]
+"m4.fd6b6fc9220b72d21683ae8e4f50a210_15" [label="15:  DeclStmt \n   *&z:int=9 [line 87]\n " shape="box"]
 	
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_15" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_12" ;
@@ -531,15 +531,15 @@ digraph iCFG {
 	
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_13" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_12" ;
-"m4.fd6b6fc9220b72d21683ae8e4f50a210_12" [label="12:  DeclStmt \n   *&something:int =1 [line 91]\n " shape="box"]
+"m4.fd6b6fc9220b72d21683ae8e4f50a210_12" [label="12:  DeclStmt \n   *&something:int=1 [line 91]\n " shape="box"]
 	
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_12" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_11" ;
-"m4.fd6b6fc9220b72d21683ae8e4f50a210_11" [label="11:  UnaryOperator \n   n$1=*&something:int  [line 92]\n  *&something:int =(n$1 + 1) [line 92]\n " shape="box"]
+"m4.fd6b6fc9220b72d21683ae8e4f50a210_11" [label="11:  UnaryOperator \n   n$1=*&something:int [line 92]\n  *&something:int=(n$1 + 1) [line 92]\n " shape="box"]
 	
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_11" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_10" ;
-"m4.fd6b6fc9220b72d21683ae8e4f50a210_10" [label="10:  BinaryOperatorStmt: Assign \n   *&z:int =42 [line 94]\n " shape="box"]
+"m4.fd6b6fc9220b72d21683ae8e4f50a210_10" [label="10:  BinaryOperatorStmt: Assign \n   *&z:int=42 [line 94]\n " shape="box"]
 	
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_10" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_3" ;
@@ -569,7 +569,7 @@ digraph iCFG {
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_4" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_17" ;
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_4" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_18" ;
-"m4.fd6b6fc9220b72d21683ae8e4f50a210_3" [label="3:  Return Stmt \n   *&return:int =0 [line 100]\n " shape="box"]
+"m4.fd6b6fc9220b72d21683ae8e4f50a210_3" [label="3:  Return Stmt \n   *&return:int=0 [line 100]\n " shape="box"]
 	
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_3" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_2" ;
@@ -580,7 +580,7 @@ digraph iCFG {
 	
 
 	 "m4.fd6b6fc9220b72d21683ae8e4f50a210_1" -> "m4.fd6b6fc9220b72d21683ae8e4f50a210_22" ;
-"m3.9678f7a7939f457fa0d9353761e189c7_17" [label="17:  DeclStmt \n   *&value:int =0 [line 61]\n " shape="box"]
+"m3.9678f7a7939f457fa0d9353761e189c7_17" [label="17:  DeclStmt \n   *&value:int=0 [line 61]\n " shape="box"]
 	
 
 	 "m3.9678f7a7939f457fa0d9353761e189c7_17" -> "m3.9678f7a7939f457fa0d9353761e189c7_4" ;
@@ -593,7 +593,7 @@ digraph iCFG {
 	
 
 	 "m3.9678f7a7939f457fa0d9353761e189c7_15" -> "m3.9678f7a7939f457fa0d9353761e189c7_14" ;
-"m3.9678f7a7939f457fa0d9353761e189c7_14" [label="14:  Call _fun_printf \n   n$2=_fun_printf(\"(0)HELLO WORLD!\":char *) [line 64]\n " shape="box"]
+"m3.9678f7a7939f457fa0d9353761e189c7_14" [label="14:  Call _fun_printf \n   n$2=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 64]\n " shape="box"]
 	
 
 	 "m3.9678f7a7939f457fa0d9353761e189c7_14" -> "m3.9678f7a7939f457fa0d9353761e189c7_3" ;
@@ -606,15 +606,15 @@ digraph iCFG {
 	
 
 	 "m3.9678f7a7939f457fa0d9353761e189c7_12" -> "m3.9678f7a7939f457fa0d9353761e189c7_11" ;
-"m3.9678f7a7939f457fa0d9353761e189c7_11" [label="11:  DeclStmt \n   *&something:int =1 [line 67]\n " shape="box"]
+"m3.9678f7a7939f457fa0d9353761e189c7_11" [label="11:  DeclStmt \n   *&something:int=1 [line 67]\n " shape="box"]
 	
 
 	 "m3.9678f7a7939f457fa0d9353761e189c7_11" -> "m3.9678f7a7939f457fa0d9353761e189c7_10" ;
-"m3.9678f7a7939f457fa0d9353761e189c7_10" [label="10:  UnaryOperator \n   n$1=*&something:int  [line 68]\n  *&something:int =(n$1 + 1) [line 68]\n " shape="box"]
+"m3.9678f7a7939f457fa0d9353761e189c7_10" [label="10:  UnaryOperator \n   n$1=*&something:int [line 68]\n  *&something:int=(n$1 + 1) [line 68]\n " shape="box"]
 	
 
 	 "m3.9678f7a7939f457fa0d9353761e189c7_10" -> "m3.9678f7a7939f457fa0d9353761e189c7_3" ;
-"m3.9678f7a7939f457fa0d9353761e189c7_9" [label="9:  DeclStmt \n   *&z:int =9 [line 70]\n " shape="box"]
+"m3.9678f7a7939f457fa0d9353761e189c7_9" [label="9:  DeclStmt \n   *&z:int=9 [line 70]\n " shape="box"]
 	
 
 	 "m3.9678f7a7939f457fa0d9353761e189c7_9" -> "m3.9678f7a7939f457fa0d9353761e189c7_3" ;
@@ -640,7 +640,7 @@ digraph iCFG {
 
 	 "m3.9678f7a7939f457fa0d9353761e189c7_4" -> "m3.9678f7a7939f457fa0d9353761e189c7_15" ;
 	 "m3.9678f7a7939f457fa0d9353761e189c7_4" -> "m3.9678f7a7939f457fa0d9353761e189c7_16" ;
-"m3.9678f7a7939f457fa0d9353761e189c7_3" [label="3:  Return Stmt \n   *&return:int =0 [line 75]\n " shape="box"]
+"m3.9678f7a7939f457fa0d9353761e189c7_3" [label="3:  Return Stmt \n   *&return:int=0 [line 75]\n " shape="box"]
 	
 
 	 "m3.9678f7a7939f457fa0d9353761e189c7_3" -> "m3.9678f7a7939f457fa0d9353761e189c7_2" ;
@@ -651,19 +651,19 @@ digraph iCFG {
 	
 
 	 "m3.9678f7a7939f457fa0d9353761e189c7_1" -> "m3.9678f7a7939f457fa0d9353761e189c7_17" ;
-"m2.aaf2f89992379705dac844c0a2a1d45f_22" [label="22:  DeclStmt \n   *&value:int =0 [line 36]\n " shape="box"]
+"m2.aaf2f89992379705dac844c0a2a1d45f_22" [label="22:  DeclStmt \n   *&value:int=0 [line 36]\n " shape="box"]
 	
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_22" -> "m2.aaf2f89992379705dac844c0a2a1d45f_4" ;
-"m2.aaf2f89992379705dac844c0a2a1d45f_21" [label="21:  DeclStmt \n   *&x:int =1 [line 38]\n " shape="box"]
+"m2.aaf2f89992379705dac844c0a2a1d45f_21" [label="21:  DeclStmt \n   *&x:int=1 [line 38]\n " shape="box"]
 	
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_21" -> "m2.aaf2f89992379705dac844c0a2a1d45f_20" ;
-"m2.aaf2f89992379705dac844c0a2a1d45f_20" [label="20:  Call _fun_printf \n   n$4=_fun_printf(\"(out)HELLO WORLD!\":char *) [line 39]\n " shape="box"]
+"m2.aaf2f89992379705dac844c0a2a1d45f_20" [label="20:  Call _fun_printf \n   n$4=_fun_printf(\"(out)HELLO WORLD!\":char*) [line 39]\n " shape="box"]
 	
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_20" -> "m2.aaf2f89992379705dac844c0a2a1d45f_19" ;
-"m2.aaf2f89992379705dac844c0a2a1d45f_19" [label="19:  BinaryOperatorStmt: Assign \n   n$3=*&value:int  [line 40]\n  *&x:int =(n$3 + 1) [line 40]\n " shape="box"]
+"m2.aaf2f89992379705dac844c0a2a1d45f_19" [label="19:  BinaryOperatorStmt: Assign \n   n$3=*&value:int [line 40]\n  *&x:int=(n$3 + 1) [line 40]\n " shape="box"]
 	
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_19" -> "m2.aaf2f89992379705dac844c0a2a1d45f_16" ;
@@ -676,11 +676,11 @@ digraph iCFG {
 	
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_17" -> "m2.aaf2f89992379705dac844c0a2a1d45f_16" ;
-"m2.aaf2f89992379705dac844c0a2a1d45f_16" [label="16:  Call _fun_printf \n   n$2=_fun_printf(\"(0)HELLO WORLD!\":char *) [line 42]\n " shape="box"]
+"m2.aaf2f89992379705dac844c0a2a1d45f_16" [label="16:  Call _fun_printf \n   n$2=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 42]\n " shape="box"]
 	
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_16" -> "m2.aaf2f89992379705dac844c0a2a1d45f_3" ;
-"m2.aaf2f89992379705dac844c0a2a1d45f_15" [label="15:  DeclStmt \n   *&z:int =9 [line 44]\n " shape="box"]
+"m2.aaf2f89992379705dac844c0a2a1d45f_15" [label="15:  DeclStmt \n   *&z:int=9 [line 44]\n " shape="box"]
 	
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_15" -> "m2.aaf2f89992379705dac844c0a2a1d45f_12" ;
@@ -693,15 +693,15 @@ digraph iCFG {
 	
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_13" -> "m2.aaf2f89992379705dac844c0a2a1d45f_12" ;
-"m2.aaf2f89992379705dac844c0a2a1d45f_12" [label="12:  DeclStmt \n   *&something:int =1 [line 48]\n " shape="box"]
+"m2.aaf2f89992379705dac844c0a2a1d45f_12" [label="12:  DeclStmt \n   *&something:int=1 [line 48]\n " shape="box"]
 	
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_12" -> "m2.aaf2f89992379705dac844c0a2a1d45f_11" ;
-"m2.aaf2f89992379705dac844c0a2a1d45f_11" [label="11:  UnaryOperator \n   n$1=*&something:int  [line 49]\n  *&something:int =(n$1 + 1) [line 49]\n " shape="box"]
+"m2.aaf2f89992379705dac844c0a2a1d45f_11" [label="11:  UnaryOperator \n   n$1=*&something:int [line 49]\n  *&something:int=(n$1 + 1) [line 49]\n " shape="box"]
 	
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_11" -> "m2.aaf2f89992379705dac844c0a2a1d45f_10" ;
-"m2.aaf2f89992379705dac844c0a2a1d45f_10" [label="10:  BinaryOperatorStmt: Assign \n   *&z:int =42 [line 51]\n " shape="box"]
+"m2.aaf2f89992379705dac844c0a2a1d45f_10" [label="10:  BinaryOperatorStmt: Assign \n   *&z:int=42 [line 51]\n " shape="box"]
 	
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_10" -> "m2.aaf2f89992379705dac844c0a2a1d45f_3" ;
@@ -731,7 +731,7 @@ digraph iCFG {
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_4" -> "m2.aaf2f89992379705dac844c0a2a1d45f_17" ;
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_4" -> "m2.aaf2f89992379705dac844c0a2a1d45f_18" ;
-"m2.aaf2f89992379705dac844c0a2a1d45f_3" [label="3:  Return Stmt \n   *&return:int =0 [line 57]\n " shape="box"]
+"m2.aaf2f89992379705dac844c0a2a1d45f_3" [label="3:  Return Stmt \n   *&return:int=0 [line 57]\n " shape="box"]
 	
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_3" -> "m2.aaf2f89992379705dac844c0a2a1d45f_2" ;
@@ -742,19 +742,19 @@ digraph iCFG {
 	
 
 	 "m2.aaf2f89992379705dac844c0a2a1d45f_1" -> "m2.aaf2f89992379705dac844c0a2a1d45f_22" ;
-"m5.7b1f6dff14d8c2dfeb7da9487be0612d_15" [label="15:  DeclStmt \n   *&value:int =0 [line 104]\n " shape="box"]
+"m5.7b1f6dff14d8c2dfeb7da9487be0612d_15" [label="15:  DeclStmt \n   *&value:int=0 [line 104]\n " shape="box"]
 	
 
 	 "m5.7b1f6dff14d8c2dfeb7da9487be0612d_15" -> "m5.7b1f6dff14d8c2dfeb7da9487be0612d_4" ;
-"m5.7b1f6dff14d8c2dfeb7da9487be0612d_14" [label="14:  DeclStmt \n   *&x:int =1 [line 107]\n " shape="box"]
+"m5.7b1f6dff14d8c2dfeb7da9487be0612d_14" [label="14:  DeclStmt \n   *&x:int=1 [line 107]\n " shape="box"]
 	
 
 	 "m5.7b1f6dff14d8c2dfeb7da9487be0612d_14" -> "m5.7b1f6dff14d8c2dfeb7da9487be0612d_13" ;
-"m5.7b1f6dff14d8c2dfeb7da9487be0612d_13" [label="13:  Call _fun_printf \n   n$4=_fun_printf(\"(out)HELLO WORLD!\":char *) [line 108]\n " shape="box"]
+"m5.7b1f6dff14d8c2dfeb7da9487be0612d_13" [label="13:  Call _fun_printf \n   n$4=_fun_printf(\"(out)HELLO WORLD!\":char*) [line 108]\n " shape="box"]
 	
 
 	 "m5.7b1f6dff14d8c2dfeb7da9487be0612d_13" -> "m5.7b1f6dff14d8c2dfeb7da9487be0612d_12" ;
-"m5.7b1f6dff14d8c2dfeb7da9487be0612d_12" [label="12:  BinaryOperatorStmt: Assign \n   n$3=*&value:int  [line 109]\n  *&x:int =(n$3 + 1) [line 109]\n " shape="box"]
+"m5.7b1f6dff14d8c2dfeb7da9487be0612d_12" [label="12:  BinaryOperatorStmt: Assign \n   n$3=*&value:int [line 109]\n  *&x:int=(n$3 + 1) [line 109]\n " shape="box"]
 	
 
 	 "m5.7b1f6dff14d8c2dfeb7da9487be0612d_12" -> "m5.7b1f6dff14d8c2dfeb7da9487be0612d_4" ;
@@ -766,7 +766,7 @@ digraph iCFG {
 	
 
 	 "m5.7b1f6dff14d8c2dfeb7da9487be0612d_10" -> "m5.7b1f6dff14d8c2dfeb7da9487be0612d_9" ;
-"m5.7b1f6dff14d8c2dfeb7da9487be0612d_9" [label="9:  Call _fun_printf \n   n$2=_fun_printf(\"(0)HELLO WORLD!\":char *) [line 112]\n " shape="box"]
+"m5.7b1f6dff14d8c2dfeb7da9487be0612d_9" [label="9:  Call _fun_printf \n   n$2=_fun_printf(\"(0)HELLO WORLD!\":char*) [line 112]\n " shape="box"]
 	
 
 	 "m5.7b1f6dff14d8c2dfeb7da9487be0612d_9" -> "m5.7b1f6dff14d8c2dfeb7da9487be0612d_4" ;
@@ -792,7 +792,7 @@ digraph iCFG {
 	
 
 	 "m5.7b1f6dff14d8c2dfeb7da9487be0612d_4" -> "m5.7b1f6dff14d8c2dfeb7da9487be0612d_5" ;
-"m5.7b1f6dff14d8c2dfeb7da9487be0612d_3" [label="3:  Return Stmt \n   *&return:int =0 [line 116]\n " shape="box"]
+"m5.7b1f6dff14d8c2dfeb7da9487be0612d_3" [label="3:  Return Stmt \n   *&return:int=0 [line 116]\n " shape="box"]
 	
 
 	 "m5.7b1f6dff14d8c2dfeb7da9487be0612d_3" -> "m5.7b1f6dff14d8c2dfeb7da9487be0612d_2" ;

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

@@ -1,10 +1,10 @@
 /* @generated */
 digraph iCFG {
-"test.098f6bcd4621d373cade4e832627b4f6_4" [label="4:  BinaryOperatorStmt: Assign \n   *&x.a:int =10 [line 17]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_4" [label="4:  BinaryOperatorStmt: Assign \n   *&x.a:int=10 [line 17]\n " shape="box"]
 	
 
 	 "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_3" [label="3:  BinaryOperatorStmt: Assign \n   *&x.b:int=20 [line 18]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_3" -> "test.098f6bcd4621d373cade4e832627b4f6_2" ;

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

@@ -1,10 +1,10 @@
 /* @generated */
 digraph iCFG {
-"test_typename.b2359812ef4a83b4e2638a11e6c522b3_4" [label="4:  DeclStmt \n   *&x:void =_t$1 [line 15]\n " shape="box"]
+"test_typename.b2359812ef4a83b4e2638a11e6c522b3_4" [label="4:  DeclStmt \n   *&x:void=_t$1 [line 15]\n " shape="box"]
 	
 
 	 "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_3" [label="3:  DeclStmt \n   *&z:void=_t$0 [line 16]\n " shape="box"]
 	
 
 	 "test_typename.b2359812ef4a83b4e2638a11e6c522b3_3" -> "test_typename.b2359812ef4a83b4e2638a11e6c522b3_2" ;

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

@@ -1,14 +1,14 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&src:int =1 [line 20]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_5" [label="5:  DeclStmt \n   *&src:int=1 [line 20]\n " shape="box"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int =0 [line 28]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   *&return:int=0 [line 28]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -19,11 +19,11 @@ digraph iCFG {
 	
 
 	 "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"]
+"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" ;
-"test.098f6bcd4621d373cade4e832627b4f6_3" [label="3:  Return Stmt \n   *&return:int =0 [line 16]\n " shape="box"]
+"test.098f6bcd4621d373cade4e832627b4f6_3" [label="3:  Return Stmt \n   *&return:int=0 [line 16]\n " shape="box"]
 	
 
 	 "test.098f6bcd4621d373cade4e832627b4f6_3" -> "test.098f6bcd4621d373cade4e832627b4f6_2" ;

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

@@ -1,18 +1,18 @@
 /* @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" [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_11" [label="11:  DeclStmt \n   *&i:int=n$2 [line 15]\n " shape="box"]
 	
 
 	 "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_10" [label="10:  BinaryOperatorStmt: Assign \n   *&val:int=(4 / 0) [line 20]\n " shape="box"]
 	
 
 	 "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_9" [label="9:  BinaryOperatorStmt: Assign \n   *&val:int=(9 / 0) [line 18]\n " shape="box"]
 	
 
 	 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_9" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_5" ;
@@ -33,18 +33,18 @@ digraph iCFG {
 	
 
 	 "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_4" [label="4:  Call _fun___builtin_va_end \n   _fun___builtin_va_end(&valist:void*) [line 22]\n " shape="box"]
 	
 
 	 "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_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_3" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_2" ;
 "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_2" [label="2: Exit vaarg_foo \n  " color=yellow style=filled]
 	
 
-"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_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_1" -> "vaarg_foo.73af1e8d32c2d09f7488c5fea173b853_12" ;

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

@@ -1,6 +1,6 @@
 /* @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_3" [label="3:  Return Stmt \n   *&return:int=3 [line 10]\n " shape="box"]
 	
 
 	 "h{d41d8cd98f00b204e9800998ecf8427e_Z1hv}.803b5572e1c1e91410fbdd09f43d6a22_3" -> "h{d41d8cd98f00b204e9800998ecf8427e_Z1hv}.803b5572e1c1e91410fbdd09f43d6a22_2" ;
@@ -11,7 +11,7 @@ digraph iCFG {
 	
 
 	 "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"]
+"switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_14" [label="14:  DeclStmt \n   *&res:int=5 [line 13]\n " shape="box"]
 	
 
 	 "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_14" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_4" ;
@@ -50,7 +50,7 @@ digraph iCFG {
 	
 
 	 "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_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_5" -> "switch_with_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z23switch_with_fallthroughi}.0f33d525cae4820211f1fad01cfd042b_3" ;
@@ -59,18 +59,18 @@ digraph iCFG {
 
 	 "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_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_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_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_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_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"]
+"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"]
 	
 
 	 "test_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z16test_fallthroughv}.b153f1307a65c2b5f6cad976bac36a19_3" -> "test_fallthrough{d41d8cd98f00b204e9800998ecf8427e_Z16test_fallthroughv}.b153f1307a65c2b5f6cad976bac36a19_2" ;

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

@@ -1,25 +1,25 @@
 /* @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" [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_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_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_4" [label="4:  CXXNewExpr \n   n$1=_fun___new(sizeof(int):unsigned long) [line 13]\n " shape="box"]
 	
 
 	 "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" [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_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_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_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" ;

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

@@ -1,13 +1,13 @@
 /* @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_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_3" -> "f{d41d8cd98f00b204e9800998ecf8427e_Z1fP6Person}.1a568c7910039e98ba51fbec36c568f8_2" ;
 "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_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_1" -> "f{d41d8cd98f00b204e9800998ecf8427e_Z1fP6Person}.1a568c7910039e98ba51fbec36c568f8_3" ;

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

@@ -1,31 +1,31 @@
 /* @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"]
+"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"]
 	
 
 	 "deleteInt{d41d8cd98f00b204e9800998ecf8427e_Z9deleteIntPi}.647508014cd09d4d2e192f8294614963_3" -> "deleteInt{d41d8cd98f00b204e9800998ecf8427e_Z9deleteIntPi}.647508014cd09d4d2e192f8294614963_2" ;
 "deleteInt{d41d8cd98f00b204e9800998ecf8427e_Z9deleteIntPi}.647508014cd09d4d2e192f8294614963_2" [label="2: Exit deleteInt \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" [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]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"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_3" -> "deleteX{d41d8cd98f00b204e9800998ecf8427e_Z7deleteXP1X}.e65990f4969cec963a8cf25f2a7e0fa6_2" ;
 "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_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_1" -> "deleteX{d41d8cd98f00b204e9800998ecf8427e_Z7deleteXP1X}.e65990f4969cec963a8cf25f2a7e0fa6_3" ;

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

@@ -1,21 +1,21 @@
 /* @generated */
 digraph iCFG {
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" [label="4:  DeclStmt \n   *&t:int *=0 [line 24]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" [label="4:  DeclStmt \n   *&t:int*=0 [line 24]\n " shape="box"]
 	
 
 	 "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_3" [label="3:  Call _fun_destroy<int_*> \n   n$0=_fun_destroy<int_*>(&t:int**) [line 25]\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_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_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_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"]
+"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_5" -> "f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_4" ;
@@ -23,14 +23,14 @@ digraph iCFG {
 	
 
 	 "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" [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_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_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_1" -> "f{d41d8cd98f00b204e9800998ecf8427e_Z1fPi}.f69f8a13fd08bf7714b26bc5f26ff0ef_5" ;
@@ -38,14 +38,14 @@ digraph iCFG {
 	
 
 	 "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_3" [label="3:  Return Stmt \n   *&return:int=0 [line 20]\n " shape="box"]
 	
 
 	 "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_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_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_1" -> "destroy<int_*>{d41d8cd98f00b204e9800998ecf8427e_Z7destroyIPiEiPT_}.63e86b2ebf524c51a279e5a3f725d0f5_4" ;

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

@@ -1,24 +1,24 @@
 /* @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" [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]
 	
 
-"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]
+"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]
 	
 
 	 "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" [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]
 	
 
-"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]
+"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]
 	
 
 	 "A_~A(_ZN1AD0Ev).8c02753d631046ed95b47845e91297b9_1" -> "A_~A(_ZN1AD0Ev).8c02753d631046ed95b47845e91297b9_3" ;

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

@@ -1,6 +1,6 @@
 /* @generated */
 digraph iCFG {
-"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" [label="3:  DeclStmt \n   _fun_X_X(&#GB<globals/global_const1.cpp|!pod>$global:class X *) [line 13]\n " shape="box"]
+"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" [label="3:  DeclStmt \n   _fun_X_X(&#GB<globals/global_const1.cpp|!pod>$global:class X*) [line 13]\n " shape="box"]
 	
 
 	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_2" ;
@@ -14,29 +14,29 @@ digraph iCFG {
 "X_X{_ZN1XC1ERKS_}.abc525d74d1815a6e1a874d1ed502de3_2" [label="2: Exit X_X \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]
+"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]
 	
 
 	 "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<globals/global_const1.cpp|!pod>$global:class X *) [line 13]\n  _fun_X_X(n$0:class X *,&#GB<globals/global_const1.cpp|!pod>$global:class X &) [line 15]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class X* [line 15]\n  _fun_X_X(&#GB<globals/global_const1.cpp|!pod>$global:class X*) [line 13]\n  _fun_X_X(n$0:class X*,&#GB<globals/global_const1.cpp|!pod>$global:class X&) [line 15]\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_1" [label="1: Start test\nFormals:  __return_param:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\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]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_1" -> "X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_2" ;
-"__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_3" [label="3:  DeclStmt \n   *&#GB<globals/global_const1.cpp>$v:int =2 [line 17]\n " shape="box"]
+"__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_3" [label="3:  DeclStmt \n   *&#GB<globals/global_const1.cpp>$v:int=2 [line 17]\n " shape="box"]
 	
 
 	 "__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_3" -> "__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_2" ;
@@ -47,11 +47,11 @@ digraph iCFG {
 	
 
 	 "__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_1" -> "__infer_globals_initializer_v.4e4b88201c5f529e31ed314500b0b0e5_3" ;
-"test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_4" [label="4:  DeclStmt \n   *&#GB<globals/global_const1.cpp>$v:int =2 [line 20]\n  n$1=*&#GB<globals/global_const1.cpp>$v:int  [line 20]\n  *&local:int =n$1 [line 20]\n " shape="box"]
+"test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_4" [label="4:  DeclStmt \n   *&#GB<globals/global_const1.cpp>$v:int=2 [line 20]\n  n$1=*&#GB<globals/global_const1.cpp>$v:int [line 20]\n  *&local:int=n$1 [line 20]\n " shape="box"]
 	
 
 	 "test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_4" -> "test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_3" ;
-"test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_3" [label="3:  Return Stmt \n   *&#GB<globals/global_const1.cpp>$v:int =2 [line 21]\n  n$0=*&#GB<globals/global_const1.cpp>$v:int  [line 21]\n  *&return:int =n$0 [line 21]\n " shape="box"]
+"test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_3" [label="3:  Return Stmt \n   *&#GB<globals/global_const1.cpp>$v:int=2 [line 21]\n  n$0=*&#GB<globals/global_const1.cpp>$v:int [line 21]\n  *&return:int=n$0 [line 21]\n " shape="box"]
 	
 
 	 "test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_3" -> "test2{d41d8cd98f00b204e9800998ecf8427e_Z5test2v}.cf7940edefd4df119b2c0c269e6b062c_2" ;

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

@@ -1,14 +1,14 @@
 /* @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<globals/global_const2.cpp>$global:int =n$1 [line 10]\n " shape="box"]
+"__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_8" [label="8:  DeclStmt \n   n$1=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 10]\n  *&#GB<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_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_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_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_6" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" ;
@@ -32,15 +32,15 @@ digraph iCFG {
 
 	 "__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<globals/global_const2.cpp>$global:int =n$1 [line 11]\n  n$2=*&#GB<globals/global_const2.cpp>$global:int  [line 11]\n  *&return:int =n$2 [line 11]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_8" [label="8:  Return Stmt \n   n$1=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 10]\n  *&#GB<globals/global_const2.cpp>$global:int=n$1 [line 11]\n  n$2=*&#GB<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" ;
-"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_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=3 [line 10]\n " shape="box"]
 	
 
 	 "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_6" [label="6:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=2 [line 10]\n " shape="box"]
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;

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

@@ -1,6 +1,6 @@
 /* @generated */
 digraph iCFG {
-"__infer_globals_initializer_x.90ed5779794b6c6f0b00544949bb1047_3" [label="3:  DeclStmt \n   n$0=_fun_foo() [line 14]\n  *&#GB<globals/initializer.cpp>$x:int =(n$0 + 5) [line 14]\n " shape="box"]
+"__infer_globals_initializer_x.90ed5779794b6c6f0b00544949bb1047_3" [label="3:  DeclStmt \n   n$0=_fun_foo() [line 14]\n  *&#GB<globals/initializer.cpp>$x:int=(n$0 + 5) [line 14]\n " shape="box"]
 	
 
 	 "__infer_globals_initializer_x.90ed5779794b6c6f0b00544949bb1047_3" -> "__infer_globals_initializer_x.90ed5779794b6c6f0b00544949bb1047_2" ;
@@ -11,7 +11,7 @@ digraph iCFG {
 	
 
 	 "__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<globals/initializer.cpp>$x:int  [line 15]\n  n$1=*&#GB<globals/initializer.cpp>$z:int  [line 15]\n  *&#GB<globals/initializer.cpp>$y:int =((n$0 + n$1) + 1) [line 15]\n " shape="box"]
+"__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" [label="3:  DeclStmt \n   n$0=*&#GB<globals/initializer.cpp>$x:int [line 15]\n  n$1=*&#GB<globals/initializer.cpp>$z:int [line 15]\n  *&#GB<globals/initializer.cpp>$y:int=((n$0 + n$1) + 1) [line 15]\n " shape="box"]
 	
 
 	 "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_3" -> "__infer_globals_initializer_y.0ea250be2dd991733c9131c53abc3c54_2" ;

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

@@ -1,6 +1,6 @@
 /* @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_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 19]\n " shape="box"]
 	
 
 	 "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_3" -> "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_2" ;
@@ -11,14 +11,14 @@ digraph iCFG {
 	
 
 	 "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"]
+"A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 11]\n " shape="box"]
 	
 
 	 "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]
 	
 
-"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_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_1" -> "A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_3" ;

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

@@ -1,6 +1,6 @@
 /* @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_templ<A>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templI1AEiv}.3baadb3ba3ae535eebf13f0f9b178f91_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 23]\n " shape="box"]
 	
 
 	 "div0_templ<A>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templI1AEiv}.3baadb3ba3ae535eebf13f0f9b178f91_3" -> "div0_templ<A>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templI1AEiv}.3baadb3ba3ae535eebf13f0f9b178f91_2" ;
@@ -11,7 +11,7 @@ digraph iCFG {
 	
 
 	 "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_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_3" -> "div0_fun{d41d8cd98f00b204e9800998ecf8427e_Z8div0_funv}.eb3bc7e27d70a5b78c6da6e74dc6539a_2" ;
@@ -25,7 +25,7 @@ digraph iCFG {
 "B<int>_B{_ZN1BIiEC1Ev}.0ea2ad6596256d0d6b6107dd3d2895ef_2" [label="2: Exit B<int>_B \n  " color=yellow style=filled]
 	
 
-"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]
+"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]
 	
 
 	 "B<int>_B{_ZN1BIiEC1Ev}.0ea2ad6596256d0d6b6107dd3d2895ef_1" -> "B<int>_B{_ZN1BIiEC1Ev}.0ea2ad6596256d0d6b6107dd3d2895ef_2" ;
@@ -40,14 +40,14 @@ digraph iCFG {
 	
 
 	 "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"]
+"B<A>_div0(_ZN1BI1AE4div0Ev).f18868f324b2038b2d87c90f3ffeeee3_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 16]\n " shape="box"]
 	
 
 	 "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]
 	
 
-"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>_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>_div0(_ZN1BI1AE4div0Ev).f18868f324b2038b2d87c90f3ffeeee3_1" -> "B<A>_div0(_ZN1BI1AE4div0Ev).f18868f324b2038b2d87c90f3ffeeee3_3" ;
@@ -62,22 +62,22 @@ digraph iCFG {
 	
 
 	 "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"]
+"A_div0(_ZN1A4div0Ev).a57f6f9d35e6a2053e6f8f5e86b8a040_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 11]\n " shape="box"]
 	
 
 	 "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]
 	
 
-"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_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_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_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_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_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_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_3" -> "div0_B_A{d41d8cd98f00b204e9800998ecf8427e_Z8div0_B_Av}.203256b7a71d4af61f07d6f0936495cb_2" ;
@@ -88,11 +88,11 @@ digraph iCFG {
 	
 
 	 "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"]
+"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_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"]
+"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_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_3" -> "div0_B_int{d41d8cd98f00b204e9800998ecf8427e_Z10div0_B_intv}.36d5725d032da6cee5255381db04d5e9_2" ;
@@ -106,11 +106,11 @@ digraph iCFG {
 "B<A>_B{_ZN1BI1AEC1Ev}.8f5152d327f8fb16714da77a1cf709d7_2" [label="2: Exit B<A>_B \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>_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>_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"]
+"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_Z10div0_templIiEiv}.73e45abf615840e788a88f2dd5b933a1_3" -> "div0_templ<int>{d41d8cd98f00b204e9800998ecf8427e_Z10div0_templIiEiv}.73e45abf615840e788a88f2dd5b933a1_2" ;
@@ -121,14 +121,14 @@ digraph iCFG {
 	
 
 	 "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_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 16]\n " shape="box"]
 	
 
 	 "B<int>_div0(_ZN1BIiE4div0Ev).9551e764ca77ab3d3fd6584814575acf_3" -> "B<int>_div0(_ZN1BIiE4div0Ev).9551e764ca77ab3d3fd6584814575acf_2" ;
 "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_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_1" -> "B<int>_div0(_ZN1BIiE4div0Ev).9551e764ca77ab3d3fd6584814575acf_3" ;

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

@@ -1,35 +1,35 @@
 /* @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_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_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_2" ;
 "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" [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"]
+"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" ;
 "A_meth_with_self(_ZN1A14meth_with_selfEii).3d68189dc22d8f38e7c0da9ff88e3d4d_2" [label="2: Exit A_meth_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]
+"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]
 	
 
 	 "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" [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]
 	
 
-"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]
+"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]
 	
 
 	 "fun_with_self{d41d8cd98f00b204e9800998ecf8427e_Z13fun_with_selfi}.233795f267cd90fecfceba5afd62aea4_1" -> "fun_with_self{d41d8cd98f00b204e9800998ecf8427e_Z13fun_with_selfi}.233795f267cd90fecfceba5afd62aea4_3" ;

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

@@ -1,6 +1,6 @@
 /* @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_3" [label="3:  Return Stmt \n   *&return:int*=null [line 10]\n " shape="box"]
 	
 
 	 "getPtr{d41d8cd98f00b204e9800998ecf8427e_Z6getPtrv}.be2c2699bd3a9fb6e2cd8fd002004d97_3" -> "getPtr{d41d8cd98f00b204e9800998ecf8427e_Z6getPtrv}.be2c2699bd3a9fb6e2cd8fd002004d97_2" ;

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

@@ -1,6 +1,6 @@
 /* @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_3" [label="3:  Return Stmt \n   *&return:int=0 [line 14]\n " shape="box"]
 	
 
 	 "get<ENUM>{d41d8cd98f00b204e9800998ecf8427e_Z3getI4ENUMET_v}.4ed5a54b122c5ff8357f5fcc4523040d_3" -> "get<ENUM>{d41d8cd98f00b204e9800998ecf8427e_Z3getI4ENUMET_v}.4ed5a54b122c5ff8357f5fcc4523040d_2" ;
@@ -11,15 +11,15 @@ digraph iCFG {
 	
 
 	 "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"]
+"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" ;
-"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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_6" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" ;
@@ -27,22 +27,22 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  DeclStmt \n   *&f2:float=0.000000 [line 23]\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_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]
+"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]
 	
 
 	 "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<void>{d41d8cd98f00b204e9800998ecf8427e_Z3getIvET_v}.b0acbd5394d155b066384a6997a01a3b_3" [label="3:  Return Stmt \n   *&return:void=-1 [line 14]\n " shape="box"]
 	
 
 	 "get<void>{d41d8cd98f00b204e9800998ecf8427e_Z3getIvET_v}.b0acbd5394d155b066384a6997a01a3b_3" -> "get<void>{d41d8cd98f00b204e9800998ecf8427e_Z3getIvET_v}.b0acbd5394d155b066384a6997a01a3b_2" ;
@@ -53,7 +53,7 @@ digraph iCFG {
 	
 
 	 "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<float>{d41d8cd98f00b204e9800998ecf8427e_Z3getIfET_v}.bb4f7b931a0a779909d493eabb9016e3_3" [label="3:  Return Stmt \n   *&return:float=0.000000 [line 14]\n " shape="box"]
 	
 
 	 "get<float>{d41d8cd98f00b204e9800998ecf8427e_Z3getIfET_v}.bb4f7b931a0a779909d493eabb9016e3_3" -> "get<float>{d41d8cd98f00b204e9800998ecf8427e_Z3getIfET_v}.bb4f7b931a0a779909d493eabb9016e3_2" ;
@@ -64,7 +64,7 @@ digraph iCFG {
 	
 
 	 "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"]
+"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" ;
@@ -75,7 +75,7 @@ digraph iCFG {
 	
 
 	 "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"]
+"get<float_*>{d41d8cd98f00b204e9800998ecf8427e_Z3getIPfET_v}.a606f40b6a080a657eabc77950cf13fc_3" [label="3:  Return Stmt \n   *&return:float*=null [line 14]\n " shape="box"]
 	
 
 	 "get<float_*>{d41d8cd98f00b204e9800998ecf8427e_Z3getIPfET_v}.a606f40b6a080a657eabc77950cf13fc_3" -> "get<float_*>{d41d8cd98f00b204e9800998ecf8427e_Z3getIPfET_v}.a606f40b6a080a657eabc77950cf13fc_2" ;

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

@@ -1,41 +1,41 @@
 /* @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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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_13" [label="13:  DeclStmt \n   _fun_vec_vec(&vector:class vec*,10:int) [line 36]\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_12" [label="12:  DeclStmt \n   *&__range:class vec&=&vector [line 37]\n " shape="box"]
 	
 
 	 "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_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_11" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_10" ;
-"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" [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" ;
@@ -47,20 +47,20 @@ digraph iCFG {
 	
 
 	 "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_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_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_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_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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
@@ -71,95 +71,95 @@ digraph iCFG {
 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" [label="2: Exit test \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]
+"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]
 	
 
 	 "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_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_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_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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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_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_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_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_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_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" [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_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_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_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_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_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"]
+"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_3" -> "vec_begin(_ZN3vec5beginEv).e886548e7d905cb0a20da338610da393_2" ;
 "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_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_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"]
+"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"]
 	
 
 	 "operator!={d41d8cd98f00b204e9800998ecf8427e_Zne8iteratorS_}.f92125b8648f9224012c80de0debd540_3" -> "operator!={d41d8cd98f00b204e9800998ecf8427e_Zne8iteratorS_}.f92125b8648f9224012c80de0debd540_2" ;
 "operator!={d41d8cd98f00b204e9800998ecf8427e_Zne8iteratorS_}.f92125b8648f9224012c80de0debd540_2" [label="2: Exit operator!= \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]
+"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]
 	
 
 	 "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"]
+"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_iterator{_ZN8iteratorC1ERKS_}.fcda12fc9b260caa840e7342dd86ae6f_2" [label="2: Exit iterator_iterator \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]
+"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_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"]
+"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_operator*(_ZN8iteratordeEv).e460522f307f6432268293a6c37dd0aa_3" -> "iterator_operator*(_ZN8iteratordeEv).e460522f307f6432268293a6c37dd0aa_2" ;
 "iterator_operator*(_ZN8iteratordeEv).e460522f307f6432268293a6c37dd0aa_2" [label="2: Exit iterator_operator* \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]
+"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]
 	
 
 	 "iterator_operator*(_ZN8iteratordeEv).e460522f307f6432268293a6c37dd0aa_1" -> "iterator_operator*(_ZN8iteratordeEv).e460522f307f6432268293a6c37dd0aa_3" ;

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

@@ -3,149 +3,149 @@ digraph iCFG {
 "TranslateAsPtr<int>_operator*(_ZN14TranslateAsPtrIiEdeEv).6e33a6aa14a0cca60ad03c9c8323478d_2" [label="2: Exit TranslateAsPtr<int>_operator* \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]
+"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]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"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_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"]
+"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_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"]
+"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_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]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"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_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"]
+"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_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"]
+"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_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]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "derefFirstArg2{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg2PiS_}.d4966e65f3ff2cb5da0b76036244bf9c_3" -> "derefFirstArg2{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg2PiS_}.d4966e65f3ff2cb5da0b76036244bf9c_2" ;
 "derefFirstArg2{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg2PiS_}.d4966e65f3ff2cb5da0b76036244bf9c_2" [label="2: Exit derefFirstArg2 \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]
+"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]
 	
 
 	 "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]
 	
 
-"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>_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>_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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "derefFirstArg3{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg3PiS_}.c22270a8b45f207485450ebff7826470_3" -> "derefFirstArg3{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg3PiS_}.c22270a8b45f207485450ebff7826470_2" ;
 "derefFirstArg3{d41d8cd98f00b204e9800998ecf8427e_Z14derefFirstArg3PiS_}.c22270a8b45f207485450ebff7826470_2" [label="2: Exit derefFirstArg3 \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]
+"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]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_4" [label="4:  DeclStmt \n   *&a:int=0 [line 63]\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"]
+"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"]
 	
 
 	 "derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_3" -> "derefFirstArg3_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg3_null_derefv}.e1b26ac6d9c6e1ff0010ecdefd5b0904_2" ;
@@ -156,30 +156,30 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_4" [label="4:  DeclStmt \n   *&a:int=0 [line 38]\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"]
+"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"]
 	
 
 	 "derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_3" -> "derefFirstArg_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z24derefFirstArg_null_derefv}.927581a38e7f35f59353c6a172d4704c_2" ;
@@ -190,37 +190,37 @@ digraph iCFG {
 	
 
 	 "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_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_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_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_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_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_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_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_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_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]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_4" [label="4:  DeclStmt \n   *&a:int=0 [line 48]\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"]
+"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"]
 	
 
 	 "derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_3" -> "derefFirstArg2_null_deref{d41d8cd98f00b204e9800998ecf8427e_Z25derefFirstArg2_null_derefv}.87e84a45939c306e33dfa703cc7fd30b_2" ;
@@ -231,34 +231,34 @@ digraph iCFG {
 	
 
 	 "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_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_6" [label="6:  DeclStmt \n   *&a:int=0 [line 140]\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_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_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_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_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_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_3" -> "getRef_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getRef_ok_derefv}.a4f3a4a756890f6bb1065e1d22e6485f_2" ;
 "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_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_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"]
+"derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_4" [label="4:  DeclStmt \n   *&a:int=0 [line 43]\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"]
+"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"]
 	
 
 	 "derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_3" -> "derefFirstArg_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z22derefFirstArg_ok_derefv}.81162ff63fe403ed6f07c90fd7747246_2" ;
@@ -269,30 +269,30 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_4" [label="4:  DeclStmt \n   *&a:int=0 [line 53]\n " shape="box"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_3" -> "derefFirstArg2_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg2_ok_derefv}.c5c7a2c8b8d8c952220574562b32d658_2" ;
@@ -303,41 +303,41 @@ digraph iCFG {
 	
 
 	 "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"]
+"getPtr_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z15getPtr_ok_derefv}.e6a87ae178aca92d95d36c354a58684b_6" [label="6:  DeclStmt \n   *&a:int=0 [line 102]\n " shape="box"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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>_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>_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>_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"]
+"derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_4" [label="4:  DeclStmt \n   *&a:int=0 [line 58]\n " shape="box"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_3" -> "derefFirstArg3_ok_deref{d41d8cd98f00b204e9800998ecf8427e_Z23derefFirstArg3_ok_derefv}.a0391ff9bad133bfe5a5eca765002a53_2" ;
@@ -351,7 +351,7 @@ digraph iCFG {
 "derefFirstArg{d41d8cd98f00b204e9800998ecf8427e_Z13derefFirstArgPiS_}.b2938b7664e69c1046eb0d5c68f18fd4_2" [label="2: Exit derefFirstArg \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]
+"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{d41d8cd98f00b204e9800998ecf8427e_Z13derefFirstArgPiS_}.b2938b7664e69c1046eb0d5c68f18fd4_1" -> "derefFirstArg{d41d8cd98f00b204e9800998ecf8427e_Z13derefFirstArgPiS_}.b2938b7664e69c1046eb0d5c68f18fd4_2" ;

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

@@ -3,45 +3,45 @@ digraph iCFG {
 "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_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_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_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::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::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::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::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::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::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::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::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::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::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::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::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::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::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::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::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::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_7" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_3" ;
@@ -53,7 +53,7 @@ digraph iCFG {
 	
 
 	 "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_5" -> "binary_conditional::conditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional11conditional.f20f612a576bee7cbbfe5f189b8a4f86_7" ;
-"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" [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" ;
@@ -69,23 +69,23 @@ digraph iCFG {
 	
 
 	 "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::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::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::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::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::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::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::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::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::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::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_7" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_3" ;
@@ -97,7 +97,7 @@ digraph iCFG {
 	
 
 	 "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::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::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_4" -> "binary_conditional::binaryConditional{d41d8cd98f00b204e9800998ecf8427e_ZN18binary_conditional17binar.09917000e376be5dfbf0e2b7b90db84c_5" ;
@@ -113,21 +113,21 @@ digraph iCFG {
 	
 
 	 "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" [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_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_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_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" [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" ;

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

@@ -1,6 +1,6 @@
 /* @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"]
+"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"]
 	
 
 	 "div1_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div1_assign_conditionalv}.92f869873008e2be38561a2db0cbf69c_3" -> "div1_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div1_assign_conditionalv}.92f869873008e2be38561a2db0cbf69c_2" ;
@@ -11,24 +11,24 @@ digraph iCFG {
 	
 
 	 "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"]
+"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_11" [label="11:  DeclStmt \n   *&v1:int=0 [line 11]\n " shape="box"]
 	
 
 	 "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"]
+"choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_10" [label="10:  DeclStmt \n   *&v2:int=1 [line 11]\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_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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_7" -> "choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_lvaluei}.6c25176eadbe218811c9816a2afa04be_4" ;
@@ -44,35 +44,35 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_11" [label="11:  DeclStmt \n   *&v1:int=0 [line 23]\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"]
+"assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_10" [label="10:  DeclStmt \n   *&v2:int=0 [line 23]\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_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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_7" -> "assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z18assign_conditionali}.9f86abcf482de92349afc0d0bb49b701_4" ;
@@ -88,18 +88,18 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "div1_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div1_temp_lvaluev}.3b77e4a6c86c90b394ed42389d225e28_3" -> "div1_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div1_temp_lvaluev}.3b77e4a6c86c90b394ed42389d225e28_2" ;
@@ -110,7 +110,7 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "div0_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div0_assign_conditionalv}.e27c458f48e2fd3eb2c37a500947ad83_3" -> "div0_assign_conditional{d41d8cd98f00b204e9800998ecf8427e_Z23div0_assign_conditionalv}.e27c458f48e2fd3eb2c37a500947ad83_2" ;
@@ -121,7 +121,7 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "div0_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_rvaluev}.659babbaece0692d30930dde0b8bc14b_3" -> "div0_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_rvaluev}.659babbaece0692d30930dde0b8bc14b_2" ;
@@ -132,7 +132,7 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "div1_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_lvaluev}.946cb482a75d8e7dcce087e5daa1e2a4_3" -> "div1_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_lvaluev}.946cb482a75d8e7dcce087e5daa1e2a4_2" ;
@@ -143,15 +143,15 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_7" -> "div_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z15div_temp_lvalueii}.8b8806a213153b17b56e7747ab0fd495_4" ;
@@ -167,19 +167,19 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "div0_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div0_temp_lvaluev}.d905fe7f39ce34b39ca169929ea65e7d_3" -> "div0_temp_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z16div0_temp_lvaluev}.d905fe7f39ce34b39ca169929ea65e7d_2" ;
@@ -190,7 +190,7 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "div0_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_lvaluev}.33971c4fb1631ae7849c0b6e9319d4ed_3" -> "div0_choose_lvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div0_choose_lvaluev}.33971c4fb1631ae7849c0b6e9319d4ed_2" ;
@@ -201,7 +201,7 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "div1_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_rvaluev}.fef13b1fcbaa224805a1550f767822a9_3" -> "div1_choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z18div1_choose_rvaluev}.fef13b1fcbaa224805a1550f767822a9_2" ;
@@ -212,20 +212,20 @@ digraph iCFG {
 	
 
 	 "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"]
+"choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_10" [label="10:  DeclStmt \n   *&v1:int=0 [line 17]\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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_7" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_4" ;
@@ -241,14 +241,14 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_1" -> "choose_rvalue{d41d8cd98f00b204e9800998ecf8427e_Z13choose_rvaluei}.b9522bc4f4323bf8a76186f0fba3aa14_10" ;

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

@@ -3,115 +3,115 @@ 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]
+"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]
 	
 
 	 "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_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_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" [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_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_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_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]
 	
 
-"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]
+"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]
 	
 
 	 "Person_Person{_ZN6PersonC1Ev}.eae7ac90d0b106ac1ffce8f205a2d898_1" -> "Person_Person{_ZN6PersonC1Ev}.eae7ac90d0b106ac1ffce8f205a2d898_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" [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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"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" ;
-"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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"initialization_c_style{d41d8cd98f00b204e9800998ecf8427e_Z22initialization_c_stylev}.c0bdd3ee3a78e2dd5959c9d641c82699_3" [label="3:  DeclStmt \n   _fun_Z_Z(&z2:class Z*) [line 34]\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_2" [label="2: Exit initialization_c_style \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]
+"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]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_1" -> "initialization_mixed_styles_not_handled_correctly{d41d8cd98f00b204e9800998ecf8427e_Z49initialization.dec4886d2469fb0c4ff79226de4af4c3_5" ;

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

@@ -1,25 +1,25 @@
 /* @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" [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]
 	
 
-"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]
+"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]
 	
 
 	 "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_5" [label="5:  DeclStmt \n   _fun_X_X(&x1:class X*,0:int,0:int) [line 21]\n " shape="box"]
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_5" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" ;
-"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" [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_3" [label="3:  DeclStmt \n   _fun_X_X(&x3:class X*,0:int,1:int) [line 23]\n " shape="box"]
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" ;
@@ -30,14 +30,14 @@ digraph iCFG {
 	
 
 	 "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_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_3" -> "X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_2" ;
 "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_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" ;

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

@@ -1,10 +1,10 @@
 /* @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"]
+"f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_4" [label="4:  DeclStmt \n   _fun_B_B(&b:class B*,0:int) [line 33]\n " shape="box"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_3" -> "f_div0{d41d8cd98f00b204e9800998ecf8427e_Z6f_div0v}.d7919065c162b30e23129b41b4d83add_2" ;
@@ -15,15 +15,15 @@ digraph iCFG {
 	
 
 	 "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"]
+"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" ;
-"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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_3" -> "delegate_constr_f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z23delegate_constr_f2_div0v}.f48835ee55e284ebd0cc90e796ee56a0_2" ;
@@ -34,49 +34,49 @@ digraph iCFG {
 	
 
 	 "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"]
+"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{_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"]
+"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{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_3" -> "B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_2" ;
 "B_B{_ZN1BC1Eii}.5ecb4fcfd023151430fa5bca33f9d0a1_2" [label="2: Exit B_B \n  " color=yellow style=filled]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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]
 	
 
-"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]
+"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]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_3" -> "f_f2_div1{d41d8cd98f00b204e9800998ecf8427e_Z9f_f2_div1v}.d3accd3ce3fcd0797a01f360d25f9dbf_2" ;
@@ -87,11 +87,11 @@ digraph iCFG {
 	
 
 	 "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"]
+"t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_4" [label="4:  DeclStmt \n   _fun_B_B(&b:class B*,0:int) [line 38]\n " shape="box"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_3" -> "t_div0{d41d8cd98f00b204e9800998ecf8427e_Z6t_div0v}.3ab75fb254c81a27c1e611abc8f785cb_2" ;
@@ -102,22 +102,22 @@ digraph iCFG {
 	
 
 	 "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"]
+"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::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]
 	
 
-"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::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::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"]
+"f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_4" [label="4:  DeclStmt \n   _fun_B_B(&b:class B*,0:int) [line 28]\n " shape="box"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_3" -> "f2_div0{d41d8cd98f00b204e9800998ecf8427e_Z7f2_div0v}.6d6861d749c71be711a71007e9543e27_2" ;
@@ -128,15 +128,15 @@ digraph iCFG {
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "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"]
+"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"]
 	
 
 	 "delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_3" -> "delegate_constr_f_div0{d41d8cd98f00b204e9800998ecf8427e_Z22delegate_constr_f_div0v}.5b81902520df6ab21a21f683c64fcbaa_2" ;
@@ -147,22 +147,22 @@ digraph iCFG {
 	
 
 	 "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{_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{_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{_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{_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{_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{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_3" -> "B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_2" ;
 "B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_2" [label="2: Exit B_B \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_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_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_1" -> "B_B{_ZN1BC1Ei}.206ff47250d7f38f694e364cf9f51809_5" ;

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

@@ -1,71 +1,71 @@
 /* @generated */
 digraph iCFG {
-"constructor_new::Person_Person{_ZN15constructor_new6PersonC1Eiii}.f12ead159d9edc219c9a5bc3bc6f68cc_5" [label="5:  BinaryOperatorStmt: Assign \n   n$4=*&this:class constructor_new::Person * [line 18]\n  n$5=*&i:int  [line 18]\n  *n$4.x:int =n$5 [line 18]\n " shape="box"]
+"constructor_new::Person_Person{_ZN15constructor_new6PersonC1Eiii}.f12ead159d9edc219c9a5bc3bc6f68cc_5" [label="5:  BinaryOperatorStmt: Assign \n   n$4=*&this:class constructor_new::Person* [line 18]\n  n$5=*&i:int [line 18]\n  *n$4.x:int=n$5 [line 18]\n " shape="box"]
 	
 
 	 "constructor_new::Person_Person{_ZN15constructor_new6PersonC1Eiii}.f12ead159d9edc219c9a5bc3bc6f68cc_5" -> "constructor_new::Person_Person{_ZN15constructor_new6PersonC1Eiii}.f12ead159d9edc219c9a5bc3bc6f68cc_4" ;
-"constructor_new::Person_Person{_ZN15constructor_new6PersonC1Eiii}.f12ead159d9edc219c9a5bc3bc6f68cc_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:class constructor_new::Person * [line 19]\n  n$3=*&j:int  [line 19]\n  *n$2.y:int =n$3 [line 19]\n " shape="box"]
+"constructor_new::Person_Person{_ZN15constructor_new6PersonC1Eiii}.f12ead159d9edc219c9a5bc3bc6f68cc_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:class constructor_new::Person* [line 19]\n  n$3=*&j:int [line 19]\n  *n$2.y:int=n$3 [line 19]\n " shape="box"]
 	
 
 	 "constructor_new::Person_Person{_ZN15constructor_new6PersonC1Eiii}.f12ead159d9edc219c9a5bc3bc6f68cc_4" -> "constructor_new::Person_Person{_ZN15constructor_new6PersonC1Eiii}.f12ead159d9edc219c9a5bc3bc6f68cc_3" ;
-"constructor_new::Person_Person{_ZN15constructor_new6PersonC1Eiii}.f12ead159d9edc219c9a5bc3bc6f68cc_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class constructor_new::Person * [line 20]\n  n$1=*&k:int  [line 20]\n  *n$0.z:int =n$1 [line 20]\n " shape="box"]
+"constructor_new::Person_Person{_ZN15constructor_new6PersonC1Eiii}.f12ead159d9edc219c9a5bc3bc6f68cc_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class constructor_new::Person* [line 20]\n  n$1=*&k:int [line 20]\n  *n$0.z:int=n$1 [line 20]\n " shape="box"]
 	
 
 	 "constructor_new::Person_Person{_ZN15constructor_new6PersonC1Eiii}.f12ead159d9edc219c9a5bc3bc6f68cc_3" -> "constructor_new::Person_Person{_ZN15constructor_new6PersonC1Eiii}.f12ead159d9edc219c9a5bc3bc6f68cc_2" ;
 "constructor_new::Person_Person{_ZN15constructor_new6PersonC1Eiii}.f12ead159d9edc219c9a5bc3bc6f68cc_2" [label="2: Exit constructor_new::Person_Person \n  " color=yellow style=filled]
 	
 
-"constructor_new::Person_Person{_ZN15constructor_new6PersonC1Eiii}.f12ead159d9edc219c9a5bc3bc6f68cc_1" [label="1: Start constructor_new::Person_Person\nFormals:  this:class constructor_new::Person * i:int  j:int  k:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
+"constructor_new::Person_Person{_ZN15constructor_new6PersonC1Eiii}.f12ead159d9edc219c9a5bc3bc6f68cc_1" [label="1: Start constructor_new::Person_Person\nFormals:  this:class constructor_new::Person* i:int j:int k:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
 	
 
 	 "constructor_new::Person_Person{_ZN15constructor_new6PersonC1Eiii}.f12ead159d9edc219c9a5bc3bc6f68cc_1" -> "constructor_new::Person_Person{_ZN15constructor_new6PersonC1Eiii}.f12ead159d9edc219c9a5bc3bc6f68cc_5" ;
-"constructor_new::int_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new15int_init_numb.670b7a0647d0c96dcb9ec85b4c270db0_4" [label="4:  DeclStmt \n   n$2=_fun___new(sizeof(int ):unsigned long ) [line 40]\n  *n$2:int =5 [line 40]\n  *&x1:int *=n$2 [line 40]\n " shape="box"]
+"constructor_new::int_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new15int_init_numb.670b7a0647d0c96dcb9ec85b4c270db0_4" [label="4:  DeclStmt \n   n$2=_fun___new(sizeof(int):unsigned long) [line 40]\n  *n$2:int=5 [line 40]\n  *&x1:int*=n$2 [line 40]\n " shape="box"]
 	
 
 	 "constructor_new::int_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new15int_init_numb.670b7a0647d0c96dcb9ec85b4c270db0_4" -> "constructor_new::int_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new15int_init_numb.670b7a0647d0c96dcb9ec85b4c270db0_3" ;
-"constructor_new::int_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new15int_init_numb.670b7a0647d0c96dcb9ec85b4c270db0_3" [label="3:  Return Stmt \n   n$0=*&x1:int * [line 41]\n  n$1=*n$0:int  [line 41]\n  *&return:int =(1 / (n$1 - 5)) [line 41]\n " shape="box"]
+"constructor_new::int_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new15int_init_numb.670b7a0647d0c96dcb9ec85b4c270db0_3" [label="3:  Return Stmt \n   n$0=*&x1:int* [line 41]\n  n$1=*n$0:int [line 41]\n  *&return:int=(1 / (n$1 - 5)) [line 41]\n " shape="box"]
 	
 
 	 "constructor_new::int_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new15int_init_numb.670b7a0647d0c96dcb9ec85b4c270db0_3" -> "constructor_new::int_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new15int_init_numb.670b7a0647d0c96dcb9ec85b4c270db0_2" ;
 "constructor_new::int_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new15int_init_numb.670b7a0647d0c96dcb9ec85b4c270db0_2" [label="2: Exit constructor_new::int_init_number \n  " color=yellow style=filled]
 	
 
-"constructor_new::int_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new15int_init_numb.670b7a0647d0c96dcb9ec85b4c270db0_1" [label="1: Start constructor_new::int_init_number\nFormals: \nLocals:  x1:int * \n   DECLARE_LOCALS(&return,&x1); [line 39]\n " color=yellow style=filled]
+"constructor_new::int_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new15int_init_numb.670b7a0647d0c96dcb9ec85b4c270db0_1" [label="1: Start constructor_new::int_init_number\nFormals: \nLocals:  x1:int* \n   DECLARE_LOCALS(&return,&x1); [line 39]\n " color=yellow style=filled]
 	
 
 	 "constructor_new::int_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new15int_init_numb.670b7a0647d0c96dcb9ec85b4c270db0_1" -> "constructor_new::int_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new15int_init_numb.670b7a0647d0c96dcb9ec85b4c270db0_4" ;
-"constructor_new::constructor_1_arg_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new26co.285fb110632c95b98518c4e4deab02f3_4" [label="4:  DeclStmt \n   n$2=_fun___new(sizeof(class constructor_new::Person ):unsigned long ) [line 30]\n  _fun_constructor_new::Person_Person(n$2:class constructor_new::Person *,5:int ) [line 30]\n  *&p:class constructor_new::Person *=n$2 [line 30]\n " shape="box"]
+"constructor_new::constructor_1_arg_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new26co.285fb110632c95b98518c4e4deab02f3_4" [label="4:  DeclStmt \n   n$2=_fun___new(sizeof(class constructor_new::Person):unsigned long) [line 30]\n  _fun_constructor_new::Person_Person(n$2:class constructor_new::Person*,5:int) [line 30]\n  *&p:class constructor_new::Person*=n$2 [line 30]\n " shape="box"]
 	
 
 	 "constructor_new::constructor_1_arg_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new26co.285fb110632c95b98518c4e4deab02f3_4" -> "constructor_new::constructor_1_arg_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new26co.285fb110632c95b98518c4e4deab02f3_3" ;
-"constructor_new::constructor_1_arg_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new26co.285fb110632c95b98518c4e4deab02f3_3" [label="3:  Return Stmt \n   n$0=*&p:class constructor_new::Person * [line 31]\n  n$1=*n$0.x:int  [line 31]\n  *&return:int =(1 / (n$1 - 5)) [line 31]\n " shape="box"]
+"constructor_new::constructor_1_arg_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new26co.285fb110632c95b98518c4e4deab02f3_3" [label="3:  Return Stmt \n   n$0=*&p:class constructor_new::Person* [line 31]\n  n$1=*n$0.x:int [line 31]\n  *&return:int=(1 / (n$1 - 5)) [line 31]\n " shape="box"]
 	
 
 	 "constructor_new::constructor_1_arg_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new26co.285fb110632c95b98518c4e4deab02f3_3" -> "constructor_new::constructor_1_arg_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new26co.285fb110632c95b98518c4e4deab02f3_2" ;
 "constructor_new::constructor_1_arg_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new26co.285fb110632c95b98518c4e4deab02f3_2" [label="2: Exit constructor_new::constructor_1_arg_new_div0 \n  " color=yellow style=filled]
 	
 
-"constructor_new::constructor_1_arg_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new26co.285fb110632c95b98518c4e4deab02f3_1" [label="1: Start constructor_new::constructor_1_arg_new_div0\nFormals: \nLocals:  p:class constructor_new::Person * \n   DECLARE_LOCALS(&return,&p); [line 29]\n " color=yellow style=filled]
+"constructor_new::constructor_1_arg_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new26co.285fb110632c95b98518c4e4deab02f3_1" [label="1: Start constructor_new::constructor_1_arg_new_div0\nFormals: \nLocals:  p:class constructor_new::Person* \n   DECLARE_LOCALS(&return,&p); [line 29]\n " color=yellow style=filled]
 	
 
 	 "constructor_new::constructor_1_arg_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new26co.285fb110632c95b98518c4e4deab02f3_1" -> "constructor_new::constructor_1_arg_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new26co.285fb110632c95b98518c4e4deab02f3_4" ;
-"constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_12" [label="12:  DeclStmt \n   *&z:int =6 [line 65]\n " shape="box"]
+"constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_12" [label="12:  DeclStmt \n   *&z:int=6 [line 65]\n " shape="box"]
 	
 
 	 "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_12" -> "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_11" ;
-"constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_11" [label="11:  DeclStmt \n   n$9=_fun___new(sizeof(int ):unsigned long ) [line 66]\n  n$10=_fun_constructor_new::getValue(4:int ) [line 66]\n  *n$9:int =n$10 [line 66]\n  *&y:int *=n$9 [line 66]\n " shape="box"]
+"constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_11" [label="11:  DeclStmt \n   n$9=_fun___new(sizeof(int):unsigned long) [line 66]\n  n$10=_fun_constructor_new::getValue(4:int) [line 66]\n  *n$9:int=n$10 [line 66]\n  *&y:int*=n$9 [line 66]\n " shape="box"]
 	
 
 	 "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_11" -> "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_5" ;
-"constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_10" [label="10:  DeclStmt \n   n$2=_fun___new(sizeof(int ):unsigned long ) [line 67]\n  n$8=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int  [line 67]\n  *n$2:int =n$8 [line 67]\n  *&x:int *=n$2 [line 67]\n " shape="box"]
+"constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_10" [label="10:  DeclStmt \n   n$2=_fun___new(sizeof(int):unsigned long) [line 67]\n  n$8=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 67]\n  *n$2:int=n$8 [line 67]\n  *&x:int*=n$2 [line 67]\n " shape="box"]
 	
 
 	 "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_10" -> "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_3" ;
-"constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_9" [label="9:  ConditinalStmt Branch \n   n$6=*&y:int * [line 67]\n  n$7=*n$6:int  [line 67]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int =(1 + n$7) [line 67]\n " shape="box"]
+"constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_9" [label="9:  ConditinalStmt Branch \n   n$6=*&y:int* [line 67]\n  n$7=*n$6:int [line 67]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=(1 + n$7) [line 67]\n " shape="box"]
 	
 
 	 "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_9" -> "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_4" ;
-"constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_8" [label="8:  ConditinalStmt Branch \n   n$5=_fun_constructor_new::getValue(1:int ) [line 67]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int =n$5 [line 67]\n " shape="box"]
+"constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_8" [label="8:  ConditinalStmt Branch \n   n$5=_fun_constructor_new::getValue(1:int) [line 67]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=n$5 [line 67]\n " shape="box"]
 	
 
 	 "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_8" -> "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_4" ;
@@ -77,7 +77,7 @@ digraph iCFG {
 	
 
 	 "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_6" -> "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_8" ;
-"constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_5" [label="5:  Call _fun_constructor_new::getValue \n   n$4=_fun_constructor_new::getValue(0:int ) [line 67]\n " shape="box"]
+"constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_5" [label="5:  Call _fun_constructor_new::getValue \n   n$4=_fun_constructor_new::getValue(0:int) [line 67]\n " shape="box"]
 	
 
 	 "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_5" -> "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_6" ;
@@ -86,37 +86,37 @@ digraph iCFG {
 	
 
 	 "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_4" -> "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_10" ;
-"constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_3" [label="3:  Return Stmt \n   n$0=*&x:int * [line 68]\n  n$1=*n$0:int  [line 68]\n  *&return:int =(1 / (n$1 - 5)) [line 68]\n " shape="box"]
+"constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_3" [label="3:  Return Stmt \n   n$0=*&x:int* [line 68]\n  n$1=*n$0:int [line 68]\n  *&return:int=(1 / (n$1 - 5)) [line 68]\n " shape="box"]
 	
 
 	 "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_3" -> "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_2" ;
 "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_2" [label="2: Exit constructor_new::int_init_nodes \n  " color=yellow style=filled]
 	
 
-"constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_1" [label="1: Start constructor_new::int_init_nodes\nFormals: \nLocals:  x:int * 0$?%__sil_tmpSIL_temp_conditional___n$3:int  y:int * z:int  \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_temp_conditional___n$3,&y,&z); [line 64]\n " color=yellow style=filled]
+"constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_1" [label="1: Start constructor_new::int_init_nodes\nFormals: \nLocals:  x:int* 0$?%__sil_tmpSIL_temp_conditional___n$3:int y:int* z:int \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_temp_conditional___n$3,&y,&z); [line 64]\n " color=yellow style=filled]
 	
 
 	 "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_1" -> "constructor_new::int_init_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_nodes.15b19b855639a3bc9e4101a166e9d506_12" ;
-"constructor_new::float_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17float_init_.f08c2c9a66da4ff292f674e5fc557384_4" [label="4:  DeclStmt \n   n$2=_fun___new(sizeof(float ):unsigned long ) [line 45]\n  *n$2:float =5.400000 [line 45]\n  *&x1:float *=n$2 [line 45]\n " shape="box"]
+"constructor_new::float_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17float_init_.f08c2c9a66da4ff292f674e5fc557384_4" [label="4:  DeclStmt \n   n$2=_fun___new(sizeof(float):unsigned long) [line 45]\n  *n$2:float=5.400000 [line 45]\n  *&x1:float*=n$2 [line 45]\n " shape="box"]
 	
 
 	 "constructor_new::float_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17float_init_.f08c2c9a66da4ff292f674e5fc557384_4" -> "constructor_new::float_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17float_init_.f08c2c9a66da4ff292f674e5fc557384_3" ;
-"constructor_new::float_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17float_init_.f08c2c9a66da4ff292f674e5fc557384_3" [label="3:  Return Stmt \n   n$0=*&x1:float * [line 46]\n  n$1=*n$0:float  [line 46]\n  *&return:float =(1 / (n$1 - 5.400000)) [line 46]\n " shape="box"]
+"constructor_new::float_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17float_init_.f08c2c9a66da4ff292f674e5fc557384_3" [label="3:  Return Stmt \n   n$0=*&x1:float* [line 46]\n  n$1=*n$0:float [line 46]\n  *&return:float=(1 / (n$1 - 5.400000)) [line 46]\n " shape="box"]
 	
 
 	 "constructor_new::float_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17float_init_.f08c2c9a66da4ff292f674e5fc557384_3" -> "constructor_new::float_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17float_init_.f08c2c9a66da4ff292f674e5fc557384_2" ;
 "constructor_new::float_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17float_init_.f08c2c9a66da4ff292f674e5fc557384_2" [label="2: Exit constructor_new::float_init_number \n  " color=yellow style=filled]
 	
 
-"constructor_new::float_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17float_init_.f08c2c9a66da4ff292f674e5fc557384_1" [label="1: Start constructor_new::float_init_number\nFormals: \nLocals:  x1:float * \n   DECLARE_LOCALS(&return,&x1); [line 44]\n " color=yellow style=filled]
+"constructor_new::float_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17float_init_.f08c2c9a66da4ff292f674e5fc557384_1" [label="1: Start constructor_new::float_init_number\nFormals: \nLocals:  x1:float* \n   DECLARE_LOCALS(&return,&x1); [line 44]\n " color=yellow style=filled]
 	
 
 	 "constructor_new::float_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17float_init_.f08c2c9a66da4ff292f674e5fc557384_1" -> "constructor_new::float_init_number{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17float_init_.f08c2c9a66da4ff292f674e5fc557384_4" ;
-"constructor_new::int_init_empty_list{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new19int_init_.0abf1bb307f0b0aba7ba50f6126aa348_4" [label="4:  DeclStmt \n   *&x1:int =0 [line 55]\n " shape="box"]
+"constructor_new::int_init_empty_list{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new19int_init_.0abf1bb307f0b0aba7ba50f6126aa348_4" [label="4:  DeclStmt \n   *&x1:int=0 [line 55]\n " shape="box"]
 	
 
 	 "constructor_new::int_init_empty_list{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new19int_init_.0abf1bb307f0b0aba7ba50f6126aa348_4" -> "constructor_new::int_init_empty_list{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new19int_init_.0abf1bb307f0b0aba7ba50f6126aa348_3" ;
-"constructor_new::int_init_empty_list{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new19int_init_.0abf1bb307f0b0aba7ba50f6126aa348_3" [label="3:  Return Stmt \n   n$0=*&x1:int  [line 56]\n  *&return:int =(1 / n$0) [line 56]\n " shape="box"]
+"constructor_new::int_init_empty_list{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new19int_init_.0abf1bb307f0b0aba7ba50f6126aa348_3" [label="3:  Return Stmt \n   n$0=*&x1:int [line 56]\n  *&return:int=(1 / n$0) [line 56]\n " shape="box"]
 	
 
 	 "constructor_new::int_init_empty_list{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new19int_init_.0abf1bb307f0b0aba7ba50f6126aa348_3" -> "constructor_new::int_init_empty_list{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new19int_init_.0abf1bb307f0b0aba7ba50f6126aa348_2" ;
@@ -127,26 +127,26 @@ digraph iCFG {
 	
 
 	 "constructor_new::int_init_empty_list{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new19int_init_.0abf1bb307f0b0aba7ba50f6126aa348_1" -> "constructor_new::int_init_empty_list{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new19int_init_.0abf1bb307f0b0aba7ba50f6126aa348_4" ;
-"constructor_new::Person_Person{_ZN15constructor_new6PersonC1Ev}.d97d127a76e3162d0758f79fa2f3b94d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class constructor_new::Person * [line 14]\n  *n$0.x:int =0 [line 14]\n " shape="box"]
+"constructor_new::Person_Person{_ZN15constructor_new6PersonC1Ev}.d97d127a76e3162d0758f79fa2f3b94d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class constructor_new::Person* [line 14]\n  *n$0.x:int=0 [line 14]\n " shape="box"]
 	
 
 	 "constructor_new::Person_Person{_ZN15constructor_new6PersonC1Ev}.d97d127a76e3162d0758f79fa2f3b94d_3" -> "constructor_new::Person_Person{_ZN15constructor_new6PersonC1Ev}.d97d127a76e3162d0758f79fa2f3b94d_2" ;
 "constructor_new::Person_Person{_ZN15constructor_new6PersonC1Ev}.d97d127a76e3162d0758f79fa2f3b94d_2" [label="2: Exit constructor_new::Person_Person \n  " color=yellow style=filled]
 	
 
-"constructor_new::Person_Person{_ZN15constructor_new6PersonC1Ev}.d97d127a76e3162d0758f79fa2f3b94d_1" [label="1: Start constructor_new::Person_Person\nFormals:  this:class constructor_new::Person *\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
+"constructor_new::Person_Person{_ZN15constructor_new6PersonC1Ev}.d97d127a76e3162d0758f79fa2f3b94d_1" [label="1: Start constructor_new::Person_Person\nFormals:  this:class constructor_new::Person*\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
 	
 
 	 "constructor_new::Person_Person{_ZN15constructor_new6PersonC1Ev}.d97d127a76e3162d0758f79fa2f3b94d_1" -> "constructor_new::Person_Person{_ZN15constructor_new6PersonC1Ev}.d97d127a76e3162d0758f79fa2f3b94d_3" ;
-"constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_9" [label="9:  DeclStmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int  [line 91]\n  n$3=_fun___new_array((sizeof(class constructor_new::Person ) * n$2):unsigned long ) [line 91]\n  *&tarray:class constructor_new::Person *=n$3 [line 91]\n " shape="box"]
+"constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_9" [label="9:  DeclStmt \n   n$2=*&0$?%__sil_tmpSIL_temp_conditional___n$0:int [line 91]\n  n$3=_fun___new_array((sizeof(class constructor_new::Person) * n$2):unsigned long) [line 91]\n  *&tarray:class constructor_new::Person*=n$3 [line 91]\n " shape="box"]
 	
 
 	 "constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_9" -> "constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_2" ;
-"constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int =3 [line 91]\n " shape="box"]
+"constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_8" [label="8:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=3 [line 91]\n " shape="box"]
 	
 
 	 "constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_8" -> "constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_3" ;
-"constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int =5 [line 91]\n " shape="box"]
+"constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_7" [label="7:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$0:int=5 [line 91]\n " shape="box"]
 	
 
 	 "constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_7" -> "constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_3" ;
@@ -158,7 +158,7 @@ digraph iCFG {
 	
 
 	 "constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_5" -> "constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_7" ;
-"constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_4" [label="4:  BinaryOperatorStmt: EQ \n   n$1=_fun_constructor_new::getValue(5:int ) [line 91]\n " shape="box"]
+"constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_4" [label="4:  BinaryOperatorStmt: EQ \n   n$1=_fun_constructor_new::getValue(5:int) [line 91]\n " shape="box"]
 	
 
 	 "constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_4" -> "constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_5" ;
@@ -170,23 +170,23 @@ digraph iCFG {
 "constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_2" [label="2: Exit constructor_new::array_of_class_with_not_constant_size \n  " color=yellow style=filled]
 	
 
-"constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_1" [label="1: Start constructor_new::array_of_class_with_not_constant_size\nFormals: \nLocals:  tarray:class constructor_new::Person * 0$?%__sil_tmpSIL_temp_conditional___n$0:int  \n   DECLARE_LOCALS(&return,&tarray,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 90]\n " color=yellow style=filled]
+"constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_1" [label="1: Start constructor_new::array_of_class_with_not_constant_size\nFormals: \nLocals:  tarray:class constructor_new::Person* 0$?%__sil_tmpSIL_temp_conditional___n$0:int \n   DECLARE_LOCALS(&return,&tarray,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 90]\n " color=yellow style=filled]
 	
 
 	 "constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_1" -> "constructor_new::array_of_class_with_not_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15construc.84bb36fcef0b0e5e77cf917c625b5103_4" ;
-"constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_11" [label="11:  DeclStmt \n   *&z:int =6 [line 72]\n " shape="box"]
+"constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_11" [label="11:  DeclStmt \n   *&z:int=6 [line 72]\n " shape="box"]
 	
 
 	 "constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_11" -> "constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_5" ;
-"constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_10" [label="10:  DeclStmt \n   n$2=_fun___new(sizeof(class constructor_new::Person ):unsigned long ) [line 73]\n  n$7=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int  [line 73]\n  _fun_constructor_new::Person_Person(n$2:class constructor_new::Person *,n$7:int ) [line 73]\n  *&p:class constructor_new::Person *=n$2 [line 73]\n " shape="box"]
+"constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_10" [label="10:  DeclStmt \n   n$2=_fun___new(sizeof(class constructor_new::Person):unsigned long) [line 73]\n  n$7=*&0$?%__sil_tmpSIL_temp_conditional___n$3:int [line 73]\n  _fun_constructor_new::Person_Person(n$2:class constructor_new::Person*,n$7:int) [line 73]\n  *&p:class constructor_new::Person*=n$2 [line 73]\n " shape="box"]
 	
 
 	 "constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_10" -> "constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_3" ;
-"constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_9" [label="9:  ConditinalStmt Branch \n   n$6=*&z:int  [line 73]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int =(1 + n$6) [line 73]\n " shape="box"]
+"constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_9" [label="9:  ConditinalStmt Branch \n   n$6=*&z:int [line 73]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=(1 + n$6) [line 73]\n " shape="box"]
 	
 
 	 "constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_9" -> "constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_4" ;
-"constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_8" [label="8:  ConditinalStmt Branch \n   n$5=_fun_constructor_new::getValue(1:int ) [line 73]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int =n$5 [line 73]\n " shape="box"]
+"constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_8" [label="8:  ConditinalStmt Branch \n   n$5=_fun_constructor_new::getValue(1:int) [line 73]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$3:int=n$5 [line 73]\n " shape="box"]
 	
 
 	 "constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_8" -> "constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_4" ;
@@ -198,7 +198,7 @@ digraph iCFG {
 	
 
 	 "constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_6" -> "constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_8" ;
-"constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_5" [label="5:  Call _fun_constructor_new::getValue \n   n$4=_fun_constructor_new::getValue(0:int ) [line 73]\n " shape="box"]
+"constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_5" [label="5:  Call _fun_constructor_new::getValue \n   n$4=_fun_constructor_new::getValue(0:int) [line 73]\n " shape="box"]
 	
 
 	 "constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_5" -> "constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_6" ;
@@ -207,78 +207,78 @@ digraph iCFG {
 	
 
 	 "constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_4" -> "constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_10" ;
-"constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_3" [label="3:  Return Stmt \n   n$0=*&p:class constructor_new::Person * [line 74]\n  n$1=*n$0.x:int  [line 74]\n  *&return:int =(1 / (n$1 - 7)) [line 74]\n " shape="box"]
+"constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_3" [label="3:  Return Stmt \n   n$0=*&p:class constructor_new::Person* [line 74]\n  n$1=*n$0.x:int [line 74]\n  *&return:int=(1 / (n$1 - 7)) [line 74]\n " shape="box"]
 	
 
 	 "constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_3" -> "constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_2" ;
 "constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_2" [label="2: Exit constructor_new::constructor_nodes \n  " color=yellow style=filled]
 	
 
-"constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_1" [label="1: Start constructor_new::constructor_nodes\nFormals: \nLocals:  p:class constructor_new::Person * 0$?%__sil_tmpSIL_temp_conditional___n$3:int  z:int  \n   DECLARE_LOCALS(&return,&p,&0$?%__sil_tmpSIL_temp_conditional___n$3,&z); [line 71]\n " color=yellow style=filled]
+"constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_1" [label="1: Start constructor_new::constructor_nodes\nFormals: \nLocals:  p:class constructor_new::Person* 0$?%__sil_tmpSIL_temp_conditional___n$3:int z:int \n   DECLARE_LOCALS(&return,&p,&0$?%__sil_tmpSIL_temp_conditional___n$3,&z); [line 71]\n " color=yellow style=filled]
 	
 
 	 "constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_1" -> "constructor_new::constructor_nodes{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new17constructor.6b2632d76ee5243b736fe7f263843e28_11" ;
-"constructor_new::int_init_empty_list_new{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new23int_i.7148a8362d26b90f839b1de3d5a025b5_4" [label="4:  DeclStmt \n   n$2=_fun___new(sizeof(int ):unsigned long ) [line 60]\n  *n$2:int =0 [line 60]\n  *&x1:int *=n$2 [line 60]\n " shape="box"]
+"constructor_new::int_init_empty_list_new{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new23int_i.7148a8362d26b90f839b1de3d5a025b5_4" [label="4:  DeclStmt \n   n$2=_fun___new(sizeof(int):unsigned long) [line 60]\n  *n$2:int=0 [line 60]\n  *&x1:int*=n$2 [line 60]\n " shape="box"]
 	
 
 	 "constructor_new::int_init_empty_list_new{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new23int_i.7148a8362d26b90f839b1de3d5a025b5_4" -> "constructor_new::int_init_empty_list_new{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new23int_i.7148a8362d26b90f839b1de3d5a025b5_3" ;
-"constructor_new::int_init_empty_list_new{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new23int_i.7148a8362d26b90f839b1de3d5a025b5_3" [label="3:  Return Stmt \n   n$0=*&x1:int * [line 61]\n  n$1=*n$0:int  [line 61]\n  *&return:int =(1 / n$1) [line 61]\n " shape="box"]
+"constructor_new::int_init_empty_list_new{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new23int_i.7148a8362d26b90f839b1de3d5a025b5_3" [label="3:  Return Stmt \n   n$0=*&x1:int* [line 61]\n  n$1=*n$0:int [line 61]\n  *&return:int=(1 / n$1) [line 61]\n " shape="box"]
 	
 
 	 "constructor_new::int_init_empty_list_new{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new23int_i.7148a8362d26b90f839b1de3d5a025b5_3" -> "constructor_new::int_init_empty_list_new{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new23int_i.7148a8362d26b90f839b1de3d5a025b5_2" ;
 "constructor_new::int_init_empty_list_new{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new23int_i.7148a8362d26b90f839b1de3d5a025b5_2" [label="2: Exit constructor_new::int_init_empty_list_new \n  " color=yellow style=filled]
 	
 
-"constructor_new::int_init_empty_list_new{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new23int_i.7148a8362d26b90f839b1de3d5a025b5_1" [label="1: Start constructor_new::int_init_empty_list_new\nFormals: \nLocals:  x1:int * \n   DECLARE_LOCALS(&return,&x1); [line 59]\n " color=yellow style=filled]
+"constructor_new::int_init_empty_list_new{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new23int_i.7148a8362d26b90f839b1de3d5a025b5_1" [label="1: Start constructor_new::int_init_empty_list_new\nFormals: \nLocals:  x1:int* \n   DECLARE_LOCALS(&return,&x1); [line 59]\n " color=yellow style=filled]
 	
 
 	 "constructor_new::int_init_empty_list_new{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new23int_i.7148a8362d26b90f839b1de3d5a025b5_1" -> "constructor_new::int_init_empty_list_new{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new23int_i.7148a8362d26b90f839b1de3d5a025b5_4" ;
-"constructor_new::int_init_empty{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_empty.e08f5f11fbc2f8017160a6eef09a2771_4" [label="4:  DeclStmt \n   n$2=_fun___new(sizeof(int ):unsigned long ) [line 50]\n  *n$2:int =0 [line 50]\n  *&x1:int *=n$2 [line 50]\n " shape="box"]
+"constructor_new::int_init_empty{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_empty.e08f5f11fbc2f8017160a6eef09a2771_4" [label="4:  DeclStmt \n   n$2=_fun___new(sizeof(int):unsigned long) [line 50]\n  *n$2:int=0 [line 50]\n  *&x1:int*=n$2 [line 50]\n " shape="box"]
 	
 
 	 "constructor_new::int_init_empty{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_empty.e08f5f11fbc2f8017160a6eef09a2771_4" -> "constructor_new::int_init_empty{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_empty.e08f5f11fbc2f8017160a6eef09a2771_3" ;
-"constructor_new::int_init_empty{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_empty.e08f5f11fbc2f8017160a6eef09a2771_3" [label="3:  Return Stmt \n   n$0=*&x1:int * [line 51]\n  n$1=*n$0:int  [line 51]\n  *&return:int =(1 / n$1) [line 51]\n " shape="box"]
+"constructor_new::int_init_empty{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_empty.e08f5f11fbc2f8017160a6eef09a2771_3" [label="3:  Return Stmt \n   n$0=*&x1:int* [line 51]\n  n$1=*n$0:int [line 51]\n  *&return:int=(1 / n$1) [line 51]\n " shape="box"]
 	
 
 	 "constructor_new::int_init_empty{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_empty.e08f5f11fbc2f8017160a6eef09a2771_3" -> "constructor_new::int_init_empty{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_empty.e08f5f11fbc2f8017160a6eef09a2771_2" ;
 "constructor_new::int_init_empty{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_empty.e08f5f11fbc2f8017160a6eef09a2771_2" [label="2: Exit constructor_new::int_init_empty \n  " color=yellow style=filled]
 	
 
-"constructor_new::int_init_empty{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_empty.e08f5f11fbc2f8017160a6eef09a2771_1" [label="1: Start constructor_new::int_init_empty\nFormals: \nLocals:  x1:int * \n   DECLARE_LOCALS(&return,&x1); [line 49]\n " color=yellow style=filled]
+"constructor_new::int_init_empty{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_empty.e08f5f11fbc2f8017160a6eef09a2771_1" [label="1: Start constructor_new::int_init_empty\nFormals: \nLocals:  x1:int* \n   DECLARE_LOCALS(&return,&x1); [line 49]\n " color=yellow style=filled]
 	
 
 	 "constructor_new::int_init_empty{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_empty.e08f5f11fbc2f8017160a6eef09a2771_1" -> "constructor_new::int_init_empty{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_init_empty.e08f5f11fbc2f8017160a6eef09a2771_4" ;
-"constructor_new::getValue{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new8getValueEi}.b5e83c45246d8bc0c43b2a1f88fc319d_3" [label="3:  Return Stmt \n   n$0=*&x:int  [line 27]\n  *&return:int =n$0 [line 27]\n " shape="box"]
+"constructor_new::getValue{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new8getValueEi}.b5e83c45246d8bc0c43b2a1f88fc319d_3" [label="3:  Return Stmt \n   n$0=*&x:int [line 27]\n  *&return:int=n$0 [line 27]\n " shape="box"]
 	
 
 	 "constructor_new::getValue{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new8getValueEi}.b5e83c45246d8bc0c43b2a1f88fc319d_3" -> "constructor_new::getValue{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new8getValueEi}.b5e83c45246d8bc0c43b2a1f88fc319d_2" ;
 "constructor_new::getValue{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new8getValueEi}.b5e83c45246d8bc0c43b2a1f88fc319d_2" [label="2: Exit constructor_new::getValue \n  " color=yellow style=filled]
 	
 
-"constructor_new::getValue{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new8getValueEi}.b5e83c45246d8bc0c43b2a1f88fc319d_1" [label="1: Start constructor_new::getValue\nFormals:  x:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 27]\n " color=yellow style=filled]
+"constructor_new::getValue{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new8getValueEi}.b5e83c45246d8bc0c43b2a1f88fc319d_1" [label="1: Start constructor_new::getValue\nFormals:  x:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 27]\n " color=yellow style=filled]
 	
 
 	 "constructor_new::getValue{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new8getValueEi}.b5e83c45246d8bc0c43b2a1f88fc319d_1" -> "constructor_new::getValue{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new8getValueEi}.b5e83c45246d8bc0c43b2a1f88fc319d_3" ;
-"constructor_new::Person_Person{_ZN15constructor_new6PersonC1Ei}.9117e996f11e537023866e9f6abcfba0_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class constructor_new::Person * [line 15]\n  n$1=*&i:int  [line 15]\n  *n$0.x:int =n$1 [line 15]\n " shape="box"]
+"constructor_new::Person_Person{_ZN15constructor_new6PersonC1Ei}.9117e996f11e537023866e9f6abcfba0_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class constructor_new::Person* [line 15]\n  n$1=*&i:int [line 15]\n  *n$0.x:int=n$1 [line 15]\n " shape="box"]
 	
 
 	 "constructor_new::Person_Person{_ZN15constructor_new6PersonC1Ei}.9117e996f11e537023866e9f6abcfba0_3" -> "constructor_new::Person_Person{_ZN15constructor_new6PersonC1Ei}.9117e996f11e537023866e9f6abcfba0_2" ;
 "constructor_new::Person_Person{_ZN15constructor_new6PersonC1Ei}.9117e996f11e537023866e9f6abcfba0_2" [label="2: Exit constructor_new::Person_Person \n  " color=yellow style=filled]
 	
 
-"constructor_new::Person_Person{_ZN15constructor_new6PersonC1Ei}.9117e996f11e537023866e9f6abcfba0_1" [label="1: Start constructor_new::Person_Person\nFormals:  this:class constructor_new::Person * i:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
+"constructor_new::Person_Person{_ZN15constructor_new6PersonC1Ei}.9117e996f11e537023866e9f6abcfba0_1" [label="1: Start constructor_new::Person_Person\nFormals:  this:class constructor_new::Person* i:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
 	 "constructor_new::Person_Person{_ZN15constructor_new6PersonC1Ei}.9117e996f11e537023866e9f6abcfba0_1" -> "constructor_new::Person_Person{_ZN15constructor_new6PersonC1Ei}.9117e996f11e537023866e9f6abcfba0_3" ;
-"constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_12" [label="12:  DeclStmt \n   n$9=*&0$?%__sil_tmpSIL_temp_conditional___n$6:int  [line 78]\n  n$10=_fun___new_array((sizeof(int ) * n$9):unsigned long ) [line 78]\n  *&x2:int *=n$10 [line 78]\n " shape="box"]
+"constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_12" [label="12:  DeclStmt \n   n$9=*&0$?%__sil_tmpSIL_temp_conditional___n$6:int [line 78]\n  n$10=_fun___new_array((sizeof(int) * n$9):unsigned long) [line 78]\n  *&x2:int*=n$10 [line 78]\n " shape="box"]
 	
 
 	 "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_12" -> "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_5" ;
-"constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int =3 [line 78]\n " shape="box"]
+"constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_11" [label="11:  ConditinalStmt Branch \n   *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=3 [line 78]\n " shape="box"]
 	
 
 	 "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_11" -> "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_6" ;
-"constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_10" [label="10:  ConditinalStmt Branch \n   n$8=_fun_constructor_new::getValue(5:int ) [line 78]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$6:int =n$8 [line 78]\n " shape="box"]
+"constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_10" [label="10:  ConditinalStmt Branch \n   n$8=_fun_constructor_new::getValue(5:int) [line 78]\n  *&0$?%__sil_tmpSIL_temp_conditional___n$6:int=n$8 [line 78]\n " shape="box"]
 	
 
 	 "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_10" -> "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_6" ;
@@ -290,7 +290,7 @@ digraph iCFG {
 	
 
 	 "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_8" -> "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_10" ;
-"constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_7" [label="7:  Call _fun_constructor_new::getValue \n   n$7=_fun_constructor_new::getValue(5:int ) [line 78]\n " shape="box"]
+"constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_7" [label="7:  Call _fun_constructor_new::getValue \n   n$7=_fun_constructor_new::getValue(5:int) [line 78]\n " shape="box"]
 	
 
 	 "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_7" -> "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_8" ;
@@ -299,78 +299,78 @@ digraph iCFG {
 	
 
 	 "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_6" -> "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_12" ;
-"constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_5" [label="5:  BinaryOperatorStmt: Assign \n   n$5=*&x2:int * [line 79]\n  *n$5[0]:int =1 [line 79]\n " shape="box"]
+"constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_5" [label="5:  BinaryOperatorStmt: Assign \n   n$5=*&x2:int* [line 79]\n  *n$5[0]:int=1 [line 79]\n " shape="box"]
 	
 
 	 "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_5" -> "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_4" ;
-"constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_4" [label="4:  BinaryOperatorStmt: Assign \n   n$4=*&x2:int * [line 80]\n  *n$4[1]:int =2 [line 80]\n " shape="box"]
+"constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_4" [label="4:  BinaryOperatorStmt: Assign \n   n$4=*&x2:int* [line 80]\n  *n$4[1]:int=2 [line 80]\n " shape="box"]
 	
 
 	 "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_4" -> "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_3" ;
-"constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_3" [label="3:  Return Stmt \n   n$0=*&x2:int * [line 81]\n  n$1=*n$0[0]:int  [line 81]\n  n$2=*&x2:int * [line 81]\n  n$3=*n$2[1]:int  [line 81]\n  *&return:int =(1 / ((n$1 + n$3) - 3)) [line 81]\n " shape="box"]
+"constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_3" [label="3:  Return Stmt \n   n$0=*&x2:int* [line 81]\n  n$1=*n$0[0]:int [line 81]\n  n$2=*&x2:int* [line 81]\n  n$3=*n$2[1]:int [line 81]\n  *&return:int=(1 / ((n$1 + n$3) - 3)) [line 81]\n " shape="box"]
 	
 
 	 "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_3" -> "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_2" ;
 "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_2" [label="2: Exit constructor_new::int_array \n  " color=yellow style=filled]
 	
 
-"constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_1" [label="1: Start constructor_new::int_array\nFormals: \nLocals:  x2:int * 0$?%__sil_tmpSIL_temp_conditional___n$6:int  \n   DECLARE_LOCALS(&return,&x2,&0$?%__sil_tmpSIL_temp_conditional___n$6); [line 77]\n " color=yellow style=filled]
+"constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_1" [label="1: Start constructor_new::int_array\nFormals: \nLocals:  x2:int* 0$?%__sil_tmpSIL_temp_conditional___n$6:int \n   DECLARE_LOCALS(&return,&x2,&0$?%__sil_tmpSIL_temp_conditional___n$6); [line 77]\n " color=yellow style=filled]
 	
 
 	 "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_1" -> "constructor_new::int_array{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new9int_arrayEv}.792fd2b8caa0f52b0ef8a389268ab444_7" ;
-"constructor_new::matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new16matrix_of_pe.ace395b88162c36b1d857fd3d0759df7_4" [label="4:  DeclStmt \n   n$2=_fun___new_array((sizeof(class constructor_new::Person *) * 10):unsigned long ) [line 99]\n  *&tarray:class constructor_new::Person **=n$2 [line 99]\n " shape="box"]
+"constructor_new::matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new16matrix_of_pe.ace395b88162c36b1d857fd3d0759df7_4" [label="4:  DeclStmt \n   n$2=_fun___new_array((sizeof(class constructor_new::Person*) * 10):unsigned long) [line 99]\n  *&tarray:class constructor_new::Person**=n$2 [line 99]\n " shape="box"]
 	
 
 	 "constructor_new::matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new16matrix_of_pe.ace395b88162c36b1d857fd3d0759df7_4" -> "constructor_new::matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new16matrix_of_pe.ace395b88162c36b1d857fd3d0759df7_3" ;
-"constructor_new::matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new16matrix_of_pe.ace395b88162c36b1d857fd3d0759df7_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&tarray:class constructor_new::Person ** [line 100]\n  n$1=_fun___new_array((sizeof(class constructor_new::Person ) * 10):unsigned long ) [line 100]\n  _fun_constructor_new::Person_Person(n$1[0]:class constructor_new::Person *) [line 100]\n  _fun_constructor_new::Person_Person(n$1[1]:class constructor_new::Person *) [line 100]\n  _fun_constructor_new::Person_Person(n$1[2]:class constructor_new::Person *) [line 100]\n  _fun_constructor_new::Person_Person(n$1[3]:class constructor_new::Person *) [line 100]\n  _fun_constructor_new::Person_Person(n$1[4]:class constructor_new::Person *) [line 100]\n  _fun_constructor_new::Person_Person(n$1[5]:class constructor_new::Person *) [line 100]\n  _fun_constructor_new::Person_Person(n$1[6]:class constructor_new::Person *) [line 100]\n  _fun_constructor_new::Person_Person(n$1[7]:class constructor_new::Person *) [line 100]\n  _fun_constructor_new::Person_Person(n$1[8]:class constructor_new::Person *) [line 100]\n  _fun_constructor_new::Person_Person(n$1[9]:class constructor_new::Person *) [line 100]\n  *n$0[0]:class constructor_new::Person *=n$1 [line 100]\n " shape="box"]
+"constructor_new::matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new16matrix_of_pe.ace395b88162c36b1d857fd3d0759df7_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&tarray:class constructor_new::Person** [line 100]\n  n$1=_fun___new_array((sizeof(class constructor_new::Person) * 10):unsigned long) [line 100]\n  _fun_constructor_new::Person_Person(n$1[0]:class constructor_new::Person*) [line 100]\n  _fun_constructor_new::Person_Person(n$1[1]:class constructor_new::Person*) [line 100]\n  _fun_constructor_new::Person_Person(n$1[2]:class constructor_new::Person*) [line 100]\n  _fun_constructor_new::Person_Person(n$1[3]:class constructor_new::Person*) [line 100]\n  _fun_constructor_new::Person_Person(n$1[4]:class constructor_new::Person*) [line 100]\n  _fun_constructor_new::Person_Person(n$1[5]:class constructor_new::Person*) [line 100]\n  _fun_constructor_new::Person_Person(n$1[6]:class constructor_new::Person*) [line 100]\n  _fun_constructor_new::Person_Person(n$1[7]:class constructor_new::Person*) [line 100]\n  _fun_constructor_new::Person_Person(n$1[8]:class constructor_new::Person*) [line 100]\n  _fun_constructor_new::Person_Person(n$1[9]:class constructor_new::Person*) [line 100]\n  *n$0[0]:class constructor_new::Person*=n$1 [line 100]\n " shape="box"]
 	
 
 	 "constructor_new::matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new16matrix_of_pe.ace395b88162c36b1d857fd3d0759df7_3" -> "constructor_new::matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new16matrix_of_pe.ace395b88162c36b1d857fd3d0759df7_2" ;
 "constructor_new::matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new16matrix_of_pe.ace395b88162c36b1d857fd3d0759df7_2" [label="2: Exit constructor_new::matrix_of_person \n  " color=yellow style=filled]
 	
 
-"constructor_new::matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new16matrix_of_pe.ace395b88162c36b1d857fd3d0759df7_1" [label="1: Start constructor_new::matrix_of_person\nFormals: \nLocals:  tarray:class constructor_new::Person ** \n   DECLARE_LOCALS(&return,&tarray); [line 98]\n " color=yellow style=filled]
+"constructor_new::matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new16matrix_of_pe.ace395b88162c36b1d857fd3d0759df7_1" [label="1: Start constructor_new::matrix_of_person\nFormals: \nLocals:  tarray:class constructor_new::Person** \n   DECLARE_LOCALS(&return,&tarray); [line 98]\n " color=yellow style=filled]
 	
 
 	 "constructor_new::matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new16matrix_of_pe.ace395b88162c36b1d857fd3d0759df7_1" -> "constructor_new::matrix_of_person{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new16matrix_of_pe.ace395b88162c36b1d857fd3d0759df7_4" ;
-"constructor_new::array_of_person_with_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor.43b079732f75f01a275fca61fe20708e_3" [label="3:  DeclStmt \n   n$0=_fun___new_array((sizeof(class constructor_new::Person ) * 10):unsigned long ) [line 95]\n  _fun_constructor_new::Person_Person(n$0[0]:class constructor_new::Person *) [line 95]\n  _fun_constructor_new::Person_Person(n$0[1]:class constructor_new::Person *) [line 95]\n  _fun_constructor_new::Person_Person(n$0[2]:class constructor_new::Person *) [line 95]\n  _fun_constructor_new::Person_Person(n$0[3]:class constructor_new::Person *) [line 95]\n  _fun_constructor_new::Person_Person(n$0[4]:class constructor_new::Person *) [line 95]\n  _fun_constructor_new::Person_Person(n$0[5]:class constructor_new::Person *) [line 95]\n  _fun_constructor_new::Person_Person(n$0[6]:class constructor_new::Person *) [line 95]\n  _fun_constructor_new::Person_Person(n$0[7]:class constructor_new::Person *) [line 95]\n  _fun_constructor_new::Person_Person(n$0[8]:class constructor_new::Person *) [line 95]\n  _fun_constructor_new::Person_Person(n$0[9]:class constructor_new::Person *) [line 95]\n  *&tarray:class constructor_new::Person *=n$0 [line 95]\n " shape="box"]
+"constructor_new::array_of_person_with_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor.43b079732f75f01a275fca61fe20708e_3" [label="3:  DeclStmt \n   n$0=_fun___new_array((sizeof(class constructor_new::Person) * 10):unsigned long) [line 95]\n  _fun_constructor_new::Person_Person(n$0[0]:class constructor_new::Person*) [line 95]\n  _fun_constructor_new::Person_Person(n$0[1]:class constructor_new::Person*) [line 95]\n  _fun_constructor_new::Person_Person(n$0[2]:class constructor_new::Person*) [line 95]\n  _fun_constructor_new::Person_Person(n$0[3]:class constructor_new::Person*) [line 95]\n  _fun_constructor_new::Person_Person(n$0[4]:class constructor_new::Person*) [line 95]\n  _fun_constructor_new::Person_Person(n$0[5]:class constructor_new::Person*) [line 95]\n  _fun_constructor_new::Person_Person(n$0[6]:class constructor_new::Person*) [line 95]\n  _fun_constructor_new::Person_Person(n$0[7]:class constructor_new::Person*) [line 95]\n  _fun_constructor_new::Person_Person(n$0[8]:class constructor_new::Person*) [line 95]\n  _fun_constructor_new::Person_Person(n$0[9]:class constructor_new::Person*) [line 95]\n  *&tarray:class constructor_new::Person*=n$0 [line 95]\n " shape="box"]
 	
 
 	 "constructor_new::array_of_person_with_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor.43b079732f75f01a275fca61fe20708e_3" -> "constructor_new::array_of_person_with_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor.43b079732f75f01a275fca61fe20708e_2" ;
 "constructor_new::array_of_person_with_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor.43b079732f75f01a275fca61fe20708e_2" [label="2: Exit constructor_new::array_of_person_with_constant_size \n  " color=yellow style=filled]
 	
 
-"constructor_new::array_of_person_with_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor.43b079732f75f01a275fca61fe20708e_1" [label="1: Start constructor_new::array_of_person_with_constant_size\nFormals: \nLocals:  tarray:class constructor_new::Person * \n   DECLARE_LOCALS(&return,&tarray); [line 95]\n " color=yellow style=filled]
+"constructor_new::array_of_person_with_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor.43b079732f75f01a275fca61fe20708e_1" [label="1: Start constructor_new::array_of_person_with_constant_size\nFormals: \nLocals:  tarray:class constructor_new::Person* \n   DECLARE_LOCALS(&return,&tarray); [line 95]\n " color=yellow style=filled]
 	
 
 	 "constructor_new::array_of_person_with_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor.43b079732f75f01a275fca61fe20708e_1" -> "constructor_new::array_of_person_with_constant_size{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor.43b079732f75f01a275fca61fe20708e_3" ;
-"constructor_new::int_array_init{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_array_init.cbda12efb404348cca57517ad8da89cd_4" [label="4:  DeclStmt \n   n$10=_fun___new_array((sizeof(int ) * 100):unsigned long ) [line 85]\n  *n$10[0]:int =1 [line 85]\n  *n$10[1]:int =2 [line 85]\n  *n$10[2]:int =3 [line 85]\n  *n$10[3]:int =4 [line 85]\n  *n$10[4]:int =5 [line 85]\n  *n$10[5]:int =6 [line 85]\n  *n$10[6]:int =7 [line 85]\n  *n$10[7]:int =8 [line 85]\n  *n$10[8]:int =9 [line 85]\n  *n$10[9]:int =10 [line 85]\n  *&arr:int *=n$10 [line 85]\n " shape="box"]
+"constructor_new::int_array_init{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_array_init.cbda12efb404348cca57517ad8da89cd_4" [label="4:  DeclStmt \n   n$10=_fun___new_array((sizeof(int) * 100):unsigned long) [line 85]\n  *n$10[0]:int=1 [line 85]\n  *n$10[1]:int=2 [line 85]\n  *n$10[2]:int=3 [line 85]\n  *n$10[3]:int=4 [line 85]\n  *n$10[4]:int=5 [line 85]\n  *n$10[5]:int=6 [line 85]\n  *n$10[6]:int=7 [line 85]\n  *n$10[7]:int=8 [line 85]\n  *n$10[8]:int=9 [line 85]\n  *n$10[9]:int=10 [line 85]\n  *&arr:int*=n$10 [line 85]\n " shape="box"]
 	
 
 	 "constructor_new::int_array_init{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_array_init.cbda12efb404348cca57517ad8da89cd_4" -> "constructor_new::int_array_init{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_array_init.cbda12efb404348cca57517ad8da89cd_3" ;
-"constructor_new::int_array_init{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_array_init.cbda12efb404348cca57517ad8da89cd_3" [label="3:  Return Stmt \n   n$0=*&arr:int * [line 86]\n  n$1=*n$0[0]:int  [line 86]\n  n$2=*&arr:int * [line 86]\n  n$3=*n$2[1]:int  [line 86]\n  n$4=*&arr:int * [line 86]\n  n$5=*n$4[2]:int  [line 86]\n  n$6=*&arr:int * [line 86]\n  n$7=*n$6[3]:int  [line 86]\n  n$8=*&arr:int * [line 86]\n  n$9=*n$8[4]:int  [line 86]\n  *&return:int =(1 / (((((n$1 + n$3) + n$5) + n$7) + n$9) - 15)) [line 86]\n " shape="box"]
+"constructor_new::int_array_init{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_array_init.cbda12efb404348cca57517ad8da89cd_3" [label="3:  Return Stmt \n   n$0=*&arr:int* [line 86]\n  n$1=*n$0[0]:int [line 86]\n  n$2=*&arr:int* [line 86]\n  n$3=*n$2[1]:int [line 86]\n  n$4=*&arr:int* [line 86]\n  n$5=*n$4[2]:int [line 86]\n  n$6=*&arr:int* [line 86]\n  n$7=*n$6[3]:int [line 86]\n  n$8=*&arr:int* [line 86]\n  n$9=*n$8[4]:int [line 86]\n  *&return:int=(1 / (((((n$1 + n$3) + n$5) + n$7) + n$9) - 15)) [line 86]\n " shape="box"]
 	
 
 	 "constructor_new::int_array_init{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_array_init.cbda12efb404348cca57517ad8da89cd_3" -> "constructor_new::int_array_init{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_array_init.cbda12efb404348cca57517ad8da89cd_2" ;
 "constructor_new::int_array_init{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_array_init.cbda12efb404348cca57517ad8da89cd_2" [label="2: Exit constructor_new::int_array_init \n  " color=yellow style=filled]
 	
 
-"constructor_new::int_array_init{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_array_init.cbda12efb404348cca57517ad8da89cd_1" [label="1: Start constructor_new::int_array_init\nFormals: \nLocals:  arr:int * \n   DECLARE_LOCALS(&return,&arr); [line 84]\n " color=yellow style=filled]
+"constructor_new::int_array_init{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_array_init.cbda12efb404348cca57517ad8da89cd_1" [label="1: Start constructor_new::int_array_init\nFormals: \nLocals:  arr:int* \n   DECLARE_LOCALS(&return,&arr); [line 84]\n " color=yellow style=filled]
 	
 
 	 "constructor_new::int_array_init{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_array_init.cbda12efb404348cca57517ad8da89cd_1" -> "constructor_new::int_array_init{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new14int_array_init.cbda12efb404348cca57517ad8da89cd_4" ;
-"constructor_new::constructor_3_args_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new27c.d39569c51b912b8f10bb1e6f48fa5551_4" [label="4:  DeclStmt \n   n$2=_fun___new(sizeof(class constructor_new::Person ):unsigned long ) [line 35]\n  _fun_constructor_new::Person_Person(n$2:class constructor_new::Person *,5:int ,6:int ,7:int ) [line 35]\n  *&p:class constructor_new::Person *=n$2 [line 35]\n " shape="box"]
+"constructor_new::constructor_3_args_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new27c.d39569c51b912b8f10bb1e6f48fa5551_4" [label="4:  DeclStmt \n   n$2=_fun___new(sizeof(class constructor_new::Person):unsigned long) [line 35]\n  _fun_constructor_new::Person_Person(n$2:class constructor_new::Person*,5:int,6:int,7:int) [line 35]\n  *&p:class constructor_new::Person*=n$2 [line 35]\n " shape="box"]
 	
 
 	 "constructor_new::constructor_3_args_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new27c.d39569c51b912b8f10bb1e6f48fa5551_4" -> "constructor_new::constructor_3_args_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new27c.d39569c51b912b8f10bb1e6f48fa5551_3" ;
-"constructor_new::constructor_3_args_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new27c.d39569c51b912b8f10bb1e6f48fa5551_3" [label="3:  Return Stmt \n   n$0=*&p:class constructor_new::Person * [line 36]\n  n$1=*n$0.z:int  [line 36]\n  *&return:int =(1 / (n$1 - 7)) [line 36]\n " shape="box"]
+"constructor_new::constructor_3_args_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new27c.d39569c51b912b8f10bb1e6f48fa5551_3" [label="3:  Return Stmt \n   n$0=*&p:class constructor_new::Person* [line 36]\n  n$1=*n$0.z:int [line 36]\n  *&return:int=(1 / (n$1 - 7)) [line 36]\n " shape="box"]
 	
 
 	 "constructor_new::constructor_3_args_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new27c.d39569c51b912b8f10bb1e6f48fa5551_3" -> "constructor_new::constructor_3_args_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new27c.d39569c51b912b8f10bb1e6f48fa5551_2" ;
 "constructor_new::constructor_3_args_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new27c.d39569c51b912b8f10bb1e6f48fa5551_2" [label="2: Exit constructor_new::constructor_3_args_new_div0 \n  " color=yellow style=filled]
 	
 
-"constructor_new::constructor_3_args_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new27c.d39569c51b912b8f10bb1e6f48fa5551_1" [label="1: Start constructor_new::constructor_3_args_new_div0\nFormals: \nLocals:  p:class constructor_new::Person * \n   DECLARE_LOCALS(&return,&p); [line 34]\n " color=yellow style=filled]
+"constructor_new::constructor_3_args_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new27c.d39569c51b912b8f10bb1e6f48fa5551_1" [label="1: Start constructor_new::constructor_3_args_new_div0\nFormals: \nLocals:  p:class constructor_new::Person* \n   DECLARE_LOCALS(&return,&p); [line 34]\n " color=yellow style=filled]
 	
 
 	 "constructor_new::constructor_3_args_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new27c.d39569c51b912b8f10bb1e6f48fa5551_1" -> "constructor_new::constructor_3_args_new_div0{d41d8cd98f00b204e9800998ecf8427e_ZN15constructor_new27c.d39569c51b912b8f10bb1e6f48fa5551_4" ;

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

@@ -1,6 +1,6 @@
 /* @generated */
 digraph iCFG {
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  DeclStmt \n   *&0$?%__sil_tmpSIL_init_list__n$0.top:int =0 [line 17]\n  *&0$?%__sil_tmpSIL_init_list__n$0.left:int =0 [line 17]\n  *&0$?%__sil_tmpSIL_init_list__n$0.bottom:int =0 [line 17]\n  *&0$?%__sil_tmpSIL_init_list__n$0.right:int =0 [line 17]\n  _fun_Person_Person(&p:class Person *,&0$?%__sil_tmpSIL_init_list__n$0:class Insets ) [line 17]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  DeclStmt \n   *&0$?%__sil_tmpSIL_init_list__n$0.top:int=0 [line 17]\n  *&0$?%__sil_tmpSIL_init_list__n$0.left:int=0 [line 17]\n  *&0$?%__sil_tmpSIL_init_list__n$0.bottom:int=0 [line 17]\n  *&0$?%__sil_tmpSIL_init_list__n$0.right:int=0 [line 17]\n  _fun_Person_Person(&p:class Person*,&0$?%__sil_tmpSIL_init_list__n$0:class Insets) [line 17]\n " shape="box"]
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" ;
@@ -11,14 +11,14 @@ digraph iCFG {
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
-"Person_Person{_ZN6PersonC1E6Insets}.178b2491062f631fdf79c9e9475774c1_3" [label="3:  Constructor Init \n   n$0=*&this:class Person * [line 14]\n  n$1=*&l:class Insets & [line 14]\n  n$2=*n$1.top:int  [line 14]\n  *n$0.age:int =n$2 [line 14]\n " shape="box"]
+"Person_Person{_ZN6PersonC1E6Insets}.178b2491062f631fdf79c9e9475774c1_3" [label="3:  Constructor Init \n   n$0=*&this:class Person* [line 14]\n  n$1=*&l:class Insets& [line 14]\n  n$2=*n$1.top:int [line 14]\n  *n$0.age:int=n$2 [line 14]\n " shape="box"]
 	
 
 	 "Person_Person{_ZN6PersonC1E6Insets}.178b2491062f631fdf79c9e9475774c1_3" -> "Person_Person{_ZN6PersonC1E6Insets}.178b2491062f631fdf79c9e9475774c1_2" ;
 "Person_Person{_ZN6PersonC1E6Insets}.178b2491062f631fdf79c9e9475774c1_2" [label="2: Exit Person_Person \n  " color=yellow style=filled]
 	
 
-"Person_Person{_ZN6PersonC1E6Insets}.178b2491062f631fdf79c9e9475774c1_1" [label="1: Start Person_Person\nFormals:  this:class Person * l:class Insets &\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
+"Person_Person{_ZN6PersonC1E6Insets}.178b2491062f631fdf79c9e9475774c1_1" [label="1: Start Person_Person\nFormals:  this:class Person* l:class Insets&\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
 	
 
 	 "Person_Person{_ZN6PersonC1E6Insets}.178b2491062f631fdf79c9e9475774c1_1" -> "Person_Person{_ZN6PersonC1E6Insets}.178b2491062f631fdf79c9e9475774c1_3" ;

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

@@ -1,32 +1,32 @@
 /* @generated */
 digraph iCFG {
-"constructor_with_body::X_init(_ZN21constructor_with_body1X4initEv).a4b1415815341c1571fba5d00892033f_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class constructor_with_body::X * [line 14]\n  *n$0.f:int =0 [line 14]\n " shape="box"]
+"constructor_with_body::X_init(_ZN21constructor_with_body1X4initEv).a4b1415815341c1571fba5d00892033f_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class constructor_with_body::X* [line 14]\n  *n$0.f:int=0 [line 14]\n " shape="box"]
 	
 
 	 "constructor_with_body::X_init(_ZN21constructor_with_body1X4initEv).a4b1415815341c1571fba5d00892033f_3" -> "constructor_with_body::X_init(_ZN21constructor_with_body1X4initEv).a4b1415815341c1571fba5d00892033f_2" ;
 "constructor_with_body::X_init(_ZN21constructor_with_body1X4initEv).a4b1415815341c1571fba5d00892033f_2" [label="2: Exit constructor_with_body::X_init \n  " color=yellow style=filled]
 	
 
-"constructor_with_body::X_init(_ZN21constructor_with_body1X4initEv).a4b1415815341c1571fba5d00892033f_1" [label="1: Start constructor_with_body::X_init\nFormals:  this:class constructor_with_body::X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
+"constructor_with_body::X_init(_ZN21constructor_with_body1X4initEv).a4b1415815341c1571fba5d00892033f_1" [label="1: Start constructor_with_body::X_init\nFormals:  this:class constructor_with_body::X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
 	
 
 	 "constructor_with_body::X_init(_ZN21constructor_with_body1X4initEv).a4b1415815341c1571fba5d00892033f_1" -> "constructor_with_body::X_init(_ZN21constructor_with_body1X4initEv).a4b1415815341c1571fba5d00892033f_3" ;
-"constructor_with_body::X_div(_ZN21constructor_with_body1X3divEv).013e59e82029af6304fe56228d9a9441_3" [label="3:  Return Stmt \n   n$0=*&this:class constructor_with_body::X * [line 21]\n  n$1=*n$0.f:int  [line 21]\n  *&return:int =(1 / n$1) [line 21]\n " shape="box"]
+"constructor_with_body::X_div(_ZN21constructor_with_body1X3divEv).013e59e82029af6304fe56228d9a9441_3" [label="3:  Return Stmt \n   n$0=*&this:class constructor_with_body::X* [line 21]\n  n$1=*n$0.f:int [line 21]\n  *&return:int=(1 / n$1) [line 21]\n " shape="box"]
 	
 
 	 "constructor_with_body::X_div(_ZN21constructor_with_body1X3divEv).013e59e82029af6304fe56228d9a9441_3" -> "constructor_with_body::X_div(_ZN21constructor_with_body1X3divEv).013e59e82029af6304fe56228d9a9441_2" ;
 "constructor_with_body::X_div(_ZN21constructor_with_body1X3divEv).013e59e82029af6304fe56228d9a9441_2" [label="2: Exit constructor_with_body::X_div \n  " color=yellow style=filled]
 	
 
-"constructor_with_body::X_div(_ZN21constructor_with_body1X3divEv).013e59e82029af6304fe56228d9a9441_1" [label="1: Start constructor_with_body::X_div\nFormals:  this:class constructor_with_body::X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 21]\n " color=yellow style=filled]
+"constructor_with_body::X_div(_ZN21constructor_with_body1X3divEv).013e59e82029af6304fe56228d9a9441_1" [label="1: Start constructor_with_body::X_div\nFormals:  this:class constructor_with_body::X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 21]\n " color=yellow style=filled]
 	
 
 	 "constructor_with_body::X_div(_ZN21constructor_with_body1X3divEv).013e59e82029af6304fe56228d9a9441_1" -> "constructor_with_body::X_div(_ZN21constructor_with_body1X3divEv).013e59e82029af6304fe56228d9a9441_3" ;
-"constructor_with_body::test_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21constructor_with_body9test_div.47cd8983302bd2a036476649ed5e67e2_4" [label="4:  DeclStmt \n   _fun_constructor_with_body::X_X(&x:class constructor_with_body::X *,0:int ,1:int ) [line 41]\n " shape="box"]
+"constructor_with_body::test_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21constructor_with_body9test_div.47cd8983302bd2a036476649ed5e67e2_4" [label="4:  DeclStmt \n   _fun_constructor_with_body::X_X(&x:class constructor_with_body::X*,0:int,1:int) [line 41]\n " shape="box"]
 	
 
 	 "constructor_with_body::test_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21constructor_with_body9test_div.47cd8983302bd2a036476649ed5e67e2_4" -> "constructor_with_body::test_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21constructor_with_body9test_div.47cd8983302bd2a036476649ed5e67e2_3" ;
-"constructor_with_body::test_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21constructor_with_body9test_div.47cd8983302bd2a036476649ed5e67e2_3" [label="3:  Call _fun_constructor_with_body::X_div \n   _=*&x:class constructor_with_body::X  [line 42]\n  n$1=_fun_constructor_with_body::X_div(&x:class constructor_with_body::X &) [line 42]\n " shape="box"]
+"constructor_with_body::test_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21constructor_with_body9test_div.47cd8983302bd2a036476649ed5e67e2_3" [label="3:  Call _fun_constructor_with_body::X_div \n   _=*&x:class constructor_with_body::X [line 42]\n  n$1=_fun_constructor_with_body::X_div(&x:class constructor_with_body::X&) [line 42]\n " shape="box"]
 	
 
 	 "constructor_with_body::test_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21constructor_with_body9test_div.47cd8983302bd2a036476649ed5e67e2_3" -> "constructor_with_body::test_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21constructor_with_body9test_div.47cd8983302bd2a036476649ed5e67e2_2" ;
@@ -37,41 +37,41 @@ digraph iCFG {
 	
 
 	 "constructor_with_body::test_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21constructor_with_body9test_div.47cd8983302bd2a036476649ed5e67e2_1" -> "constructor_with_body::test_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21constructor_with_body9test_div.47cd8983302bd2a036476649ed5e67e2_4" ;
-"constructor_with_body::X_X{_ZN21constructor_with_body1XC1Eii}.5d491c6deba9d56c30b1893fa1925162_5" [label="5:  DeclStmt \n   n$4=*&a:int  [line 25]\n  n$5=*&b:int  [line 25]\n  *&c:int =(n$4 + n$5) [line 25]\n " shape="box"]
+"constructor_with_body::X_X{_ZN21constructor_with_body1XC1Eii}.5d491c6deba9d56c30b1893fa1925162_5" [label="5:  DeclStmt \n   n$4=*&a:int [line 25]\n  n$5=*&b:int [line 25]\n  *&c:int=(n$4 + n$5) [line 25]\n " shape="box"]
 	
 
 	 "constructor_with_body::X_X{_ZN21constructor_with_body1XC1Eii}.5d491c6deba9d56c30b1893fa1925162_5" -> "constructor_with_body::X_X{_ZN21constructor_with_body1XC1Eii}.5d491c6deba9d56c30b1893fa1925162_4" ;
-"constructor_with_body::X_X{_ZN21constructor_with_body1XC1Eii}.5d491c6deba9d56c30b1893fa1925162_4" [label="4:  Call _fun_constructor_with_body::X_init \n   n$2=*&this:class constructor_with_body::X * [line 26]\n  _=*n$2:class constructor_with_body::X  [line 26]\n  _fun_constructor_with_body::X_init(n$2:class constructor_with_body::X *) [line 26]\n " shape="box"]
+"constructor_with_body::X_X{_ZN21constructor_with_body1XC1Eii}.5d491c6deba9d56c30b1893fa1925162_4" [label="4:  Call _fun_constructor_with_body::X_init \n   n$2=*&this:class constructor_with_body::X* [line 26]\n  _=*n$2:class constructor_with_body::X [line 26]\n  _fun_constructor_with_body::X_init(n$2:class constructor_with_body::X*) [line 26]\n " shape="box"]
 	
 
 	 "constructor_with_body::X_X{_ZN21constructor_with_body1XC1Eii}.5d491c6deba9d56c30b1893fa1925162_4" -> "constructor_with_body::X_X{_ZN21constructor_with_body1XC1Eii}.5d491c6deba9d56c30b1893fa1925162_3" ;
-"constructor_with_body::X_X{_ZN21constructor_with_body1XC1Eii}.5d491c6deba9d56c30b1893fa1925162_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class constructor_with_body::X * [line 27]\n  n$1=*&c:int  [line 27]\n  *n$0.f:int =n$1 [line 27]\n " shape="box"]
+"constructor_with_body::X_X{_ZN21constructor_with_body1XC1Eii}.5d491c6deba9d56c30b1893fa1925162_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class constructor_with_body::X* [line 27]\n  n$1=*&c:int [line 27]\n  *n$0.f:int=n$1 [line 27]\n " shape="box"]
 	
 
 	 "constructor_with_body::X_X{_ZN21constructor_with_body1XC1Eii}.5d491c6deba9d56c30b1893fa1925162_3" -> "constructor_with_body::X_X{_ZN21constructor_with_body1XC1Eii}.5d491c6deba9d56c30b1893fa1925162_2" ;
 "constructor_with_body::X_X{_ZN21constructor_with_body1XC1Eii}.5d491c6deba9d56c30b1893fa1925162_2" [label="2: Exit constructor_with_body::X_X \n  " color=yellow style=filled]
 	
 
-"constructor_with_body::X_X{_ZN21constructor_with_body1XC1Eii}.5d491c6deba9d56c30b1893fa1925162_1" [label="1: Start constructor_with_body::X_X\nFormals:  this:class constructor_with_body::X * a:int  b:int \nLocals:  c:int  \n   DECLARE_LOCALS(&return,&c); [line 24]\n " color=yellow style=filled]
+"constructor_with_body::X_X{_ZN21constructor_with_body1XC1Eii}.5d491c6deba9d56c30b1893fa1925162_1" [label="1: Start constructor_with_body::X_X\nFormals:  this:class constructor_with_body::X* a:int b:int\nLocals:  c:int \n   DECLARE_LOCALS(&return,&c); [line 24]\n " color=yellow style=filled]
 	
 
 	 "constructor_with_body::X_X{_ZN21constructor_with_body1XC1Eii}.5d491c6deba9d56c30b1893fa1925162_1" -> "constructor_with_body::X_X{_ZN21constructor_with_body1XC1Eii}.5d491c6deba9d56c30b1893fa1925162_5" ;
-"constructor_with_body::X_X{_ZN21constructor_with_body1XC1Ev}.fab61542b5e3338152a9ce3e83b292c1_3" [label="3:  Call _fun_constructor_with_body::X_init \n   n$0=*&this:class constructor_with_body::X * [line 17]\n  _=*n$0:class constructor_with_body::X  [line 17]\n  _fun_constructor_with_body::X_init(n$0:class constructor_with_body::X *) [line 17]\n " shape="box"]
+"constructor_with_body::X_X{_ZN21constructor_with_body1XC1Ev}.fab61542b5e3338152a9ce3e83b292c1_3" [label="3:  Call _fun_constructor_with_body::X_init \n   n$0=*&this:class constructor_with_body::X* [line 17]\n  _=*n$0:class constructor_with_body::X [line 17]\n  _fun_constructor_with_body::X_init(n$0:class constructor_with_body::X*) [line 17]\n " shape="box"]
 	
 
 	 "constructor_with_body::X_X{_ZN21constructor_with_body1XC1Ev}.fab61542b5e3338152a9ce3e83b292c1_3" -> "constructor_with_body::X_X{_ZN21constructor_with_body1XC1Ev}.fab61542b5e3338152a9ce3e83b292c1_2" ;
 "constructor_with_body::X_X{_ZN21constructor_with_body1XC1Ev}.fab61542b5e3338152a9ce3e83b292c1_2" [label="2: Exit constructor_with_body::X_X \n  " color=yellow style=filled]
 	
 
-"constructor_with_body::X_X{_ZN21constructor_with_body1XC1Ev}.fab61542b5e3338152a9ce3e83b292c1_1" [label="1: Start constructor_with_body::X_X\nFormals:  this:class constructor_with_body::X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
+"constructor_with_body::X_X{_ZN21constructor_with_body1XC1Ev}.fab61542b5e3338152a9ce3e83b292c1_1" [label="1: Start constructor_with_body::X_X\nFormals:  this:class constructor_with_body::X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
 	
 
 	 "constructor_with_body::X_X{_ZN21constructor_with_body1XC1Ev}.fab61542b5e3338152a9ce3e83b292c1_1" -> "constructor_with_body::X_X{_ZN21constructor_with_body1XC1Ev}.fab61542b5e3338152a9ce3e83b292c1_3" ;
-"constructor_with_body::test_div0_default_constructor{d41d8cd98f00b204e9800998ecf8427e_ZN21constructo.48f03f3d51ace6003d29d7d848bbb880_4" [label="4:  DeclStmt \n   _fun_constructor_with_body::X_X(&x:class constructor_with_body::X *) [line 36]\n " shape="box"]
+"constructor_with_body::test_div0_default_constructor{d41d8cd98f00b204e9800998ecf8427e_ZN21constructo.48f03f3d51ace6003d29d7d848bbb880_4" [label="4:  DeclStmt \n   _fun_constructor_with_body::X_X(&x:class constructor_with_body::X*) [line 36]\n " shape="box"]
 	
 
 	 "constructor_with_body::test_div0_default_constructor{d41d8cd98f00b204e9800998ecf8427e_ZN21constructo.48f03f3d51ace6003d29d7d848bbb880_4" -> "constructor_with_body::test_div0_default_constructor{d41d8cd98f00b204e9800998ecf8427e_ZN21constructo.48f03f3d51ace6003d29d7d848bbb880_3" ;
-"constructor_with_body::test_div0_default_constructor{d41d8cd98f00b204e9800998ecf8427e_ZN21constructo.48f03f3d51ace6003d29d7d848bbb880_3" [label="3:  Call _fun_constructor_with_body::X_div \n   _=*&x:class constructor_with_body::X  [line 37]\n  n$1=_fun_constructor_with_body::X_div(&x:class constructor_with_body::X &) [line 37]\n " shape="box"]
+"constructor_with_body::test_div0_default_constructor{d41d8cd98f00b204e9800998ecf8427e_ZN21constructo.48f03f3d51ace6003d29d7d848bbb880_3" [label="3:  Call _fun_constructor_with_body::X_div \n   _=*&x:class constructor_with_body::X [line 37]\n  n$1=_fun_constructor_with_body::X_div(&x:class constructor_with_body::X&) [line 37]\n " shape="box"]
 	
 
 	 "constructor_with_body::test_div0_default_constructor{d41d8cd98f00b204e9800998ecf8427e_ZN21constructo.48f03f3d51ace6003d29d7d848bbb880_3" -> "constructor_with_body::test_div0_default_constructor{d41d8cd98f00b204e9800998ecf8427e_ZN21constructo.48f03f3d51ace6003d29d7d848bbb880_2" ;
@@ -82,11 +82,11 @@ digraph iCFG {
 	
 
 	 "constructor_with_body::test_div0_default_constructor{d41d8cd98f00b204e9800998ecf8427e_ZN21constructo.48f03f3d51ace6003d29d7d848bbb880_1" -> "constructor_with_body::test_div0_default_constructor{d41d8cd98f00b204e9800998ecf8427e_ZN21constructo.48f03f3d51ace6003d29d7d848bbb880_4" ;
-"constructor_with_body::test_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21constructor_with_body9test_div.af736390f22d9dcebbfc405ec2a926d0_4" [label="4:  DeclStmt \n   _fun_constructor_with_body::X_X(&x:class constructor_with_body::X *,-2:int ,2:int ) [line 31]\n " shape="box"]
+"constructor_with_body::test_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21constructor_with_body9test_div.af736390f22d9dcebbfc405ec2a926d0_4" [label="4:  DeclStmt \n   _fun_constructor_with_body::X_X(&x:class constructor_with_body::X*,-2:int,2:int) [line 31]\n " shape="box"]
 	
 
 	 "constructor_with_body::test_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21constructor_with_body9test_div.af736390f22d9dcebbfc405ec2a926d0_4" -> "constructor_with_body::test_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21constructor_with_body9test_div.af736390f22d9dcebbfc405ec2a926d0_3" ;
-"constructor_with_body::test_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21constructor_with_body9test_div.af736390f22d9dcebbfc405ec2a926d0_3" [label="3:  Call _fun_constructor_with_body::X_div \n   _=*&x:class constructor_with_body::X  [line 32]\n  n$1=_fun_constructor_with_body::X_div(&x:class constructor_with_body::X &) [line 32]\n " shape="box"]
+"constructor_with_body::test_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21constructor_with_body9test_div.af736390f22d9dcebbfc405ec2a926d0_3" [label="3:  Call _fun_constructor_with_body::X_div \n   _=*&x:class constructor_with_body::X [line 32]\n  n$1=_fun_constructor_with_body::X_div(&x:class constructor_with_body::X&) [line 32]\n " shape="box"]
 	
 
 	 "constructor_with_body::test_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21constructor_with_body9test_div.af736390f22d9dcebbfc405ec2a926d0_3" -> "constructor_with_body::test_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21constructor_with_body9test_div.af736390f22d9dcebbfc405ec2a926d0_2" ;

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

@@ -1,25 +1,25 @@
 /* @generated */
 digraph iCFG {
-"copy_move_constructor::getX{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getXEi}.00dad5067c368ba669fb710d5cb310c7_5" [label="5:  DeclStmt \n   _fun_copy_move_constructor::X_X(&x:class copy_move_constructor::X *) [line 30]\n " shape="box"]
+"copy_move_constructor::getX{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getXEi}.00dad5067c368ba669fb710d5cb310c7_5" [label="5:  DeclStmt \n   _fun_copy_move_constructor::X_X(&x:class copy_move_constructor::X*) [line 30]\n " shape="box"]
 	
 
 	 "copy_move_constructor::getX{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getXEi}.00dad5067c368ba669fb710d5cb310c7_5" -> "copy_move_constructor::getX{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getXEi}.00dad5067c368ba669fb710d5cb310c7_4" ;
-"copy_move_constructor::getX{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getXEi}.00dad5067c368ba669fb710d5cb310c7_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&f:int  [line 31]\n  *&x.f:int =n$1 [line 31]\n " shape="box"]
+"copy_move_constructor::getX{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getXEi}.00dad5067c368ba669fb710d5cb310c7_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&f:int [line 31]\n  *&x.f:int=n$1 [line 31]\n " shape="box"]
 	
 
 	 "copy_move_constructor::getX{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getXEi}.00dad5067c368ba669fb710d5cb310c7_4" -> "copy_move_constructor::getX{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getXEi}.00dad5067c368ba669fb710d5cb310c7_3" ;
-"copy_move_constructor::getX{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getXEi}.00dad5067c368ba669fb710d5cb310c7_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class copy_move_constructor::X * [line 32]\n  _fun_copy_move_constructor::X_X(n$0:class copy_move_constructor::X *,&x:class copy_move_constructor::X &) [line 32]\n " shape="box"]
+"copy_move_constructor::getX{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getXEi}.00dad5067c368ba669fb710d5cb310c7_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class copy_move_constructor::X* [line 32]\n  _fun_copy_move_constructor::X_X(n$0:class copy_move_constructor::X*,&x:class copy_move_constructor::X&) [line 32]\n " shape="box"]
 	
 
 	 "copy_move_constructor::getX{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getXEi}.00dad5067c368ba669fb710d5cb310c7_3" -> "copy_move_constructor::getX{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getXEi}.00dad5067c368ba669fb710d5cb310c7_2" ;
 "copy_move_constructor::getX{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getXEi}.00dad5067c368ba669fb710d5cb310c7_2" [label="2: Exit copy_move_constructor::getX \n  " color=yellow style=filled]
 	
 
-"copy_move_constructor::getX{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getXEi}.00dad5067c368ba669fb710d5cb310c7_1" [label="1: Start copy_move_constructor::getX\nFormals:  f:int  __return_param:class copy_move_constructor::X *\nLocals:  x:class copy_move_constructor::X  \n   DECLARE_LOCALS(&return,&x); [line 29]\n " color=yellow style=filled]
+"copy_move_constructor::getX{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getXEi}.00dad5067c368ba669fb710d5cb310c7_1" [label="1: Start copy_move_constructor::getX\nFormals:  f:int __return_param:class copy_move_constructor::X*\nLocals:  x:class copy_move_constructor::X \n   DECLARE_LOCALS(&return,&x); [line 29]\n " color=yellow style=filled]
 	
 
 	 "copy_move_constructor::getX{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getXEi}.00dad5067c368ba669fb710d5cb310c7_1" -> "copy_move_constructor::getX{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getXEi}.00dad5067c368ba669fb710d5cb310c7_5" ;
-"copy_move_constructor::moveY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10moveY_.7a545f412923a1583673932ecf1ee3f4_3" [label="3:  Return Stmt \n   _fun_copy_move_constructor::getY(1:int ,&0$?%__sil_tmp__temp_return_n$1:class copy_move_constructor::Y *) [line 57]\n  n$2=*&0$?%__sil_tmp__temp_return_n$1.f:int  [line 57]\n  *&return:int =(1 / n$2) [line 57]\n " shape="box"]
+"copy_move_constructor::moveY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10moveY_.7a545f412923a1583673932ecf1ee3f4_3" [label="3:  Return Stmt \n   _fun_copy_move_constructor::getY(1:int,&0$?%__sil_tmp__temp_return_n$1:class copy_move_constructor::Y*) [line 57]\n  n$2=*&0$?%__sil_tmp__temp_return_n$1.f:int [line 57]\n  *&return:int=(1 / n$2) [line 57]\n " shape="box"]
 	
 
 	 "copy_move_constructor::moveY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10moveY_.7a545f412923a1583673932ecf1ee3f4_3" -> "copy_move_constructor::moveY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10moveY_.7a545f412923a1583673932ecf1ee3f4_2" ;
@@ -30,7 +30,7 @@ digraph iCFG {
 	
 
 	 "copy_move_constructor::moveY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10moveY_.7a545f412923a1583673932ecf1ee3f4_1" -> "copy_move_constructor::moveY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10moveY_.7a545f412923a1583673932ecf1ee3f4_3" ;
-"copy_move_constructor::moveX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10moveX_.99c0b67eb8aef735644d369e52acdfba_3" [label="3:  Return Stmt \n   _fun_copy_move_constructor::getX(0:int ,&0$?%__sil_tmp__temp_return_n$1:class copy_move_constructor::X *) [line 48]\n  n$2=*&0$?%__sil_tmp__temp_return_n$1.f:int  [line 48]\n  *&return:int =(1 / n$2) [line 48]\n " shape="box"]
+"copy_move_constructor::moveX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10moveX_.99c0b67eb8aef735644d369e52acdfba_3" [label="3:  Return Stmt \n   _fun_copy_move_constructor::getX(0:int,&0$?%__sil_tmp__temp_return_n$1:class copy_move_constructor::X*) [line 48]\n  n$2=*&0$?%__sil_tmp__temp_return_n$1.f:int [line 48]\n  *&return:int=(1 / n$2) [line 48]\n " shape="box"]
 	
 
 	 "copy_move_constructor::moveX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10moveX_.99c0b67eb8aef735644d369e52acdfba_3" -> "copy_move_constructor::moveX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10moveX_.99c0b67eb8aef735644d369e52acdfba_2" ;
@@ -44,31 +44,31 @@ digraph iCFG {
 "copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1Ev}.eee3477952b6b0c121f13c26764fcc89_2" [label="2: Exit copy_move_constructor::Y_Y \n  " color=yellow style=filled]
 	
 
-"copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1Ev}.eee3477952b6b0c121f13c26764fcc89_1" [label="1: Start copy_move_constructor::Y_Y\nFormals:  this:class copy_move_constructor::Y *\nLocals:  \n   DECLARE_LOCALS(&return); [line 23]\n " color=yellow style=filled]
+"copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1Ev}.eee3477952b6b0c121f13c26764fcc89_1" [label="1: Start copy_move_constructor::Y_Y\nFormals:  this:class copy_move_constructor::Y*\nLocals:  \n   DECLARE_LOCALS(&return); [line 23]\n " color=yellow style=filled]
 	
 
 	 "copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1Ev}.eee3477952b6b0c121f13c26764fcc89_1" -> "copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1Ev}.eee3477952b6b0c121f13c26764fcc89_2" ;
-"copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_8" [label="8:  DeclStmt \n   _fun_copy_move_constructor::X_X(&x1:class copy_move_constructor::X *) [line 66]\n " shape="box"]
+"copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_8" [label="8:  DeclStmt \n   _fun_copy_move_constructor::X_X(&x1:class copy_move_constructor::X*) [line 66]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_8" -> "copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_7" ;
-"copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_7" [label="7:  BinaryOperatorStmt: Assign \n   *&x1.f:int =1 [line 67]\n " shape="box"]
+"copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_7" [label="7:  BinaryOperatorStmt: Assign \n   *&x1.f:int=1 [line 67]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_7" -> "copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_6" ;
-"copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_6" [label="6:  DeclStmt \n   _fun_copy_move_constructor::X_X(&x2:class copy_move_constructor::X *,&x1:class copy_move_constructor::X &) [line 68]\n " shape="box"]
+"copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_6" [label="6:  DeclStmt \n   _fun_copy_move_constructor::X_X(&x2:class copy_move_constructor::X*,&x1:class copy_move_constructor::X&) [line 68]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_6" -> "copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_5" ;
-"copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_5" [label="5:  DeclStmt \n   n$5=*&x2.f:int  [line 69]\n  *&d1:int =(1 / n$5) [line 69]\n " shape="box"]
+"copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_5" [label="5:  DeclStmt \n   n$5=*&x2.f:int [line 69]\n  *&d1:int=(1 / n$5) [line 69]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_5" -> "copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_4" ;
-"copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_4" [label="4:  DeclStmt \n   _fun_copy_move_constructor::getX(1:int ,&0$?%__sil_tmp__temp_return_n$3:class copy_move_constructor::X *) [line 70]\n  n$4=*&0$?%__sil_tmp__temp_return_n$3.f:int  [line 70]\n  *&d2:int =(1 / n$4) [line 70]\n " shape="box"]
+"copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_4" [label="4:  DeclStmt \n   _fun_copy_move_constructor::getX(1:int,&0$?%__sil_tmp__temp_return_n$3:class copy_move_constructor::X*) [line 70]\n  n$4=*&0$?%__sil_tmp__temp_return_n$3.f:int [line 70]\n  *&d2:int=(1 / n$4) [line 70]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_4" -> "copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_3" ;
-"copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_3" [label="3:  Return Stmt \n   n$0=*&d1:int  [line 71]\n  n$1=*&d2:int  [line 71]\n  *&return:int =(n$0 + n$1) [line 71]\n " shape="box"]
+"copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_3" [label="3:  Return Stmt \n   n$0=*&d1:int [line 71]\n  n$1=*&d2:int [line 71]\n  *&return:int=(n$0 + n$1) [line 71]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_3" -> "copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_2" ;
@@ -79,57 +79,57 @@ digraph iCFG {
 	
 
 	 "copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_1" -> "copy_move_constructor::copyX_moveX_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.6818480c14ebda6d041f6ae3e2f2de73_8" ;
-"copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1ERKS0_}.a1bb59feb4c97e47fb0df8989fc1ca51_3" [label="3:  Constructor Init \n   n$0=*&this:class copy_move_constructor::Y * [line 24]\n  n$1=*&y:class copy_move_constructor::Y & [line 24]\n  n$2=*n$1.f:int  [line 24]\n  *n$0.f:int =n$2 [line 24]\n " shape="box"]
+"copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1ERKS0_}.a1bb59feb4c97e47fb0df8989fc1ca51_3" [label="3:  Constructor Init \n   n$0=*&this:class copy_move_constructor::Y* [line 24]\n  n$1=*&y:class copy_move_constructor::Y& [line 24]\n  n$2=*n$1.f:int [line 24]\n  *n$0.f:int=n$2 [line 24]\n " shape="box"]
 	
 
 	 "copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1ERKS0_}.a1bb59feb4c97e47fb0df8989fc1ca51_3" -> "copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1ERKS0_}.a1bb59feb4c97e47fb0df8989fc1ca51_2" ;
 "copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1ERKS0_}.a1bb59feb4c97e47fb0df8989fc1ca51_2" [label="2: Exit copy_move_constructor::Y_Y \n  " color=yellow style=filled]
 	
 
-"copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1ERKS0_}.a1bb59feb4c97e47fb0df8989fc1ca51_1" [label="1: Start copy_move_constructor::Y_Y\nFormals:  this:class copy_move_constructor::Y * y:class copy_move_constructor::Y &\nLocals:  \n   DECLARE_LOCALS(&return); [line 24]\n " color=yellow style=filled]
+"copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1ERKS0_}.a1bb59feb4c97e47fb0df8989fc1ca51_1" [label="1: Start copy_move_constructor::Y_Y\nFormals:  this:class copy_move_constructor::Y* y:class copy_move_constructor::Y&\nLocals:  \n   DECLARE_LOCALS(&return); [line 24]\n " color=yellow style=filled]
 	
 
 	 "copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1ERKS0_}.a1bb59feb4c97e47fb0df8989fc1ca51_1" -> "copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1ERKS0_}.a1bb59feb4c97e47fb0df8989fc1ca51_3" ;
-"copy_move_constructor::getY{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getYEi}.faf5e349d9e93a3fbe406ba124a7d736_5" [label="5:  DeclStmt \n   _fun_copy_move_constructor::Y_Y(&y:class copy_move_constructor::Y *) [line 36]\n " shape="box"]
+"copy_move_constructor::getY{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getYEi}.faf5e349d9e93a3fbe406ba124a7d736_5" [label="5:  DeclStmt \n   _fun_copy_move_constructor::Y_Y(&y:class copy_move_constructor::Y*) [line 36]\n " shape="box"]
 	
 
 	 "copy_move_constructor::getY{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getYEi}.faf5e349d9e93a3fbe406ba124a7d736_5" -> "copy_move_constructor::getY{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getYEi}.faf5e349d9e93a3fbe406ba124a7d736_4" ;
-"copy_move_constructor::getY{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getYEi}.faf5e349d9e93a3fbe406ba124a7d736_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&f:int  [line 37]\n  *&y.f:int =n$1 [line 37]\n " shape="box"]
+"copy_move_constructor::getY{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getYEi}.faf5e349d9e93a3fbe406ba124a7d736_4" [label="4:  BinaryOperatorStmt: Assign \n   n$1=*&f:int [line 37]\n  *&y.f:int=n$1 [line 37]\n " shape="box"]
 	
 
 	 "copy_move_constructor::getY{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getYEi}.faf5e349d9e93a3fbe406ba124a7d736_4" -> "copy_move_constructor::getY{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getYEi}.faf5e349d9e93a3fbe406ba124a7d736_3" ;
-"copy_move_constructor::getY{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getYEi}.faf5e349d9e93a3fbe406ba124a7d736_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class copy_move_constructor::Y * [line 38]\n  _fun_copy_move_constructor::Y_Y(n$0:class copy_move_constructor::Y *,&y:class copy_move_constructor::Y &) [line 38]\n " shape="box"]
+"copy_move_constructor::getY{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getYEi}.faf5e349d9e93a3fbe406ba124a7d736_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class copy_move_constructor::Y* [line 38]\n  _fun_copy_move_constructor::Y_Y(n$0:class copy_move_constructor::Y*,&y:class copy_move_constructor::Y&) [line 38]\n " shape="box"]
 	
 
 	 "copy_move_constructor::getY{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getYEi}.faf5e349d9e93a3fbe406ba124a7d736_3" -> "copy_move_constructor::getY{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getYEi}.faf5e349d9e93a3fbe406ba124a7d736_2" ;
 "copy_move_constructor::getY{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getYEi}.faf5e349d9e93a3fbe406ba124a7d736_2" [label="2: Exit copy_move_constructor::getY \n  " color=yellow style=filled]
 	
 
-"copy_move_constructor::getY{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getYEi}.faf5e349d9e93a3fbe406ba124a7d736_1" [label="1: Start copy_move_constructor::getY\nFormals:  f:int  __return_param:class copy_move_constructor::Y *\nLocals:  y:class copy_move_constructor::Y  \n   DECLARE_LOCALS(&return,&y); [line 35]\n " color=yellow style=filled]
+"copy_move_constructor::getY{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getYEi}.faf5e349d9e93a3fbe406ba124a7d736_1" [label="1: Start copy_move_constructor::getY\nFormals:  f:int __return_param:class copy_move_constructor::Y*\nLocals:  y:class copy_move_constructor::Y \n   DECLARE_LOCALS(&return,&y); [line 35]\n " color=yellow style=filled]
 	
 
 	 "copy_move_constructor::getY{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getYEi}.faf5e349d9e93a3fbe406ba124a7d736_1" -> "copy_move_constructor::getY{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor4getYEi}.faf5e349d9e93a3fbe406ba124a7d736_5" ;
-"copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_8" [label="8:  DeclStmt \n   _fun_copy_move_constructor::Y_Y(&y1:class copy_move_constructor::Y *) [line 75]\n " shape="box"]
+"copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_8" [label="8:  DeclStmt \n   _fun_copy_move_constructor::Y_Y(&y1:class copy_move_constructor::Y*) [line 75]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_8" -> "copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_7" ;
-"copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_7" [label="7:  BinaryOperatorStmt: Assign \n   *&y1.f:int =1 [line 76]\n " shape="box"]
+"copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_7" [label="7:  BinaryOperatorStmt: Assign \n   *&y1.f:int=1 [line 76]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_7" -> "copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_6" ;
-"copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_6" [label="6:  DeclStmt \n   _fun_copy_move_constructor::Y_Y(&y2:class copy_move_constructor::Y *,&y1:class copy_move_constructor::Y &) [line 77]\n " shape="box"]
+"copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_6" [label="6:  DeclStmt \n   _fun_copy_move_constructor::Y_Y(&y2:class copy_move_constructor::Y*,&y1:class copy_move_constructor::Y&) [line 77]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_6" -> "copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_5" ;
-"copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_5" [label="5:  DeclStmt \n   n$5=*&y2.f:int  [line 78]\n  *&d1:int =(1 / n$5) [line 78]\n " shape="box"]
+"copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_5" [label="5:  DeclStmt \n   n$5=*&y2.f:int [line 78]\n  *&d1:int=(1 / n$5) [line 78]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_5" -> "copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_4" ;
-"copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_4" [label="4:  DeclStmt \n   _fun_copy_move_constructor::getY(2:int ,&0$?%__sil_tmp__temp_return_n$3:class copy_move_constructor::Y *) [line 79]\n  n$4=*&0$?%__sil_tmp__temp_return_n$3.f:int  [line 79]\n  *&d2:int =(1 / n$4) [line 79]\n " shape="box"]
+"copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_4" [label="4:  DeclStmt \n   _fun_copy_move_constructor::getY(2:int,&0$?%__sil_tmp__temp_return_n$3:class copy_move_constructor::Y*) [line 79]\n  n$4=*&0$?%__sil_tmp__temp_return_n$3.f:int [line 79]\n  *&d2:int=(1 / n$4) [line 79]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_4" -> "copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_3" ;
-"copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_3" [label="3:  Return Stmt \n   n$0=*&d1:int  [line 80]\n  n$1=*&d2:int  [line 80]\n  *&return:int =(n$0 + n$1) [line 80]\n " shape="box"]
+"copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_3" [label="3:  Return Stmt \n   n$0=*&d1:int [line 80]\n  n$1=*&d2:int [line 80]\n  *&return:int=(n$0 + n$1) [line 80]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_3" -> "copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_2" ;
@@ -140,44 +140,44 @@ digraph iCFG {
 	
 
 	 "copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_1" -> "copy_move_constructor::copyY_moveY_div1{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor16.08592d3e50a2c3394f35cee31e9b17c2_8" ;
-"copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1ERKS0_}.938921af7dd4069cf40dd76f4a734a03_3" [label="3:  Constructor Init \n   n$0=*&this:class copy_move_constructor::X * [line 15]\n  n$1=*&__param_0:class copy_move_constructor::X & [line 15]\n  n$2=*n$1.f:int  [line 15]\n  *n$0.f:int =n$2 [line 15]\n " shape="box"]
+"copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1ERKS0_}.938921af7dd4069cf40dd76f4a734a03_3" [label="3:  Constructor Init \n   n$0=*&this:class copy_move_constructor::X* [line 15]\n  n$1=*&__param_0:class copy_move_constructor::X& [line 15]\n  n$2=*n$1.f:int [line 15]\n  *n$0.f:int=n$2 [line 15]\n " shape="box"]
 	
 
 	 "copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1ERKS0_}.938921af7dd4069cf40dd76f4a734a03_3" -> "copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1ERKS0_}.938921af7dd4069cf40dd76f4a734a03_2" ;
 "copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1ERKS0_}.938921af7dd4069cf40dd76f4a734a03_2" [label="2: Exit copy_move_constructor::X_X \n  " color=yellow style=filled]
 	
 
-"copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1ERKS0_}.938921af7dd4069cf40dd76f4a734a03_1" [label="1: Start copy_move_constructor::X_X\nFormals:  this:class copy_move_constructor::X * __param_0:class copy_move_constructor::X &\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
+"copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1ERKS0_}.938921af7dd4069cf40dd76f4a734a03_1" [label="1: Start copy_move_constructor::X_X\nFormals:  this:class copy_move_constructor::X* __param_0:class copy_move_constructor::X&\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
 	 "copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1ERKS0_}.938921af7dd4069cf40dd76f4a734a03_1" -> "copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1ERKS0_}.938921af7dd4069cf40dd76f4a734a03_3" ;
-"copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1EOKS0_}.5f8ffb0efd14c4e2a52eda68cb73ab09_3" [label="3:  Constructor Init \n   n$0=*&this:class copy_move_constructor::Y * [line 26]\n  n$1=*&y:class copy_move_constructor::Y & [line 26]\n  n$2=*n$1.f:int  [line 26]\n  *n$0.f:int =(n$2 - 1) [line 26]\n " shape="box"]
+"copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1EOKS0_}.5f8ffb0efd14c4e2a52eda68cb73ab09_3" [label="3:  Constructor Init \n   n$0=*&this:class copy_move_constructor::Y* [line 26]\n  n$1=*&y:class copy_move_constructor::Y& [line 26]\n  n$2=*n$1.f:int [line 26]\n  *n$0.f:int=(n$2 - 1) [line 26]\n " shape="box"]
 	
 
 	 "copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1EOKS0_}.5f8ffb0efd14c4e2a52eda68cb73ab09_3" -> "copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1EOKS0_}.5f8ffb0efd14c4e2a52eda68cb73ab09_2" ;
 "copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1EOKS0_}.5f8ffb0efd14c4e2a52eda68cb73ab09_2" [label="2: Exit copy_move_constructor::Y_Y \n  " color=yellow style=filled]
 	
 
-"copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1EOKS0_}.5f8ffb0efd14c4e2a52eda68cb73ab09_1" [label="1: Start copy_move_constructor::Y_Y\nFormals:  this:class copy_move_constructor::Y * y:class copy_move_constructor::Y &\nLocals:  \n   DECLARE_LOCALS(&return); [line 26]\n " color=yellow style=filled]
+"copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1EOKS0_}.5f8ffb0efd14c4e2a52eda68cb73ab09_1" [label="1: Start copy_move_constructor::Y_Y\nFormals:  this:class copy_move_constructor::Y* y:class copy_move_constructor::Y&\nLocals:  \n   DECLARE_LOCALS(&return); [line 26]\n " color=yellow style=filled]
 	
 
 	 "copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1EOKS0_}.5f8ffb0efd14c4e2a52eda68cb73ab09_1" -> "copy_move_constructor::Y_Y{_ZN21copy_move_constructor1YC1EOKS0_}.5f8ffb0efd14c4e2a52eda68cb73ab09_3" ;
 "copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1Ev}.43eb711dd0840594dd55a622c469a871_2" [label="2: Exit copy_move_constructor::X_X \n  " color=yellow style=filled]
 	
 
-"copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1Ev}.43eb711dd0840594dd55a622c469a871_1" [label="1: Start copy_move_constructor::X_X\nFormals:  this:class copy_move_constructor::X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
+"copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1Ev}.43eb711dd0840594dd55a622c469a871_1" [label="1: Start copy_move_constructor::X_X\nFormals:  this:class copy_move_constructor::X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
 	 "copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1Ev}.43eb711dd0840594dd55a622c469a871_1" -> "copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1Ev}.43eb711dd0840594dd55a622c469a871_2" ;
-"copy_move_constructor::moveY_moveY_copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constru.ba708b806578d7e24a2491d7c12b501d_5" [label="5:  DeclStmt \n   _fun_copy_move_constructor::getY(2:int ,&0$?%__sil_tmpSIL_materialize_temp__n$1:class copy_move_constructor::Y *) [line 60]\n  _fun_copy_move_constructor::Y_Y(&y1:class copy_move_constructor::Y *,&0$?%__sil_tmpSIL_materialize_temp__n$1:class copy_move_constructor::Y &) [line 60]\n " shape="box"]
+"copy_move_constructor::moveY_moveY_copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constru.ba708b806578d7e24a2491d7c12b501d_5" [label="5:  DeclStmt \n   _fun_copy_move_constructor::getY(2:int,&0$?%__sil_tmpSIL_materialize_temp__n$1:class copy_move_constructor::Y*) [line 60]\n  _fun_copy_move_constructor::Y_Y(&y1:class copy_move_constructor::Y*,&0$?%__sil_tmpSIL_materialize_temp__n$1:class copy_move_constructor::Y&) [line 60]\n " shape="box"]
 	
 
 	 "copy_move_constructor::moveY_moveY_copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constru.ba708b806578d7e24a2491d7c12b501d_5" -> "copy_move_constructor::moveY_moveY_copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constru.ba708b806578d7e24a2491d7c12b501d_4" ;
-"copy_move_constructor::moveY_moveY_copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constru.ba708b806578d7e24a2491d7c12b501d_4" [label="4:  DeclStmt \n   _fun_copy_move_constructor::Y_Y(&y2:class copy_move_constructor::Y *,&y1:class copy_move_constructor::Y &) [line 61]\n " shape="box"]
+"copy_move_constructor::moveY_moveY_copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constru.ba708b806578d7e24a2491d7c12b501d_4" [label="4:  DeclStmt \n   _fun_copy_move_constructor::Y_Y(&y2:class copy_move_constructor::Y*,&y1:class copy_move_constructor::Y&) [line 61]\n " shape="box"]
 	
 
 	 "copy_move_constructor::moveY_moveY_copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constru.ba708b806578d7e24a2491d7c12b501d_4" -> "copy_move_constructor::moveY_moveY_copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constru.ba708b806578d7e24a2491d7c12b501d_3" ;
-"copy_move_constructor::moveY_moveY_copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constru.ba708b806578d7e24a2491d7c12b501d_3" [label="3:  Return Stmt \n   n$0=*&y2.f:int  [line 62]\n  *&return:int =(1 / n$0) [line 62]\n " shape="box"]
+"copy_move_constructor::moveY_moveY_copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constru.ba708b806578d7e24a2491d7c12b501d_3" [label="3:  Return Stmt \n   n$0=*&y2.f:int [line 62]\n  *&return:int=(1 / n$0) [line 62]\n " shape="box"]
 	
 
 	 "copy_move_constructor::moveY_moveY_copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constru.ba708b806578d7e24a2491d7c12b501d_3" -> "copy_move_constructor::moveY_moveY_copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constru.ba708b806578d7e24a2491d7c12b501d_2" ;
@@ -188,19 +188,19 @@ digraph iCFG {
 	
 
 	 "copy_move_constructor::moveY_moveY_copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constru.ba708b806578d7e24a2491d7c12b501d_1" -> "copy_move_constructor::moveY_moveY_copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constru.ba708b806578d7e24a2491d7c12b501d_5" ;
-"copy_move_constructor::copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyY_.d07887baaf3056cca0765355546b4932_6" [label="6:  DeclStmt \n   _fun_copy_move_constructor::Y_Y(&y1:class copy_move_constructor::Y *) [line 51]\n " shape="box"]
+"copy_move_constructor::copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyY_.d07887baaf3056cca0765355546b4932_6" [label="6:  DeclStmt \n   _fun_copy_move_constructor::Y_Y(&y1:class copy_move_constructor::Y*) [line 51]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyY_.d07887baaf3056cca0765355546b4932_6" -> "copy_move_constructor::copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyY_.d07887baaf3056cca0765355546b4932_5" ;
-"copy_move_constructor::copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyY_.d07887baaf3056cca0765355546b4932_5" [label="5:  BinaryOperatorStmt: Assign \n   *&y1.f:int =0 [line 52]\n " shape="box"]
+"copy_move_constructor::copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyY_.d07887baaf3056cca0765355546b4932_5" [label="5:  BinaryOperatorStmt: Assign \n   *&y1.f:int=0 [line 52]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyY_.d07887baaf3056cca0765355546b4932_5" -> "copy_move_constructor::copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyY_.d07887baaf3056cca0765355546b4932_4" ;
-"copy_move_constructor::copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyY_.d07887baaf3056cca0765355546b4932_4" [label="4:  DeclStmt \n   _fun_copy_move_constructor::Y_Y(&y2:class copy_move_constructor::Y *,&y1:class copy_move_constructor::Y &) [line 53]\n " shape="box"]
+"copy_move_constructor::copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyY_.d07887baaf3056cca0765355546b4932_4" [label="4:  DeclStmt \n   _fun_copy_move_constructor::Y_Y(&y2:class copy_move_constructor::Y*,&y1:class copy_move_constructor::Y&) [line 53]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyY_.d07887baaf3056cca0765355546b4932_4" -> "copy_move_constructor::copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyY_.d07887baaf3056cca0765355546b4932_3" ;
-"copy_move_constructor::copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyY_.d07887baaf3056cca0765355546b4932_3" [label="3:  Return Stmt \n   n$0=*&y2.f:int  [line 54]\n  *&return:int =(1 / n$0) [line 54]\n " shape="box"]
+"copy_move_constructor::copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyY_.d07887baaf3056cca0765355546b4932_3" [label="3:  Return Stmt \n   n$0=*&y2.f:int [line 54]\n  *&return:int=(1 / n$0) [line 54]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyY_.d07887baaf3056cca0765355546b4932_3" -> "copy_move_constructor::copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyY_.d07887baaf3056cca0765355546b4932_2" ;
@@ -211,19 +211,19 @@ digraph iCFG {
 	
 
 	 "copy_move_constructor::copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyY_.d07887baaf3056cca0765355546b4932_1" -> "copy_move_constructor::copyY_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyY_.d07887baaf3056cca0765355546b4932_6" ;
-"copy_move_constructor::copyX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyX_.8590b792825912e946d4f6a87a5a554c_6" [label="6:  DeclStmt \n   _fun_copy_move_constructor::X_X(&x1:class copy_move_constructor::X *) [line 42]\n " shape="box"]
+"copy_move_constructor::copyX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyX_.8590b792825912e946d4f6a87a5a554c_6" [label="6:  DeclStmt \n   _fun_copy_move_constructor::X_X(&x1:class copy_move_constructor::X*) [line 42]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyX_.8590b792825912e946d4f6a87a5a554c_6" -> "copy_move_constructor::copyX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyX_.8590b792825912e946d4f6a87a5a554c_5" ;
-"copy_move_constructor::copyX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyX_.8590b792825912e946d4f6a87a5a554c_5" [label="5:  BinaryOperatorStmt: Assign \n   *&x1.f:int =0 [line 43]\n " shape="box"]
+"copy_move_constructor::copyX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyX_.8590b792825912e946d4f6a87a5a554c_5" [label="5:  BinaryOperatorStmt: Assign \n   *&x1.f:int=0 [line 43]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyX_.8590b792825912e946d4f6a87a5a554c_5" -> "copy_move_constructor::copyX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyX_.8590b792825912e946d4f6a87a5a554c_4" ;
-"copy_move_constructor::copyX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyX_.8590b792825912e946d4f6a87a5a554c_4" [label="4:  DeclStmt \n   _fun_copy_move_constructor::X_X(&x2:class copy_move_constructor::X *,&x1:class copy_move_constructor::X &) [line 44]\n " shape="box"]
+"copy_move_constructor::copyX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyX_.8590b792825912e946d4f6a87a5a554c_4" [label="4:  DeclStmt \n   _fun_copy_move_constructor::X_X(&x2:class copy_move_constructor::X*,&x1:class copy_move_constructor::X&) [line 44]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyX_.8590b792825912e946d4f6a87a5a554c_4" -> "copy_move_constructor::copyX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyX_.8590b792825912e946d4f6a87a5a554c_3" ;
-"copy_move_constructor::copyX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyX_.8590b792825912e946d4f6a87a5a554c_3" [label="3:  Return Stmt \n   n$0=*&x2.f:int  [line 45]\n  *&return:int =(1 / n$0) [line 45]\n " shape="box"]
+"copy_move_constructor::copyX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyX_.8590b792825912e946d4f6a87a5a554c_3" [label="3:  Return Stmt \n   n$0=*&x2.f:int [line 45]\n  *&return:int=(1 / n$0) [line 45]\n " shape="box"]
 	
 
 	 "copy_move_constructor::copyX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyX_.8590b792825912e946d4f6a87a5a554c_3" -> "copy_move_constructor::copyX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyX_.8590b792825912e946d4f6a87a5a554c_2" ;
@@ -234,14 +234,14 @@ digraph iCFG {
 	
 
 	 "copy_move_constructor::copyX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyX_.8590b792825912e946d4f6a87a5a554c_1" -> "copy_move_constructor::copyX_div0{d41d8cd98f00b204e9800998ecf8427e_ZN21copy_move_constructor10copyX_.8590b792825912e946d4f6a87a5a554c_6" ;
-"copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1EOS0_}.e24ff40e22addf38aee51c3eff30d413_3" [label="3:  Constructor Init \n   n$0=*&this:class copy_move_constructor::X * [line 15]\n  n$1=*&__param_0:class copy_move_constructor::X & [line 15]\n  n$2=*n$1.f:int  [line 15]\n  *n$0.f:int =n$2 [line 15]\n " shape="box"]
+"copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1EOS0_}.e24ff40e22addf38aee51c3eff30d413_3" [label="3:  Constructor Init \n   n$0=*&this:class copy_move_constructor::X* [line 15]\n  n$1=*&__param_0:class copy_move_constructor::X& [line 15]\n  n$2=*n$1.f:int [line 15]\n  *n$0.f:int=n$2 [line 15]\n " shape="box"]
 	
 
 	 "copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1EOS0_}.e24ff40e22addf38aee51c3eff30d413_3" -> "copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1EOS0_}.e24ff40e22addf38aee51c3eff30d413_2" ;
 "copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1EOS0_}.e24ff40e22addf38aee51c3eff30d413_2" [label="2: Exit copy_move_constructor::X_X \n  " color=yellow style=filled]
 	
 
-"copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1EOS0_}.e24ff40e22addf38aee51c3eff30d413_1" [label="1: Start copy_move_constructor::X_X\nFormals:  this:class copy_move_constructor::X * __param_0:class copy_move_constructor::X &\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
+"copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1EOS0_}.e24ff40e22addf38aee51c3eff30d413_1" [label="1: Start copy_move_constructor::X_X\nFormals:  this:class copy_move_constructor::X* __param_0:class copy_move_constructor::X&\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
 	 "copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1EOS0_}.e24ff40e22addf38aee51c3eff30d413_1" -> "copy_move_constructor::X_X{_ZN21copy_move_constructor1XC1EOS0_}.e24ff40e22addf38aee51c3eff30d413_3" ;

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

@@ -1,6 +1,6 @@
 /* @generated */
 digraph iCFG {
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  DeclStmt \n   _fun_Y_Y(&y:class Y *) [line 25]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  DeclStmt \n   _fun_Y_Y(&y:class Y*) [line 25]\n " shape="box"]
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_2" ;
@@ -11,60 +11,60 @@ digraph iCFG {
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
-"X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_5" [label="5:  Constructor Init \n   n$2=*&this:class X * [line 11]\n  *n$2.a:int =-1 [line 11]\n " shape="box"]
+"X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_5" [label="5:  Constructor Init \n   n$2=*&this:class X* [line 11]\n  *n$2.a:int=-1 [line 11]\n " shape="box"]
 	
 
 	 "X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_5" -> "X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_4" ;
-"X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_4" [label="4:  Constructor Init \n   n$1=*&this:class X * [line 12]\n  *n$1.b:int =-2 [line 12]\n " shape="box"]
+"X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_4" [label="4:  Constructor Init \n   n$1=*&this:class X* [line 12]\n  *n$1.b:int=-2 [line 12]\n " shape="box"]
 	
 
 	 "X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_4" -> "X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_3" ;
-"X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_3" [label="3:  Constructor Init \n   n$0=*&this:class X * [line 13]\n  *n$0.c:int =0 [line 13]\n " shape="box"]
+"X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_3" [label="3:  Constructor Init \n   n$0=*&this:class X* [line 13]\n  *n$0.c:int=0 [line 13]\n " shape="box"]
 	
 
 	 "X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_3" -> "X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_2" ;
 "X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_2" [label="2: Exit X_X \n  " color=yellow style=filled]
 	
 
-"X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_1" [label="1: Start X_X\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
+"X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_1" [label="1: Start X_X\nFormals:  this:class X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
 	 "X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_1" -> "X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_5" ;
-"Y_Y{_ZN1YC1Ev}.59d1fb591847c1ba18f67a9e78858d35_5" [label="5:  Constructor Init \n   n$2=*&this:class Y * [line 20]\n  _fun_X_X(n$2.x1:class X *,1:int ,2:int ) [line 20]\n " shape="box"]
+"Y_Y{_ZN1YC1Ev}.59d1fb591847c1ba18f67a9e78858d35_5" [label="5:  Constructor Init \n   n$2=*&this:class Y* [line 20]\n  _fun_X_X(n$2.x1:class X*,1:int,2:int) [line 20]\n " shape="box"]
 	
 
 	 "Y_Y{_ZN1YC1Ev}.59d1fb591847c1ba18f67a9e78858d35_5" -> "Y_Y{_ZN1YC1Ev}.59d1fb591847c1ba18f67a9e78858d35_4" ;
-"Y_Y{_ZN1YC1Ev}.59d1fb591847c1ba18f67a9e78858d35_4" [label="4:  Constructor Init \n   n$1=*&this:class Y * [line 21]\n  _fun_X_X(n$1.x2:class X *) [line 21]\n " shape="box"]
+"Y_Y{_ZN1YC1Ev}.59d1fb591847c1ba18f67a9e78858d35_4" [label="4:  Constructor Init \n   n$1=*&this:class Y* [line 21]\n  _fun_X_X(n$1.x2:class X*) [line 21]\n " shape="box"]
 	
 
 	 "Y_Y{_ZN1YC1Ev}.59d1fb591847c1ba18f67a9e78858d35_4" -> "Y_Y{_ZN1YC1Ev}.59d1fb591847c1ba18f67a9e78858d35_3" ;
-"Y_Y{_ZN1YC1Ev}.59d1fb591847c1ba18f67a9e78858d35_3" [label="3:  Constructor Init \n   n$0=*&this:class Y * [line 19]\n  _fun_X_X(n$0.x3:class X *) [line 19]\n " shape="box"]
+"Y_Y{_ZN1YC1Ev}.59d1fb591847c1ba18f67a9e78858d35_3" [label="3:  Constructor Init \n   n$0=*&this:class Y* [line 19]\n  _fun_X_X(n$0.x3:class X*) [line 19]\n " shape="box"]
 	
 
 	 "Y_Y{_ZN1YC1Ev}.59d1fb591847c1ba18f67a9e78858d35_3" -> "Y_Y{_ZN1YC1Ev}.59d1fb591847c1ba18f67a9e78858d35_2" ;
 "Y_Y{_ZN1YC1Ev}.59d1fb591847c1ba18f67a9e78858d35_2" [label="2: Exit Y_Y \n  " color=yellow style=filled]
 	
 
-"Y_Y{_ZN1YC1Ev}.59d1fb591847c1ba18f67a9e78858d35_1" [label="1: Start Y_Y\nFormals:  this:class Y *\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
+"Y_Y{_ZN1YC1Ev}.59d1fb591847c1ba18f67a9e78858d35_1" [label="1: Start Y_Y\nFormals:  this:class Y*\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
 	
 
 	 "Y_Y{_ZN1YC1Ev}.59d1fb591847c1ba18f67a9e78858d35_1" -> "Y_Y{_ZN1YC1Ev}.59d1fb591847c1ba18f67a9e78858d35_5" ;
-"X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_5" [label="5:  Constructor Init \n   n$2=*&this:class X * [line 16]\n  n$3=*&a:int  [line 16]\n  n$4=*&b:int  [line 16]\n  *n$2.a:int =(n$3 + n$4) [line 16]\n " shape="box"]
+"X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_5" [label="5:  Constructor Init \n   n$2=*&this:class X* [line 16]\n  n$3=*&a:int [line 16]\n  n$4=*&b:int [line 16]\n  *n$2.a:int=(n$3 + n$4) [line 16]\n " shape="box"]
 	
 
 	 "X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_5" -> "X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_4" ;
-"X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_4" [label="4:  Constructor Init \n   n$1=*&this:class X * [line 12]\n  *n$1.b:int =-2 [line 12]\n " shape="box"]
+"X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_4" [label="4:  Constructor Init \n   n$1=*&this:class X* [line 12]\n  *n$1.b:int=-2 [line 12]\n " shape="box"]
 	
 
 	 "X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_4" -> "X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_3" ;
-"X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_3" [label="3:  Constructor Init \n   n$0=*&this:class X * [line 13]\n  *n$0.c:int =0 [line 13]\n " shape="box"]
+"X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_3" [label="3:  Constructor Init \n   n$0=*&this:class X* [line 13]\n  *n$0.c:int=0 [line 13]\n " shape="box"]
 	
 
 	 "X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_3" -> "X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_2" ;
 "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 16]\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 16]\n " color=yellow style=filled]
 	
 
 	 "X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_1" -> "X_X{_ZN1XC1Eii}.dea5701a4245aaf51e5b3119370abb6b_5" ;

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

@@ -1,17 +1,17 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$0[0]:int =1 [line 24]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0[1]:int =2 [line 24]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0[2]:int =3 [line 24]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0[3]:int =4 [line 24]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0[4]:int =5 [line 24]\n  n$1=_fun___infer_skip_function(&0$?%__sil_tmpSIL_materialize_temp__n$0:int [5]) [line 24]\n  _fun_X_X(&x:class X *,n$1:class std::initializer_list<int> ) [line 24]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$0[0]:int=1 [line 24]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0[1]:int=2 [line 24]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0[2]:int=3 [line 24]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0[3]:int=4 [line 24]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$0[4]:int=5 [line 24]\n  n$1=_fun___infer_skip_function(&0$?%__sil_tmpSIL_materialize_temp__n$0:int[5]) [line 24]\n  _fun_X_X(&x:class X*,n$1:class std::initializer_list<int>) [line 24]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  x:class X  0$?%__sil_tmpSIL_materialize_temp__n$0:int [5] \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 24]\n " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  x:class X 0$?%__sil_tmpSIL_materialize_temp__n$0:int[5] \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 24]\n " color=yellow style=filled]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_9" [label="9:  BinaryOperatorStmt: Assign \n   n$8=*&this:class X * [line 16]\n  n$9=*&this:class X * [line 16]\n  n$10=*n$9.sum:int  [line 16]\n  n$11=*&i:int * [line 16]\n  n$12=*n$11:int  [line 16]\n  *n$8.sum:int =(n$10 + n$12) [line 16]\n " shape="box"]
+"X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_9" [label="9:  BinaryOperatorStmt: Assign \n   n$8=*&this:class X* [line 16]\n  n$9=*&this:class X* [line 16]\n  n$10=*n$9.sum:int [line 16]\n  n$11=*&i:int* [line 16]\n  n$12=*n$11:int [line 16]\n  *n$8.sum:int=(n$10 + n$12) [line 16]\n " shape="box"]
 	
 
 	 "X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_9" -> "X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_5" ;
@@ -23,16 +23,16 @@ digraph iCFG {
 	
 
 	 "X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_7" -> "X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_9" ;
-"X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_6" [label="6:  BinaryOperatorStmt: NE \n   n$4=*&i:int * [line 15]\n  n$5=*&list:class std::initializer_list<int> & [line 15]\n  _=*n$5:class std::initializer_list<int>  [line 15]\n  n$7=_fun_std::initializer_list<int>_end(n$5:class std::initializer_list<int> &) [line 15]\n " shape="box"]
+"X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_6" [label="6:  BinaryOperatorStmt: NE \n   n$4=*&i:int* [line 15]\n  n$5=*&list:class std::initializer_list<int>& [line 15]\n  _=*n$5:class std::initializer_list<int> [line 15]\n  n$7=_fun_std::initializer_list<int>_end(n$5:class std::initializer_list<int>&) [line 15]\n " shape="box"]
 	
 
 	 "X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_6" -> "X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_7" ;
 	 "X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_6" -> "X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_8" ;
-"X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_5" [label="5:  UnaryOperator \n   n$3=*&i:int * [line 15]\n  *&i:int *=(n$3 + 1) [line 15]\n " shape="box"]
+"X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_5" [label="5:  UnaryOperator \n   n$3=*&i:int* [line 15]\n  *&i:int*=(n$3 + 1) [line 15]\n " shape="box"]
 	
 
 	 "X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_5" -> "X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_3" ;
-"X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_4" [label="4:  DeclStmt \n   n$0=*&list:class std::initializer_list<int> & [line 15]\n  _=*n$0:class std::initializer_list<int>  [line 15]\n  n$2=_fun_std::initializer_list<int>_begin(n$0:class std::initializer_list<int> &) [line 15]\n  *&i:int *=n$2 [line 15]\n " shape="box"]
+"X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_4" [label="4:  DeclStmt \n   n$0=*&list:class std::initializer_list<int>& [line 15]\n  _=*n$0:class std::initializer_list<int> [line 15]\n  n$2=_fun_std::initializer_list<int>_begin(n$0:class std::initializer_list<int>&) [line 15]\n  *&i:int*=n$2 [line 15]\n " shape="box"]
 	
 
 	 "X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_4" -> "X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_3" ;
@@ -43,29 +43,29 @@ digraph iCFG {
 "X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_2" [label="2: Exit X_X \n  " color=yellow style=filled]
 	
 
-"X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_1" [label="1: Start X_X\nFormals:  this:class X * list:class std::initializer_list<int> &\nLocals:  i:int * \n   DECLARE_LOCALS(&return,&i); [line 14]\n " color=yellow style=filled]
+"X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_1" [label="1: Start X_X\nFormals:  this:class X* list:class std::initializer_list<int>&\nLocals:  i:int* \n   DECLARE_LOCALS(&return,&i); [line 14]\n " color=yellow style=filled]
 	
 
 	 "X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_1" -> "X_X{_ZN1XC1ESt16initializer_listIiE}.f26ab90a26d9b8ebd8fe94c844cf1787_4" ;
-"std::initializer_list<int>_end(_ZNKSt16initializer_listIiE3endEv).2c8cf9cf41f8bb69ba2088846ff8c820_3" [label="3:  Return Stmt \n   n$0=*&this:class std::initializer_list<int> * [line 93]\n  n$1=*n$0.__begin_:int * [line 93]\n  n$2=*&this:class std::initializer_list<int> * [line 93]\n  n$3=*n$2.__size_:unsigned long  [line 93]\n  *&return:int *=(n$1 + n$3) [line 93]\n " shape="box"]
+"std::initializer_list<int>_end(_ZNKSt16initializer_listIiE3endEv).2c8cf9cf41f8bb69ba2088846ff8c820_3" [label="3:  Return Stmt \n   n$0=*&this:class std::initializer_list<int>* [line 93]\n  n$1=*n$0.__begin_:int* [line 93]\n  n$2=*&this:class std::initializer_list<int>* [line 93]\n  n$3=*n$2.__size_:unsigned long [line 93]\n  *&return:int*=(n$1 + n$3) [line 93]\n " shape="box"]
 	
 
 	 "std::initializer_list<int>_end(_ZNKSt16initializer_listIiE3endEv).2c8cf9cf41f8bb69ba2088846ff8c820_3" -> "std::initializer_list<int>_end(_ZNKSt16initializer_listIiE3endEv).2c8cf9cf41f8bb69ba2088846ff8c820_2" ;
 "std::initializer_list<int>_end(_ZNKSt16initializer_listIiE3endEv).2c8cf9cf41f8bb69ba2088846ff8c820_2" [label="2: Exit std::initializer_list<int>_end \n  " color=yellow style=filled]
 	
 
-"std::initializer_list<int>_end(_ZNKSt16initializer_listIiE3endEv).2c8cf9cf41f8bb69ba2088846ff8c820_1" [label="1: Start std::initializer_list<int>_end\nFormals:  this:class std::initializer_list<int> *\nLocals:  \n   DECLARE_LOCALS(&return); [line 91]\n " color=yellow style=filled]
+"std::initializer_list<int>_end(_ZNKSt16initializer_listIiE3endEv).2c8cf9cf41f8bb69ba2088846ff8c820_1" [label="1: Start std::initializer_list<int>_end\nFormals:  this:class std::initializer_list<int>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 91]\n " color=yellow style=filled]
 	
 
 	 "std::initializer_list<int>_end(_ZNKSt16initializer_listIiE3endEv).2c8cf9cf41f8bb69ba2088846ff8c820_1" -> "std::initializer_list<int>_end(_ZNKSt16initializer_listIiE3endEv).2c8cf9cf41f8bb69ba2088846ff8c820_3" ;
-"std::initializer_list<int>_begin(_ZNKSt16initializer_listIiE5beginEv).0e97e8437c2dc7998ccfed09b122491e_3" [label="3:  Return Stmt \n   n$0=*&this:class std::initializer_list<int> * [line 89]\n  n$1=*n$0.__begin_:int * [line 89]\n  *&return:int *=n$1 [line 89]\n " shape="box"]
+"std::initializer_list<int>_begin(_ZNKSt16initializer_listIiE5beginEv).0e97e8437c2dc7998ccfed09b122491e_3" [label="3:  Return Stmt \n   n$0=*&this:class std::initializer_list<int>* [line 89]\n  n$1=*n$0.__begin_:int* [line 89]\n  *&return:int*=n$1 [line 89]\n " shape="box"]
 	
 
 	 "std::initializer_list<int>_begin(_ZNKSt16initializer_listIiE5beginEv).0e97e8437c2dc7998ccfed09b122491e_3" -> "std::initializer_list<int>_begin(_ZNKSt16initializer_listIiE5beginEv).0e97e8437c2dc7998ccfed09b122491e_2" ;
 "std::initializer_list<int>_begin(_ZNKSt16initializer_listIiE5beginEv).0e97e8437c2dc7998ccfed09b122491e_2" [label="2: Exit std::initializer_list<int>_begin \n  " color=yellow style=filled]
 	
 
-"std::initializer_list<int>_begin(_ZNKSt16initializer_listIiE5beginEv).0e97e8437c2dc7998ccfed09b122491e_1" [label="1: Start std::initializer_list<int>_begin\nFormals:  this:class std::initializer_list<int> *\nLocals:  \n   DECLARE_LOCALS(&return); [line 87]\n " color=yellow style=filled]
+"std::initializer_list<int>_begin(_ZNKSt16initializer_listIiE5beginEv).0e97e8437c2dc7998ccfed09b122491e_1" [label="1: Start std::initializer_list<int>_begin\nFormals:  this:class std::initializer_list<int>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 87]\n " color=yellow style=filled]
 	
 
 	 "std::initializer_list<int>_begin(_ZNKSt16initializer_listIiE5beginEv).0e97e8437c2dc7998ccfed09b122491e_1" -> "std::initializer_list<int>_begin(_ZNKSt16initializer_listIiE5beginEv).0e97e8437c2dc7998ccfed09b122491e_3" ;

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

@@ -1,6 +1,6 @@
 /* @generated */
 digraph iCFG {
-"temp_object::getX_field_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15getX_field_div0Ev}.f209e5ac42a054a050e18602e69c131f_3" [label="3:  Return Stmt \n   _fun_temp_object::getX(0:int ,1:int ,&0$?%__sil_tmp__temp_return_n$1:class temp_object::X *) [line 39]\n  n$2=*&0$?%__sil_tmp__temp_return_n$1.f:int  [line 39]\n  n$3=_fun_temp_object::div(n$2:int ) [line 39]\n  *&return:int =n$3 [line 39]\n " shape="box"]
+"temp_object::getX_field_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15getX_field_div0Ev}.f209e5ac42a054a050e18602e69c131f_3" [label="3:  Return Stmt \n   _fun_temp_object::getX(0:int,1:int,&0$?%__sil_tmp__temp_return_n$1:class temp_object::X*) [line 39]\n  n$2=*&0$?%__sil_tmp__temp_return_n$1.f:int [line 39]\n  n$3=_fun_temp_object::div(n$2:int) [line 39]\n  *&return:int=n$3 [line 39]\n " shape="box"]
 	
 
 	 "temp_object::getX_field_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15getX_field_div0Ev}.f209e5ac42a054a050e18602e69c131f_3" -> "temp_object::getX_field_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15getX_field_div0Ev}.f209e5ac42a054a050e18602e69c131f_2" ;
@@ -11,7 +11,7 @@ digraph iCFG {
 	
 
 	 "temp_object::getX_field_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15getX_field_div0Ev}.f209e5ac42a054a050e18602e69c131f_1" -> "temp_object::getX_field_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15getX_field_div0Ev}.f209e5ac42a054a050e18602e69c131f_3" ;
-"temp_object::temp_field2_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16temp_field2_div0Ev}.ac73a3f5f8d285249d74d83ae4ea4305_3" [label="3:  Return Stmt \n   _fun_temp_object::X_X(&0$?%__sil_tmp__temp_construct_n$0:class temp_object::X *,0:int ) [line 35]\n  n$1=*&0$?%__sil_tmp__temp_construct_n$0.f:int  [line 35]\n  n$2=_fun_temp_object::div(n$1:int ) [line 35]\n  *&return:int =n$2 [line 35]\n " shape="box"]
+"temp_object::temp_field2_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16temp_field2_div0Ev}.ac73a3f5f8d285249d74d83ae4ea4305_3" [label="3:  Return Stmt \n   _fun_temp_object::X_X(&0$?%__sil_tmp__temp_construct_n$0:class temp_object::X*,0:int) [line 35]\n  n$1=*&0$?%__sil_tmp__temp_construct_n$0.f:int [line 35]\n  n$2=_fun_temp_object::div(n$1:int) [line 35]\n  *&return:int=n$2 [line 35]\n " shape="box"]
 	
 
 	 "temp_object::temp_field2_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16temp_field2_div0Ev}.ac73a3f5f8d285249d74d83ae4ea4305_3" -> "temp_object::temp_field2_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16temp_field2_div0Ev}.ac73a3f5f8d285249d74d83ae4ea4305_2" ;
@@ -22,40 +22,40 @@ digraph iCFG {
 	
 
 	 "temp_object::temp_field2_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16temp_field2_div0Ev}.ac73a3f5f8d285249d74d83ae4ea4305_1" -> "temp_object::temp_field2_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16temp_field2_div0Ev}.ac73a3f5f8d285249d74d83ae4ea4305_3" ;
-"temp_object::getX{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object4getXEii}.5328473c1646ee7a03a348ec7c54a5b6_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class temp_object::X * [line 26]\n  n$2=*&a:int  [line 26]\n  n$3=*&b:int  [line 26]\n  _fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$1:class temp_object::X *,n$2:int ,n$3:int ) [line 26]\n  _fun_temp_object::X_X(n$0:class temp_object::X *,&0$?%__sil_tmpSIL_materialize_temp__n$1:class temp_object::X &) [line 26]\n " shape="box"]
+"temp_object::getX{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object4getXEii}.5328473c1646ee7a03a348ec7c54a5b6_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class temp_object::X* [line 26]\n  n$2=*&a:int [line 26]\n  n$3=*&b:int [line 26]\n  _fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$1:class temp_object::X*,n$2:int,n$3:int) [line 26]\n  _fun_temp_object::X_X(n$0:class temp_object::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:class temp_object::X&) [line 26]\n " shape="box"]
 	
 
 	 "temp_object::getX{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object4getXEii}.5328473c1646ee7a03a348ec7c54a5b6_3" -> "temp_object::getX{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object4getXEii}.5328473c1646ee7a03a348ec7c54a5b6_2" ;
 "temp_object::getX{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object4getXEii}.5328473c1646ee7a03a348ec7c54a5b6_2" [label="2: Exit temp_object::getX \n  " color=yellow style=filled]
 	
 
-"temp_object::getX{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object4getXEii}.5328473c1646ee7a03a348ec7c54a5b6_1" [label="1: Start temp_object::getX\nFormals:  a:int  b:int  __return_param:class temp_object::X *\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:class temp_object::X  \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 26]\n " color=yellow style=filled]
+"temp_object::getX{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object4getXEii}.5328473c1646ee7a03a348ec7c54a5b6_1" [label="1: Start temp_object::getX\nFormals:  a:int b:int __return_param:class temp_object::X*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:class temp_object::X \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 26]\n " color=yellow style=filled]
 	
 
 	 "temp_object::getX{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object4getXEii}.5328473c1646ee7a03a348ec7c54a5b6_1" -> "temp_object::getX{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object4getXEii}.5328473c1646ee7a03a348ec7c54a5b6_3" ;
-"temp_object::div{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object3divEi}.d9d8299c0f4d383323fea8d79172893d_3" [label="3:  Return Stmt \n   n$0=*&f:int  [line 21]\n  *&return:int =(1 / n$0) [line 21]\n " shape="box"]
+"temp_object::div{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object3divEi}.d9d8299c0f4d383323fea8d79172893d_3" [label="3:  Return Stmt \n   n$0=*&f:int [line 21]\n  *&return:int=(1 / n$0) [line 21]\n " shape="box"]
 	
 
 	 "temp_object::div{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object3divEi}.d9d8299c0f4d383323fea8d79172893d_3" -> "temp_object::div{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object3divEi}.d9d8299c0f4d383323fea8d79172893d_2" ;
 "temp_object::div{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object3divEi}.d9d8299c0f4d383323fea8d79172893d_2" [label="2: Exit temp_object::div \n  " color=yellow style=filled]
 	
 
-"temp_object::div{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object3divEi}.d9d8299c0f4d383323fea8d79172893d_1" [label="1: Start temp_object::div\nFormals:  f:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 21]\n " color=yellow style=filled]
+"temp_object::div{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object3divEi}.d9d8299c0f4d383323fea8d79172893d_1" [label="1: Start temp_object::div\nFormals:  f:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 21]\n " color=yellow style=filled]
 	
 
 	 "temp_object::div{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object3divEi}.d9d8299c0f4d383323fea8d79172893d_1" -> "temp_object::div{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object3divEi}.d9d8299c0f4d383323fea8d79172893d_3" ;
-"temp_object::X_div(_ZN11temp_object1X3divEv).170dde8cd189808e7395ecc77e06aaf1_3" [label="3:  Return Stmt \n   n$0=*&this:class temp_object::X * [line 18]\n  n$1=*n$0.f:int  [line 18]\n  *&return:int =(1 / n$1) [line 18]\n " shape="box"]
+"temp_object::X_div(_ZN11temp_object1X3divEv).170dde8cd189808e7395ecc77e06aaf1_3" [label="3:  Return Stmt \n   n$0=*&this:class temp_object::X* [line 18]\n  n$1=*n$0.f:int [line 18]\n  *&return:int=(1 / n$1) [line 18]\n " shape="box"]
 	
 
 	 "temp_object::X_div(_ZN11temp_object1X3divEv).170dde8cd189808e7395ecc77e06aaf1_3" -> "temp_object::X_div(_ZN11temp_object1X3divEv).170dde8cd189808e7395ecc77e06aaf1_2" ;
 "temp_object::X_div(_ZN11temp_object1X3divEv).170dde8cd189808e7395ecc77e06aaf1_2" [label="2: Exit temp_object::X_div \n  " color=yellow style=filled]
 	
 
-"temp_object::X_div(_ZN11temp_object1X3divEv).170dde8cd189808e7395ecc77e06aaf1_1" [label="1: Start temp_object::X_div\nFormals:  this:class temp_object::X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
+"temp_object::X_div(_ZN11temp_object1X3divEv).170dde8cd189808e7395ecc77e06aaf1_1" [label="1: Start temp_object::X_div\nFormals:  this:class temp_object::X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
 	
 
 	 "temp_object::X_div(_ZN11temp_object1X3divEv).170dde8cd189808e7395ecc77e06aaf1_1" -> "temp_object::X_div(_ZN11temp_object1X3divEv).170dde8cd189808e7395ecc77e06aaf1_3" ;
-"temp_object::temp_field_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15temp_field_div0Ev}.aa8e7ffe00e4f54113d09c0b8e28cb8d_3" [label="3:  Return Stmt \n   _fun_temp_object::X_X(&0$?%__sil_tmp__temp_construct_n$0:class temp_object::X *,0:int ,1:int ) [line 33]\n  n$1=*&0$?%__sil_tmp__temp_construct_n$0.f:int  [line 33]\n  n$2=_fun_temp_object::div(n$1:int ) [line 33]\n  *&return:int =n$2 [line 33]\n " shape="box"]
+"temp_object::temp_field_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15temp_field_div0Ev}.aa8e7ffe00e4f54113d09c0b8e28cb8d_3" [label="3:  Return Stmt \n   _fun_temp_object::X_X(&0$?%__sil_tmp__temp_construct_n$0:class temp_object::X*,0:int,1:int) [line 33]\n  n$1=*&0$?%__sil_tmp__temp_construct_n$0.f:int [line 33]\n  n$2=_fun_temp_object::div(n$1:int) [line 33]\n  *&return:int=n$2 [line 33]\n " shape="box"]
 	
 
 	 "temp_object::temp_field_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15temp_field_div0Ev}.aa8e7ffe00e4f54113d09c0b8e28cb8d_3" -> "temp_object::temp_field_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15temp_field_div0Ev}.aa8e7ffe00e4f54113d09c0b8e28cb8d_2" ;
@@ -66,7 +66,7 @@ digraph iCFG {
 	
 
 	 "temp_object::temp_field_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15temp_field_div0Ev}.aa8e7ffe00e4f54113d09c0b8e28cb8d_1" -> "temp_object::temp_field_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15temp_field_div0Ev}.aa8e7ffe00e4f54113d09c0b8e28cb8d_3" ;
-"temp_object::getX_field_div1{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15getX_field_div1Ev}.7596a465f3472cd7579077959b7a814a_3" [label="3:  Return Stmt \n   _fun_temp_object::getX(1:int ,0:int ,&0$?%__sil_tmp__temp_return_n$1:class temp_object::X *) [line 45]\n  n$2=*&0$?%__sil_tmp__temp_return_n$1.f:int  [line 45]\n  n$3=_fun_temp_object::div(n$2:int ) [line 45]\n  *&return:int =n$3 [line 45]\n " shape="box"]
+"temp_object::getX_field_div1{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15getX_field_div1Ev}.7596a465f3472cd7579077959b7a814a_3" [label="3:  Return Stmt \n   _fun_temp_object::getX(1:int,0:int,&0$?%__sil_tmp__temp_return_n$1:class temp_object::X*) [line 45]\n  n$2=*&0$?%__sil_tmp__temp_return_n$1.f:int [line 45]\n  n$3=_fun_temp_object::div(n$2:int) [line 45]\n  *&return:int=n$3 [line 45]\n " shape="box"]
 	
 
 	 "temp_object::getX_field_div1{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15getX_field_div1Ev}.7596a465f3472cd7579077959b7a814a_3" -> "temp_object::getX_field_div1{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15getX_field_div1Ev}.7596a465f3472cd7579077959b7a814a_2" ;
@@ -77,7 +77,7 @@ digraph iCFG {
 	
 
 	 "temp_object::getX_field_div1{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15getX_field_div1Ev}.7596a465f3472cd7579077959b7a814a_1" -> "temp_object::getX_field_div1{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15getX_field_div1Ev}.7596a465f3472cd7579077959b7a814a_3" ;
-"temp_object::temp_field_div1{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15temp_field_div1Ev}.4916b8cdf1ac96a3781bb5acceaa27a0_3" [label="3:  Return Stmt \n   _fun_temp_object::X_X(&0$?%__sil_tmp__temp_construct_n$0:class temp_object::X *,1:int ,0:int ) [line 43]\n  n$1=*&0$?%__sil_tmp__temp_construct_n$0.f:int  [line 43]\n  n$2=_fun_temp_object::div(n$1:int ) [line 43]\n  *&return:int =n$2 [line 43]\n " shape="box"]
+"temp_object::temp_field_div1{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15temp_field_div1Ev}.4916b8cdf1ac96a3781bb5acceaa27a0_3" [label="3:  Return Stmt \n   _fun_temp_object::X_X(&0$?%__sil_tmp__temp_construct_n$0:class temp_object::X*,1:int,0:int) [line 43]\n  n$1=*&0$?%__sil_tmp__temp_construct_n$0.f:int [line 43]\n  n$2=_fun_temp_object::div(n$1:int) [line 43]\n  *&return:int=n$2 [line 43]\n " shape="box"]
 	
 
 	 "temp_object::temp_field_div1{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15temp_field_div1Ev}.4916b8cdf1ac96a3781bb5acceaa27a0_3" -> "temp_object::temp_field_div1{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15temp_field_div1Ev}.4916b8cdf1ac96a3781bb5acceaa27a0_2" ;
@@ -88,11 +88,11 @@ digraph iCFG {
 	
 
 	 "temp_object::temp_field_div1{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15temp_field_div1Ev}.4916b8cdf1ac96a3781bb5acceaa27a0_1" -> "temp_object::temp_field_div1{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object15temp_field_div1Ev}.4916b8cdf1ac96a3781bb5acceaa27a0_3" ;
-"temp_object::assign_temp_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16assign_temp_div0Ev}.e71583ec7a8bdd7e24dd2378a4db441d_4" [label="4:  DeclStmt \n   _fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$2:class temp_object::X *,0:int ,1:int ) [line 29]\n  _fun_temp_object::X_X(&x:class temp_object::X *,&0$?%__sil_tmpSIL_materialize_temp__n$2:class temp_object::X &) [line 29]\n " shape="box"]
+"temp_object::assign_temp_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16assign_temp_div0Ev}.e71583ec7a8bdd7e24dd2378a4db441d_4" [label="4:  DeclStmt \n   _fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$2:class temp_object::X*,0:int,1:int) [line 29]\n  _fun_temp_object::X_X(&x:class temp_object::X*,&0$?%__sil_tmpSIL_materialize_temp__n$2:class temp_object::X&) [line 29]\n " shape="box"]
 	
 
 	 "temp_object::assign_temp_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16assign_temp_div0Ev}.e71583ec7a8bdd7e24dd2378a4db441d_4" -> "temp_object::assign_temp_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16assign_temp_div0Ev}.e71583ec7a8bdd7e24dd2378a4db441d_3" ;
-"temp_object::assign_temp_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16assign_temp_div0Ev}.e71583ec7a8bdd7e24dd2378a4db441d_3" [label="3:  Return Stmt \n   _=*&x:class temp_object::X  [line 30]\n  n$1=_fun_temp_object::X_div(&x:class temp_object::X &) [line 30]\n  *&return:int =n$1 [line 30]\n " shape="box"]
+"temp_object::assign_temp_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16assign_temp_div0Ev}.e71583ec7a8bdd7e24dd2378a4db441d_3" [label="3:  Return Stmt \n   _=*&x:class temp_object::X [line 30]\n  n$1=_fun_temp_object::X_div(&x:class temp_object::X&) [line 30]\n  *&return:int=n$1 [line 30]\n " shape="box"]
 	
 
 	 "temp_object::assign_temp_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16assign_temp_div0Ev}.e71583ec7a8bdd7e24dd2378a4db441d_3" -> "temp_object::assign_temp_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16assign_temp_div0Ev}.e71583ec7a8bdd7e24dd2378a4db441d_2" ;
@@ -103,40 +103,40 @@ digraph iCFG {
 	
 
 	 "temp_object::assign_temp_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16assign_temp_div0Ev}.e71583ec7a8bdd7e24dd2378a4db441d_1" -> "temp_object::assign_temp_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16assign_temp_div0Ev}.e71583ec7a8bdd7e24dd2378a4db441d_4" ;
-"temp_object::X_X{_ZN11temp_object1XC1Eii}.2a2e9eb0633e634942df70f1a6ceae06_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class temp_object::X * [line 14]\n  n$1=*&a:int  [line 14]\n  *n$0.f:int =n$1 [line 14]\n " shape="box"]
+"temp_object::X_X{_ZN11temp_object1XC1Eii}.2a2e9eb0633e634942df70f1a6ceae06_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class temp_object::X* [line 14]\n  n$1=*&a:int [line 14]\n  *n$0.f:int=n$1 [line 14]\n " shape="box"]
 	
 
 	 "temp_object::X_X{_ZN11temp_object1XC1Eii}.2a2e9eb0633e634942df70f1a6ceae06_3" -> "temp_object::X_X{_ZN11temp_object1XC1Eii}.2a2e9eb0633e634942df70f1a6ceae06_2" ;
 "temp_object::X_X{_ZN11temp_object1XC1Eii}.2a2e9eb0633e634942df70f1a6ceae06_2" [label="2: Exit temp_object::X_X \n  " color=yellow style=filled]
 	
 
-"temp_object::X_X{_ZN11temp_object1XC1Eii}.2a2e9eb0633e634942df70f1a6ceae06_1" [label="1: Start temp_object::X_X\nFormals:  this:class temp_object::X * a:int  b:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
+"temp_object::X_X{_ZN11temp_object1XC1Eii}.2a2e9eb0633e634942df70f1a6ceae06_1" [label="1: Start temp_object::X_X\nFormals:  this:class temp_object::X* a:int b:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
 	
 
 	 "temp_object::X_X{_ZN11temp_object1XC1Eii}.2a2e9eb0633e634942df70f1a6ceae06_1" -> "temp_object::X_X{_ZN11temp_object1XC1Eii}.2a2e9eb0633e634942df70f1a6ceae06_3" ;
-"temp_object::X_X{_ZN11temp_object1XC1Ei}.88450e55bc92b16b17bf57332de036f1_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class temp_object::X * [line 13]\n  n$1=*&a:int  [line 13]\n  *n$0.f:int =n$1 [line 13]\n " shape="box"]
+"temp_object::X_X{_ZN11temp_object1XC1Ei}.88450e55bc92b16b17bf57332de036f1_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class temp_object::X* [line 13]\n  n$1=*&a:int [line 13]\n  *n$0.f:int=n$1 [line 13]\n " shape="box"]
 	
 
 	 "temp_object::X_X{_ZN11temp_object1XC1Ei}.88450e55bc92b16b17bf57332de036f1_3" -> "temp_object::X_X{_ZN11temp_object1XC1Ei}.88450e55bc92b16b17bf57332de036f1_2" ;
 "temp_object::X_X{_ZN11temp_object1XC1Ei}.88450e55bc92b16b17bf57332de036f1_2" [label="2: Exit temp_object::X_X \n  " color=yellow style=filled]
 	
 
-"temp_object::X_X{_ZN11temp_object1XC1Ei}.88450e55bc92b16b17bf57332de036f1_1" [label="1: Start temp_object::X_X\nFormals:  this:class temp_object::X * a:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
+"temp_object::X_X{_ZN11temp_object1XC1Ei}.88450e55bc92b16b17bf57332de036f1_1" [label="1: Start temp_object::X_X\nFormals:  this:class temp_object::X* a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
 	
 
 	 "temp_object::X_X{_ZN11temp_object1XC1Ei}.88450e55bc92b16b17bf57332de036f1_1" -> "temp_object::X_X{_ZN11temp_object1XC1Ei}.88450e55bc92b16b17bf57332de036f1_3" ;
-"temp_object::X_X{_ZN11temp_object1XC1ERKS0_}.d537208824d50c6b0e58b3d1a2e00cd9_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class temp_object::X * [line 16]\n  n$1=*&x:class temp_object::X & [line 16]\n  n$2=*n$1.f:int  [line 16]\n  *n$0.f:int =n$2 [line 16]\n " shape="box"]
+"temp_object::X_X{_ZN11temp_object1XC1ERKS0_}.d537208824d50c6b0e58b3d1a2e00cd9_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class temp_object::X* [line 16]\n  n$1=*&x:class temp_object::X& [line 16]\n  n$2=*n$1.f:int [line 16]\n  *n$0.f:int=n$2 [line 16]\n " shape="box"]
 	
 
 	 "temp_object::X_X{_ZN11temp_object1XC1ERKS0_}.d537208824d50c6b0e58b3d1a2e00cd9_3" -> "temp_object::X_X{_ZN11temp_object1XC1ERKS0_}.d537208824d50c6b0e58b3d1a2e00cd9_2" ;
 "temp_object::X_X{_ZN11temp_object1XC1ERKS0_}.d537208824d50c6b0e58b3d1a2e00cd9_2" [label="2: Exit temp_object::X_X \n  " color=yellow style=filled]
 	
 
-"temp_object::X_X{_ZN11temp_object1XC1ERKS0_}.d537208824d50c6b0e58b3d1a2e00cd9_1" [label="1: Start temp_object::X_X\nFormals:  this:class temp_object::X * x:class temp_object::X &\nLocals:  \n   DECLARE_LOCALS(&return); [line 16]\n " color=yellow style=filled]
+"temp_object::X_X{_ZN11temp_object1XC1ERKS0_}.d537208824d50c6b0e58b3d1a2e00cd9_1" [label="1: Start temp_object::X_X\nFormals:  this:class temp_object::X* x:class temp_object::X&\nLocals:  \n   DECLARE_LOCALS(&return); [line 16]\n " color=yellow style=filled]
 	
 
 	 "temp_object::X_X{_ZN11temp_object1XC1ERKS0_}.d537208824d50c6b0e58b3d1a2e00cd9_1" -> "temp_object::X_X{_ZN11temp_object1XC1ERKS0_}.d537208824d50c6b0e58b3d1a2e00cd9_3" ;
-"temp_object::getX_method_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16getX_method_div0Ev}.7e645e294d9173ff0207c8f341a5c832_3" [label="3:  Return Stmt \n   _fun_temp_object::getX(0:int ,1:int ,&0$?%__sil_tmp__temp_return_n$1:class temp_object::X *) [line 41]\n  n$2=_fun_temp_object::X_div(&0$?%__sil_tmp__temp_return_n$1:class temp_object::X &) [line 41]\n  *&return:int =n$2 [line 41]\n " shape="box"]
+"temp_object::getX_method_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16getX_method_div0Ev}.7e645e294d9173ff0207c8f341a5c832_3" [label="3:  Return Stmt \n   _fun_temp_object::getX(0:int,1:int,&0$?%__sil_tmp__temp_return_n$1:class temp_object::X*) [line 41]\n  n$2=_fun_temp_object::X_div(&0$?%__sil_tmp__temp_return_n$1:class temp_object::X&) [line 41]\n  *&return:int=n$2 [line 41]\n " shape="box"]
 	
 
 	 "temp_object::getX_method_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16getX_method_div0Ev}.7e645e294d9173ff0207c8f341a5c832_3" -> "temp_object::getX_method_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16getX_method_div0Ev}.7e645e294d9173ff0207c8f341a5c832_2" ;
@@ -147,7 +147,7 @@ digraph iCFG {
 	
 
 	 "temp_object::getX_method_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16getX_method_div0Ev}.7e645e294d9173ff0207c8f341a5c832_1" -> "temp_object::getX_method_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16getX_method_div0Ev}.7e645e294d9173ff0207c8f341a5c832_3" ;
-"temp_object::temp_method_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16temp_method_div0Ev}.8a94101bd39d99d002730e3706e9b06f_3" [label="3:  Return Stmt \n   _fun_temp_object::X_X(&0$?%__sil_tmp__temp_construct_n$0:class temp_object::X *,0:int ,1:int ) [line 37]\n  n$1=_fun_temp_object::X_div(&0$?%__sil_tmp__temp_construct_n$0:class temp_object::X &) [line 37]\n  *&return:int =n$1 [line 37]\n " shape="box"]
+"temp_object::temp_method_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16temp_method_div0Ev}.8a94101bd39d99d002730e3706e9b06f_3" [label="3:  Return Stmt \n   _fun_temp_object::X_X(&0$?%__sil_tmp__temp_construct_n$0:class temp_object::X*,0:int,1:int) [line 37]\n  n$1=_fun_temp_object::X_div(&0$?%__sil_tmp__temp_construct_n$0:class temp_object::X&) [line 37]\n  *&return:int=n$1 [line 37]\n " shape="box"]
 	
 
 	 "temp_object::temp_method_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16temp_method_div0Ev}.8a94101bd39d99d002730e3706e9b06f_3" -> "temp_object::temp_method_div0{d41d8cd98f00b204e9800998ecf8427e_ZN11temp_object16temp_method_div0Ev}.8a94101bd39d99d002730e3706e9b06f_2" ;

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

@@ -1,6 +1,6 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   n$0=_fun_deref(0:int *) [line 28]\n  *&return:int =n$0 [line 28]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  Return Stmt \n   n$0=_fun_deref(0:int*) [line 28]\n  *&return:int=n$0 [line 28]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
@@ -11,7 +11,7 @@ digraph iCFG {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
-"call_deref_with_null{d41d8cd98f00b204e9800998ecf8427e_Z20call_deref_with_nullv}.fcb84ec38620d01b61814503592ab750_3" [label="3:  Call _fun_deref_null \n   n$0=_fun_deref_null(null:int *) [line 24]\n " shape="box"]
+"call_deref_with_null{d41d8cd98f00b204e9800998ecf8427e_Z20call_deref_with_nullv}.fcb84ec38620d01b61814503592ab750_3" [label="3:  Call _fun_deref_null \n   n$0=_fun_deref_null(null:int*) [line 24]\n " shape="box"]
 	
 
 	 "call_deref_with_null{d41d8cd98f00b204e9800998ecf8427e_Z20call_deref_with_nullv}.fcb84ec38620d01b61814503592ab750_3" -> "call_deref_with_null{d41d8cd98f00b204e9800998ecf8427e_Z20call_deref_with_nullv}.fcb84ec38620d01b61814503592ab750_2" ;
@@ -22,7 +22,7 @@ digraph iCFG {
 	
 
 	 "call_deref_with_null{d41d8cd98f00b204e9800998ecf8427e_Z20call_deref_with_nullv}.fcb84ec38620d01b61814503592ab750_1" -> "call_deref_with_null{d41d8cd98f00b204e9800998ecf8427e_Z20call_deref_with_nullv}.fcb84ec38620d01b61814503592ab750_3" ;
-"deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_8" [label="8:  ObjCCPPThrow \n   _fun___infer_objc_cpp_throw(\"Null pointer!\":char *) [line 12]\n " shape="box"]
+"deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_8" [label="8:  ObjCCPPThrow \n   _fun___infer_objc_cpp_throw(\"Null pointer!\":char*) [line 12]\n " shape="box"]
 	
 
 	 "deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_8" -> "deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_4" ;
@@ -34,7 +34,7 @@ digraph iCFG {
 	
 
 	 "deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_6" -> "deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_8" ;
-"deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_5" [label="5:  BinaryOperatorStmt: EQ \n   n$2=*&p:int * [line 11]\n " shape="box"]
+"deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_5" [label="5:  BinaryOperatorStmt: EQ \n   n$2=*&p:int* [line 11]\n " shape="box"]
 	
 
 	 "deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_5" -> "deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_6" ;
@@ -43,25 +43,25 @@ digraph iCFG {
 	
 
 	 "deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_4" -> "deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_3" ;
-"deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_3" [label="3:  Return Stmt \n   n$0=*&p:int * [line 14]\n  n$1=*n$0:int  [line 14]\n  *&return:int =n$1 [line 14]\n " shape="box"]
+"deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_3" [label="3:  Return Stmt \n   n$0=*&p:int* [line 14]\n  n$1=*n$0:int [line 14]\n  *&return:int=n$1 [line 14]\n " shape="box"]
 	
 
 	 "deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_3" -> "deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_2" ;
 "deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_2" [label="2: Exit deref \n  " color=yellow style=filled]
 	
 
-"deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_1" [label="1: Start deref\nFormals:  p:int *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
+"deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_1" [label="1: Start deref\nFormals:  p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
 	 "deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_1" -> "deref{d41d8cd98f00b204e9800998ecf8427e_Z5derefPi}.1d0054b4e8f1180440da0c2b41feb4c1_5" ;
-"deref_null{d41d8cd98f00b204e9800998ecf8427e_Z10deref_nullPi}.573637fa82f810cc84aca2df3c15a325_3" [label="3:  Return Stmt \n   n$0=*&p:int * [line 19]\n  n$1=*n$0:int  [line 19]\n  *&return:int =n$1 [line 19]\n " shape="box"]
+"deref_null{d41d8cd98f00b204e9800998ecf8427e_Z10deref_nullPi}.573637fa82f810cc84aca2df3c15a325_3" [label="3:  Return Stmt \n   n$0=*&p:int* [line 19]\n  n$1=*n$0:int [line 19]\n  *&return:int=n$1 [line 19]\n " shape="box"]
 	
 
 	 "deref_null{d41d8cd98f00b204e9800998ecf8427e_Z10deref_nullPi}.573637fa82f810cc84aca2df3c15a325_3" -> "deref_null{d41d8cd98f00b204e9800998ecf8427e_Z10deref_nullPi}.573637fa82f810cc84aca2df3c15a325_2" ;
 "deref_null{d41d8cd98f00b204e9800998ecf8427e_Z10deref_nullPi}.573637fa82f810cc84aca2df3c15a325_2" [label="2: Exit deref_null \n  " color=yellow style=filled]
 	
 
-"deref_null{d41d8cd98f00b204e9800998ecf8427e_Z10deref_nullPi}.573637fa82f810cc84aca2df3c15a325_1" [label="1: Start deref_null\nFormals:  p:int *\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
+"deref_null{d41d8cd98f00b204e9800998ecf8427e_Z10deref_nullPi}.573637fa82f810cc84aca2df3c15a325_1" [label="1: Start deref_null\nFormals:  p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
 	
 
 	 "deref_null{d41d8cd98f00b204e9800998ecf8427e_Z10deref_nullPi}.573637fa82f810cc84aca2df3c15a325_1" -> "deref_null{d41d8cd98f00b204e9800998ecf8427e_Z10deref_nullPi}.573637fa82f810cc84aca2df3c15a325_3" ;

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

@@ -7,7 +7,7 @@ digraph iCFG {
 	
 
 	 "throw1{d41d8cd98f00b204e9800998ecf8427e_Z6throw1v}.114ffb11adfb5a315c7e3cbb53a7b865_1" -> "throw1{d41d8cd98f00b204e9800998ecf8427e_Z6throw1v}.114ffb11adfb5a315c7e3cbb53a7b865_2" ;
-"noexcept_in_no_throw_is_true{d41d8cd98f00b204e9800998ecf8427e_Z28noexcept_in_no_throw_is_truev}.a14601e75d60b3da496574676b888111_3" [label="3:  Return Stmt \n   *&return:int =1 [line 14]\n " shape="box"]
+"noexcept_in_no_throw_is_true{d41d8cd98f00b204e9800998ecf8427e_Z28noexcept_in_no_throw_is_truev}.a14601e75d60b3da496574676b888111_3" [label="3:  Return Stmt \n   *&return:int=1 [line 14]\n " shape="box"]
 	
 
 	 "noexcept_in_no_throw_is_true{d41d8cd98f00b204e9800998ecf8427e_Z28noexcept_in_no_throw_is_truev}.a14601e75d60b3da496574676b888111_3" -> "noexcept_in_no_throw_is_true{d41d8cd98f00b204e9800998ecf8427e_Z28noexcept_in_no_throw_is_truev}.a14601e75d60b3da496574676b888111_2" ;
@@ -18,7 +18,7 @@ digraph iCFG {
 	
 
 	 "noexcept_in_no_throw_is_true{d41d8cd98f00b204e9800998ecf8427e_Z28noexcept_in_no_throw_is_truev}.a14601e75d60b3da496574676b888111_1" -> "noexcept_in_no_throw_is_true{d41d8cd98f00b204e9800998ecf8427e_Z28noexcept_in_no_throw_is_truev}.a14601e75d60b3da496574676b888111_3" ;
-"noexcept_in_throw1_is_false{d41d8cd98f00b204e9800998ecf8427e_Z27noexcept_in_throw1_is_falsev}.e24c34dfe12fb37463a063a9be45127d_3" [label="3:  Return Stmt \n   *&return:int =0 [line 16]\n " shape="box"]
+"noexcept_in_throw1_is_false{d41d8cd98f00b204e9800998ecf8427e_Z27noexcept_in_throw1_is_falsev}.e24c34dfe12fb37463a063a9be45127d_3" [label="3:  Return Stmt \n   *&return:int=0 [line 16]\n " shape="box"]
 	
 
 	 "noexcept_in_throw1_is_false{d41d8cd98f00b204e9800998ecf8427e_Z27noexcept_in_throw1_is_falsev}.e24c34dfe12fb37463a063a9be45127d_3" -> "noexcept_in_throw1_is_false{d41d8cd98f00b204e9800998ecf8427e_Z27noexcept_in_throw1_is_falsev}.e24c34dfe12fb37463a063a9be45127d_2" ;

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

@@ -1,36 +1,36 @@
 /* @generated */
 digraph iCFG {
-"foo::lambda_shared_lambda_lambda1.cpp:19:17_operator()(_ZZ3foovENK3$_1clEv).985fe31737ac21d3fc164c617feba422_3" [label="3:  Return Stmt \n   *&return:int =(1 / 0) [line 19]\n " shape="box"]
+"foo::lambda_shared_lambda_lambda1.cpp:19:17_operator()(_ZZ3foovENK3$_1clEv).985fe31737ac21d3fc164c617feba422_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 19]\n " shape="box"]
 	
 
 	 "foo::lambda_shared_lambda_lambda1.cpp:19:17_operator()(_ZZ3foovENK3$_1clEv).985fe31737ac21d3fc164c617feba422_3" -> "foo::lambda_shared_lambda_lambda1.cpp:19:17_operator()(_ZZ3foovENK3$_1clEv).985fe31737ac21d3fc164c617feba422_2" ;
 "foo::lambda_shared_lambda_lambda1.cpp:19:17_operator()(_ZZ3foovENK3$_1clEv).985fe31737ac21d3fc164c617feba422_2" [label="2: Exit foo::lambda_shared_lambda_lambda1.cpp:19:17_operator() \n  " color=yellow style=filled]
 	
 
-"foo::lambda_shared_lambda_lambda1.cpp:19:17_operator()(_ZZ3foovENK3$_1clEv).985fe31737ac21d3fc164c617feba422_1" [label="1: Start foo::lambda_shared_lambda_lambda1.cpp:19:17_operator()\nFormals:  this:class foo::lambda_shared_lambda_lambda1.cpp:19:17 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
+"foo::lambda_shared_lambda_lambda1.cpp:19:17_operator()(_ZZ3foovENK3$_1clEv).985fe31737ac21d3fc164c617feba422_1" [label="1: Start foo::lambda_shared_lambda_lambda1.cpp:19:17_operator()\nFormals:  this:class foo::lambda_shared_lambda_lambda1.cpp:19:17*\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
 	
 
 	 "foo::lambda_shared_lambda_lambda1.cpp:19:17_operator()(_ZZ3foovENK3$_1clEv).985fe31737ac21d3fc164c617feba422_1" -> "foo::lambda_shared_lambda_lambda1.cpp:19:17_operator()(_ZZ3foovENK3$_1clEv).985fe31737ac21d3fc164c617feba422_3" ;
-"foo::lambda_shared_lambda_lambda1.cpp:20:12_operator()(_ZZ3foovENK3$_2clEi).83f062e992857d1735d2bdb1eb5970f7_3" [label="3:  Return Stmt \n   n$0=*&i:int  [line 20]\n  *&i:int =(n$0 + 1) [line 20]\n  n$1=*&i:int  [line 20]\n  *&return:int =n$1 [line 20]\n " shape="box"]
+"foo::lambda_shared_lambda_lambda1.cpp:20:12_operator()(_ZZ3foovENK3$_2clEi).83f062e992857d1735d2bdb1eb5970f7_3" [label="3:  Return Stmt \n   n$0=*&i:int [line 20]\n  *&i:int=(n$0 + 1) [line 20]\n  n$1=*&i:int [line 20]\n  *&return:int=n$1 [line 20]\n " shape="box"]
 	
 
 	 "foo::lambda_shared_lambda_lambda1.cpp:20:12_operator()(_ZZ3foovENK3$_2clEi).83f062e992857d1735d2bdb1eb5970f7_3" -> "foo::lambda_shared_lambda_lambda1.cpp:20:12_operator()(_ZZ3foovENK3$_2clEi).83f062e992857d1735d2bdb1eb5970f7_2" ;
 "foo::lambda_shared_lambda_lambda1.cpp:20:12_operator()(_ZZ3foovENK3$_2clEi).83f062e992857d1735d2bdb1eb5970f7_2" [label="2: Exit foo::lambda_shared_lambda_lambda1.cpp:20:12_operator() \n  " color=yellow style=filled]
 	
 
-"foo::lambda_shared_lambda_lambda1.cpp:20:12_operator()(_ZZ3foovENK3$_2clEi).83f062e992857d1735d2bdb1eb5970f7_1" [label="1: Start foo::lambda_shared_lambda_lambda1.cpp:20:12_operator()\nFormals:  this:class foo::lambda_shared_lambda_lambda1.cpp:20:12 * i:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 20]\n " color=yellow style=filled]
+"foo::lambda_shared_lambda_lambda1.cpp:20:12_operator()(_ZZ3foovENK3$_2clEi).83f062e992857d1735d2bdb1eb5970f7_1" [label="1: Start foo::lambda_shared_lambda_lambda1.cpp:20:12_operator()\nFormals:  this:class foo::lambda_shared_lambda_lambda1.cpp:20:12* i:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 20]\n " color=yellow style=filled]
 	
 
 	 "foo::lambda_shared_lambda_lambda1.cpp:20:12_operator()(_ZZ3foovENK3$_2clEi).83f062e992857d1735d2bdb1eb5970f7_1" -> "foo::lambda_shared_lambda_lambda1.cpp:20:12_operator()(_ZZ3foovENK3$_2clEi).83f062e992857d1735d2bdb1eb5970f7_3" ;
-"foo{d41d8cd98f00b204e9800998ecf8427e_Z3foov}.cec094ac2a03268f9ce740007750b9a1_5" [label="5:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$2:class foo::lambda_shared_lambda_lambda1.cpp:19:17 =(_fun_foo::lambda_shared_lambda_lambda1.cpp:19:17_operator()) [line 19]\n  _fun_foo::lambda_shared_lambda_lambda1.cpp:19:17_(&unused:class foo::lambda_shared_lambda_lambda1.cpp:19:17 *,&0$?%__sil_tmpSIL_materialize_temp__n$2:class foo::lambda_shared_lambda_lambda1.cpp:19:17 &) [line 19]\n " shape="box"]
+"foo{d41d8cd98f00b204e9800998ecf8427e_Z3foov}.cec094ac2a03268f9ce740007750b9a1_5" [label="5:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$2:class foo::lambda_shared_lambda_lambda1.cpp:19:17=(_fun_foo::lambda_shared_lambda_lambda1.cpp:19:17_operator()) [line 19]\n  _fun_foo::lambda_shared_lambda_lambda1.cpp:19:17_(&unused:class foo::lambda_shared_lambda_lambda1.cpp:19:17*,&0$?%__sil_tmpSIL_materialize_temp__n$2:class foo::lambda_shared_lambda_lambda1.cpp:19:17&) [line 19]\n " shape="box"]
 	
 
 	 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3foov}.cec094ac2a03268f9ce740007750b9a1_5" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3foov}.cec094ac2a03268f9ce740007750b9a1_4" ;
-"foo{d41d8cd98f00b204e9800998ecf8427e_Z3foov}.cec094ac2a03268f9ce740007750b9a1_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$1:class foo::lambda_shared_lambda_lambda1.cpp:20:12 =(_fun_foo::lambda_shared_lambda_lambda1.cpp:20:12_operator()) [line 20]\n  _fun_foo::lambda_shared_lambda_lambda1.cpp:20:12_(&y:class foo::lambda_shared_lambda_lambda1.cpp:20:12 *,&0$?%__sil_tmpSIL_materialize_temp__n$1:class foo::lambda_shared_lambda_lambda1.cpp:20:12 &) [line 20]\n " shape="box"]
+"foo{d41d8cd98f00b204e9800998ecf8427e_Z3foov}.cec094ac2a03268f9ce740007750b9a1_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$1:class foo::lambda_shared_lambda_lambda1.cpp:20:12=(_fun_foo::lambda_shared_lambda_lambda1.cpp:20:12_operator()) [line 20]\n  _fun_foo::lambda_shared_lambda_lambda1.cpp:20:12_(&y:class foo::lambda_shared_lambda_lambda1.cpp:20:12*,&0$?%__sil_tmpSIL_materialize_temp__n$1:class foo::lambda_shared_lambda_lambda1.cpp:20:12&) [line 20]\n " shape="box"]
 	
 
 	 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3foov}.cec094ac2a03268f9ce740007750b9a1_4" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3foov}.cec094ac2a03268f9ce740007750b9a1_3" ;
-"foo{d41d8cd98f00b204e9800998ecf8427e_Z3foov}.cec094ac2a03268f9ce740007750b9a1_3" [label="3:  Return Stmt \n   n$0=_fun_foo::lambda_shared_lambda_lambda1.cpp:20:12_operator()(&y:class foo::lambda_shared_lambda_lambda1.cpp:20:12 &,3:int ) [line 21]\n  *&return:int =(5 / (4 - n$0)) [line 21]\n " shape="box"]
+"foo{d41d8cd98f00b204e9800998ecf8427e_Z3foov}.cec094ac2a03268f9ce740007750b9a1_3" [label="3:  Return Stmt \n   n$0=_fun_foo::lambda_shared_lambda_lambda1.cpp:20:12_operator()(&y:class foo::lambda_shared_lambda_lambda1.cpp:20:12&,3:int) [line 21]\n  *&return:int=(5 / (4 - n$0)) [line 21]\n " shape="box"]
 	
 
 	 "foo{d41d8cd98f00b204e9800998ecf8427e_Z3foov}.cec094ac2a03268f9ce740007750b9a1_3" -> "foo{d41d8cd98f00b204e9800998ecf8427e_Z3foov}.cec094ac2a03268f9ce740007750b9a1_2" ;
@@ -44,22 +44,22 @@ digraph iCFG {
 "foo::lambda_shared_lambda_lambda1.cpp:20:12_{_ZZ3foovEN3$_2C1EOS_}.0e1564c2cc993b8beca9a7d9955e04a5_2" [label="2: Exit foo::lambda_shared_lambda_lambda1.cpp:20:12_ \n  " color=yellow style=filled]
 	
 
-"foo::lambda_shared_lambda_lambda1.cpp:20:12_{_ZZ3foovEN3$_2C1EOS_}.0e1564c2cc993b8beca9a7d9955e04a5_1" [label="1: Start foo::lambda_shared_lambda_lambda1.cpp:20:12_\nFormals:  this:class foo::lambda_shared_lambda_lambda1.cpp:20:12 * __param_0:class foo::lambda_shared_lambda_lambda1.cpp:20:12 &\nLocals:  \n   DECLARE_LOCALS(&return); [line 20]\n " color=yellow style=filled]
+"foo::lambda_shared_lambda_lambda1.cpp:20:12_{_ZZ3foovEN3$_2C1EOS_}.0e1564c2cc993b8beca9a7d9955e04a5_1" [label="1: Start foo::lambda_shared_lambda_lambda1.cpp:20:12_\nFormals:  this:class foo::lambda_shared_lambda_lambda1.cpp:20:12* __param_0:class foo::lambda_shared_lambda_lambda1.cpp:20:12&\nLocals:  \n   DECLARE_LOCALS(&return); [line 20]\n " color=yellow style=filled]
 	
 
 	 "foo::lambda_shared_lambda_lambda1.cpp:20:12_{_ZZ3foovEN3$_2C1EOS_}.0e1564c2cc993b8beca9a7d9955e04a5_1" -> "foo::lambda_shared_lambda_lambda1.cpp:20:12_{_ZZ3foovEN3$_2C1EOS_}.0e1564c2cc993b8beca9a7d9955e04a5_2" ;
 "bar::lambda_shared_lambda_lambda1.cpp:11:15_{_ZZ3barvEN3$_0C1EOS_}.6a9e9fc47abfe378dd0d5c66eaa11486_2" [label="2: Exit bar::lambda_shared_lambda_lambda1.cpp:11:15_ \n  " color=yellow style=filled]
 	
 
-"bar::lambda_shared_lambda_lambda1.cpp:11:15_{_ZZ3barvEN3$_0C1EOS_}.6a9e9fc47abfe378dd0d5c66eaa11486_1" [label="1: Start bar::lambda_shared_lambda_lambda1.cpp:11:15_\nFormals:  this:class bar::lambda_shared_lambda_lambda1.cpp:11:15 * __param_0:class bar::lambda_shared_lambda_lambda1.cpp:11:15 &\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
+"bar::lambda_shared_lambda_lambda1.cpp:11:15_{_ZZ3barvEN3$_0C1EOS_}.6a9e9fc47abfe378dd0d5c66eaa11486_1" [label="1: Start bar::lambda_shared_lambda_lambda1.cpp:11:15_\nFormals:  this:class bar::lambda_shared_lambda_lambda1.cpp:11:15* __param_0:class bar::lambda_shared_lambda_lambda1.cpp:11:15&\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
 	
 
 	 "bar::lambda_shared_lambda_lambda1.cpp:11:15_{_ZZ3barvEN3$_0C1EOS_}.6a9e9fc47abfe378dd0d5c66eaa11486_1" -> "bar::lambda_shared_lambda_lambda1.cpp:11:15_{_ZZ3barvEN3$_0C1EOS_}.6a9e9fc47abfe378dd0d5c66eaa11486_2" ;
-"fooOK{d41d8cd98f00b204e9800998ecf8427e_Z5fooOKv}.47d0d2e9b234595bd6caff2a4331e134_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$1:class fooOK::lambda_shared_lambda_lambda1.cpp:26:12 =(_fun_fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator()) [line 26]\n  _fun_fooOK::lambda_shared_lambda_lambda1.cpp:26:12_(&y:class fooOK::lambda_shared_lambda_lambda1.cpp:26:12 *,&0$?%__sil_tmpSIL_materialize_temp__n$1:class fooOK::lambda_shared_lambda_lambda1.cpp:26:12 &) [line 26]\n " shape="box"]
+"fooOK{d41d8cd98f00b204e9800998ecf8427e_Z5fooOKv}.47d0d2e9b234595bd6caff2a4331e134_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$1:class fooOK::lambda_shared_lambda_lambda1.cpp:26:12=(_fun_fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator()) [line 26]\n  _fun_fooOK::lambda_shared_lambda_lambda1.cpp:26:12_(&y:class fooOK::lambda_shared_lambda_lambda1.cpp:26:12*,&0$?%__sil_tmpSIL_materialize_temp__n$1:class fooOK::lambda_shared_lambda_lambda1.cpp:26:12&) [line 26]\n " shape="box"]
 	
 
 	 "fooOK{d41d8cd98f00b204e9800998ecf8427e_Z5fooOKv}.47d0d2e9b234595bd6caff2a4331e134_4" -> "fooOK{d41d8cd98f00b204e9800998ecf8427e_Z5fooOKv}.47d0d2e9b234595bd6caff2a4331e134_3" ;
-"fooOK{d41d8cd98f00b204e9800998ecf8427e_Z5fooOKv}.47d0d2e9b234595bd6caff2a4331e134_3" [label="3:  Return Stmt \n   n$0=_fun_fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator()(&y:class fooOK::lambda_shared_lambda_lambda1.cpp:26:12 &,3:int ) [line 27]\n  *&return:int =(5 / (4 - n$0)) [line 27]\n " shape="box"]
+"fooOK{d41d8cd98f00b204e9800998ecf8427e_Z5fooOKv}.47d0d2e9b234595bd6caff2a4331e134_3" [label="3:  Return Stmt \n   n$0=_fun_fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator()(&y:class fooOK::lambda_shared_lambda_lambda1.cpp:26:12&,3:int) [line 27]\n  *&return:int=(5 / (4 - n$0)) [line 27]\n " shape="box"]
 	
 
 	 "fooOK{d41d8cd98f00b204e9800998ecf8427e_Z5fooOKv}.47d0d2e9b234595bd6caff2a4331e134_3" -> "fooOK{d41d8cd98f00b204e9800998ecf8427e_Z5fooOKv}.47d0d2e9b234595bd6caff2a4331e134_2" ;
@@ -73,48 +73,48 @@ digraph iCFG {
 "fooOK::lambda_shared_lambda_lambda1.cpp:26:12_{_ZZ5fooOKvEN3$_3C1EOS_}.53c636602c55e8b65c0551285317a32e_2" [label="2: Exit fooOK::lambda_shared_lambda_lambda1.cpp:26:12_ \n  " color=yellow style=filled]
 	
 
-"fooOK::lambda_shared_lambda_lambda1.cpp:26:12_{_ZZ5fooOKvEN3$_3C1EOS_}.53c636602c55e8b65c0551285317a32e_1" [label="1: Start fooOK::lambda_shared_lambda_lambda1.cpp:26:12_\nFormals:  this:class fooOK::lambda_shared_lambda_lambda1.cpp:26:12 * __param_0:class fooOK::lambda_shared_lambda_lambda1.cpp:26:12 &\nLocals:  \n   DECLARE_LOCALS(&return); [line 26]\n " color=yellow style=filled]
+"fooOK::lambda_shared_lambda_lambda1.cpp:26:12_{_ZZ5fooOKvEN3$_3C1EOS_}.53c636602c55e8b65c0551285317a32e_1" [label="1: Start fooOK::lambda_shared_lambda_lambda1.cpp:26:12_\nFormals:  this:class fooOK::lambda_shared_lambda_lambda1.cpp:26:12* __param_0:class fooOK::lambda_shared_lambda_lambda1.cpp:26:12&\nLocals:  \n   DECLARE_LOCALS(&return); [line 26]\n " color=yellow style=filled]
 	
 
 	 "fooOK::lambda_shared_lambda_lambda1.cpp:26:12_{_ZZ5fooOKvEN3$_3C1EOS_}.53c636602c55e8b65c0551285317a32e_1" -> "fooOK::lambda_shared_lambda_lambda1.cpp:26:12_{_ZZ5fooOKvEN3$_3C1EOS_}.53c636602c55e8b65c0551285317a32e_2" ;
-"fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator()(_ZZ5fooOKvENK3$_3clEi).28114dfeeb5c9cb201f2f32c650e906c_3" [label="3:  Return Stmt \n   n$0=*&i:int  [line 26]\n  *&i:int =(n$0 + 1) [line 26]\n  *&return:int =n$0 [line 26]\n " shape="box"]
+"fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator()(_ZZ5fooOKvENK3$_3clEi).28114dfeeb5c9cb201f2f32c650e906c_3" [label="3:  Return Stmt \n   n$0=*&i:int [line 26]\n  *&i:int=(n$0 + 1) [line 26]\n  *&return:int=n$0 [line 26]\n " shape="box"]
 	
 
 	 "fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator()(_ZZ5fooOKvENK3$_3clEi).28114dfeeb5c9cb201f2f32c650e906c_3" -> "fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator()(_ZZ5fooOKvENK3$_3clEi).28114dfeeb5c9cb201f2f32c650e906c_2" ;
 "fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator()(_ZZ5fooOKvENK3$_3clEi).28114dfeeb5c9cb201f2f32c650e906c_2" [label="2: Exit fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator() \n  " color=yellow style=filled]
 	
 
-"fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator()(_ZZ5fooOKvENK3$_3clEi).28114dfeeb5c9cb201f2f32c650e906c_1" [label="1: Start fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator()\nFormals:  this:class fooOK::lambda_shared_lambda_lambda1.cpp:26:12 * i:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 26]\n " color=yellow style=filled]
+"fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator()(_ZZ5fooOKvENK3$_3clEi).28114dfeeb5c9cb201f2f32c650e906c_1" [label="1: Start fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator()\nFormals:  this:class fooOK::lambda_shared_lambda_lambda1.cpp:26:12* i:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 26]\n " color=yellow style=filled]
 	
 
 	 "fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator()(_ZZ5fooOKvENK3$_3clEi).28114dfeeb5c9cb201f2f32c650e906c_1" -> "fooOK::lambda_shared_lambda_lambda1.cpp:26:12_operator()(_ZZ5fooOKvENK3$_3clEi).28114dfeeb5c9cb201f2f32c650e906c_3" ;
 "foo::lambda_shared_lambda_lambda1.cpp:19:17_{_ZZ3foovEN3$_1C1EOS_}.5561ce7b5dc8b401fdf94ad612389a2a_2" [label="2: Exit foo::lambda_shared_lambda_lambda1.cpp:19:17_ \n  " color=yellow style=filled]
 	
 
-"foo::lambda_shared_lambda_lambda1.cpp:19:17_{_ZZ3foovEN3$_1C1EOS_}.5561ce7b5dc8b401fdf94ad612389a2a_1" [label="1: Start foo::lambda_shared_lambda_lambda1.cpp:19:17_\nFormals:  this:class foo::lambda_shared_lambda_lambda1.cpp:19:17 * __param_0:class foo::lambda_shared_lambda_lambda1.cpp:19:17 &\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
+"foo::lambda_shared_lambda_lambda1.cpp:19:17_{_ZZ3foovEN3$_1C1EOS_}.5561ce7b5dc8b401fdf94ad612389a2a_1" [label="1: Start foo::lambda_shared_lambda_lambda1.cpp:19:17_\nFormals:  this:class foo::lambda_shared_lambda_lambda1.cpp:19:17* __param_0:class foo::lambda_shared_lambda_lambda1.cpp:19:17&\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
 	
 
 	 "foo::lambda_shared_lambda_lambda1.cpp:19:17_{_ZZ3foovEN3$_1C1EOS_}.5561ce7b5dc8b401fdf94ad612389a2a_1" -> "foo::lambda_shared_lambda_lambda1.cpp:19:17_{_ZZ3foovEN3$_1C1EOS_}.5561ce7b5dc8b401fdf94ad612389a2a_2" ;
-"bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()(_ZZ3barvENK3$_0clEv).cb0ea2b31d556c91fda839346a13c429_4" [label="4:  DeclStmt \n   *&i:int =0 [line 12]\n " shape="box"]
+"bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()(_ZZ3barvENK3$_0clEv).cb0ea2b31d556c91fda839346a13c429_4" [label="4:  DeclStmt \n   *&i:int=0 [line 12]\n " shape="box"]
 	
 
 	 "bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()(_ZZ3barvENK3$_0clEv).cb0ea2b31d556c91fda839346a13c429_4" -> "bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()(_ZZ3barvENK3$_0clEv).cb0ea2b31d556c91fda839346a13c429_3" ;
-"bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()(_ZZ3barvENK3$_0clEv).cb0ea2b31d556c91fda839346a13c429_3" [label="3:  Return Stmt \n   n$0=*&i:int  [line 13]\n  *&return:int =n$0 [line 13]\n " shape="box"]
+"bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()(_ZZ3barvENK3$_0clEv).cb0ea2b31d556c91fda839346a13c429_3" [label="3:  Return Stmt \n   n$0=*&i:int [line 13]\n  *&return:int=n$0 [line 13]\n " shape="box"]
 	
 
 	 "bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()(_ZZ3barvENK3$_0clEv).cb0ea2b31d556c91fda839346a13c429_3" -> "bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()(_ZZ3barvENK3$_0clEv).cb0ea2b31d556c91fda839346a13c429_2" ;
 "bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()(_ZZ3barvENK3$_0clEv).cb0ea2b31d556c91fda839346a13c429_2" [label="2: Exit bar::lambda_shared_lambda_lambda1.cpp:11:15_operator() \n  " color=yellow style=filled]
 	
 
-"bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()(_ZZ3barvENK3$_0clEv).cb0ea2b31d556c91fda839346a13c429_1" [label="1: Start bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()\nFormals:  this:class bar::lambda_shared_lambda_lambda1.cpp:11:15 *\nLocals:  i:int  \n   DECLARE_LOCALS(&return,&i); [line 11]\n " color=yellow style=filled]
+"bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()(_ZZ3barvENK3$_0clEv).cb0ea2b31d556c91fda839346a13c429_1" [label="1: Start bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()\nFormals:  this:class bar::lambda_shared_lambda_lambda1.cpp:11:15*\nLocals:  i:int \n   DECLARE_LOCALS(&return,&i); [line 11]\n " color=yellow style=filled]
 	
 
 	 "bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()(_ZZ3barvENK3$_0clEv).cb0ea2b31d556c91fda839346a13c429_1" -> "bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()(_ZZ3barvENK3$_0clEv).cb0ea2b31d556c91fda839346a13c429_4" ;
-"bar{d41d8cd98f00b204e9800998ecf8427e_Z3barv}.fd8b7c2b286499dc294bdb8f8b246862_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$1:class bar::lambda_shared_lambda_lambda1.cpp:11:15 =(_fun_bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()) [line 11]\n  _fun_bar::lambda_shared_lambda_lambda1.cpp:11:15_(&func:class bar::lambda_shared_lambda_lambda1.cpp:11:15 *,&0$?%__sil_tmpSIL_materialize_temp__n$1:class bar::lambda_shared_lambda_lambda1.cpp:11:15 &) [line 11]\n " shape="box"]
+"bar{d41d8cd98f00b204e9800998ecf8427e_Z3barv}.fd8b7c2b286499dc294bdb8f8b246862_4" [label="4:  DeclStmt \n   *&0$?%__sil_tmpSIL_materialize_temp__n$1:class bar::lambda_shared_lambda_lambda1.cpp:11:15=(_fun_bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()) [line 11]\n  _fun_bar::lambda_shared_lambda_lambda1.cpp:11:15_(&func:class bar::lambda_shared_lambda_lambda1.cpp:11:15*,&0$?%__sil_tmpSIL_materialize_temp__n$1:class bar::lambda_shared_lambda_lambda1.cpp:11:15&) [line 11]\n " shape="box"]
 	
 
 	 "bar{d41d8cd98f00b204e9800998ecf8427e_Z3barv}.fd8b7c2b286499dc294bdb8f8b246862_4" -> "bar{d41d8cd98f00b204e9800998ecf8427e_Z3barv}.fd8b7c2b286499dc294bdb8f8b246862_3" ;
-"bar{d41d8cd98f00b204e9800998ecf8427e_Z3barv}.fd8b7c2b286499dc294bdb8f8b246862_3" [label="3:  Return Stmt \n   n$0=_fun_bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()(&func:class bar::lambda_shared_lambda_lambda1.cpp:11:15 &) [line 15]\n  *&return:int =(7 / n$0) [line 15]\n " shape="box"]
+"bar{d41d8cd98f00b204e9800998ecf8427e_Z3barv}.fd8b7c2b286499dc294bdb8f8b246862_3" [label="3:  Return Stmt \n   n$0=_fun_bar::lambda_shared_lambda_lambda1.cpp:11:15_operator()(&func:class bar::lambda_shared_lambda_lambda1.cpp:11:15&) [line 15]\n  *&return:int=(7 / n$0) [line 15]\n " shape="box"]
 	
 
 	 "bar{d41d8cd98f00b204e9800998ecf8427e_Z3barv}.fd8b7c2b286499dc294bdb8f8b246862_3" -> "bar{d41d8cd98f00b204e9800998ecf8427e_Z3barv}.fd8b7c2b286499dc294bdb8f8b246862_2" ;

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

@@ -1,14 +1,14 @@
 /* @generated */
 digraph iCFG {
-"conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_10" [label="10:  DeclStmt \n   _fun_conversion_operator::X_X(&x:class conversion_operator::X *,1:int ,1:_Bool ) [line 64]\n " shape="box"]
+"conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_10" [label="10:  DeclStmt \n   _fun_conversion_operator::X_X(&x:class conversion_operator::X*,1:int,1:_Bool) [line 64]\n " shape="box"]
 	
 
 	 "conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_10" -> "conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_5" ;
-"conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_9" [label="9:  DeclStmt \n   _=*&x:class conversion_operator::X  [line 66]\n  n$6=_fun_conversion_operator::X_operator_int(&x:class conversion_operator::X &) [line 66]\n  *&v:int =n$6 [line 66]\n " shape="box"]
+"conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_9" [label="9:  DeclStmt \n   _=*&x:class conversion_operator::X [line 66]\n  n$6=_fun_conversion_operator::X_operator_int(&x:class conversion_operator::X&) [line 66]\n  *&v:int=n$6 [line 66]\n " shape="box"]
 	
 
 	 "conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_9" -> "conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_8" ;
-"conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_8" [label="8:  Return Stmt \n   n$4=*&v:int  [line 67]\n  *&return:int =(1 / n$4) [line 67]\n " shape="box"]
+"conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_8" [label="8:  Return Stmt \n   n$4=*&v:int [line 67]\n  *&return:int=(1 / n$4) [line 67]\n " shape="box"]
 	
 
 	 "conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_8" -> "conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_2" ;
@@ -20,7 +20,7 @@ digraph iCFG {
 	
 
 	 "conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_6" -> "conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_9" ;
-"conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_5" [label="5:  Call _fun_conversion_operator::X_operator_bool \n   _=*&x:class conversion_operator::X  [line 65]\n  n$3=_fun_conversion_operator::X_operator_bool(&x:class conversion_operator::X &) [line 65]\n " shape="box"]
+"conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_5" [label="5:  Call _fun_conversion_operator::X_operator_bool \n   _=*&x:class conversion_operator::X [line 65]\n  n$3=_fun_conversion_operator::X_operator_bool(&x:class conversion_operator::X&) [line 65]\n " shape="box"]
 	
 
 	 "conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_5" -> "conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_6" ;
@@ -29,7 +29,7 @@ digraph iCFG {
 	
 
 	 "conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_4" -> "conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_3" ;
-"conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_3" [label="3:  Return Stmt \n   _=*&x:class conversion_operator::X  [line 69]\n  n$1=_fun_conversion_operator::X_operator_int(&x:class conversion_operator::X &) [line 69]\n  *&return:int =n$1 [line 69]\n " shape="box"]
+"conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_3" [label="3:  Return Stmt \n   _=*&x:class conversion_operator::X [line 69]\n  n$1=_fun_conversion_operator::X_operator_int(&x:class conversion_operator::X&) [line 69]\n  *&return:int=n$1 [line 69]\n " shape="box"]
 	
 
 	 "conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_3" -> "conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_2" ;
@@ -40,52 +40,52 @@ digraph iCFG {
 	
 
 	 "conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_1" -> "conversion_operator::branch_div1{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.49bb4aa865fa63a218f0c61093e085ce_10" ;
-"conversion_operator::X_X{_ZN19conversion_operator1XC1Eib}.aec165e5824e20faf9037780940ace67_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:class conversion_operator::X * [line 18]\n  n$3=*&f:int  [line 18]\n  *n$2.f_:int =n$3 [line 18]\n " shape="box"]
+"conversion_operator::X_X{_ZN19conversion_operator1XC1Eib}.aec165e5824e20faf9037780940ace67_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:class conversion_operator::X* [line 18]\n  n$3=*&f:int [line 18]\n  *n$2.f_:int=n$3 [line 18]\n " shape="box"]
 	
 
 	 "conversion_operator::X_X{_ZN19conversion_operator1XC1Eib}.aec165e5824e20faf9037780940ace67_4" -> "conversion_operator::X_X{_ZN19conversion_operator1XC1Eib}.aec165e5824e20faf9037780940ace67_3" ;
-"conversion_operator::X_X{_ZN19conversion_operator1XC1Eib}.aec165e5824e20faf9037780940ace67_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class conversion_operator::X * [line 19]\n  n$1=*&b:_Bool  [line 19]\n  *n$0.b_:_Bool =n$1 [line 19]\n " shape="box"]
+"conversion_operator::X_X{_ZN19conversion_operator1XC1Eib}.aec165e5824e20faf9037780940ace67_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class conversion_operator::X* [line 19]\n  n$1=*&b:_Bool [line 19]\n  *n$0.b_:_Bool=n$1 [line 19]\n " shape="box"]
 	
 
 	 "conversion_operator::X_X{_ZN19conversion_operator1XC1Eib}.aec165e5824e20faf9037780940ace67_3" -> "conversion_operator::X_X{_ZN19conversion_operator1XC1Eib}.aec165e5824e20faf9037780940ace67_2" ;
 "conversion_operator::X_X{_ZN19conversion_operator1XC1Eib}.aec165e5824e20faf9037780940ace67_2" [label="2: Exit conversion_operator::X_X \n  " color=yellow style=filled]
 	
 
-"conversion_operator::X_X{_ZN19conversion_operator1XC1Eib}.aec165e5824e20faf9037780940ace67_1" [label="1: Start conversion_operator::X_X\nFormals:  this:class conversion_operator::X * f:int  b:_Bool \nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
+"conversion_operator::X_X{_ZN19conversion_operator1XC1Eib}.aec165e5824e20faf9037780940ace67_1" [label="1: Start conversion_operator::X_X\nFormals:  this:class conversion_operator::X* f:int b:_Bool\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
 	
 
 	 "conversion_operator::X_X{_ZN19conversion_operator1XC1Eib}.aec165e5824e20faf9037780940ace67_1" -> "conversion_operator::X_X{_ZN19conversion_operator1XC1Eib}.aec165e5824e20faf9037780940ace67_4" ;
 "conversion_operator::Y_Y{_ZN19conversion_operator1YC1Ev}.1f3cad4203d46e6505f777a349285227_2" [label="2: Exit conversion_operator::Y_Y \n  " color=yellow style=filled]
 	
 
-"conversion_operator::Y_Y{_ZN19conversion_operator1YC1Ev}.1f3cad4203d46e6505f777a349285227_1" [label="1: Start conversion_operator::Y_Y\nFormals:  this:class conversion_operator::Y *\nLocals:  \n   DECLARE_LOCALS(&return); [line 27]\n " color=yellow style=filled]
+"conversion_operator::Y_Y{_ZN19conversion_operator1YC1Ev}.1f3cad4203d46e6505f777a349285227_1" [label="1: Start conversion_operator::Y_Y\nFormals:  this:class conversion_operator::Y*\nLocals:  \n   DECLARE_LOCALS(&return); [line 27]\n " color=yellow style=filled]
 	
 
 	 "conversion_operator::Y_Y{_ZN19conversion_operator1YC1Ev}.1f3cad4203d46e6505f777a349285227_1" -> "conversion_operator::Y_Y{_ZN19conversion_operator1YC1Ev}.1f3cad4203d46e6505f777a349285227_2" ;
-"conversion_operator::X_X{_ZN19conversion_operator1XC1ERKS0_}.fe390674b98626da24bd8250d67e0242_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=*&this:class conversion_operator::X * [line 22]\n  n$4=*&x:class conversion_operator::X & [line 22]\n  n$5=*n$4.f_:int  [line 22]\n  *n$3.f_:int =n$5 [line 22]\n " shape="box"]
+"conversion_operator::X_X{_ZN19conversion_operator1XC1ERKS0_}.fe390674b98626da24bd8250d67e0242_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=*&this:class conversion_operator::X* [line 22]\n  n$4=*&x:class conversion_operator::X& [line 22]\n  n$5=*n$4.f_:int [line 22]\n  *n$3.f_:int=n$5 [line 22]\n " shape="box"]
 	
 
 	 "conversion_operator::X_X{_ZN19conversion_operator1XC1ERKS0_}.fe390674b98626da24bd8250d67e0242_4" -> "conversion_operator::X_X{_ZN19conversion_operator1XC1ERKS0_}.fe390674b98626da24bd8250d67e0242_3" ;
-"conversion_operator::X_X{_ZN19conversion_operator1XC1ERKS0_}.fe390674b98626da24bd8250d67e0242_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class conversion_operator::X * [line 23]\n  n$1=*&x:class conversion_operator::X & [line 23]\n  n$2=*n$1.b_:_Bool  [line 23]\n  *n$0.b_:_Bool =n$2 [line 23]\n " shape="box"]
+"conversion_operator::X_X{_ZN19conversion_operator1XC1ERKS0_}.fe390674b98626da24bd8250d67e0242_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class conversion_operator::X* [line 23]\n  n$1=*&x:class conversion_operator::X& [line 23]\n  n$2=*n$1.b_:_Bool [line 23]\n  *n$0.b_:_Bool=n$2 [line 23]\n " shape="box"]
 	
 
 	 "conversion_operator::X_X{_ZN19conversion_operator1XC1ERKS0_}.fe390674b98626da24bd8250d67e0242_3" -> "conversion_operator::X_X{_ZN19conversion_operator1XC1ERKS0_}.fe390674b98626da24bd8250d67e0242_2" ;
 "conversion_operator::X_X{_ZN19conversion_operator1XC1ERKS0_}.fe390674b98626da24bd8250d67e0242_2" [label="2: Exit conversion_operator::X_X \n  " color=yellow style=filled]
 	
 
-"conversion_operator::X_X{_ZN19conversion_operator1XC1ERKS0_}.fe390674b98626da24bd8250d67e0242_1" [label="1: Start conversion_operator::X_X\nFormals:  this:class conversion_operator::X * x:class conversion_operator::X &\nLocals:  \n   DECLARE_LOCALS(&return); [line 21]\n " color=yellow style=filled]
+"conversion_operator::X_X{_ZN19conversion_operator1XC1ERKS0_}.fe390674b98626da24bd8250d67e0242_1" [label="1: Start conversion_operator::X_X\nFormals:  this:class conversion_operator::X* x:class conversion_operator::X&\nLocals:  \n   DECLARE_LOCALS(&return); [line 21]\n " color=yellow style=filled]
 	
 
 	 "conversion_operator::X_X{_ZN19conversion_operator1XC1ERKS0_}.fe390674b98626da24bd8250d67e0242_1" -> "conversion_operator::X_X{_ZN19conversion_operator1XC1ERKS0_}.fe390674b98626da24bd8250d67e0242_4" ;
-"conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_10" [label="10:  DeclStmt \n   _fun_conversion_operator::X_X(&x:class conversion_operator::X *,0:int ,1:_Bool ) [line 35]\n " shape="box"]
+"conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_10" [label="10:  DeclStmt \n   _fun_conversion_operator::X_X(&x:class conversion_operator::X*,0:int,1:_Bool) [line 35]\n " shape="box"]
 	
 
 	 "conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_10" -> "conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_5" ;
-"conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_9" [label="9:  DeclStmt \n   _=*&x:class conversion_operator::X  [line 37]\n  n$6=_fun_conversion_operator::X_operator_int(&x:class conversion_operator::X &) [line 37]\n  *&v:int =n$6 [line 37]\n " shape="box"]
+"conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_9" [label="9:  DeclStmt \n   _=*&x:class conversion_operator::X [line 37]\n  n$6=_fun_conversion_operator::X_operator_int(&x:class conversion_operator::X&) [line 37]\n  *&v:int=n$6 [line 37]\n " shape="box"]
 	
 
 	 "conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_9" -> "conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_8" ;
-"conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_8" [label="8:  Return Stmt \n   n$4=*&v:int  [line 38]\n  *&return:int =(1 / n$4) [line 38]\n " shape="box"]
+"conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_8" [label="8:  Return Stmt \n   n$4=*&v:int [line 38]\n  *&return:int=(1 / n$4) [line 38]\n " shape="box"]
 	
 
 	 "conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_8" -> "conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_2" ;
@@ -97,7 +97,7 @@ digraph iCFG {
 	
 
 	 "conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_6" -> "conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_9" ;
-"conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_5" [label="5:  Call _fun_conversion_operator::X_operator_bool \n   _=*&x:class conversion_operator::X  [line 36]\n  n$3=_fun_conversion_operator::X_operator_bool(&x:class conversion_operator::X &) [line 36]\n " shape="box"]
+"conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_5" [label="5:  Call _fun_conversion_operator::X_operator_bool \n   _=*&x:class conversion_operator::X [line 36]\n  n$3=_fun_conversion_operator::X_operator_bool(&x:class conversion_operator::X&) [line 36]\n " shape="box"]
 	
 
 	 "conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_5" -> "conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_6" ;
@@ -106,7 +106,7 @@ digraph iCFG {
 	
 
 	 "conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_4" -> "conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_3" ;
-"conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_3" [label="3:  Return Stmt \n   _=*&x:class conversion_operator::X  [line 40]\n  n$1=_fun_conversion_operator::X_operator_int(&x:class conversion_operator::X &) [line 40]\n  *&return:int =n$1 [line 40]\n " shape="box"]
+"conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_3" [label="3:  Return Stmt \n   _=*&x:class conversion_operator::X [line 40]\n  n$1=_fun_conversion_operator::X_operator_int(&x:class conversion_operator::X&) [line 40]\n  *&return:int=n$1 [line 40]\n " shape="box"]
 	
 
 	 "conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_3" -> "conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_2" ;
@@ -117,45 +117,45 @@ digraph iCFG {
 	
 
 	 "conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_1" -> "conversion_operator::branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator11branch_di.aa14f8ff40589026a7de7bcf7f056961_10" ;
-"conversion_operator::Y_operator_X(_ZN19conversion_operator1YcvNS_1XEEv).7fbfbd377b227fbeead158d94909d990_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class conversion_operator::X * [line 29]\n  n$2=*&this:class conversion_operator::Y * [line 29]\n  n$3=*n$2.f:int  [line 29]\n  n$4=*&this:class conversion_operator::Y * [line 29]\n  n$5=*n$4.b:int  [line 29]\n  _fun_conversion_operator::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$1:class conversion_operator::X *,n$3:int ,n$5:_Bool ) [line 29]\n  _fun_conversion_operator::X_X(n$0:class conversion_operator::X *,&0$?%__sil_tmpSIL_materialize_temp__n$1:class conversion_operator::X &) [line 29]\n " shape="box"]
+"conversion_operator::Y_operator_X(_ZN19conversion_operator1YcvNS_1XEEv).7fbfbd377b227fbeead158d94909d990_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class conversion_operator::X* [line 29]\n  n$2=*&this:class conversion_operator::Y* [line 29]\n  n$3=*n$2.f:int [line 29]\n  n$4=*&this:class conversion_operator::Y* [line 29]\n  n$5=*n$4.b:int [line 29]\n  _fun_conversion_operator::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$1:class conversion_operator::X*,n$3:int,n$5:_Bool) [line 29]\n  _fun_conversion_operator::X_X(n$0:class conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:class conversion_operator::X&) [line 29]\n " shape="box"]
 	
 
 	 "conversion_operator::Y_operator_X(_ZN19conversion_operator1YcvNS_1XEEv).7fbfbd377b227fbeead158d94909d990_3" -> "conversion_operator::Y_operator_X(_ZN19conversion_operator1YcvNS_1XEEv).7fbfbd377b227fbeead158d94909d990_2" ;
 "conversion_operator::Y_operator_X(_ZN19conversion_operator1YcvNS_1XEEv).7fbfbd377b227fbeead158d94909d990_2" [label="2: Exit conversion_operator::Y_operator_X \n  " color=yellow style=filled]
 	
 
-"conversion_operator::Y_operator_X(_ZN19conversion_operator1YcvNS_1XEEv).7fbfbd377b227fbeead158d94909d990_1" [label="1: Start conversion_operator::Y_operator_X\nFormals:  this:class conversion_operator::Y * __return_param:class conversion_operator::X *\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:class conversion_operator::X  \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 29]\n " color=yellow style=filled]
+"conversion_operator::Y_operator_X(_ZN19conversion_operator1YcvNS_1XEEv).7fbfbd377b227fbeead158d94909d990_1" [label="1: Start conversion_operator::Y_operator_X\nFormals:  this:class conversion_operator::Y* __return_param:class conversion_operator::X*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:class conversion_operator::X \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 29]\n " color=yellow style=filled]
 	
 
 	 "conversion_operator::Y_operator_X(_ZN19conversion_operator1YcvNS_1XEEv).7fbfbd377b227fbeead158d94909d990_1" -> "conversion_operator::Y_operator_X(_ZN19conversion_operator1YcvNS_1XEEv).7fbfbd377b227fbeead158d94909d990_3" ;
-"conversion_operator::X_operator_int(_ZN19conversion_operator1XcviEv).5fd445c29c23d75d880cde3646c3c635_3" [label="3:  Return Stmt \n   n$0=*&this:class conversion_operator::X * [line 13]\n  n$1=*n$0.f_:int  [line 13]\n  *&return:int =n$1 [line 13]\n " shape="box"]
+"conversion_operator::X_operator_int(_ZN19conversion_operator1XcviEv).5fd445c29c23d75d880cde3646c3c635_3" [label="3:  Return Stmt \n   n$0=*&this:class conversion_operator::X* [line 13]\n  n$1=*n$0.f_:int [line 13]\n  *&return:int=n$1 [line 13]\n " shape="box"]
 	
 
 	 "conversion_operator::X_operator_int(_ZN19conversion_operator1XcviEv).5fd445c29c23d75d880cde3646c3c635_3" -> "conversion_operator::X_operator_int(_ZN19conversion_operator1XcviEv).5fd445c29c23d75d880cde3646c3c635_2" ;
 "conversion_operator::X_operator_int(_ZN19conversion_operator1XcviEv).5fd445c29c23d75d880cde3646c3c635_2" [label="2: Exit conversion_operator::X_operator_int \n  " color=yellow style=filled]
 	
 
-"conversion_operator::X_operator_int(_ZN19conversion_operator1XcviEv).5fd445c29c23d75d880cde3646c3c635_1" [label="1: Start conversion_operator::X_operator_int\nFormals:  this:class conversion_operator::X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
+"conversion_operator::X_operator_int(_ZN19conversion_operator1XcviEv).5fd445c29c23d75d880cde3646c3c635_1" [label="1: Start conversion_operator::X_operator_int\nFormals:  this:class conversion_operator::X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
 	
 
 	 "conversion_operator::X_operator_int(_ZN19conversion_operator1XcviEv).5fd445c29c23d75d880cde3646c3c635_1" -> "conversion_operator::X_operator_int(_ZN19conversion_operator1XcviEv).5fd445c29c23d75d880cde3646c3c635_3" ;
-"conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_12" [label="12:  DeclStmt \n   _fun_conversion_operator::Y_Y(&y:class conversion_operator::Y *) [line 44]\n " shape="box"]
+"conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_12" [label="12:  DeclStmt \n   _fun_conversion_operator::Y_Y(&y:class conversion_operator::Y*) [line 44]\n " shape="box"]
 	
 
 	 "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_12" -> "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_11" ;
-"conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_11" [label="11:  BinaryOperatorStmt: Assign \n   *&y.f:int =0 [line 45]\n " shape="box"]
+"conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_11" [label="11:  BinaryOperatorStmt: Assign \n   *&y.f:int=0 [line 45]\n " shape="box"]
 	
 
 	 "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_11" -> "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_10" ;
-"conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_10" [label="10:  BinaryOperatorStmt: Assign \n   *&y.b:int =1 [line 46]\n " shape="box"]
+"conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_10" [label="10:  BinaryOperatorStmt: Assign \n   *&y.b:int=1 [line 46]\n " shape="box"]
 	
 
 	 "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_10" -> "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_5" ;
-"conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_9" [label="9:  DeclStmt \n   _=*&y:class conversion_operator::Y  [line 48]\n  _fun_conversion_operator::Y_operator_X(&y:class conversion_operator::Y &,&0$?%__sil_tmpSIL_materialize_temp__n$12:class conversion_operator::X *) [line 48]\n  _fun_conversion_operator::X_X(&0$?%__sil_tmp__temp_construct_n$11:class conversion_operator::X *,&0$?%__sil_tmpSIL_materialize_temp__n$12:class conversion_operator::X &) [line 48]\n  n$15=_fun_conversion_operator::X_operator_int(&0$?%__sil_tmp__temp_construct_n$11:class conversion_operator::X &) [line 48]\n  *&v:int =n$15 [line 48]\n " shape="box"]
+"conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_9" [label="9:  DeclStmt \n   _=*&y:class conversion_operator::Y [line 48]\n  _fun_conversion_operator::Y_operator_X(&y:class conversion_operator::Y&,&0$?%__sil_tmpSIL_materialize_temp__n$12:class conversion_operator::X*) [line 48]\n  _fun_conversion_operator::X_X(&0$?%__sil_tmp__temp_construct_n$11:class conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$12:class conversion_operator::X&) [line 48]\n  n$15=_fun_conversion_operator::X_operator_int(&0$?%__sil_tmp__temp_construct_n$11:class conversion_operator::X&) [line 48]\n  *&v:int=n$15 [line 48]\n " shape="box"]
 	
 
 	 "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_9" -> "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_8" ;
-"conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_8" [label="8:  Return Stmt \n   n$10=*&v:int  [line 49]\n  *&return:int =(1 / n$10) [line 49]\n " shape="box"]
+"conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_8" [label="8:  Return Stmt \n   n$10=*&v:int [line 49]\n  *&return:int=(1 / n$10) [line 49]\n " shape="box"]
 	
 
 	 "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_8" -> "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_2" ;
@@ -167,7 +167,7 @@ digraph iCFG {
 	
 
 	 "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_6" -> "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_9" ;
-"conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_5" [label="5:  Call _fun_conversion_operator::X_operator_bool \n   _=*&y:class conversion_operator::Y  [line 47]\n  _fun_conversion_operator::Y_operator_X(&y:class conversion_operator::Y &,&0$?%__sil_tmpSIL_materialize_temp__n$6:class conversion_operator::X *) [line 47]\n  _fun_conversion_operator::X_X(&0$?%__sil_tmp__temp_construct_n$5:class conversion_operator::X *,&0$?%__sil_tmpSIL_materialize_temp__n$6:class conversion_operator::X &) [line 47]\n  n$9=_fun_conversion_operator::X_operator_bool(&0$?%__sil_tmp__temp_construct_n$5:class conversion_operator::X &) [line 47]\n " shape="box"]
+"conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_5" [label="5:  Call _fun_conversion_operator::X_operator_bool \n   _=*&y:class conversion_operator::Y [line 47]\n  _fun_conversion_operator::Y_operator_X(&y:class conversion_operator::Y&,&0$?%__sil_tmpSIL_materialize_temp__n$6:class conversion_operator::X*) [line 47]\n  _fun_conversion_operator::X_X(&0$?%__sil_tmp__temp_construct_n$5:class conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$6:class conversion_operator::X&) [line 47]\n  n$9=_fun_conversion_operator::X_operator_bool(&0$?%__sil_tmp__temp_construct_n$5:class conversion_operator::X&) [line 47]\n " shape="box"]
 	
 
 	 "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_5" -> "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_6" ;
@@ -176,7 +176,7 @@ digraph iCFG {
 	
 
 	 "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_4" -> "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_3" ;
-"conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_3" [label="3:  Return Stmt \n   _=*&y:class conversion_operator::Y  [line 51]\n  _fun_conversion_operator::Y_operator_X(&y:class conversion_operator::Y &,&0$?%__sil_tmpSIL_materialize_temp__n$1:class conversion_operator::X *) [line 51]\n  _fun_conversion_operator::X_X(&0$?%__sil_tmp__temp_construct_n$0:class conversion_operator::X *,&0$?%__sil_tmpSIL_materialize_temp__n$1:class conversion_operator::X &) [line 51]\n  n$4=_fun_conversion_operator::X_operator_int(&0$?%__sil_tmp__temp_construct_n$0:class conversion_operator::X &) [line 51]\n  *&return:int =n$4 [line 51]\n " shape="box"]
+"conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_3" [label="3:  Return Stmt \n   _=*&y:class conversion_operator::Y [line 51]\n  _fun_conversion_operator::Y_operator_X(&y:class conversion_operator::Y&,&0$?%__sil_tmpSIL_materialize_temp__n$1:class conversion_operator::X*) [line 51]\n  _fun_conversion_operator::X_X(&0$?%__sil_tmp__temp_construct_n$0:class conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:class conversion_operator::X&) [line 51]\n  n$4=_fun_conversion_operator::X_operator_int(&0$?%__sil_tmp__temp_construct_n$0:class conversion_operator::X&) [line 51]\n  *&return:int=n$4 [line 51]\n " shape="box"]
 	
 
 	 "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_3" -> "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_2" ;
@@ -187,26 +187,26 @@ digraph iCFG {
 	
 
 	 "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_1" -> "conversion_operator::y_branch_div0{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13y_branc.7a76ee17fb27e50abb4de1e42987b12a_12" ;
-"conversion_operator::X_operator_bool(_ZN19conversion_operator1XcvbEv).07ddb8d49a563ab5f06ea9514f6d1fc2_3" [label="3:  Return Stmt \n   n$0=*&this:class conversion_operator::X * [line 14]\n  n$1=*n$0.b_:_Bool  [line 14]\n  *&return:_Bool =n$1 [line 14]\n " shape="box"]
+"conversion_operator::X_operator_bool(_ZN19conversion_operator1XcvbEv).07ddb8d49a563ab5f06ea9514f6d1fc2_3" [label="3:  Return Stmt \n   n$0=*&this:class conversion_operator::X* [line 14]\n  n$1=*n$0.b_:_Bool [line 14]\n  *&return:_Bool=n$1 [line 14]\n " shape="box"]
 	
 
 	 "conversion_operator::X_operator_bool(_ZN19conversion_operator1XcvbEv).07ddb8d49a563ab5f06ea9514f6d1fc2_3" -> "conversion_operator::X_operator_bool(_ZN19conversion_operator1XcvbEv).07ddb8d49a563ab5f06ea9514f6d1fc2_2" ;
 "conversion_operator::X_operator_bool(_ZN19conversion_operator1XcvbEv).07ddb8d49a563ab5f06ea9514f6d1fc2_2" [label="2: Exit conversion_operator::X_operator_bool \n  " color=yellow style=filled]
 	
 
-"conversion_operator::X_operator_bool(_ZN19conversion_operator1XcvbEv).07ddb8d49a563ab5f06ea9514f6d1fc2_1" [label="1: Start conversion_operator::X_operator_bool\nFormals:  this:class conversion_operator::X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
+"conversion_operator::X_operator_bool(_ZN19conversion_operator1XcvbEv).07ddb8d49a563ab5f06ea9514f6d1fc2_1" [label="1: Start conversion_operator::X_operator_bool\nFormals:  this:class conversion_operator::X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
 	
 
 	 "conversion_operator::X_operator_bool(_ZN19conversion_operator1XcvbEv).07ddb8d49a563ab5f06ea9514f6d1fc2_1" -> "conversion_operator::X_operator_bool(_ZN19conversion_operator1XcvbEv).07ddb8d49a563ab5f06ea9514f6d1fc2_3" ;
-"conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_10" [label="10:  DeclStmt \n   _fun_conversion_operator::X_X(&x:class conversion_operator::X *,0:int ,0:_Bool ) [line 55]\n " shape="box"]
+"conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_10" [label="10:  DeclStmt \n   _fun_conversion_operator::X_X(&x:class conversion_operator::X*,0:int,0:_Bool) [line 55]\n " shape="box"]
 	
 
 	 "conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_10" -> "conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_5" ;
-"conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_9" [label="9:  DeclStmt \n   _=*&x:class conversion_operator::X  [line 57]\n  n$6=_fun_conversion_operator::X_operator_int(&x:class conversion_operator::X &) [line 57]\n  *&v:int =n$6 [line 57]\n " shape="box"]
+"conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_9" [label="9:  DeclStmt \n   _=*&x:class conversion_operator::X [line 57]\n  n$6=_fun_conversion_operator::X_operator_int(&x:class conversion_operator::X&) [line 57]\n  *&v:int=n$6 [line 57]\n " shape="box"]
 	
 
 	 "conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_9" -> "conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_8" ;
-"conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_8" [label="8:  Return Stmt \n   n$4=*&v:int  [line 58]\n  *&return:int =(1 / n$4) [line 58]\n " shape="box"]
+"conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_8" [label="8:  Return Stmt \n   n$4=*&v:int [line 58]\n  *&return:int=(1 / n$4) [line 58]\n " shape="box"]
 	
 
 	 "conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_8" -> "conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_2" ;
@@ -218,7 +218,7 @@ digraph iCFG {
 	
 
 	 "conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_6" -> "conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_9" ;
-"conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_5" [label="5:  Call _fun_conversion_operator::X_operator_bool \n   _=*&x:class conversion_operator::X  [line 56]\n  n$3=_fun_conversion_operator::X_operator_bool(&x:class conversion_operator::X &) [line 56]\n " shape="box"]
+"conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_5" [label="5:  Call _fun_conversion_operator::X_operator_bool \n   _=*&x:class conversion_operator::X [line 56]\n  n$3=_fun_conversion_operator::X_operator_bool(&x:class conversion_operator::X&) [line 56]\n " shape="box"]
 	
 
 	 "conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_5" -> "conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_6" ;
@@ -227,7 +227,7 @@ digraph iCFG {
 	
 
 	 "conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_4" -> "conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_3" ;
-"conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_3" [label="3:  Return Stmt \n   _=*&x:class conversion_operator::X  [line 60]\n  n$1=_fun_conversion_operator::X_operator_int(&x:class conversion_operator::X &) [line 60]\n  *&return:int =n$1 [line 60]\n " shape="box"]
+"conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_3" [label="3:  Return Stmt \n   _=*&x:class conversion_operator::X [line 60]\n  n$1=_fun_conversion_operator::X_operator_int(&x:class conversion_operator::X&) [line 60]\n  *&return:int=n$1 [line 60]\n " shape="box"]
 	
 
 	 "conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_3" -> "conversion_operator::branch_no_div{d41d8cd98f00b204e9800998ecf8427e_ZN19conversion_operator13branch_.3ae06ed300032a64309733e89d1480e2_2" ;

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

@@ -1,32 +1,32 @@
 /* @generated */
 digraph iCFG {
-"A_fun_default(_ZN1A11fun_defaultEiii).68471429d7a7f2109841ce688b4dc1bc_3" [label="3:  Return Stmt \n   n$0=*&a:int  [line 13]\n  n$1=*&b:int  [line 13]\n  n$2=*&c:int  [line 13]\n  *&return:int =((n$0 + n$1) + n$2) [line 13]\n " shape="box"]
+"A_fun_default(_ZN1A11fun_defaultEiii).68471429d7a7f2109841ce688b4dc1bc_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 13]\n  n$1=*&b:int [line 13]\n  n$2=*&c:int [line 13]\n  *&return:int=((n$0 + n$1) + n$2) [line 13]\n " shape="box"]
 	
 
 	 "A_fun_default(_ZN1A11fun_defaultEiii).68471429d7a7f2109841ce688b4dc1bc_3" -> "A_fun_default(_ZN1A11fun_defaultEiii).68471429d7a7f2109841ce688b4dc1bc_2" ;
 "A_fun_default(_ZN1A11fun_defaultEiii).68471429d7a7f2109841ce688b4dc1bc_2" [label="2: Exit A_fun_default \n  " color=yellow style=filled]
 	
 
-"A_fun_default(_ZN1A11fun_defaultEiii).68471429d7a7f2109841ce688b4dc1bc_1" [label="1: Start A_fun_default\nFormals:  this:class A * a:int  b:int  c:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
+"A_fun_default(_ZN1A11fun_defaultEiii).68471429d7a7f2109841ce688b4dc1bc_1" [label="1: Start A_fun_default\nFormals:  this:class A* a:int b:int c:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
 	
 
 	 "A_fun_default(_ZN1A11fun_defaultEiii).68471429d7a7f2109841ce688b4dc1bc_1" -> "A_fun_default(_ZN1A11fun_defaultEiii).68471429d7a7f2109841ce688b4dc1bc_3" ;
-"call_method_with_default_parameters{d41d8cd98f00b204e9800998ecf8427e_Z35call_method_with_default_par.d5b89e435ec1aea7d936aea03f3d71d4_5" [label="5:  Call _fun_A_fun_default \n   n$6=*&a_ptr:class A * [line 18]\n  _=*n$6:class A  [line 18]\n  n$8=_fun_A_fun_default(n$6:class A *,1:int ,2:int ,3:int ) [line 18]\n " shape="box"]
+"call_method_with_default_parameters{d41d8cd98f00b204e9800998ecf8427e_Z35call_method_with_default_par.d5b89e435ec1aea7d936aea03f3d71d4_5" [label="5:  Call _fun_A_fun_default \n   n$6=*&a_ptr:class A* [line 18]\n  _=*n$6:class A [line 18]\n  n$8=_fun_A_fun_default(n$6:class A*,1:int,2:int,3:int) [line 18]\n " shape="box"]
 	
 
 	 "call_method_with_default_parameters{d41d8cd98f00b204e9800998ecf8427e_Z35call_method_with_default_par.d5b89e435ec1aea7d936aea03f3d71d4_5" -> "call_method_with_default_parameters{d41d8cd98f00b204e9800998ecf8427e_Z35call_method_with_default_par.d5b89e435ec1aea7d936aea03f3d71d4_4" ;
-"call_method_with_default_parameters{d41d8cd98f00b204e9800998ecf8427e_Z35call_method_with_default_par.d5b89e435ec1aea7d936aea03f3d71d4_4" [label="4:  Call _fun_A_fun_default \n   n$3=*&a_ptr:class A * [line 19]\n  _=*n$3:class A  [line 19]\n  n$5=_fun_A_fun_default(n$3:class A *,1:int ,2:int ,20:int ) [line 19]\n " shape="box"]
+"call_method_with_default_parameters{d41d8cd98f00b204e9800998ecf8427e_Z35call_method_with_default_par.d5b89e435ec1aea7d936aea03f3d71d4_4" [label="4:  Call _fun_A_fun_default \n   n$3=*&a_ptr:class A* [line 19]\n  _=*n$3:class A [line 19]\n  n$5=_fun_A_fun_default(n$3:class A*,1:int,2:int,20:int) [line 19]\n " shape="box"]
 	
 
 	 "call_method_with_default_parameters{d41d8cd98f00b204e9800998ecf8427e_Z35call_method_with_default_par.d5b89e435ec1aea7d936aea03f3d71d4_4" -> "call_method_with_default_parameters{d41d8cd98f00b204e9800998ecf8427e_Z35call_method_with_default_par.d5b89e435ec1aea7d936aea03f3d71d4_3" ;
-"call_method_with_default_parameters{d41d8cd98f00b204e9800998ecf8427e_Z35call_method_with_default_par.d5b89e435ec1aea7d936aea03f3d71d4_3" [label="3:  Call _fun_A_fun_default \n   n$0=*&a_ptr:class A * [line 20]\n  _=*n$0:class A  [line 20]\n  n$2=_fun_A_fun_default(n$0:class A *,1:int ,10:int ,20:int ) [line 20]\n " shape="box"]
+"call_method_with_default_parameters{d41d8cd98f00b204e9800998ecf8427e_Z35call_method_with_default_par.d5b89e435ec1aea7d936aea03f3d71d4_3" [label="3:  Call _fun_A_fun_default \n   n$0=*&a_ptr:class A* [line 20]\n  _=*n$0:class A [line 20]\n  n$2=_fun_A_fun_default(n$0:class A*,1:int,10:int,20:int) [line 20]\n " shape="box"]
 	
 
 	 "call_method_with_default_parameters{d41d8cd98f00b204e9800998ecf8427e_Z35call_method_with_default_par.d5b89e435ec1aea7d936aea03f3d71d4_3" -> "call_method_with_default_parameters{d41d8cd98f00b204e9800998ecf8427e_Z35call_method_with_default_par.d5b89e435ec1aea7d936aea03f3d71d4_2" ;
 "call_method_with_default_parameters{d41d8cd98f00b204e9800998ecf8427e_Z35call_method_with_default_par.d5b89e435ec1aea7d936aea03f3d71d4_2" [label="2: Exit call_method_with_default_parameters \n  " color=yellow style=filled]
 	
 
-"call_method_with_default_parameters{d41d8cd98f00b204e9800998ecf8427e_Z35call_method_with_default_par.d5b89e435ec1aea7d936aea03f3d71d4_1" [label="1: Start call_method_with_default_parameters\nFormals: \nLocals:  a_ptr:class A * \n   DECLARE_LOCALS(&return,&a_ptr); [line 16]\n " color=yellow style=filled]
+"call_method_with_default_parameters{d41d8cd98f00b204e9800998ecf8427e_Z35call_method_with_default_par.d5b89e435ec1aea7d936aea03f3d71d4_1" [label="1: Start call_method_with_default_parameters\nFormals: \nLocals:  a_ptr:class A* \n   DECLARE_LOCALS(&return,&a_ptr); [line 16]\n " color=yellow style=filled]
 	
 
 	 "call_method_with_default_parameters{d41d8cd98f00b204e9800998ecf8427e_Z35call_method_with_default_par.d5b89e435ec1aea7d936aea03f3d71d4_1" -> "call_method_with_default_parameters{d41d8cd98f00b204e9800998ecf8427e_Z35call_method_with_default_par.d5b89e435ec1aea7d936aea03f3d71d4_5" ;

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

@@ -1,39 +1,39 @@
 /* @generated */
 digraph iCFG {
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  Call _fun_A_method \n   n$0=*&a_ptr:class A * [line 25]\n  _=*n$0:class A  [line 25]\n  n$2=_fun_A_method(n$0:class A *) [line 25]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  Call _fun_A_method \n   n$0=*&a_ptr:class A* [line 25]\n  _=*n$0:class A [line 25]\n  n$2=_fun_A_method(n$0:class A*) [line 25]\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_1" [label="1: Start test\nFormals: \nLocals:  a_ptr:class A * \n   DECLARE_LOCALS(&return,&a_ptr); [line 23]\n " color=yellow style=filled]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" [label="1: Start test\nFormals: \nLocals:  a_ptr:class A* \n   DECLARE_LOCALS(&return,&a_ptr); [line 23]\n " color=yellow style=filled]
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
-"A_init(_ZN1A4initEi).e819fb4dba0f06bae8d9c904ce3e3362_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class A * [line 14]\n  n$1=*&val:int  [line 14]\n  *n$0.field:int =n$1 [line 14]\n " shape="box"]
+"A_init(_ZN1A4initEi).e819fb4dba0f06bae8d9c904ce3e3362_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class A* [line 14]\n  n$1=*&val:int [line 14]\n  *n$0.field:int=n$1 [line 14]\n " shape="box"]
 	
 
 	 "A_init(_ZN1A4initEi).e819fb4dba0f06bae8d9c904ce3e3362_3" -> "A_init(_ZN1A4initEi).e819fb4dba0f06bae8d9c904ce3e3362_2" ;
 "A_init(_ZN1A4initEi).e819fb4dba0f06bae8d9c904ce3e3362_2" [label="2: Exit A_init \n  " color=yellow style=filled]
 	
 
-"A_init(_ZN1A4initEi).e819fb4dba0f06bae8d9c904ce3e3362_1" [label="1: Start A_init\nFormals:  this:class A * val:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
+"A_init(_ZN1A4initEi).e819fb4dba0f06bae8d9c904ce3e3362_1" [label="1: Start A_init\nFormals:  this:class A* val:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
 	
 
 	 "A_init(_ZN1A4initEi).e819fb4dba0f06bae8d9c904ce3e3362_1" -> "A_init(_ZN1A4initEi).e819fb4dba0f06bae8d9c904ce3e3362_3" ;
-"A_method(_ZN1A6methodEv).e602354a5cbf7fd2460e929638d9e139_4" [label="4:  Call _fun_A_init \n   n$2=*&this:class A * [line 19]\n  _=*n$2:class A  [line 19]\n  _fun_A_init(n$2:class A *,10:int ) [line 19]\n " shape="box"]
+"A_method(_ZN1A6methodEv).e602354a5cbf7fd2460e929638d9e139_4" [label="4:  Call _fun_A_init \n   n$2=*&this:class A* [line 19]\n  _=*n$2:class A [line 19]\n  _fun_A_init(n$2:class A*,10:int) [line 19]\n " shape="box"]
 	
 
 	 "A_method(_ZN1A6methodEv).e602354a5cbf7fd2460e929638d9e139_4" -> "A_method(_ZN1A6methodEv).e602354a5cbf7fd2460e929638d9e139_3" ;
-"A_method(_ZN1A6methodEv).e602354a5cbf7fd2460e929638d9e139_3" [label="3:  Return Stmt \n   n$0=*&this:class A * [line 20]\n  n$1=*n$0.field:int  [line 20]\n  *&return:int =n$1 [line 20]\n " shape="box"]
+"A_method(_ZN1A6methodEv).e602354a5cbf7fd2460e929638d9e139_3" [label="3:  Return Stmt \n   n$0=*&this:class A* [line 20]\n  n$1=*n$0.field:int [line 20]\n  *&return:int=n$1 [line 20]\n " shape="box"]
 	
 
 	 "A_method(_ZN1A6methodEv).e602354a5cbf7fd2460e929638d9e139_3" -> "A_method(_ZN1A6methodEv).e602354a5cbf7fd2460e929638d9e139_2" ;
 "A_method(_ZN1A6methodEv).e602354a5cbf7fd2460e929638d9e139_2" [label="2: Exit A_method \n  " color=yellow style=filled]
 	
 
-"A_method(_ZN1A6methodEv).e602354a5cbf7fd2460e929638d9e139_1" [label="1: Start A_method\nFormals:  this:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
+"A_method(_ZN1A6methodEv).e602354a5cbf7fd2460e929638d9e139_1" [label="1: Start A_method\nFormals:  this:class A*\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
 	
 
 	 "A_method(_ZN1A6methodEv).e602354a5cbf7fd2460e929638d9e139_1" -> "A_method(_ZN1A6methodEv).e602354a5cbf7fd2460e929638d9e139_4" ;

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

@@ -1,43 +1,43 @@
 /* @generated */
 digraph iCFG {
-"test_call{d41d8cd98f00b204e9800998ecf8427e_Z9test_callv}.617851b749bcf9d3ff8d24b6b3bb4fee_4" [label="4:  Call _fun_A_fun \n   n$4=*&a_ptr:class A * [line 25]\n  _=*n$4:class A  [line 25]\n  n$6=_fun_A_fun(n$4:class A *) [line 25]\n " shape="box"]
+"test_call{d41d8cd98f00b204e9800998ecf8427e_Z9test_callv}.617851b749bcf9d3ff8d24b6b3bb4fee_4" [label="4:  Call _fun_A_fun \n   n$4=*&a_ptr:class A* [line 25]\n  _=*n$4:class A [line 25]\n  n$6=_fun_A_fun(n$4:class A*) [line 25]\n " shape="box"]
 	
 
 	 "test_call{d41d8cd98f00b204e9800998ecf8427e_Z9test_callv}.617851b749bcf9d3ff8d24b6b3bb4fee_4" -> "test_call{d41d8cd98f00b204e9800998ecf8427e_Z9test_callv}.617851b749bcf9d3ff8d24b6b3bb4fee_3" ;
-"test_call{d41d8cd98f00b204e9800998ecf8427e_Z9test_callv}.617851b749bcf9d3ff8d24b6b3bb4fee_3" [label="3:  Call _fun_A::AIn_fun \n   n$0=*&a_ptr:class A * [line 26]\n  n$1=*n$0.in:class A::AIn * [line 26]\n  _=*n$1:class A::AIn  [line 26]\n  n$3=_fun_A::AIn_fun(n$1:class A::AIn *) [line 26]\n " shape="box"]
+"test_call{d41d8cd98f00b204e9800998ecf8427e_Z9test_callv}.617851b749bcf9d3ff8d24b6b3bb4fee_3" [label="3:  Call _fun_A::AIn_fun \n   n$0=*&a_ptr:class A* [line 26]\n  n$1=*n$0.in:class A::AIn* [line 26]\n  _=*n$1:class A::AIn [line 26]\n  n$3=_fun_A::AIn_fun(n$1:class A::AIn*) [line 26]\n " shape="box"]
 	
 
 	 "test_call{d41d8cd98f00b204e9800998ecf8427e_Z9test_callv}.617851b749bcf9d3ff8d24b6b3bb4fee_3" -> "test_call{d41d8cd98f00b204e9800998ecf8427e_Z9test_callv}.617851b749bcf9d3ff8d24b6b3bb4fee_2" ;
 "test_call{d41d8cd98f00b204e9800998ecf8427e_Z9test_callv}.617851b749bcf9d3ff8d24b6b3bb4fee_2" [label="2: Exit test_call \n  " color=yellow style=filled]
 	
 
-"test_call{d41d8cd98f00b204e9800998ecf8427e_Z9test_callv}.617851b749bcf9d3ff8d24b6b3bb4fee_1" [label="1: Start test_call\nFormals: \nLocals:  a_ptr:class A * \n   DECLARE_LOCALS(&return,&a_ptr); [line 23]\n " color=yellow style=filled]
+"test_call{d41d8cd98f00b204e9800998ecf8427e_Z9test_callv}.617851b749bcf9d3ff8d24b6b3bb4fee_1" [label="1: Start test_call\nFormals: \nLocals:  a_ptr:class A* \n   DECLARE_LOCALS(&return,&a_ptr); [line 23]\n " color=yellow style=filled]
 	
 
 	 "test_call{d41d8cd98f00b204e9800998ecf8427e_Z9test_callv}.617851b749bcf9d3ff8d24b6b3bb4fee_1" -> "test_call{d41d8cd98f00b204e9800998ecf8427e_Z9test_callv}.617851b749bcf9d3ff8d24b6b3bb4fee_4" ;
-"A_fun(_ZN1A3funEv).f7fa758d33d866ee76c4572b4c676157_4" [label="4:  DeclStmt \n   *&c:int =10 [line 18]\n " shape="box"]
+"A_fun(_ZN1A3funEv).f7fa758d33d866ee76c4572b4c676157_4" [label="4:  DeclStmt \n   *&c:int=10 [line 18]\n " shape="box"]
 	
 
 	 "A_fun(_ZN1A3funEv).f7fa758d33d866ee76c4572b4c676157_4" -> "A_fun(_ZN1A3funEv).f7fa758d33d866ee76c4572b4c676157_3" ;
-"A_fun(_ZN1A3funEv).f7fa758d33d866ee76c4572b4c676157_3" [label="3:  Return Stmt \n   n$0=*&c:int  [line 19]\n  *&return:int =(n$0 + 1) [line 19]\n " shape="box"]
+"A_fun(_ZN1A3funEv).f7fa758d33d866ee76c4572b4c676157_3" [label="3:  Return Stmt \n   n$0=*&c:int [line 19]\n  *&return:int=(n$0 + 1) [line 19]\n " shape="box"]
 	
 
 	 "A_fun(_ZN1A3funEv).f7fa758d33d866ee76c4572b4c676157_3" -> "A_fun(_ZN1A3funEv).f7fa758d33d866ee76c4572b4c676157_2" ;
 "A_fun(_ZN1A3funEv).f7fa758d33d866ee76c4572b4c676157_2" [label="2: Exit A_fun \n  " color=yellow style=filled]
 	
 
-"A_fun(_ZN1A3funEv).f7fa758d33d866ee76c4572b4c676157_1" [label="1: Start A_fun\nFormals:  this:class A *\nLocals:  c:int  \n   DECLARE_LOCALS(&return,&c); [line 17]\n " color=yellow style=filled]
+"A_fun(_ZN1A3funEv).f7fa758d33d866ee76c4572b4c676157_1" [label="1: Start A_fun\nFormals:  this:class A*\nLocals:  c:int \n   DECLARE_LOCALS(&return,&c); [line 17]\n " color=yellow style=filled]
 	
 
 	 "A_fun(_ZN1A3funEv).f7fa758d33d866ee76c4572b4c676157_1" -> "A_fun(_ZN1A3funEv).f7fa758d33d866ee76c4572b4c676157_4" ;
-"A::AIn_fun(_ZN1A3AIn3funEv).72e2fc9b2dd94a724697bd791589e12c_3" [label="3:  Return Stmt \n   *&return:int =1 [line 13]\n " shape="box"]
+"A::AIn_fun(_ZN1A3AIn3funEv).72e2fc9b2dd94a724697bd791589e12c_3" [label="3:  Return Stmt \n   *&return:int=1 [line 13]\n " shape="box"]
 	
 
 	 "A::AIn_fun(_ZN1A3AIn3funEv).72e2fc9b2dd94a724697bd791589e12c_3" -> "A::AIn_fun(_ZN1A3AIn3funEv).72e2fc9b2dd94a724697bd791589e12c_2" ;
 "A::AIn_fun(_ZN1A3AIn3funEv).72e2fc9b2dd94a724697bd791589e12c_2" [label="2: Exit A::AIn_fun \n  " color=yellow style=filled]
 	
 
-"A::AIn_fun(_ZN1A3AIn3funEv).72e2fc9b2dd94a724697bd791589e12c_1" [label="1: Start A::AIn_fun\nFormals:  this:class A::AIn *\nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
+"A::AIn_fun(_ZN1A3AIn3funEv).72e2fc9b2dd94a724697bd791589e12c_1" [label="1: Start A::AIn_fun\nFormals:  this:class A::AIn*\nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
 	
 
 	 "A::AIn_fun(_ZN1A3AIn3funEv).72e2fc9b2dd94a724697bd791589e12c_1" -> "A::AIn_fun(_ZN1A3AIn3funEv).72e2fc9b2dd94a724697bd791589e12c_3" ;

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

@@ -1,39 +1,39 @@
 /* @generated */
 digraph iCFG {
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" [label="4:  Call _fun_A_fun \n   n$3=*&a_ptr:class A * [line 23]\n  _=*n$3:class A  [line 23]\n  n$5=_fun_A_fun(n$3:class A *,1:int ,2:int ) [line 23]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" [label="4:  Call _fun_A_fun \n   n$3=*&a_ptr:class A* [line 23]\n  _=*n$3:class A [line 23]\n  n$5=_fun_A_fun(n$3:class A*,1:int,2:int) [line 23]\n " shape="box"]
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  Call _fun_A_fun \n   n$0=*&a_ptr:class A * [line 24]\n  _=*n$0:class A  [line 24]\n  n$2=_fun_A_fun(n$0:class A *,1:int ,2:int ,3:int ) [line 24]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_3" [label="3:  Call _fun_A_fun \n   n$0=*&a_ptr:class A* [line 24]\n  _=*n$0:class A [line 24]\n  n$2=_fun_A_fun(n$0:class A*,1:int,2:int,3:int) [line 24]\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_1" [label="1: Start test\nFormals: \nLocals:  a_ptr:class A * \n   DECLARE_LOCALS(&return,&a_ptr); [line 20]\n " color=yellow style=filled]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" [label="1: Start test\nFormals: \nLocals:  a_ptr:class A* \n   DECLARE_LOCALS(&return,&a_ptr); [line 20]\n " color=yellow style=filled]
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testv}.8c08101fe48ee96867ff8578442d10bc_4" ;
-"A_fun(_ZN1A3funEiii).618d361263f858392f0801f2bfbb7085_3" [label="3:  Return Stmt \n   n$0=*&a:int  [line 16]\n  n$1=*&b:int  [line 16]\n  n$2=*&c:int  [line 16]\n  *&return:int =((n$0 + n$1) + n$2) [line 16]\n " shape="box"]
+"A_fun(_ZN1A3funEiii).618d361263f858392f0801f2bfbb7085_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 16]\n  n$1=*&b:int [line 16]\n  n$2=*&c:int [line 16]\n  *&return:int=((n$0 + n$1) + n$2) [line 16]\n " shape="box"]
 	
 
 	 "A_fun(_ZN1A3funEiii).618d361263f858392f0801f2bfbb7085_3" -> "A_fun(_ZN1A3funEiii).618d361263f858392f0801f2bfbb7085_2" ;
 "A_fun(_ZN1A3funEiii).618d361263f858392f0801f2bfbb7085_2" [label="2: Exit A_fun \n  " color=yellow style=filled]
 	
 
-"A_fun(_ZN1A3funEiii).618d361263f858392f0801f2bfbb7085_1" [label="1: Start A_fun\nFormals:  this:class A * a:int  b:int  c:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 16]\n " color=yellow style=filled]
+"A_fun(_ZN1A3funEiii).618d361263f858392f0801f2bfbb7085_1" [label="1: Start A_fun\nFormals:  this:class A* a:int b:int c:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 16]\n " color=yellow style=filled]
 	
 
 	 "A_fun(_ZN1A3funEiii).618d361263f858392f0801f2bfbb7085_1" -> "A_fun(_ZN1A3funEiii).618d361263f858392f0801f2bfbb7085_3" ;
-"A_fun(_ZN1A3funEii).725b13bf748707860ab33acd63cab6bd_3" [label="3:  Return Stmt \n   n$0=*&a:int  [line 18]\n  n$1=*&b:int  [line 18]\n  *&return:int =(n$0 - n$1) [line 18]\n " shape="box"]
+"A_fun(_ZN1A3funEii).725b13bf748707860ab33acd63cab6bd_3" [label="3:  Return Stmt \n   n$0=*&a:int [line 18]\n  n$1=*&b:int [line 18]\n  *&return:int=(n$0 - n$1) [line 18]\n " shape="box"]
 	
 
 	 "A_fun(_ZN1A3funEii).725b13bf748707860ab33acd63cab6bd_3" -> "A_fun(_ZN1A3funEii).725b13bf748707860ab33acd63cab6bd_2" ;
 "A_fun(_ZN1A3funEii).725b13bf748707860ab33acd63cab6bd_2" [label="2: Exit A_fun \n  " color=yellow style=filled]
 	
 
-"A_fun(_ZN1A3funEii).725b13bf748707860ab33acd63cab6bd_1" [label="1: Start A_fun\nFormals:  this:class A * a:int  b:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
+"A_fun(_ZN1A3funEii).725b13bf748707860ab33acd63cab6bd_1" [label="1: Start A_fun\nFormals:  this:class A* a:int b:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
 	
 
 	 "A_fun(_ZN1A3funEii).725b13bf748707860ab33acd63cab6bd_1" -> "A_fun(_ZN1A3funEii).725b13bf748707860ab33acd63cab6bd_3" ;

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

@@ -3,48 +3,48 @@ digraph iCFG {
 "X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_2" [label="2: Exit X_X \n  " color=yellow style=filled]
 	
 
-"X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_1" [label="1: Start X_X\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
+"X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_1" [label="1: Start X_X\nFormals:  this:class X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
 	 "X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_1" -> "X_X{_ZN1XC1Ev}.dbc1390b15606562094682699e12caba_2" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_4" [label="4:  DeclStmt \n   n$2=*&a:class A * [line 22]\n  _=*n$2:class A  [line 22]\n  _fun_A_get(n$2:class A *,1:int ,&0$?%__sil_tmpSIL_materialize_temp__n$1:class X *) [line 22]\n  _fun_X_X(&x:class X *,&0$?%__sil_tmpSIL_materialize_temp__n$1:class X &) [line 22]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_4" [label="4:  DeclStmt \n   n$2=*&a:class A* [line 22]\n  _=*n$2:class A [line 22]\n  _fun_A_get(n$2:class A*,1:int,&0$?%__sil_tmpSIL_materialize_temp__n$1:class X*) [line 22]\n  _fun_X_X(&x:class X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:class X&) [line 22]\n " shape="box"]
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_4" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_3" ;
-"test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_3" [label="3:  Return Stmt \n   n$0=*&x.f:int  [line 23]\n  *&return:int =(1 / n$0) [line 23]\n " shape="box"]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_3" [label="3:  Return Stmt \n   n$0=*&x.f:int [line 23]\n  *&return:int=(1 / n$0) [line 23]\n " shape="box"]
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_3" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_2" ;
 "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:  x:class X  0$?%__sil_tmpSIL_materialize_temp__n$1:class X  \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 21]\n " color=yellow style=filled]
+"test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_1" [label="1: Start test\nFormals:  a:class A*\nLocals:  x:class X 0$?%__sil_tmpSIL_materialize_temp__n$1:class X \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 21]\n " color=yellow style=filled]
 	
 
 	 "test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_1" -> "test{d41d8cd98f00b204e9800998ecf8427e_Z4testP1A}.7a412acadb48a203ae4f2e6c04b46938_4" ;
-"A_get(_ZN1A3getEi).232a3c7a02501db340c6f88c0bc70d74_4" [label="4:  DeclStmt \n   _fun_X_X(&x:class X *) [line 16]\n " shape="box"]
+"A_get(_ZN1A3getEi).232a3c7a02501db340c6f88c0bc70d74_4" [label="4:  DeclStmt \n   _fun_X_X(&x:class X*) [line 16]\n " shape="box"]
 	
 
 	 "A_get(_ZN1A3getEi).232a3c7a02501db340c6f88c0bc70d74_4" -> "A_get(_ZN1A3getEi).232a3c7a02501db340c6f88c0bc70d74_3" ;
-"A_get(_ZN1A3getEi).232a3c7a02501db340c6f88c0bc70d74_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class X * [line 17]\n  _fun_X_X(n$0:class X *,&x:class X &) [line 17]\n " shape="box"]
+"A_get(_ZN1A3getEi).232a3c7a02501db340c6f88c0bc70d74_3" [label="3:  Return Stmt \n   n$0=*&__return_param:class X* [line 17]\n  _fun_X_X(n$0:class X*,&x:class X&) [line 17]\n " shape="box"]
 	
 
 	 "A_get(_ZN1A3getEi).232a3c7a02501db340c6f88c0bc70d74_3" -> "A_get(_ZN1A3getEi).232a3c7a02501db340c6f88c0bc70d74_2" ;
 "A_get(_ZN1A3getEi).232a3c7a02501db340c6f88c0bc70d74_2" [label="2: Exit A_get \n  " color=yellow style=filled]
 	
 
-"A_get(_ZN1A3getEi).232a3c7a02501db340c6f88c0bc70d74_1" [label="1: Start A_get\nFormals:  this:class A * p:int  __return_param:class X *\nLocals:  x:class X  \n   DECLARE_LOCALS(&return,&x); [line 15]\n " color=yellow style=filled]
+"A_get(_ZN1A3getEi).232a3c7a02501db340c6f88c0bc70d74_1" [label="1: Start A_get\nFormals:  this:class A* p:int __return_param:class X*\nLocals:  x:class X \n   DECLARE_LOCALS(&return,&x); [line 15]\n " color=yellow style=filled]
 	
 
 	 "A_get(_ZN1A3getEi).232a3c7a02501db340c6f88c0bc70d74_1" -> "A_get(_ZN1A3getEi).232a3c7a02501db340c6f88c0bc70d74_4" ;
-"X_X{_ZN1XC1EOS_}.886a759a564f2c7a7ef4e4bdc83fae77_3" [label="3:  Constructor Init \n   n$0=*&this:class X * [line 10]\n  n$1=*&__param_0:class X & [line 10]\n  n$2=*n$1.f:int  [line 10]\n  *n$0.f:int =n$2 [line 10]\n " shape="box"]
+"X_X{_ZN1XC1EOS_}.886a759a564f2c7a7ef4e4bdc83fae77_3" [label="3:  Constructor Init \n   n$0=*&this:class X* [line 10]\n  n$1=*&__param_0:class X& [line 10]\n  n$2=*n$1.f:int [line 10]\n  *n$0.f:int=n$2 [line 10]\n " shape="box"]
 	
 
 	 "X_X{_ZN1XC1EOS_}.886a759a564f2c7a7ef4e4bdc83fae77_3" -> "X_X{_ZN1XC1EOS_}.886a759a564f2c7a7ef4e4bdc83fae77_2" ;
 "X_X{_ZN1XC1EOS_}.886a759a564f2c7a7ef4e4bdc83fae77_2" [label="2: Exit X_X \n  " color=yellow style=filled]
 	
 
-"X_X{_ZN1XC1EOS_}.886a759a564f2c7a7ef4e4bdc83fae77_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]
+"X_X{_ZN1XC1EOS_}.886a759a564f2c7a7ef4e4bdc83fae77_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]
 	
 
 	 "X_X{_ZN1XC1EOS_}.886a759a564f2c7a7ef4e4bdc83fae77_1" -> "X_X{_ZN1XC1EOS_}.886a759a564f2c7a7ef4e4bdc83fae77_3" ;