[IR] Take parameters into account in to_filename method

Reviewed By: mbouaziz

Differential Revision: D8395033

fbshipit-source-id: 2dd285e

infer/models/objc/src/NSString.m

@@ -13,6 +13,8 @@ size_t __get_array_length(const void* arr);
 void __infer_assume(bool cond);
 void __set_wont_leak_attribute(const void* ptr);
 
+typedef NSUInteger NSStringEncoding;
+
 @implementation NSString
 
 + (instancetype)stringWithUTF8String:(const char*)bytes {
@@ -48,7 +50,7 @@ void __set_wont_leak_attribute(const void* ptr);
 
 - (instancetype)initWithBytesNoCopy:(char*)bytes
                              length:(NSUInteger)length
-                           encoding:(id)encoding
+                           encoding:(NSStringEncoding)encoding
                        freeWhenDone:(BOOL)flag {
   if (flag == YES) {
     if (bytes) {

infer/src/IR/Typ.ml

@@ -749,11 +749,10 @@ module Procname = struct
 
 
     let parameters_to_string parameters =
-      let name_opt_to_string par_opt =
+      let string_pars =
-        match par_opt with Some par -> Name.to_string par | None -> ""
+        List.filter_map ~f:(fun name_opt -> Option.map ~f:Name.to_string name_opt) parameters
       in
-      let string_pars = List.map ~f:name_opt_to_string parameters in
+      if List.is_empty string_pars then "" else "(" ^ String.concat ~sep:"," string_pars ^ ")"
-      if List.is_empty parameters then "" else "(" ^ String.concat ~sep:"," string_pars ^ ")"
 
 
     let clang_param_of_name class_name : clang_parameter = Some class_name
@@ -1247,10 +1246,13 @@ module Procname = struct
     in
     let proc_id =
       match pname with
-      | C {mangled} ->
+      | C {parameters; mangled} ->
-          get_qual_name_str pname :: Option.to_list mangled |> String.concat ~sep:"#"
+          (get_qual_name_str pname ^ Parameter.parameters_to_string parameters)
+          :: Option.to_list mangled
+          |> String.concat ~sep:"#"
       | ObjC_Cpp objc_cpp ->
-          get_qual_name_str pname ^ "#" ^ ObjC_Cpp.kind_to_verbose_string objc_cpp.kind
+          get_qual_name_str pname ^ Parameter.parameters_to_string objc_cpp.parameters ^ "#"
+          ^ ObjC_Cpp.kind_to_verbose_string objc_cpp.kind
       | _ ->
           to_unique_id pname
     in

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

@@ -1,93 +1,93 @@
 /* @generated */
 digraph cfg {
-"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_1" [label="1: Start std::atomic_flag_clear\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 965, column 1]\n " color=yellow style=filled]
+"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_1" [label="1: Start std::atomic_flag_clear\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 965, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_1" -> "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" ;
+	 "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_1" -> "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" ;
-"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
+"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 965, column 51]\n  _=*n$1:std::atomic_flag [line 965, column 51]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 965, column 51]\n " shape="box"]
+"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 965, column 51]\n  _=*n$1:std::atomic_flag [line 965, column 51]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 965, column 51]\n " shape="box"]
 	
 
-	 "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" -> "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_2" ;
+	 "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" -> "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_2" ;
-"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_1" [label="1: Start std::atomic_flag_clear\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 964, column 1]\n " color=yellow style=filled]
+"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_1" [label="1: Start std::atomic_flag_clear\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 964, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_1" -> "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" ;
+	 "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_1" -> "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" ;
-"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
+"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 964, column 60]\n  _=*n$1:std::atomic_flag [line 964, column 60]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 964, column 60]\n " shape="box"]
+"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 964, column 60]\n  _=*n$1:std::atomic_flag [line 964, column 60]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 964, column 60]\n " shape="box"]
 	
 
-	 "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" -> "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_2" ;
+	 "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" -> "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_2" ;
-"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_1" [label="1: Start std::atomic_flag_clear_explicit\nFormals:  f:std::atomic_flag* mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 970, column 1]\n " color=yellow style=filled]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_1" [label="1: Start std::atomic_flag_clear_explicit\nFormals:  f:std::atomic_flag* mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 970, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_1" -> "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" ;
+	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_1" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" ;
-"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 971, column 3]\n  _=*n$1:std::atomic_flag [line 971, column 3]\n  n$3=*&mo:int [line 971, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 971, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 971, column 3]\n  _=*n$1:std::atomic_flag [line 971, column 3]\n  n$3=*&mo:int [line 971, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 971, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" -> "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_2" ;
+	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_2" ;
-"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_1" [label="1: Start std::atomic_flag_clear_explicit\nFormals:  f:std::atomic_flag* mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 966, column 1]\n " color=yellow style=filled]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_1" [label="1: Start std::atomic_flag_clear_explicit\nFormals:  f:std::atomic_flag* mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 966, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_1" -> "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" ;
+	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_1" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" ;
-"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 968, column 3]\n  _=*n$1:std::atomic_flag [line 968, column 3]\n  n$3=*&mo:int [line 968, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 968, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 968, column 3]\n  _=*n$1:std::atomic_flag [line 968, column 3]\n  n$3=*&mo:int [line 968, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 968, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" -> "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_2" ;
+	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_2" ;
-"atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_1" [label="1: Start std::atomic_flag_test_and_set\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 953, column 1]\n " color=yellow style=filled]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_1" [label="1: Start std::atomic_flag_test_and_set\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 953, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_1" -> "atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_3" ;
+	 "atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_1" -> "atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_3" ;
-"atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_2" [label="2: Exit std::atomic_flag_test_and_set \n  " color=yellow style=filled]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_2" [label="2: Exit std::atomic_flag_test_and_set \n  " color=yellow style=filled]
 	
 
-"atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 954, column 10]\n  _=*n$0:std::atomic_flag [line 954, column 10]\n  n$2=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,5:int) [line 954, column 10]\n  *&return:_Bool=n$2 [line 954, column 3]\n " shape="box"]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 954, column 10]\n  _=*n$0:std::atomic_flag [line 954, column 10]\n  n$2=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,5:int) [line 954, column 10]\n  *&return:_Bool=n$2 [line 954, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_3" -> "atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_2" ;
+	 "atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_3" -> "atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_2" ;
-"atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_1" [label="1: Start std::atomic_flag_test_and_set\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 950, column 1]\n " color=yellow style=filled]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_1" [label="1: Start std::atomic_flag_test_and_set\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 950, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_1" -> "atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_3" ;
+	 "atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_1" -> "atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_3" ;
-"atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_2" [label="2: Exit std::atomic_flag_test_and_set \n  " color=yellow style=filled]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_2" [label="2: Exit std::atomic_flag_test_and_set \n  " color=yellow style=filled]
 	
 
-"atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 951, column 10]\n  _=*n$0:std::atomic_flag [line 951, column 10]\n  n$2=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,5:int) [line 951, column 10]\n  *&return:_Bool=n$2 [line 951, column 3]\n " shape="box"]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 951, column 10]\n  _=*n$0:std::atomic_flag [line 951, column 10]\n  n$2=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,5:int) [line 951, column 10]\n  *&return:_Bool=n$2 [line 951, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_3" -> "atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_2" ;
+	 "atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_3" -> "atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_2" ;
-"atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_1" [label="1: Start std::atomic_flag_test_and_set_explicit\nFormals:  f:std::atomic_flag* m:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 956, column 1]\n " color=yellow style=filled]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_1" [label="1: Start std::atomic_flag_test_and_set_explicit\nFormals:  f:std::atomic_flag* m:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 956, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_1" -> "atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_3" ;
+	 "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_1" -> "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_3" ;
-"atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_2" [label="2: Exit std::atomic_flag_test_and_set_explicit \n  " color=yellow style=filled]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_2" [label="2: Exit std::atomic_flag_test_and_set_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 958, column 10]\n  _=*n$0:std::atomic_flag [line 958, column 10]\n  n$2=*&m:int [line 958, column 26]\n  n$3=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,n$2:int) [line 958, column 10]\n  *&return:_Bool=n$3 [line 958, column 3]\n " shape="box"]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 958, column 10]\n  _=*n$0:std::atomic_flag [line 958, column 10]\n  n$2=*&m:int [line 958, column 26]\n  n$3=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,n$2:int) [line 958, column 10]\n  *&return:_Bool=n$3 [line 958, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_3" -> "atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_2" ;
+	 "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_3" -> "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_2" ;
-"atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_1" [label="1: Start std::atomic_flag_test_and_set_explicit\nFormals:  f:std::atomic_flag* m:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 960, column 1]\n " color=yellow style=filled]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_1" [label="1: Start std::atomic_flag_test_and_set_explicit\nFormals:  f:std::atomic_flag* m:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 960, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_1" -> "atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_3" ;
+	 "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_1" -> "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_3" ;
-"atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_2" [label="2: Exit std::atomic_flag_test_and_set_explicit \n  " color=yellow style=filled]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_2" [label="2: Exit std::atomic_flag_test_and_set_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 962, column 10]\n  _=*n$0:std::atomic_flag [line 962, column 10]\n  n$2=*&m:int [line 962, column 26]\n  n$3=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,n$2:int) [line 962, column 10]\n  *&return:_Bool=n$3 [line 962, column 3]\n " shape="box"]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 962, column 10]\n  _=*n$0:std::atomic_flag [line 962, column 10]\n  n$2=*&m:int [line 962, column 26]\n  n$3=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,n$2:int) [line 962, column 10]\n  *&return:_Bool=n$3 [line 962, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_3" -> "atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_2" ;
+	 "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_3" -> "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_2" ;
 "atomic_signal_fence#std#6355610664018428588.7a78429494f0c76954bdfa39cac652e7_1" [label="1: Start std::atomic_signal_fence\nFormals:  mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 975, column 1]\n " color=yellow style=filled]
 	
 

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

@@ -1,93 +1,93 @@
 /* @generated */
 digraph cfg {
-"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_1" [label="1: Start std::atomic_flag_clear\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 965, column 1]\n " color=yellow style=filled]
+"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_1" [label="1: Start std::atomic_flag_clear\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 965, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_1" -> "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" ;
+	 "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_1" -> "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" ;
-"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
+"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 965, column 51]\n  _=*n$1:std::atomic_flag [line 965, column 51]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 965, column 51]\n " shape="box"]
+"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 965, column 51]\n  _=*n$1:std::atomic_flag [line 965, column 51]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 965, column 51]\n " shape="box"]
 	
 
-	 "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" -> "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_2" ;
+	 "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" -> "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_2" ;
-"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_1" [label="1: Start std::atomic_flag_clear\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 964, column 1]\n " color=yellow style=filled]
+"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_1" [label="1: Start std::atomic_flag_clear\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 964, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_1" -> "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" ;
+	 "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_1" -> "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" ;
-"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
+"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 964, column 60]\n  _=*n$1:std::atomic_flag [line 964, column 60]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 964, column 60]\n " shape="box"]
+"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 964, column 60]\n  _=*n$1:std::atomic_flag [line 964, column 60]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 964, column 60]\n " shape="box"]
 	
 
-	 "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" -> "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_2" ;
+	 "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" -> "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_2" ;
-"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_1" [label="1: Start std::atomic_flag_clear_explicit\nFormals:  f:std::atomic_flag* mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 970, column 1]\n " color=yellow style=filled]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_1" [label="1: Start std::atomic_flag_clear_explicit\nFormals:  f:std::atomic_flag* mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 970, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_1" -> "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" ;
+	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_1" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" ;
-"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 971, column 3]\n  _=*n$1:std::atomic_flag [line 971, column 3]\n  n$3=*&mo:int [line 971, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 971, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 971, column 3]\n  _=*n$1:std::atomic_flag [line 971, column 3]\n  n$3=*&mo:int [line 971, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 971, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" -> "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_2" ;
+	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_2" ;
-"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_1" [label="1: Start std::atomic_flag_clear_explicit\nFormals:  f:std::atomic_flag* mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 966, column 1]\n " color=yellow style=filled]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_1" [label="1: Start std::atomic_flag_clear_explicit\nFormals:  f:std::atomic_flag* mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 966, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_1" -> "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" ;
+	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_1" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" ;
-"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 968, column 3]\n  _=*n$1:std::atomic_flag [line 968, column 3]\n  n$3=*&mo:int [line 968, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 968, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 968, column 3]\n  _=*n$1:std::atomic_flag [line 968, column 3]\n  n$3=*&mo:int [line 968, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 968, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" -> "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_2" ;
+	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_2" ;
-"atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_1" [label="1: Start std::atomic_flag_test_and_set\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 953, column 1]\n " color=yellow style=filled]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_1" [label="1: Start std::atomic_flag_test_and_set\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 953, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_1" -> "atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_3" ;
+	 "atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_1" -> "atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_3" ;
-"atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_2" [label="2: Exit std::atomic_flag_test_and_set \n  " color=yellow style=filled]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_2" [label="2: Exit std::atomic_flag_test_and_set \n  " color=yellow style=filled]
 	
 
-"atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 954, column 10]\n  _=*n$0:std::atomic_flag [line 954, column 10]\n  n$2=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,5:int) [line 954, column 10]\n  *&return:_Bool=n$2 [line 954, column 3]\n " shape="box"]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 954, column 10]\n  _=*n$0:std::atomic_flag [line 954, column 10]\n  n$2=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,5:int) [line 954, column 10]\n  *&return:_Bool=n$2 [line 954, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_3" -> "atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_2" ;
+	 "atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_3" -> "atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_2" ;
-"atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_1" [label="1: Start std::atomic_flag_test_and_set\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 950, column 1]\n " color=yellow style=filled]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_1" [label="1: Start std::atomic_flag_test_and_set\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 950, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_1" -> "atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_3" ;
+	 "atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_1" -> "atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_3" ;
-"atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_2" [label="2: Exit std::atomic_flag_test_and_set \n  " color=yellow style=filled]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_2" [label="2: Exit std::atomic_flag_test_and_set \n  " color=yellow style=filled]
 	
 
-"atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 951, column 10]\n  _=*n$0:std::atomic_flag [line 951, column 10]\n  n$2=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,5:int) [line 951, column 10]\n  *&return:_Bool=n$2 [line 951, column 3]\n " shape="box"]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 951, column 10]\n  _=*n$0:std::atomic_flag [line 951, column 10]\n  n$2=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,5:int) [line 951, column 10]\n  *&return:_Bool=n$2 [line 951, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_3" -> "atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_2" ;
+	 "atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_3" -> "atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_2" ;
-"atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_1" [label="1: Start std::atomic_flag_test_and_set_explicit\nFormals:  f:std::atomic_flag* m:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 956, column 1]\n " color=yellow style=filled]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_1" [label="1: Start std::atomic_flag_test_and_set_explicit\nFormals:  f:std::atomic_flag* m:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 956, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_1" -> "atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_3" ;
+	 "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_1" -> "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_3" ;
-"atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_2" [label="2: Exit std::atomic_flag_test_and_set_explicit \n  " color=yellow style=filled]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_2" [label="2: Exit std::atomic_flag_test_and_set_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 958, column 10]\n  _=*n$0:std::atomic_flag [line 958, column 10]\n  n$2=*&m:int [line 958, column 26]\n  n$3=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,n$2:int) [line 958, column 10]\n  *&return:_Bool=n$3 [line 958, column 3]\n " shape="box"]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 958, column 10]\n  _=*n$0:std::atomic_flag [line 958, column 10]\n  n$2=*&m:int [line 958, column 26]\n  n$3=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,n$2:int) [line 958, column 10]\n  *&return:_Bool=n$3 [line 958, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_3" -> "atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_2" ;
+	 "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_3" -> "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_2" ;
-"atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_1" [label="1: Start std::atomic_flag_test_and_set_explicit\nFormals:  f:std::atomic_flag* m:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 960, column 1]\n " color=yellow style=filled]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_1" [label="1: Start std::atomic_flag_test_and_set_explicit\nFormals:  f:std::atomic_flag* m:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 960, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_1" -> "atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_3" ;
+	 "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_1" -> "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_3" ;
-"atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_2" [label="2: Exit std::atomic_flag_test_and_set_explicit \n  " color=yellow style=filled]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_2" [label="2: Exit std::atomic_flag_test_and_set_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 962, column 10]\n  _=*n$0:std::atomic_flag [line 962, column 10]\n  n$2=*&m:int [line 962, column 26]\n  n$3=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,n$2:int) [line 962, column 10]\n  *&return:_Bool=n$3 [line 962, column 3]\n " shape="box"]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 962, column 10]\n  _=*n$0:std::atomic_flag [line 962, column 10]\n  n$2=*&m:int [line 962, column 26]\n  n$3=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,n$2:int) [line 962, column 10]\n  *&return:_Bool=n$3 [line 962, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_3" -> "atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_2" ;
+	 "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_3" -> "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_2" ;
 "atomic_signal_fence#std#6355610664018428588.7a78429494f0c76954bdfa39cac652e7_1" [label="1: Start std::atomic_signal_fence\nFormals:  mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 975, column 1]\n " color=yellow style=filled]
 	
 

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

@@ -1,93 +1,93 @@
 /* @generated */
 digraph cfg {
-"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_1" [label="1: Start std::atomic_flag_clear\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 965, column 1]\n " color=yellow style=filled]
+"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_1" [label="1: Start std::atomic_flag_clear\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 965, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_1" -> "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" ;
+	 "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_1" -> "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" ;
-"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
+"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 965, column 51]\n  _=*n$1:std::atomic_flag [line 965, column 51]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 965, column 51]\n " shape="box"]
+"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 965, column 51]\n  _=*n$1:std::atomic_flag [line 965, column 51]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 965, column 51]\n " shape="box"]
 	
 
-	 "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" -> "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_2" ;
+	 "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" -> "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_2" ;
-"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_1" [label="1: Start std::atomic_flag_clear\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 964, column 1]\n " color=yellow style=filled]
+"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_1" [label="1: Start std::atomic_flag_clear\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 964, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_1" -> "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" ;
+	 "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_1" -> "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" ;
-"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
+"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 964, column 60]\n  _=*n$1:std::atomic_flag [line 964, column 60]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 964, column 60]\n " shape="box"]
+"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 964, column 60]\n  _=*n$1:std::atomic_flag [line 964, column 60]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 964, column 60]\n " shape="box"]
 	
 
-	 "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" -> "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_2" ;
+	 "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" -> "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_2" ;
-"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_1" [label="1: Start std::atomic_flag_clear_explicit\nFormals:  f:std::atomic_flag* mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 970, column 1]\n " color=yellow style=filled]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_1" [label="1: Start std::atomic_flag_clear_explicit\nFormals:  f:std::atomic_flag* mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 970, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_1" -> "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" ;
+	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_1" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" ;
-"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 971, column 3]\n  _=*n$1:std::atomic_flag [line 971, column 3]\n  n$3=*&mo:int [line 971, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 971, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 971, column 3]\n  _=*n$1:std::atomic_flag [line 971, column 3]\n  n$3=*&mo:int [line 971, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 971, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" -> "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_2" ;
+	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_2" ;
-"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_1" [label="1: Start std::atomic_flag_clear_explicit\nFormals:  f:std::atomic_flag* mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 966, column 1]\n " color=yellow style=filled]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_1" [label="1: Start std::atomic_flag_clear_explicit\nFormals:  f:std::atomic_flag* mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 966, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_1" -> "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" ;
+	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_1" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" ;
-"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 968, column 3]\n  _=*n$1:std::atomic_flag [line 968, column 3]\n  n$3=*&mo:int [line 968, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 968, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 968, column 3]\n  _=*n$1:std::atomic_flag [line 968, column 3]\n  n$3=*&mo:int [line 968, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 968, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" -> "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_2" ;
+	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_2" ;
-"atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_1" [label="1: Start std::atomic_flag_test_and_set\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 953, column 1]\n " color=yellow style=filled]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_1" [label="1: Start std::atomic_flag_test_and_set\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 953, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_1" -> "atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_3" ;
+	 "atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_1" -> "atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_3" ;
-"atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_2" [label="2: Exit std::atomic_flag_test_and_set \n  " color=yellow style=filled]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_2" [label="2: Exit std::atomic_flag_test_and_set \n  " color=yellow style=filled]
 	
 
-"atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 954, column 10]\n  _=*n$0:std::atomic_flag [line 954, column 10]\n  n$2=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,5:int) [line 954, column 10]\n  *&return:_Bool=n$2 [line 954, column 3]\n " shape="box"]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 954, column 10]\n  _=*n$0:std::atomic_flag [line 954, column 10]\n  n$2=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,5:int) [line 954, column 10]\n  *&return:_Bool=n$2 [line 954, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_3" -> "atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_2" ;
+	 "atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_3" -> "atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_2" ;
-"atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_1" [label="1: Start std::atomic_flag_test_and_set\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 950, column 1]\n " color=yellow style=filled]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_1" [label="1: Start std::atomic_flag_test_and_set\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 950, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_1" -> "atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_3" ;
+	 "atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_1" -> "atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_3" ;
-"atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_2" [label="2: Exit std::atomic_flag_test_and_set \n  " color=yellow style=filled]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_2" [label="2: Exit std::atomic_flag_test_and_set \n  " color=yellow style=filled]
 	
 
-"atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 951, column 10]\n  _=*n$0:std::atomic_flag [line 951, column 10]\n  n$2=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,5:int) [line 951, column 10]\n  *&return:_Bool=n$2 [line 951, column 3]\n " shape="box"]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 951, column 10]\n  _=*n$0:std::atomic_flag [line 951, column 10]\n  n$2=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,5:int) [line 951, column 10]\n  *&return:_Bool=n$2 [line 951, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_3" -> "atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_2" ;
+	 "atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_3" -> "atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_2" ;
-"atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_1" [label="1: Start std::atomic_flag_test_and_set_explicit\nFormals:  f:std::atomic_flag* m:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 956, column 1]\n " color=yellow style=filled]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_1" [label="1: Start std::atomic_flag_test_and_set_explicit\nFormals:  f:std::atomic_flag* m:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 956, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_1" -> "atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_3" ;
+	 "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_1" -> "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_3" ;
-"atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_2" [label="2: Exit std::atomic_flag_test_and_set_explicit \n  " color=yellow style=filled]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_2" [label="2: Exit std::atomic_flag_test_and_set_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 958, column 10]\n  _=*n$0:std::atomic_flag [line 958, column 10]\n  n$2=*&m:int [line 958, column 26]\n  n$3=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,n$2:int) [line 958, column 10]\n  *&return:_Bool=n$3 [line 958, column 3]\n " shape="box"]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 958, column 10]\n  _=*n$0:std::atomic_flag [line 958, column 10]\n  n$2=*&m:int [line 958, column 26]\n  n$3=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,n$2:int) [line 958, column 10]\n  *&return:_Bool=n$3 [line 958, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_3" -> "atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_2" ;
+	 "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_3" -> "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_2" ;
-"atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_1" [label="1: Start std::atomic_flag_test_and_set_explicit\nFormals:  f:std::atomic_flag* m:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 960, column 1]\n " color=yellow style=filled]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_1" [label="1: Start std::atomic_flag_test_and_set_explicit\nFormals:  f:std::atomic_flag* m:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 960, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_1" -> "atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_3" ;
+	 "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_1" -> "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_3" ;
-"atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_2" [label="2: Exit std::atomic_flag_test_and_set_explicit \n  " color=yellow style=filled]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_2" [label="2: Exit std::atomic_flag_test_and_set_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 962, column 10]\n  _=*n$0:std::atomic_flag [line 962, column 10]\n  n$2=*&m:int [line 962, column 26]\n  n$3=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,n$2:int) [line 962, column 10]\n  *&return:_Bool=n$3 [line 962, column 3]\n " shape="box"]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 962, column 10]\n  _=*n$0:std::atomic_flag [line 962, column 10]\n  n$2=*&m:int [line 962, column 26]\n  n$3=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,n$2:int) [line 962, column 10]\n  *&return:_Bool=n$3 [line 962, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_3" -> "atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_2" ;
+	 "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_3" -> "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_2" ;
 "atomic_signal_fence#std#6355610664018428588.7a78429494f0c76954bdfa39cac652e7_1" [label="1: Start std::atomic_signal_fence\nFormals:  mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 975, column 1]\n " color=yellow style=filled]
 	
 

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

@@ -1,93 +1,93 @@
 /* @generated */
 digraph cfg {
-"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_1" [label="1: Start std::atomic_flag_clear\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 965, column 1]\n " color=yellow style=filled]
+"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_1" [label="1: Start std::atomic_flag_clear\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 965, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_1" -> "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" ;
+	 "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_1" -> "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" ;
-"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
+"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 965, column 51]\n  _=*n$1:std::atomic_flag [line 965, column 51]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 965, column 51]\n " shape="box"]
+"atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 965, column 51]\n  _=*n$1:std::atomic_flag [line 965, column 51]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 965, column 51]\n " shape="box"]
 	
 
-	 "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_3" -> "atomic_flag_clear#std#17550914922100779771.d1fb16da8327178ccc23af6843a8ea0b_2" ;
+	 "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_3" -> "atomic_flag_clear#std(class std::atomic_flag)#17550914922100779771.b40ff6dea8467aa48fb1fad5c85a8009_2" ;
-"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_1" [label="1: Start std::atomic_flag_clear\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 964, column 1]\n " color=yellow style=filled]
+"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_1" [label="1: Start std::atomic_flag_clear\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 964, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_1" -> "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" ;
+	 "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_1" -> "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" ;
-"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
+"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_2" [label="2: Exit std::atomic_flag_clear \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 964, column 60]\n  _=*n$1:std::atomic_flag [line 964, column 60]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 964, column 60]\n " shape="box"]
+"atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 964, column 60]\n  _=*n$1:std::atomic_flag [line 964, column 60]\n  n$3=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,5:int) [line 964, column 60]\n " shape="box"]
 	
 
-	 "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_3" -> "atomic_flag_clear#std#8417018393663174481.295be794cdae89c82fc079ad828db14c_2" ;
+	 "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_3" -> "atomic_flag_clear#std(class std::atomic_flag)#8417018393663174481.4341d144fbe33187ae045b01f0e1b40f_2" ;
-"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_1" [label="1: Start std::atomic_flag_clear_explicit\nFormals:  f:std::atomic_flag* mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 970, column 1]\n " color=yellow style=filled]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_1" [label="1: Start std::atomic_flag_clear_explicit\nFormals:  f:std::atomic_flag* mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 970, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_1" -> "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" ;
+	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_1" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" ;
-"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 971, column 3]\n  _=*n$1:std::atomic_flag [line 971, column 3]\n  n$3=*&mo:int [line 971, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 971, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 971, column 3]\n  _=*n$1:std::atomic_flag [line 971, column 3]\n  n$3=*&mo:int [line 971, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 971, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_3" -> "atomic_flag_clear_explicit#std#13508243229460098920.9096df62446733c75716182054ac50b0_2" ;
+	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_3" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#13508243229460098920.c26a8394ae32c4c5cec109cbacc8259c_2" ;
-"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_1" [label="1: Start std::atomic_flag_clear_explicit\nFormals:  f:std::atomic_flag* mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 966, column 1]\n " color=yellow style=filled]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_1" [label="1: Start std::atomic_flag_clear_explicit\nFormals:  f:std::atomic_flag* mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 966, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_1" -> "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" ;
+	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_1" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" ;
-"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_2" [label="2: Exit std::atomic_flag_clear_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 968, column 3]\n  _=*n$1:std::atomic_flag [line 968, column 3]\n  n$3=*&mo:int [line 968, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 968, column 3]\n " shape="box"]
+"atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" [label="3:  Call _fun_std::atomic_flag_clear \n   n$1=*&f:std::atomic_flag* [line 968, column 3]\n  _=*n$1:std::atomic_flag [line 968, column 3]\n  n$3=*&mo:int [line 968, column 12]\n  n$4=_fun_std::atomic_flag_clear(n$1:std::atomic_flag*,n$3:int) [line 968, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_3" -> "atomic_flag_clear_explicit#std#17643441563504553916.f821a0b7a94ce430273c34c2a0bc2777_2" ;
+	 "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_3" -> "atomic_flag_clear_explicit#std(class std::atomic_flag)#17643441563504553916.bf9623dc8b93caad1a1d212bed8336cd_2" ;
-"atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_1" [label="1: Start std::atomic_flag_test_and_set\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 953, column 1]\n " color=yellow style=filled]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_1" [label="1: Start std::atomic_flag_test_and_set\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 953, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_1" -> "atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_3" ;
+	 "atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_1" -> "atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_3" ;
-"atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_2" [label="2: Exit std::atomic_flag_test_and_set \n  " color=yellow style=filled]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_2" [label="2: Exit std::atomic_flag_test_and_set \n  " color=yellow style=filled]
 	
 
-"atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 954, column 10]\n  _=*n$0:std::atomic_flag [line 954, column 10]\n  n$2=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,5:int) [line 954, column 10]\n  *&return:_Bool=n$2 [line 954, column 3]\n " shape="box"]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 954, column 10]\n  _=*n$0:std::atomic_flag [line 954, column 10]\n  n$2=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,5:int) [line 954, column 10]\n  *&return:_Bool=n$2 [line 954, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_3" -> "atomic_flag_test_and_set#std#7118173663506619749.13841ca29c4792e1c80a6a0c7836266a_2" ;
+	 "atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_3" -> "atomic_flag_test_and_set#std(class std::atomic_flag)#7118173663506619749.8e5bcce1a903365d13b93d8f9cc09a0f_2" ;
-"atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_1" [label="1: Start std::atomic_flag_test_and_set\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 950, column 1]\n " color=yellow style=filled]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_1" [label="1: Start std::atomic_flag_test_and_set\nFormals:  f:std::atomic_flag*\nLocals:  \n   DECLARE_LOCALS(&return); [line 950, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_1" -> "atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_3" ;
+	 "atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_1" -> "atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_3" ;
-"atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_2" [label="2: Exit std::atomic_flag_test_and_set \n  " color=yellow style=filled]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_2" [label="2: Exit std::atomic_flag_test_and_set \n  " color=yellow style=filled]
 	
 
-"atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 951, column 10]\n  _=*n$0:std::atomic_flag [line 951, column 10]\n  n$2=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,5:int) [line 951, column 10]\n  *&return:_Bool=n$2 [line 951, column 3]\n " shape="box"]
+"atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 951, column 10]\n  _=*n$0:std::atomic_flag [line 951, column 10]\n  n$2=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,5:int) [line 951, column 10]\n  *&return:_Bool=n$2 [line 951, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_3" -> "atomic_flag_test_and_set#std#75594002239380467.79e49468f8f4c300b83436f9bcd1157e_2" ;
+	 "atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_3" -> "atomic_flag_test_and_set#std(class std::atomic_flag)#75594002239380467.20ebabcf2d2656accbbc1a7d565aeb60_2" ;
-"atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_1" [label="1: Start std::atomic_flag_test_and_set_explicit\nFormals:  f:std::atomic_flag* m:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 956, column 1]\n " color=yellow style=filled]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_1" [label="1: Start std::atomic_flag_test_and_set_explicit\nFormals:  f:std::atomic_flag* m:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 956, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_1" -> "atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_3" ;
+	 "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_1" -> "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_3" ;
-"atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_2" [label="2: Exit std::atomic_flag_test_and_set_explicit \n  " color=yellow style=filled]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_2" [label="2: Exit std::atomic_flag_test_and_set_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 958, column 10]\n  _=*n$0:std::atomic_flag [line 958, column 10]\n  n$2=*&m:int [line 958, column 26]\n  n$3=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,n$2:int) [line 958, column 10]\n  *&return:_Bool=n$3 [line 958, column 3]\n " shape="box"]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 958, column 10]\n  _=*n$0:std::atomic_flag [line 958, column 10]\n  n$2=*&m:int [line 958, column 26]\n  n$3=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,n$2:int) [line 958, column 10]\n  *&return:_Bool=n$3 [line 958, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_3" -> "atomic_flag_test_and_set_explicit#std#17397655144703252762.c6e589e3ba2e8123c95eda828e44339b_2" ;
+	 "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_3" -> "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#17397655144703252762.f8cb6317434afa11c329d6f16d1915f1_2" ;
-"atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_1" [label="1: Start std::atomic_flag_test_and_set_explicit\nFormals:  f:std::atomic_flag* m:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 960, column 1]\n " color=yellow style=filled]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_1" [label="1: Start std::atomic_flag_test_and_set_explicit\nFormals:  f:std::atomic_flag* m:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 960, column 1]\n " color=yellow style=filled]
 	
 
-	 "atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_1" -> "atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_3" ;
+	 "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_1" -> "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_3" ;
-"atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_2" [label="2: Exit std::atomic_flag_test_and_set_explicit \n  " color=yellow style=filled]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_2" [label="2: Exit std::atomic_flag_test_and_set_explicit \n  " color=yellow style=filled]
 	
 
-"atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 962, column 10]\n  _=*n$0:std::atomic_flag [line 962, column 10]\n  n$2=*&m:int [line 962, column 26]\n  n$3=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,n$2:int) [line 962, column 10]\n  *&return:_Bool=n$3 [line 962, column 3]\n " shape="box"]
+"atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_3" [label="3:  Return Stmt \n   n$0=*&f:std::atomic_flag* [line 962, column 10]\n  _=*n$0:std::atomic_flag [line 962, column 10]\n  n$2=*&m:int [line 962, column 26]\n  n$3=_fun_std::atomic_flag_test_and_set(n$0:std::atomic_flag*,n$2:int) [line 962, column 10]\n  *&return:_Bool=n$3 [line 962, column 3]\n " shape="box"]
 	
 
-	 "atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_3" -> "atomic_flag_test_and_set_explicit#std#7255134785098398782.34c19b21bb282ac2300d973f3b04f887_2" ;
+	 "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_3" -> "atomic_flag_test_and_set_explicit#std(class std::atomic_flag)#7255134785098398782.e07b3d514a35d3db92d8d39e4db8a8e2_2" ;
 "atomic_signal_fence#std#6355610664018428588.7a78429494f0c76954bdfa39cac652e7_1" [label="1: Start std::atomic_signal_fence\nFormals:  mo:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 975, column 1]\n " color=yellow style=filled]
 	
 

infer/tests/build_systems/codetoanalyze/objc_getters_setters/A.h

@@ -20,6 +20,8 @@ typedef void (^MyBlock)(int x);
     and_also:(_Nonnull MyBlock)block2
          and:(nullable NSString*)name;
 
+- (instancetype)withMetadata:(NSString*)name;
+
 @end
 
 void c_function(_Nonnull MyBlock block1,

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

@@ -540,32 +540,32 @@ digraph cfg {
 	
 
 	 "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_9" -> "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_2" ;
-"operator++#iterator#break_scope#(2766485846133390801).11d4c93e59bfd59c8af952e0b96f50cf_1" [label="1: Start break_scope::iterator_operator++\nFormals:  this:break_scope::iterator* __return_param:break_scope::iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 22, column 3]\n " color=yellow style=filled]
+"operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_1" [label="1: Start break_scope::iterator_operator++\nFormals:  this:break_scope::iterator* __return_param:break_scope::iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 22, column 3]\n " color=yellow style=filled]
 	
 
-	 "operator++#iterator#break_scope#(2766485846133390801).11d4c93e59bfd59c8af952e0b96f50cf_1" -> "operator++#iterator#break_scope#(2766485846133390801).11d4c93e59bfd59c8af952e0b96f50cf_4" ;
+	 "operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_1" -> "operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_4" ;
-"operator++#iterator#break_scope#(2766485846133390801).11d4c93e59bfd59c8af952e0b96f50cf_2" [label="2: Exit break_scope::iterator_operator++ \n  " color=yellow style=filled]
+"operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_2" [label="2: Exit break_scope::iterator_operator++ \n  " color=yellow style=filled]
 	
 
-"operator++#iterator#break_scope#(2766485846133390801).11d4c93e59bfd59c8af952e0b96f50cf_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::iterator* [line 24, column 5]\n  n$1=*&this:break_scope::iterator* [line 24, column 13]\n  n$2=_fun_break_scope::iterator_iterator(n$0:break_scope::iterator*,n$1:break_scope::iterator&) [line 24, column 12]\n " shape="box"]
+"operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::iterator* [line 24, column 5]\n  n$1=*&this:break_scope::iterator* [line 24, column 13]\n  n$2=_fun_break_scope::iterator_iterator(n$0:break_scope::iterator*,n$1:break_scope::iterator&) [line 24, column 12]\n " shape="box"]
 	
 
-	 "operator++#iterator#break_scope#(2766485846133390801).11d4c93e59bfd59c8af952e0b96f50cf_3" -> "operator++#iterator#break_scope#(2766485846133390801).11d4c93e59bfd59c8af952e0b96f50cf_2" ;
+	 "operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_3" -> "operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_2" ;
-"operator++#iterator#break_scope#(2766485846133390801).11d4c93e59bfd59c8af952e0b96f50cf_4" [label="4:  UnaryOperator \n   n$4=*&this:break_scope::iterator* [line 23, column 5]\n  n$5=*n$4.position:int [line 23, column 5]\n  *n$4.position:int=(n$5 + 1) [line 23, column 5]\n " shape="box"]
+"operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_4" [label="4:  UnaryOperator \n   n$4=*&this:break_scope::iterator* [line 23, column 5]\n  n$5=*n$4.position:int [line 23, column 5]\n  *n$4.position:int=(n$5 + 1) [line 23, column 5]\n " shape="box"]
 	
 
-	 "operator++#iterator#break_scope#(2766485846133390801).11d4c93e59bfd59c8af952e0b96f50cf_4" -> "operator++#iterator#break_scope#(2766485846133390801).11d4c93e59bfd59c8af952e0b96f50cf_3" ;
+	 "operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_4" -> "operator++#iterator#break_scope(class break_scope::iterator)#(2766485846133390801).12f92dbbbaf6641d4bc9bd9bd9586210_3" ;
-"operator*#iterator#break_scope#(4328339407583570703).cdad0941eaaed797f70482510d139870_1" [label="1: Start break_scope::iterator_operator*\nFormals:  this:break_scope::iterator* __return_param:break_scope::X*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X const  \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 42, column 1]\n " color=yellow style=filled]
+"operator*#iterator#break_scope(class break_scope::X)#(4328339407583570703).89adb890a0c29514eda31053987e2050_1" [label="1: Start break_scope::iterator_operator*\nFormals:  this:break_scope::iterator* __return_param:break_scope::X*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X const  \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 42, column 1]\n " color=yellow style=filled]
 	
 
-	 "operator*#iterator#break_scope#(4328339407583570703).cdad0941eaaed797f70482510d139870_1" -> "operator*#iterator#break_scope#(4328339407583570703).cdad0941eaaed797f70482510d139870_3" ;
+	 "operator*#iterator#break_scope(class break_scope::X)#(4328339407583570703).89adb890a0c29514eda31053987e2050_1" -> "operator*#iterator#break_scope(class break_scope::X)#(4328339407583570703).89adb890a0c29514eda31053987e2050_3" ;
-"operator*#iterator#break_scope#(4328339407583570703).cdad0941eaaed797f70482510d139870_2" [label="2: Exit break_scope::iterator_operator* \n  " color=yellow style=filled]
+"operator*#iterator#break_scope(class break_scope::X)#(4328339407583570703).89adb890a0c29514eda31053987e2050_2" [label="2: Exit break_scope::iterator_operator* \n  " color=yellow style=filled]
 	
 
-"operator*#iterator#break_scope#(4328339407583570703).cdad0941eaaed797f70482510d139870_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::X* [line 42, column 33]\n  n$2=*&this:break_scope::iterator const * [line 42, column 40]\n  n$3=*n$2.vector:break_scope::vec const * [line 42, column 40]\n  _=*n$3:break_scope::vec const  [line 42, column 40]\n  n$5=*&this:break_scope::iterator const * [line 42, column 52]\n  n$6=*n$5.position:int [line 42, column 52]\n  n$8=_fun_break_scope::vec_get(n$3:break_scope::vec const *,n$6:int,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X*) [line 42, column 40]\n  n$9=_fun_break_scope::X_X(n$0:break_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X const &) [line 42, column 40]\n " shape="box"]
+"operator*#iterator#break_scope(class break_scope::X)#(4328339407583570703).89adb890a0c29514eda31053987e2050_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::X* [line 42, column 33]\n  n$2=*&this:break_scope::iterator const * [line 42, column 40]\n  n$3=*n$2.vector:break_scope::vec const * [line 42, column 40]\n  _=*n$3:break_scope::vec const  [line 42, column 40]\n  n$5=*&this:break_scope::iterator const * [line 42, column 52]\n  n$6=*n$5.position:int [line 42, column 52]\n  n$8=_fun_break_scope::vec_get(n$3:break_scope::vec const *,n$6:int,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X*) [line 42, column 40]\n  n$9=_fun_break_scope::X_X(n$0:break_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::X const &) [line 42, column 40]\n " shape="box"]
 	
 
-	 "operator*#iterator#break_scope#(4328339407583570703).cdad0941eaaed797f70482510d139870_3" -> "operator*#iterator#break_scope#(4328339407583570703).cdad0941eaaed797f70482510d139870_2" ;
+	 "operator*#iterator#break_scope(class break_scope::X)#(4328339407583570703).89adb890a0c29514eda31053987e2050_3" -> "operator*#iterator#break_scope(class break_scope::X)#(4328339407583570703).89adb890a0c29514eda31053987e2050_2" ;
 "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_1" [label="1: Start break_scope::iterator_iterator\nFormals:  this:break_scope::iterator* __param_0:break_scope::iterator const &\nLocals:  \n   DECLARE_LOCALS(&return); [line 16, column 8]\n " color=yellow style=filled]
 	
 
@@ -581,21 +581,21 @@ digraph cfg {
 	
 
 	 "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_4" -> "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_3" ;
-"iterator#iterator#break_scope#{16869174875139255019}.6ab4697f81ed961d5f192c83dffe5de4_1" [label="1: Start break_scope::iterator_iterator\nFormals:  this:break_scope::iterator* v:break_scope::vec const * pos:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 20, column 3]\n " color=yellow style=filled]
+"iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_1" [label="1: Start break_scope::iterator_iterator\nFormals:  this:break_scope::iterator* v:break_scope::vec const * pos:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 20, column 3]\n " color=yellow style=filled]
 	
 
-	 "iterator#iterator#break_scope#{16869174875139255019}.6ab4697f81ed961d5f192c83dffe5de4_1" -> "iterator#iterator#break_scope#{16869174875139255019}.6ab4697f81ed961d5f192c83dffe5de4_4" ;
+	 "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_1" -> "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_4" ;
-"iterator#iterator#break_scope#{16869174875139255019}.6ab4697f81ed961d5f192c83dffe5de4_2" [label="2: Exit break_scope::iterator_iterator \n  " color=yellow style=filled]
+"iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_2" [label="2: Exit break_scope::iterator_iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#break_scope#{16869174875139255019}.6ab4697f81ed961d5f192c83dffe5de4_3" [label="3:  Constructor Init \n   n$2=*&this:break_scope::iterator* [line 20, column 52]\n  n$3=*&v:break_scope::vec const * [line 20, column 59]\n  *n$2.vector:break_scope::vec const *=n$3 [line 20, column 52]\n " shape="box"]
+"iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_3" [label="3:  Constructor Init \n   n$2=*&this:break_scope::iterator* [line 20, column 52]\n  n$3=*&v:break_scope::vec const * [line 20, column 59]\n  *n$2.vector:break_scope::vec const *=n$3 [line 20, column 52]\n " shape="box"]
 	
 
-	 "iterator#iterator#break_scope#{16869174875139255019}.6ab4697f81ed961d5f192c83dffe5de4_3" -> "iterator#iterator#break_scope#{16869174875139255019}.6ab4697f81ed961d5f192c83dffe5de4_2" ;
+	 "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_3" -> "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_2" ;
-"iterator#iterator#break_scope#{16869174875139255019}.6ab4697f81ed961d5f192c83dffe5de4_4" [label="4:  Constructor Init \n   n$4=*&this:break_scope::iterator* [line 20, column 37]\n  n$5=*&pos:int [line 20, column 46]\n  *n$4.position:int=n$5 [line 20, column 37]\n " shape="box"]
+"iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_4" [label="4:  Constructor Init \n   n$4=*&this:break_scope::iterator* [line 20, column 37]\n  n$5=*&pos:int [line 20, column 46]\n  *n$4.position:int=n$5 [line 20, column 37]\n " shape="box"]
 	
 
-	 "iterator#iterator#break_scope#{16869174875139255019}.6ab4697f81ed961d5f192c83dffe5de4_4" -> "iterator#iterator#break_scope#{16869174875139255019}.6ab4697f81ed961d5f192c83dffe5de4_3" ;
+	 "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_4" -> "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_3" ;
 "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_1" [label="1: Start break_scope::iterator_iterator\nFormals:  this:break_scope::iterator* __param_0:break_scope::iterator&\nLocals:  \n   DECLARE_LOCALS(&return); [line 16, column 8]\n " color=yellow style=filled]
 	
 
@@ -611,39 +611,39 @@ digraph cfg {
 	
 
 	 "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_4" -> "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_3" ;
-"get#vec#break_scope#(1283787980840570343).8c225fcc5fb36e3f37c7fa3dc5e9f9db_1" [label="1: Start break_scope::vec_get\nFormals:  this:break_scope::vec* pos:int __return_param:break_scope::X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 37, column 3]\n " color=yellow style=filled]
+"get#vec#break_scope(class break_scope::X)#(1283787980840570343).f29590f18442006705e4b1df63322511_1" [label="1: Start break_scope::vec_get\nFormals:  this:break_scope::vec* pos:int __return_param:break_scope::X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 37, column 3]\n " color=yellow style=filled]
 	
 
-	 "get#vec#break_scope#(1283787980840570343).8c225fcc5fb36e3f37c7fa3dc5e9f9db_1" -> "get#vec#break_scope#(1283787980840570343).8c225fcc5fb36e3f37c7fa3dc5e9f9db_3" ;
+	 "get#vec#break_scope(class break_scope::X)#(1283787980840570343).f29590f18442006705e4b1df63322511_1" -> "get#vec#break_scope(class break_scope::X)#(1283787980840570343).f29590f18442006705e4b1df63322511_3" ;
-"get#vec#break_scope#(1283787980840570343).8c225fcc5fb36e3f37c7fa3dc5e9f9db_2" [label="2: Exit break_scope::vec_get \n  " color=yellow style=filled]
+"get#vec#break_scope(class break_scope::X)#(1283787980840570343).f29590f18442006705e4b1df63322511_2" [label="2: Exit break_scope::vec_get \n  " color=yellow style=filled]
 	
 
-"get#vec#break_scope#(1283787980840570343).8c225fcc5fb36e3f37c7fa3dc5e9f9db_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::X* [line 37, column 26]\n  n$1=*&this:break_scope::vec const * [line 37, column 33]\n  n$2=*&pos:int [line 37, column 39]\n  n$3=_fun_break_scope::X_X(n$0:break_scope::X*,n$1._data[n$2]:break_scope::X const &) [line 37, column 33]\n " shape="box"]
+"get#vec#break_scope(class break_scope::X)#(1283787980840570343).f29590f18442006705e4b1df63322511_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::X* [line 37, column 26]\n  n$1=*&this:break_scope::vec const * [line 37, column 33]\n  n$2=*&pos:int [line 37, column 39]\n  n$3=_fun_break_scope::X_X(n$0:break_scope::X*,n$1._data[n$2]:break_scope::X const &) [line 37, column 33]\n " shape="box"]
 	
 
-	 "get#vec#break_scope#(1283787980840570343).8c225fcc5fb36e3f37c7fa3dc5e9f9db_3" -> "get#vec#break_scope#(1283787980840570343).8c225fcc5fb36e3f37c7fa3dc5e9f9db_2" ;
+	 "get#vec#break_scope(class break_scope::X)#(1283787980840570343).f29590f18442006705e4b1df63322511_3" -> "get#vec#break_scope(class break_scope::X)#(1283787980840570343).f29590f18442006705e4b1df63322511_2" ;
-"end#vec#break_scope#(4427317924121915380).244553a42bbf0c7e825bfd96f82a9063_1" [label="1: Start break_scope::vec_end\nFormals:  this:break_scope::vec* __return_param:break_scope::iterator*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 35, column 3]\n " color=yellow style=filled]
+"end#vec#break_scope(class break_scope::iterator)#(4427317924121915380).28b4ffbb5a64aa367cc424acb2a0de9b_1" [label="1: Start break_scope::vec_end\nFormals:  this:break_scope::vec* __return_param:break_scope::iterator*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 35, column 3]\n " color=yellow style=filled]
 	
 
-	 "end#vec#break_scope#(4427317924121915380).244553a42bbf0c7e825bfd96f82a9063_1" -> "end#vec#break_scope#(4427317924121915380).244553a42bbf0c7e825bfd96f82a9063_3" ;
+	 "end#vec#break_scope(class break_scope::iterator)#(4427317924121915380).28b4ffbb5a64aa367cc424acb2a0de9b_1" -> "end#vec#break_scope(class break_scope::iterator)#(4427317924121915380).28b4ffbb5a64aa367cc424acb2a0de9b_3" ;
-"end#vec#break_scope#(4427317924121915380).244553a42bbf0c7e825bfd96f82a9063_2" [label="2: Exit break_scope::vec_end \n  " color=yellow style=filled]
+"end#vec#break_scope(class break_scope::iterator)#(4427317924121915380).28b4ffbb5a64aa367cc424acb2a0de9b_2" [label="2: Exit break_scope::vec_end \n  " color=yellow style=filled]
 	
 
-"end#vec#break_scope#(4427317924121915380).244553a42bbf0c7e825bfd96f82a9063_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::iterator* [line 35, column 20]\n  n$2=*&this:break_scope::vec* [line 35, column 36]\n  n$3=_fun_break_scope::iterator_iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator*,n$2:break_scope::vec*,10:int) [line 35, column 27]\n  n$4=_fun_break_scope::iterator_iterator(n$0:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator&) [line 35, column 27]\n " shape="box"]
+"end#vec#break_scope(class break_scope::iterator)#(4427317924121915380).28b4ffbb5a64aa367cc424acb2a0de9b_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::iterator* [line 35, column 20]\n  n$2=*&this:break_scope::vec* [line 35, column 36]\n  n$3=_fun_break_scope::iterator_iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator*,n$2:break_scope::vec*,10:int) [line 35, column 27]\n  n$4=_fun_break_scope::iterator_iterator(n$0:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator&) [line 35, column 27]\n " shape="box"]
 	
 
-	 "end#vec#break_scope#(4427317924121915380).244553a42bbf0c7e825bfd96f82a9063_3" -> "end#vec#break_scope#(4427317924121915380).244553a42bbf0c7e825bfd96f82a9063_2" ;
+	 "end#vec#break_scope(class break_scope::iterator)#(4427317924121915380).28b4ffbb5a64aa367cc424acb2a0de9b_3" -> "end#vec#break_scope(class break_scope::iterator)#(4427317924121915380).28b4ffbb5a64aa367cc424acb2a0de9b_2" ;
-"begin#vec#break_scope#(5557509884489875894).e034f7c9d5268cece0387739b5adfebe_1" [label="1: Start break_scope::vec_begin\nFormals:  this:break_scope::vec* __return_param:break_scope::iterator*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 34, column 3]\n " color=yellow style=filled]
+"begin#vec#break_scope(class break_scope::iterator)#(5557509884489875894).5dac1fcfbf012c7c4e9ccd6f67cbd1ce_1" [label="1: Start break_scope::vec_begin\nFormals:  this:break_scope::vec* __return_param:break_scope::iterator*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 34, column 3]\n " color=yellow style=filled]
 	
 
-	 "begin#vec#break_scope#(5557509884489875894).e034f7c9d5268cece0387739b5adfebe_1" -> "begin#vec#break_scope#(5557509884489875894).e034f7c9d5268cece0387739b5adfebe_3" ;
+	 "begin#vec#break_scope(class break_scope::iterator)#(5557509884489875894).5dac1fcfbf012c7c4e9ccd6f67cbd1ce_1" -> "begin#vec#break_scope(class break_scope::iterator)#(5557509884489875894).5dac1fcfbf012c7c4e9ccd6f67cbd1ce_3" ;
-"begin#vec#break_scope#(5557509884489875894).e034f7c9d5268cece0387739b5adfebe_2" [label="2: Exit break_scope::vec_begin \n  " color=yellow style=filled]
+"begin#vec#break_scope(class break_scope::iterator)#(5557509884489875894).5dac1fcfbf012c7c4e9ccd6f67cbd1ce_2" [label="2: Exit break_scope::vec_begin \n  " color=yellow style=filled]
 	
 
-"begin#vec#break_scope#(5557509884489875894).e034f7c9d5268cece0387739b5adfebe_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::iterator* [line 34, column 22]\n  n$2=*&this:break_scope::vec* [line 34, column 38]\n  n$3=_fun_break_scope::iterator_iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator*,n$2:break_scope::vec*,0:int) [line 34, column 29]\n  n$4=_fun_break_scope::iterator_iterator(n$0:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator&) [line 34, column 29]\n " shape="box"]
+"begin#vec#break_scope(class break_scope::iterator)#(5557509884489875894).5dac1fcfbf012c7c4e9ccd6f67cbd1ce_3" [label="3:  Return Stmt \n   n$0=*&__return_param:break_scope::iterator* [line 34, column 22]\n  n$2=*&this:break_scope::vec* [line 34, column 38]\n  n$3=_fun_break_scope::iterator_iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator*,n$2:break_scope::vec*,0:int) [line 34, column 29]\n  n$4=_fun_break_scope::iterator_iterator(n$0:break_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$1:break_scope::iterator&) [line 34, column 29]\n " shape="box"]
 	
 
-	 "begin#vec#break_scope#(5557509884489875894).e034f7c9d5268cece0387739b5adfebe_3" -> "begin#vec#break_scope#(5557509884489875894).e034f7c9d5268cece0387739b5adfebe_2" ;
+	 "begin#vec#break_scope(class break_scope::iterator)#(5557509884489875894).5dac1fcfbf012c7c4e9ccd6f67cbd1ce_3" -> "begin#vec#break_scope(class break_scope::iterator)#(5557509884489875894).5dac1fcfbf012c7c4e9ccd6f67cbd1ce_2" ;
 "vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_1" [label="1: Start break_scope::vec_vec\nFormals:  this:break_scope::vec*\nLocals:  \n   DECLARE_LOCALS(&return); [line 33, column 3]\n " color=yellow style=filled]
 	
 

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

@@ -1,14 +1,14 @@
 /* @generated */
 digraph cfg {
-"f#3072121847520995784.879d673a5bab84df6d2f71ce7f834b14_1" [label="1: Start f\nFormals:  p:Person*\nLocals:  \n   DECLARE_LOCALS(&return); [line 13, column 1]\n " color=yellow style=filled]
+"f(class Person)#3072121847520995784.d15d531febb371128c8a5206341d5cb9_1" [label="1: Start f\nFormals:  p:Person*\nLocals:  \n   DECLARE_LOCALS(&return); [line 13, column 1]\n " color=yellow style=filled]
 	
 
-	 "f#3072121847520995784.879d673a5bab84df6d2f71ce7f834b14_1" -> "f#3072121847520995784.879d673a5bab84df6d2f71ce7f834b14_3" ;
+	 "f(class Person)#3072121847520995784.d15d531febb371128c8a5206341d5cb9_1" -> "f(class Person)#3072121847520995784.d15d531febb371128c8a5206341d5cb9_3" ;
-"f#3072121847520995784.879d673a5bab84df6d2f71ce7f834b14_2" [label="2: Exit f \n  " color=yellow style=filled]
+"f(class Person)#3072121847520995784.d15d531febb371128c8a5206341d5cb9_2" [label="2: Exit f \n  " color=yellow style=filled]
 	
 
-"f#3072121847520995784.879d673a5bab84df6d2f71ce7f834b14_3" [label="3:  Call _fun_Person_~Person \n   n$1=*&p:Person* [line 13, column 21]\n  _=*n$1:Person [line 13, column 21]\n  n$3=_fun_Person_~Person(n$1:Person*) [line 13, column 21]\n " shape="box"]
+"f(class Person)#3072121847520995784.d15d531febb371128c8a5206341d5cb9_3" [label="3:  Call _fun_Person_~Person \n   n$1=*&p:Person* [line 13, column 21]\n  _=*n$1:Person [line 13, column 21]\n  n$3=_fun_Person_~Person(n$1:Person*) [line 13, column 21]\n " shape="box"]
 	
 
-	 "f#3072121847520995784.879d673a5bab84df6d2f71ce7f834b14_3" -> "f#3072121847520995784.879d673a5bab84df6d2f71ce7f834b14_2" ;
+	 "f(class Person)#3072121847520995784.d15d531febb371128c8a5206341d5cb9_3" -> "f(class Person)#3072121847520995784.d15d531febb371128c8a5206341d5cb9_2" ;
 }

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

@@ -11,17 +11,17 @@ digraph cfg {
 	
 
 	 "deleteInt#11507157942721721842.63c462d9916f225a70cc32ed39aaaf5f_3" -> "deleteInt#11507157942721721842.63c462d9916f225a70cc32ed39aaaf5f_2" ;
-"deleteX#8359832236310221055.8e97d527465f9865245eba503777c9c7_1" [label="1: Start deleteX\nFormals:  x:X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 12, column 1]\n " color=yellow style=filled]
+"deleteX(class X)#8359832236310221055.de7d98d32d68fd20c6aec48045fd1c8e_1" [label="1: Start deleteX\nFormals:  x:X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 12, column 1]\n " color=yellow style=filled]
 	
 
-	 "deleteX#8359832236310221055.8e97d527465f9865245eba503777c9c7_1" -> "deleteX#8359832236310221055.8e97d527465f9865245eba503777c9c7_3" ;
+	 "deleteX(class X)#8359832236310221055.de7d98d32d68fd20c6aec48045fd1c8e_1" -> "deleteX(class X)#8359832236310221055.de7d98d32d68fd20c6aec48045fd1c8e_3" ;
-"deleteX#8359832236310221055.8e97d527465f9865245eba503777c9c7_2" [label="2: Exit deleteX \n  " color=yellow style=filled]
+"deleteX(class X)#8359832236310221055.de7d98d32d68fd20c6aec48045fd1c8e_2" [label="2: Exit deleteX \n  " color=yellow style=filled]
 	
 
-"deleteX#8359832236310221055.8e97d527465f9865245eba503777c9c7_3" [label="3:  Call delete \n   n$1=*&x:X* [line 12, column 29]\n  n$2=_fun___delete(n$1:X*) [line 12, column 22]\n " shape="box"]
+"deleteX(class X)#8359832236310221055.de7d98d32d68fd20c6aec48045fd1c8e_3" [label="3:  Call delete \n   n$1=*&x:X* [line 12, column 29]\n  n$2=_fun___delete(n$1:X*) [line 12, column 22]\n " shape="box"]
 	
 
-	 "deleteX#8359832236310221055.8e97d527465f9865245eba503777c9c7_3" -> "deleteX#8359832236310221055.8e97d527465f9865245eba503777c9c7_2" ;
+	 "deleteX(class X)#8359832236310221055.de7d98d32d68fd20c6aec48045fd1c8e_3" -> "deleteX(class X)#8359832236310221055.de7d98d32d68fd20c6aec48045fd1c8e_2" ;
 "__infer_inner_destructor_~X#X#(9850251229546392500).d48deae5dbd403872895c6ef0bdaa126_1" [label="1: Start X___infer_inner_destructor_~X\nFormals:  this:X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 9, column 3]\n " color=yellow style=filled]
 	
 

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

@@ -427,17 +427,17 @@ digraph cfg {
 	
 
 	 "~X#X#continue_scope#(14106261246415748043).bee8da02915b57fe8c8e01c9b731311d_3" -> "~X#X#continue_scope#(14106261246415748043).bee8da02915b57fe8c8e01c9b731311d_2" ;
-"operator*#iterator#continue_scope#(10976315504449545146).52feec5517a47e2a4f419770b171de17_1" [label="1: Start continue_scope::iterator_operator*\nFormals:  this:continue_scope::iterator* __return_param:continue_scope::X*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X const  \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 42, column 1]\n " color=yellow style=filled]
+"operator*#iterator#continue_scope(class continue_scope::X)#(10976315504449545146).6f0a140275409bbf42ae1dbc8842f6af_1" [label="1: Start continue_scope::iterator_operator*\nFormals:  this:continue_scope::iterator* __return_param:continue_scope::X*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X const  \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 42, column 1]\n " color=yellow style=filled]
 	
 
-	 "operator*#iterator#continue_scope#(10976315504449545146).52feec5517a47e2a4f419770b171de17_1" -> "operator*#iterator#continue_scope#(10976315504449545146).52feec5517a47e2a4f419770b171de17_3" ;
+	 "operator*#iterator#continue_scope(class continue_scope::X)#(10976315504449545146).6f0a140275409bbf42ae1dbc8842f6af_1" -> "operator*#iterator#continue_scope(class continue_scope::X)#(10976315504449545146).6f0a140275409bbf42ae1dbc8842f6af_3" ;
-"operator*#iterator#continue_scope#(10976315504449545146).52feec5517a47e2a4f419770b171de17_2" [label="2: Exit continue_scope::iterator_operator* \n  " color=yellow style=filled]
+"operator*#iterator#continue_scope(class continue_scope::X)#(10976315504449545146).6f0a140275409bbf42ae1dbc8842f6af_2" [label="2: Exit continue_scope::iterator_operator* \n  " color=yellow style=filled]
 	
 
-"operator*#iterator#continue_scope#(10976315504449545146).52feec5517a47e2a4f419770b171de17_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::X* [line 42, column 33]\n  n$2=*&this:continue_scope::iterator const * [line 42, column 40]\n  n$3=*n$2.vector:continue_scope::vec const * [line 42, column 40]\n  _=*n$3:continue_scope::vec const  [line 42, column 40]\n  n$5=*&this:continue_scope::iterator const * [line 42, column 52]\n  n$6=*n$5.position:int [line 42, column 52]\n  n$8=_fun_continue_scope::vec_get(n$3:continue_scope::vec const *,n$6:int,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X*) [line 42, column 40]\n  n$9=_fun_continue_scope::X_X(n$0:continue_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X const &) [line 42, column 40]\n " shape="box"]
+"operator*#iterator#continue_scope(class continue_scope::X)#(10976315504449545146).6f0a140275409bbf42ae1dbc8842f6af_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::X* [line 42, column 33]\n  n$2=*&this:continue_scope::iterator const * [line 42, column 40]\n  n$3=*n$2.vector:continue_scope::vec const * [line 42, column 40]\n  _=*n$3:continue_scope::vec const  [line 42, column 40]\n  n$5=*&this:continue_scope::iterator const * [line 42, column 52]\n  n$6=*n$5.position:int [line 42, column 52]\n  n$8=_fun_continue_scope::vec_get(n$3:continue_scope::vec const *,n$6:int,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X*) [line 42, column 40]\n  n$9=_fun_continue_scope::X_X(n$0:continue_scope::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X const &) [line 42, column 40]\n " shape="box"]
 	
 
-	 "operator*#iterator#continue_scope#(10976315504449545146).52feec5517a47e2a4f419770b171de17_3" -> "operator*#iterator#continue_scope#(10976315504449545146).52feec5517a47e2a4f419770b171de17_2" ;
+	 "operator*#iterator#continue_scope(class continue_scope::X)#(10976315504449545146).6f0a140275409bbf42ae1dbc8842f6af_3" -> "operator*#iterator#continue_scope(class continue_scope::X)#(10976315504449545146).6f0a140275409bbf42ae1dbc8842f6af_2" ;
 "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_1" [label="1: Start continue_scope::iterator_operator!=\nFormals:  this:continue_scope::iterator* i2:continue_scope::iterator const &\nLocals:  0$?%__sil_tmpSIL_temp_conditional___n$0:_Bool \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_temp_conditional___n$0); [line 27, column 3]\n " color=yellow style=filled]
 	
 
@@ -474,21 +474,21 @@ digraph cfg {
 	
 
 	 "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_9" -> "operator!=#iterator#continue_scope#(11025097396656630732).d1947b35520a12f51156c7fee5f5e4a1_2" ;
-"operator++#iterator#continue_scope#(16434574593791982090).926de445b967c9119c5cf6eecba7a618_1" [label="1: Start continue_scope::iterator_operator++\nFormals:  this:continue_scope::iterator* __return_param:continue_scope::iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 22, column 3]\n " color=yellow style=filled]
+"operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_1" [label="1: Start continue_scope::iterator_operator++\nFormals:  this:continue_scope::iterator* __return_param:continue_scope::iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 22, column 3]\n " color=yellow style=filled]
 	
 
-	 "operator++#iterator#continue_scope#(16434574593791982090).926de445b967c9119c5cf6eecba7a618_1" -> "operator++#iterator#continue_scope#(16434574593791982090).926de445b967c9119c5cf6eecba7a618_4" ;
+	 "operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_1" -> "operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_4" ;
-"operator++#iterator#continue_scope#(16434574593791982090).926de445b967c9119c5cf6eecba7a618_2" [label="2: Exit continue_scope::iterator_operator++ \n  " color=yellow style=filled]
+"operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_2" [label="2: Exit continue_scope::iterator_operator++ \n  " color=yellow style=filled]
 	
 
-"operator++#iterator#continue_scope#(16434574593791982090).926de445b967c9119c5cf6eecba7a618_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::iterator* [line 24, column 5]\n  n$1=*&this:continue_scope::iterator* [line 24, column 13]\n  n$2=_fun_continue_scope::iterator_iterator(n$0:continue_scope::iterator*,n$1:continue_scope::iterator&) [line 24, column 12]\n " shape="box"]
+"operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::iterator* [line 24, column 5]\n  n$1=*&this:continue_scope::iterator* [line 24, column 13]\n  n$2=_fun_continue_scope::iterator_iterator(n$0:continue_scope::iterator*,n$1:continue_scope::iterator&) [line 24, column 12]\n " shape="box"]
 	
 
-	 "operator++#iterator#continue_scope#(16434574593791982090).926de445b967c9119c5cf6eecba7a618_3" -> "operator++#iterator#continue_scope#(16434574593791982090).926de445b967c9119c5cf6eecba7a618_2" ;
+	 "operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_3" -> "operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_2" ;
-"operator++#iterator#continue_scope#(16434574593791982090).926de445b967c9119c5cf6eecba7a618_4" [label="4:  UnaryOperator \n   n$4=*&this:continue_scope::iterator* [line 23, column 5]\n  n$5=*n$4.position:int [line 23, column 5]\n  *n$4.position:int=(n$5 + 1) [line 23, column 5]\n " shape="box"]
+"operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_4" [label="4:  UnaryOperator \n   n$4=*&this:continue_scope::iterator* [line 23, column 5]\n  n$5=*n$4.position:int [line 23, column 5]\n  *n$4.position:int=(n$5 + 1) [line 23, column 5]\n " shape="box"]
 	
 
-	 "operator++#iterator#continue_scope#(16434574593791982090).926de445b967c9119c5cf6eecba7a618_4" -> "operator++#iterator#continue_scope#(16434574593791982090).926de445b967c9119c5cf6eecba7a618_3" ;
+	 "operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_4" -> "operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_3" ;
 "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_1" [label="1: Start continue_scope::iterator_iterator\nFormals:  this:continue_scope::iterator* __param_0:continue_scope::iterator&\nLocals:  \n   DECLARE_LOCALS(&return); [line 16, column 8]\n " color=yellow style=filled]
 	
 
@@ -504,21 +504,21 @@ digraph cfg {
 	
 
 	 "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_4" -> "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_3" ;
-"iterator#iterator#continue_scope#{17152205201271404012}.6fcfea00eca12936183691c85f57ca37_1" [label="1: Start continue_scope::iterator_iterator\nFormals:  this:continue_scope::iterator* v:continue_scope::vec const * pos:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 20, column 3]\n " color=yellow style=filled]
+"iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_1" [label="1: Start continue_scope::iterator_iterator\nFormals:  this:continue_scope::iterator* v:continue_scope::vec const * pos:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 20, column 3]\n " color=yellow style=filled]
 	
 
-	 "iterator#iterator#continue_scope#{17152205201271404012}.6fcfea00eca12936183691c85f57ca37_1" -> "iterator#iterator#continue_scope#{17152205201271404012}.6fcfea00eca12936183691c85f57ca37_4" ;
+	 "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_1" -> "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_4" ;
-"iterator#iterator#continue_scope#{17152205201271404012}.6fcfea00eca12936183691c85f57ca37_2" [label="2: Exit continue_scope::iterator_iterator \n  " color=yellow style=filled]
+"iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_2" [label="2: Exit continue_scope::iterator_iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#continue_scope#{17152205201271404012}.6fcfea00eca12936183691c85f57ca37_3" [label="3:  Constructor Init \n   n$2=*&this:continue_scope::iterator* [line 20, column 52]\n  n$3=*&v:continue_scope::vec const * [line 20, column 59]\n  *n$2.vector:continue_scope::vec const *=n$3 [line 20, column 52]\n " shape="box"]
+"iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_3" [label="3:  Constructor Init \n   n$2=*&this:continue_scope::iterator* [line 20, column 52]\n  n$3=*&v:continue_scope::vec const * [line 20, column 59]\n  *n$2.vector:continue_scope::vec const *=n$3 [line 20, column 52]\n " shape="box"]
 	
 
-	 "iterator#iterator#continue_scope#{17152205201271404012}.6fcfea00eca12936183691c85f57ca37_3" -> "iterator#iterator#continue_scope#{17152205201271404012}.6fcfea00eca12936183691c85f57ca37_2" ;
+	 "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_3" -> "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_2" ;
-"iterator#iterator#continue_scope#{17152205201271404012}.6fcfea00eca12936183691c85f57ca37_4" [label="4:  Constructor Init \n   n$4=*&this:continue_scope::iterator* [line 20, column 37]\n  n$5=*&pos:int [line 20, column 46]\n  *n$4.position:int=n$5 [line 20, column 37]\n " shape="box"]
+"iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_4" [label="4:  Constructor Init \n   n$4=*&this:continue_scope::iterator* [line 20, column 37]\n  n$5=*&pos:int [line 20, column 46]\n  *n$4.position:int=n$5 [line 20, column 37]\n " shape="box"]
 	
 
-	 "iterator#iterator#continue_scope#{17152205201271404012}.6fcfea00eca12936183691c85f57ca37_4" -> "iterator#iterator#continue_scope#{17152205201271404012}.6fcfea00eca12936183691c85f57ca37_3" ;
+	 "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_4" -> "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_3" ;
 "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_1" [label="1: Start continue_scope::iterator_iterator\nFormals:  this:continue_scope::iterator* __param_0:continue_scope::iterator const &\nLocals:  \n   DECLARE_LOCALS(&return); [line 16, column 8]\n " color=yellow style=filled]
 	
 
@@ -534,39 +534,39 @@ digraph cfg {
 	
 
 	 "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_4" -> "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_3" ;
-"begin#vec#continue_scope#(10867355481694456603).b98e56054b13873648ee448110d89e0d_1" [label="1: Start continue_scope::vec_begin\nFormals:  this:continue_scope::vec* __return_param:continue_scope::iterator*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 34, column 3]\n " color=yellow style=filled]
+"begin#vec#continue_scope(class continue_scope::iterator)#(10867355481694456603).8c0551e386b9f2c25bf3629672b303c4_1" [label="1: Start continue_scope::vec_begin\nFormals:  this:continue_scope::vec* __return_param:continue_scope::iterator*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 34, column 3]\n " color=yellow style=filled]
 	
 
-	 "begin#vec#continue_scope#(10867355481694456603).b98e56054b13873648ee448110d89e0d_1" -> "begin#vec#continue_scope#(10867355481694456603).b98e56054b13873648ee448110d89e0d_3" ;
+	 "begin#vec#continue_scope(class continue_scope::iterator)#(10867355481694456603).8c0551e386b9f2c25bf3629672b303c4_1" -> "begin#vec#continue_scope(class continue_scope::iterator)#(10867355481694456603).8c0551e386b9f2c25bf3629672b303c4_3" ;
-"begin#vec#continue_scope#(10867355481694456603).b98e56054b13873648ee448110d89e0d_2" [label="2: Exit continue_scope::vec_begin \n  " color=yellow style=filled]
+"begin#vec#continue_scope(class continue_scope::iterator)#(10867355481694456603).8c0551e386b9f2c25bf3629672b303c4_2" [label="2: Exit continue_scope::vec_begin \n  " color=yellow style=filled]
 	
 
-"begin#vec#continue_scope#(10867355481694456603).b98e56054b13873648ee448110d89e0d_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::iterator* [line 34, column 22]\n  n$2=*&this:continue_scope::vec* [line 34, column 38]\n  n$3=_fun_continue_scope::iterator_iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator*,n$2:continue_scope::vec*,0:int) [line 34, column 29]\n  n$4=_fun_continue_scope::iterator_iterator(n$0:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator&) [line 34, column 29]\n " shape="box"]
+"begin#vec#continue_scope(class continue_scope::iterator)#(10867355481694456603).8c0551e386b9f2c25bf3629672b303c4_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::iterator* [line 34, column 22]\n  n$2=*&this:continue_scope::vec* [line 34, column 38]\n  n$3=_fun_continue_scope::iterator_iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator*,n$2:continue_scope::vec*,0:int) [line 34, column 29]\n  n$4=_fun_continue_scope::iterator_iterator(n$0:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator&) [line 34, column 29]\n " shape="box"]
 	
 
-	 "begin#vec#continue_scope#(10867355481694456603).b98e56054b13873648ee448110d89e0d_3" -> "begin#vec#continue_scope#(10867355481694456603).b98e56054b13873648ee448110d89e0d_2" ;
+	 "begin#vec#continue_scope(class continue_scope::iterator)#(10867355481694456603).8c0551e386b9f2c25bf3629672b303c4_3" -> "begin#vec#continue_scope(class continue_scope::iterator)#(10867355481694456603).8c0551e386b9f2c25bf3629672b303c4_2" ;
-"get#vec#continue_scope#(13898317495016814620).68b3a48870926ee1b656c13c172b7eaf_1" [label="1: Start continue_scope::vec_get\nFormals:  this:continue_scope::vec* pos:int __return_param:continue_scope::X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 37, column 3]\n " color=yellow style=filled]
+"get#vec#continue_scope(class continue_scope::X)#(13898317495016814620).3829388c237a09b0f1feeaf1c583e486_1" [label="1: Start continue_scope::vec_get\nFormals:  this:continue_scope::vec* pos:int __return_param:continue_scope::X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 37, column 3]\n " color=yellow style=filled]
 	
 
-	 "get#vec#continue_scope#(13898317495016814620).68b3a48870926ee1b656c13c172b7eaf_1" -> "get#vec#continue_scope#(13898317495016814620).68b3a48870926ee1b656c13c172b7eaf_3" ;
+	 "get#vec#continue_scope(class continue_scope::X)#(13898317495016814620).3829388c237a09b0f1feeaf1c583e486_1" -> "get#vec#continue_scope(class continue_scope::X)#(13898317495016814620).3829388c237a09b0f1feeaf1c583e486_3" ;
-"get#vec#continue_scope#(13898317495016814620).68b3a48870926ee1b656c13c172b7eaf_2" [label="2: Exit continue_scope::vec_get \n  " color=yellow style=filled]
+"get#vec#continue_scope(class continue_scope::X)#(13898317495016814620).3829388c237a09b0f1feeaf1c583e486_2" [label="2: Exit continue_scope::vec_get \n  " color=yellow style=filled]
 	
 
-"get#vec#continue_scope#(13898317495016814620).68b3a48870926ee1b656c13c172b7eaf_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::X* [line 37, column 26]\n  n$1=*&this:continue_scope::vec const * [line 37, column 33]\n  n$2=*&pos:int [line 37, column 39]\n  n$3=_fun_continue_scope::X_X(n$0:continue_scope::X*,n$1._data[n$2]:continue_scope::X const &) [line 37, column 33]\n " shape="box"]
+"get#vec#continue_scope(class continue_scope::X)#(13898317495016814620).3829388c237a09b0f1feeaf1c583e486_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::X* [line 37, column 26]\n  n$1=*&this:continue_scope::vec const * [line 37, column 33]\n  n$2=*&pos:int [line 37, column 39]\n  n$3=_fun_continue_scope::X_X(n$0:continue_scope::X*,n$1._data[n$2]:continue_scope::X const &) [line 37, column 33]\n " shape="box"]
 	
 
-	 "get#vec#continue_scope#(13898317495016814620).68b3a48870926ee1b656c13c172b7eaf_3" -> "get#vec#continue_scope#(13898317495016814620).68b3a48870926ee1b656c13c172b7eaf_2" ;
+	 "get#vec#continue_scope(class continue_scope::X)#(13898317495016814620).3829388c237a09b0f1feeaf1c583e486_3" -> "get#vec#continue_scope(class continue_scope::X)#(13898317495016814620).3829388c237a09b0f1feeaf1c583e486_2" ;
-"end#vec#continue_scope#(4225103001970544933).ded338553ca4887b56031f34ea912cde_1" [label="1: Start continue_scope::vec_end\nFormals:  this:continue_scope::vec* __return_param:continue_scope::iterator*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 35, column 3]\n " color=yellow style=filled]
+"end#vec#continue_scope(class continue_scope::iterator)#(4225103001970544933).15b63d21cc3cccf91200fcac42652775_1" [label="1: Start continue_scope::vec_end\nFormals:  this:continue_scope::vec* __return_param:continue_scope::iterator*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 35, column 3]\n " color=yellow style=filled]
 	
 
-	 "end#vec#continue_scope#(4225103001970544933).ded338553ca4887b56031f34ea912cde_1" -> "end#vec#continue_scope#(4225103001970544933).ded338553ca4887b56031f34ea912cde_3" ;
+	 "end#vec#continue_scope(class continue_scope::iterator)#(4225103001970544933).15b63d21cc3cccf91200fcac42652775_1" -> "end#vec#continue_scope(class continue_scope::iterator)#(4225103001970544933).15b63d21cc3cccf91200fcac42652775_3" ;
-"end#vec#continue_scope#(4225103001970544933).ded338553ca4887b56031f34ea912cde_2" [label="2: Exit continue_scope::vec_end \n  " color=yellow style=filled]
+"end#vec#continue_scope(class continue_scope::iterator)#(4225103001970544933).15b63d21cc3cccf91200fcac42652775_2" [label="2: Exit continue_scope::vec_end \n  " color=yellow style=filled]
 	
 
-"end#vec#continue_scope#(4225103001970544933).ded338553ca4887b56031f34ea912cde_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::iterator* [line 35, column 20]\n  n$2=*&this:continue_scope::vec* [line 35, column 36]\n  n$3=_fun_continue_scope::iterator_iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator*,n$2:continue_scope::vec*,10:int) [line 35, column 27]\n  n$4=_fun_continue_scope::iterator_iterator(n$0:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator&) [line 35, column 27]\n " shape="box"]
+"end#vec#continue_scope(class continue_scope::iterator)#(4225103001970544933).15b63d21cc3cccf91200fcac42652775_3" [label="3:  Return Stmt \n   n$0=*&__return_param:continue_scope::iterator* [line 35, column 20]\n  n$2=*&this:continue_scope::vec* [line 35, column 36]\n  n$3=_fun_continue_scope::iterator_iterator(&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator*,n$2:continue_scope::vec*,10:int) [line 35, column 27]\n  n$4=_fun_continue_scope::iterator_iterator(n$0:continue_scope::iterator*,&0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator&) [line 35, column 27]\n " shape="box"]
 	
 
-	 "end#vec#continue_scope#(4225103001970544933).ded338553ca4887b56031f34ea912cde_3" -> "end#vec#continue_scope#(4225103001970544933).ded338553ca4887b56031f34ea912cde_2" ;
+	 "end#vec#continue_scope(class continue_scope::iterator)#(4225103001970544933).15b63d21cc3cccf91200fcac42652775_3" -> "end#vec#continue_scope(class continue_scope::iterator)#(4225103001970544933).15b63d21cc3cccf91200fcac42652775_2" ;
 "vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_1" [label="1: Start continue_scope::vec_vec\nFormals:  this:continue_scope::vec*\nLocals:  \n   DECLARE_LOCALS(&return); [line 33, column 3]\n " color=yellow style=filled]
 	
 

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

@@ -11,36 +11,36 @@ digraph cfg {
 	
 
 	 "callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_3" -> "callgetZ#destructor_scope#16418724657639342926.f4c0cbb2a5d892ea82496dd2540a9ead_2" ;
-"getX#destructor_scope#11739464242911605656.40a1d0621360ad71d65c4cc39bf927eb_1" [label="1: Start destructor_scope::getX\nFormals:  __return_param:destructor_scope::X*\nLocals:  x:destructor_scope::X \n   DECLARE_LOCALS(&return,&x); [line 68, column 1]\n " color=yellow style=filled]
+"getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_1" [label="1: Start destructor_scope::getX\nFormals:  __return_param:destructor_scope::X*\nLocals:  x:destructor_scope::X \n   DECLARE_LOCALS(&return,&x); [line 68, column 1]\n " color=yellow style=filled]
 	
 
-	 "getX#destructor_scope#11739464242911605656.40a1d0621360ad71d65c4cc39bf927eb_1" -> "getX#destructor_scope#11739464242911605656.40a1d0621360ad71d65c4cc39bf927eb_4" ;
+	 "getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_1" -> "getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_4" ;
-"getX#destructor_scope#11739464242911605656.40a1d0621360ad71d65c4cc39bf927eb_2" [label="2: Exit destructor_scope::getX \n  " color=yellow style=filled]
+"getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_2" [label="2: Exit destructor_scope::getX \n  " color=yellow style=filled]
 	
 
-"getX#destructor_scope#11739464242911605656.40a1d0621360ad71d65c4cc39bf927eb_3" [label="3:  Return Stmt \n   n$0=*&__return_param:destructor_scope::X* [line 70, column 3]\n  n$1=_fun_destructor_scope::X_X(n$0:destructor_scope::X*,&x:destructor_scope::X&) [line 70, column 10]\n  _=*&x:destructor_scope::X [line 70, column 10]\n  n$3=_fun_destructor_scope::X_~X(&x:destructor_scope::X*) [line 70, column 10]\n " shape="box"]
+"getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_3" [label="3:  Return Stmt \n   n$0=*&__return_param:destructor_scope::X* [line 70, column 3]\n  n$1=_fun_destructor_scope::X_X(n$0:destructor_scope::X*,&x:destructor_scope::X&) [line 70, column 10]\n  _=*&x:destructor_scope::X [line 70, column 10]\n  n$3=_fun_destructor_scope::X_~X(&x:destructor_scope::X*) [line 70, column 10]\n " shape="box"]
 	
 
-	 "getX#destructor_scope#11739464242911605656.40a1d0621360ad71d65c4cc39bf927eb_3" -> "getX#destructor_scope#11739464242911605656.40a1d0621360ad71d65c4cc39bf927eb_2" ;
+	 "getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_3" -> "getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_2" ;
-"getX#destructor_scope#11739464242911605656.40a1d0621360ad71d65c4cc39bf927eb_4" [label="4:  DeclStmt \n   n$5=_fun_destructor_scope::X_X(&x:destructor_scope::X*) [line 69, column 5]\n " shape="box"]
+"getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_4" [label="4:  DeclStmt \n   n$5=_fun_destructor_scope::X_X(&x:destructor_scope::X*) [line 69, column 5]\n " shape="box"]
 	
 
-	 "getX#destructor_scope#11739464242911605656.40a1d0621360ad71d65c4cc39bf927eb_4" -> "getX#destructor_scope#11739464242911605656.40a1d0621360ad71d65c4cc39bf927eb_3" ;
+	 "getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_4" -> "getX#destructor_scope(class destructor_scope::X)#11739464242911605656.956e6b931ba67c14d56b1314b7f2fce7_3" ;
-"getZ#destructor_scope#13110319947448813202.fe2bc6519a3d7998283b70bbacc3915e_1" [label="1: Start destructor_scope::getZ\nFormals:  __return_param:destructor_scope::Z*\nLocals:  z:destructor_scope::Z \n   DECLARE_LOCALS(&return,&z); [line 73, column 1]\n " color=yellow style=filled]
+"getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_1" [label="1: Start destructor_scope::getZ\nFormals:  __return_param:destructor_scope::Z*\nLocals:  z:destructor_scope::Z \n   DECLARE_LOCALS(&return,&z); [line 73, column 1]\n " color=yellow style=filled]
 	
 
-	 "getZ#destructor_scope#13110319947448813202.fe2bc6519a3d7998283b70bbacc3915e_1" -> "getZ#destructor_scope#13110319947448813202.fe2bc6519a3d7998283b70bbacc3915e_4" ;
+	 "getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_1" -> "getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_4" ;
-"getZ#destructor_scope#13110319947448813202.fe2bc6519a3d7998283b70bbacc3915e_2" [label="2: Exit destructor_scope::getZ \n  " color=yellow style=filled]
+"getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_2" [label="2: Exit destructor_scope::getZ \n  " color=yellow style=filled]
 	
 
-"getZ#destructor_scope#13110319947448813202.fe2bc6519a3d7998283b70bbacc3915e_3" [label="3:  Return Stmt \n   n$0=*&__return_param:destructor_scope::Z* [line 75, column 3]\n  n$1=_fun_destructor_scope::Z_Z(n$0:destructor_scope::Z*,&z:destructor_scope::Z&) [line 75, column 10]\n  _=*&z:destructor_scope::Z [line 75, column 10]\n  n$3=_fun_destructor_scope::Z_~Z(&z:destructor_scope::Z*) [line 75, column 10]\n " shape="box"]
+"getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_3" [label="3:  Return Stmt \n   n$0=*&__return_param:destructor_scope::Z* [line 75, column 3]\n  n$1=_fun_destructor_scope::Z_Z(n$0:destructor_scope::Z*,&z:destructor_scope::Z&) [line 75, column 10]\n  _=*&z:destructor_scope::Z [line 75, column 10]\n  n$3=_fun_destructor_scope::Z_~Z(&z:destructor_scope::Z*) [line 75, column 10]\n " shape="box"]
 	
 
-	 "getZ#destructor_scope#13110319947448813202.fe2bc6519a3d7998283b70bbacc3915e_3" -> "getZ#destructor_scope#13110319947448813202.fe2bc6519a3d7998283b70bbacc3915e_2" ;
+	 "getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_3" -> "getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_2" ;
-"getZ#destructor_scope#13110319947448813202.fe2bc6519a3d7998283b70bbacc3915e_4" [label="4:  DeclStmt \n   n$5=_fun_destructor_scope::Z_Z(&z:destructor_scope::Z*) [line 74, column 5]\n " shape="box"]
+"getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_4" [label="4:  DeclStmt \n   n$5=_fun_destructor_scope::Z_Z(&z:destructor_scope::Z*) [line 74, column 5]\n " shape="box"]
 	
 
-	 "getZ#destructor_scope#13110319947448813202.fe2bc6519a3d7998283b70bbacc3915e_4" -> "getZ#destructor_scope#13110319947448813202.fe2bc6519a3d7998283b70bbacc3915e_3" ;
+	 "getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_4" -> "getZ#destructor_scope(class destructor_scope::Z)#13110319947448813202.27b8261073c8d26082c5ea18b0194031_3" ;
 "test1#destructor_scope#3167061604758065234.d3af82d2ddb9b80d2c9930cb62bbbffa_1" [label="1: Start destructor_scope::test1\nFormals:  a:_Bool b:_Bool\nLocals:  y3:destructor_scope::Y y1:destructor_scope::Y x3:destructor_scope::X y2:destructor_scope::Y x2:destructor_scope::X s:destructor_scope::S x1:destructor_scope::X \n   DECLARE_LOCALS(&return,&y3,&y1,&x3,&y2,&x2,&s,&x1); [line 37, column 1]\n " color=yellow style=filled]
 	
 

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

@@ -22,17 +22,17 @@ digraph cfg {
 	
 
 	 "__infer_globals_initializer_v#708fabe5dc8ff523caaa5f44184921e8.588095fa475e4a9e8c83f50f26a48ea9_3" -> "__infer_globals_initializer_v#708fabe5dc8ff523caaa5f44184921e8.588095fa475e4a9e8c83f50f26a48ea9_2" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_1" [label="1: Start test\nFormals:  __return_param:X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 13, column 1]\n " color=yellow style=filled]
+"test(class X)#18241244337164948030.76ba1cf61f22b6e7f39fb9940d283ba3_1" [label="1: Start test\nFormals:  __return_param:X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 13, column 1]\n " color=yellow style=filled]
 	
 
-	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_1" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" ;
+	 "test(class X)#18241244337164948030.76ba1cf61f22b6e7f39fb9940d283ba3_1" -> "test(class X)#18241244337164948030.76ba1cf61f22b6e7f39fb9940d283ba3_3" ;
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" [label="2: Exit test \n  " color=yellow style=filled]
+"test(class X)#18241244337164948030.76ba1cf61f22b6e7f39fb9940d283ba3_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" [label="3:  Return Stmt \n   n$0=*&__return_param:X* [line 13, column 12]\n  n$1=_fun_X_X(n$0:X*,&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|!pod>$global:X const &) [line 13, column 19]\n " shape="box"]
+"test(class X)#18241244337164948030.76ba1cf61f22b6e7f39fb9940d283ba3_3" [label="3:  Return Stmt \n   n$0=*&__return_param:X* [line 13, column 12]\n  n$1=_fun_X_X(n$0:X*,&#GB<codetoanalyze/cpp/frontend/globals/global_const1.cpp|!pod>$global:X const &) [line 13, column 19]\n " shape="box"]
 	
 
-	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
+	 "test(class X)#18241244337164948030.76ba1cf61f22b6e7f39fb9940d283ba3_3" -> "test(class X)#18241244337164948030.76ba1cf61f22b6e7f39fb9940d283ba3_2" ;
 "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_1" [label="1: Start test2\nFormals: \nLocals:  local:int \n   DECLARE_LOCALS(&return,&local); [line 17, column 1]\n " color=yellow style=filled]
 	
 

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

@@ -11,17 +11,17 @@ digraph cfg {
 	
 
 	 "fun_with_self#17802276037376540432.4639f371cac8e491a6b8c0363a0bc168_3" -> "fun_with_self#17802276037376540432.4639f371cac8e491a6b8c0363a0bc168_2" ;
-"test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_1" [label="1: Start test\nFormals:  a:A*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15, column 1]\n " color=yellow style=filled]
+"test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_1" [label="1: Start test\nFormals:  a:A*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15, column 1]\n " color=yellow style=filled]
 	
 
-	 "test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_1" -> "test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_3" ;
+	 "test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_1" -> "test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_3" ;
-"test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_2" [label="2: Exit test \n  " color=yellow style=filled]
+"test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_3" [label="3:  Return Stmt \n   n$0=*&a:A* [line 15, column 25]\n  _=*n$0:A [line 15, column 25]\n  n$2=_fun_A_meth_with_self(n$0:A*,1:int,2:int) [line 15, column 25]\n  n$3=_fun_fun_with_self(10:int) [line 15, column 51]\n  *&return:int=(n$2 + n$3) [line 15, column 18]\n " shape="box"]
+"test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_3" [label="3:  Return Stmt \n   n$0=*&a:A* [line 15, column 25]\n  _=*n$0:A [line 15, column 25]\n  n$2=_fun_A_meth_with_self(n$0:A*,1:int,2:int) [line 15, column 25]\n  n$3=_fun_fun_with_self(10:int) [line 15, column 51]\n  *&return:int=(n$2 + n$3) [line 15, column 18]\n " shape="box"]
 	
 
-	 "test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_3" -> "test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_2" ;
+	 "test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_3" -> "test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_2" ;
 "meth_with_self#A#(5126246555081316972).087223c2fe95da4de39ef1116c167075_1" [label="1: Start A_meth_with_self\nFormals:  this:A* self:int b:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 10, column 3]\n " color=yellow style=filled]
 	
 

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

@@ -88,21 +88,21 @@ digraph cfg {
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_13" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_12" ;
-"operator++#iterator#(14034081864165661659).8f8d47641e87add0a7463df1d1fa7b15_1" [label="1: Start iterator_operator++\nFormals:  this:iterator* __return_param:iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 11, column 3]\n " color=yellow style=filled]
+"operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_1" [label="1: Start iterator_operator++\nFormals:  this:iterator* __return_param:iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 11, column 3]\n " color=yellow style=filled]
 	
 
-	 "operator++#iterator#(14034081864165661659).8f8d47641e87add0a7463df1d1fa7b15_1" -> "operator++#iterator#(14034081864165661659).8f8d47641e87add0a7463df1d1fa7b15_4" ;
+	 "operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_1" -> "operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_4" ;
-"operator++#iterator#(14034081864165661659).8f8d47641e87add0a7463df1d1fa7b15_2" [label="2: Exit iterator_operator++ \n  " color=yellow style=filled]
+"operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_2" [label="2: Exit iterator_operator++ \n  " color=yellow style=filled]
 	
 
-"operator++#iterator#(14034081864165661659).8f8d47641e87add0a7463df1d1fa7b15_3" [label="3:  Return Stmt \n   n$0=*&__return_param:iterator* [line 13, column 5]\n  n$1=*&this:iterator* [line 13, column 13]\n  n$2=_fun_iterator_iterator(n$0:iterator*,n$1:iterator&) [line 13, column 12]\n " shape="box"]
+"operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_3" [label="3:  Return Stmt \n   n$0=*&__return_param:iterator* [line 13, column 5]\n  n$1=*&this:iterator* [line 13, column 13]\n  n$2=_fun_iterator_iterator(n$0:iterator*,n$1:iterator&) [line 13, column 12]\n " shape="box"]
 	
 
-	 "operator++#iterator#(14034081864165661659).8f8d47641e87add0a7463df1d1fa7b15_3" -> "operator++#iterator#(14034081864165661659).8f8d47641e87add0a7463df1d1fa7b15_2" ;
+	 "operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_3" -> "operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_2" ;
-"operator++#iterator#(14034081864165661659).8f8d47641e87add0a7463df1d1fa7b15_4" [label="4:  BinaryOperatorStmt: AddAssign \n   n$4=*&this:iterator* [line 12, column 5]\n  n$5=*n$4.val:int [line 12, column 5]\n  *n$4.val:int=(n$5 + 1) [line 12, column 5]\n " shape="box"]
+"operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_4" [label="4:  BinaryOperatorStmt: AddAssign \n   n$4=*&this:iterator* [line 12, column 5]\n  n$5=*n$4.val:int [line 12, column 5]\n  *n$4.val:int=(n$5 + 1) [line 12, column 5]\n " shape="box"]
 	
 
-	 "operator++#iterator#(14034081864165661659).8f8d47641e87add0a7463df1d1fa7b15_4" -> "operator++#iterator#(14034081864165661659).8f8d47641e87add0a7463df1d1fa7b15_3" ;
+	 "operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_4" -> "operator++#iterator(class iterator)#(14034081864165661659).574423d3d3249b4f53477fb1be150024_3" ;
 "operator*#iterator#(14296957122470685412).e3f593369544fc43a253ad1e4f5ed136_1" [label="1: Start iterator_operator*\nFormals:  this:iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15, column 3]\n " color=yellow style=filled]
 	
 
@@ -143,28 +143,28 @@ digraph cfg {
 	
 
 	 "iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_3" -> "iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_2" ;
-"end#vec#(14240882620331653738).9e08a46e9d5bcb3339794674882c80a3_1" [label="1: Start vec_end\nFormals:  this:vec* __return_param:iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 27, column 3]\n " color=yellow style=filled]
+"end#vec(class iterator)#(14240882620331653738).aed9da65654959634fd17d4511cfa44d_1" [label="1: Start vec_end\nFormals:  this:vec* __return_param:iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 27, column 3]\n " color=yellow style=filled]
 	
 
-	 "end#vec#(14240882620331653738).9e08a46e9d5bcb3339794674882c80a3_1" -> "end#vec#(14240882620331653738).9e08a46e9d5bcb3339794674882c80a3_3" ;
+	 "end#vec(class iterator)#(14240882620331653738).aed9da65654959634fd17d4511cfa44d_1" -> "end#vec(class iterator)#(14240882620331653738).aed9da65654959634fd17d4511cfa44d_3" ;
-"end#vec#(14240882620331653738).9e08a46e9d5bcb3339794674882c80a3_2" [label="2: Exit vec_end \n  " color=yellow style=filled]
+"end#vec(class iterator)#(14240882620331653738).aed9da65654959634fd17d4511cfa44d_2" [label="2: Exit vec_end \n  " color=yellow style=filled]
 	
 
-"end#vec#(14240882620331653738).9e08a46e9d5bcb3339794674882c80a3_3" [label="3:  Return Stmt \n   n$0=*&__return_param:iterator* [line 27, column 20]\n  n$1=*&this:vec* [line 27, column 27]\n  n$2=_fun_iterator_iterator(n$0:iterator*,n$1.end_:iterator&) [line 27, column 27]\n " shape="box"]
+"end#vec(class iterator)#(14240882620331653738).aed9da65654959634fd17d4511cfa44d_3" [label="3:  Return Stmt \n   n$0=*&__return_param:iterator* [line 27, column 20]\n  n$1=*&this:vec* [line 27, column 27]\n  n$2=_fun_iterator_iterator(n$0:iterator*,n$1.end_:iterator&) [line 27, column 27]\n " shape="box"]
 	
 
-	 "end#vec#(14240882620331653738).9e08a46e9d5bcb3339794674882c80a3_3" -> "end#vec#(14240882620331653738).9e08a46e9d5bcb3339794674882c80a3_2" ;
+	 "end#vec(class iterator)#(14240882620331653738).aed9da65654959634fd17d4511cfa44d_3" -> "end#vec(class iterator)#(14240882620331653738).aed9da65654959634fd17d4511cfa44d_2" ;
-"begin#vec#(1866137161906470488).7bca21f38283b3487a15399a2f8cb73c_1" [label="1: Start vec_begin\nFormals:  this:vec* __return_param:iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 26, column 3]\n " color=yellow style=filled]
+"begin#vec(class iterator)#(1866137161906470488).407edea568a869b61c9e5e8424e0b5f7_1" [label="1: Start vec_begin\nFormals:  this:vec* __return_param:iterator*\nLocals:  \n   DECLARE_LOCALS(&return); [line 26, column 3]\n " color=yellow style=filled]
 	
 
-	 "begin#vec#(1866137161906470488).7bca21f38283b3487a15399a2f8cb73c_1" -> "begin#vec#(1866137161906470488).7bca21f38283b3487a15399a2f8cb73c_3" ;
+	 "begin#vec(class iterator)#(1866137161906470488).407edea568a869b61c9e5e8424e0b5f7_1" -> "begin#vec(class iterator)#(1866137161906470488).407edea568a869b61c9e5e8424e0b5f7_3" ;
-"begin#vec#(1866137161906470488).7bca21f38283b3487a15399a2f8cb73c_2" [label="2: Exit vec_begin \n  " color=yellow style=filled]
+"begin#vec(class iterator)#(1866137161906470488).407edea568a869b61c9e5e8424e0b5f7_2" [label="2: Exit vec_begin \n  " color=yellow style=filled]
 	
 
-"begin#vec#(1866137161906470488).7bca21f38283b3487a15399a2f8cb73c_3" [label="3:  Return Stmt \n   n$0=*&__return_param:iterator* [line 26, column 22]\n  n$1=*&this:vec* [line 26, column 29]\n  n$2=_fun_iterator_iterator(n$0:iterator*,n$1.begin_:iterator&) [line 26, column 29]\n " shape="box"]
+"begin#vec(class iterator)#(1866137161906470488).407edea568a869b61c9e5e8424e0b5f7_3" [label="3:  Return Stmt \n   n$0=*&__return_param:iterator* [line 26, column 22]\n  n$1=*&this:vec* [line 26, column 29]\n  n$2=_fun_iterator_iterator(n$0:iterator*,n$1.begin_:iterator&) [line 26, column 29]\n " shape="box"]
 	
 
-	 "begin#vec#(1866137161906470488).7bca21f38283b3487a15399a2f8cb73c_3" -> "begin#vec#(1866137161906470488).7bca21f38283b3487a15399a2f8cb73c_2" ;
+	 "begin#vec(class iterator)#(1866137161906470488).407edea568a869b61c9e5e8424e0b5f7_3" -> "begin#vec(class iterator)#(1866137161906470488).407edea568a869b61c9e5e8424e0b5f7_2" ;
 "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_1" [label="1: Start vec_vec\nFormals:  this:vec* size:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 22, column 3]\n " color=yellow style=filled]
 	
 

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

@@ -92,21 +92,21 @@ digraph cfg {
 	
 
 	 "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_11" -> "conditional#binary_conditional#4777209206611953450.41decaebdce6325bd31c1d47d4647c45_5" ;
-"getX#binary_conditional#7708042186122353096.ec6c66051810049a5e5688caadbf0f96_1" [label="1: Start binary_conditional::getX\nFormals:  __return_param:binary_conditional::X*\nLocals:  x:binary_conditional::X \n   DECLARE_LOCALS(&return,&x); [line 14, column 1]\n " color=yellow style=filled]
+"getX#binary_conditional(class binary_conditional::X)#7708042186122353096.8825a5a3afa327848f6dcf77ec0e3f60_1" [label="1: Start binary_conditional::getX\nFormals:  __return_param:binary_conditional::X*\nLocals:  x:binary_conditional::X \n   DECLARE_LOCALS(&return,&x); [line 14, column 1]\n " color=yellow style=filled]
 	
 
-	 "getX#binary_conditional#7708042186122353096.ec6c66051810049a5e5688caadbf0f96_1" -> "getX#binary_conditional#7708042186122353096.ec6c66051810049a5e5688caadbf0f96_4" ;
+	 "getX#binary_conditional(class binary_conditional::X)#7708042186122353096.8825a5a3afa327848f6dcf77ec0e3f60_1" -> "getX#binary_conditional(class binary_conditional::X)#7708042186122353096.8825a5a3afa327848f6dcf77ec0e3f60_4" ;
-"getX#binary_conditional#7708042186122353096.ec6c66051810049a5e5688caadbf0f96_2" [label="2: Exit binary_conditional::getX \n  " color=yellow style=filled]
+"getX#binary_conditional(class binary_conditional::X)#7708042186122353096.8825a5a3afa327848f6dcf77ec0e3f60_2" [label="2: Exit binary_conditional::getX \n  " color=yellow style=filled]
 	
 
-"getX#binary_conditional#7708042186122353096.ec6c66051810049a5e5688caadbf0f96_3" [label="3:  Return Stmt \n   n$0=*&__return_param:binary_conditional::X* [line 16, column 3]\n  n$1=_fun_binary_conditional::X_X(n$0:binary_conditional::X*,&x:binary_conditional::X&) [line 16, column 10]\n  _=*&x:binary_conditional::X [line 16, column 10]\n  n$3=_fun_binary_conditional::X_~X(&x:binary_conditional::X*) [line 16, column 10]\n " shape="box"]
+"getX#binary_conditional(class binary_conditional::X)#7708042186122353096.8825a5a3afa327848f6dcf77ec0e3f60_3" [label="3:  Return Stmt \n   n$0=*&__return_param:binary_conditional::X* [line 16, column 3]\n  n$1=_fun_binary_conditional::X_X(n$0:binary_conditional::X*,&x:binary_conditional::X&) [line 16, column 10]\n  _=*&x:binary_conditional::X [line 16, column 10]\n  n$3=_fun_binary_conditional::X_~X(&x:binary_conditional::X*) [line 16, column 10]\n " shape="box"]
 	
 
-	 "getX#binary_conditional#7708042186122353096.ec6c66051810049a5e5688caadbf0f96_3" -> "getX#binary_conditional#7708042186122353096.ec6c66051810049a5e5688caadbf0f96_2" ;
+	 "getX#binary_conditional(class binary_conditional::X)#7708042186122353096.8825a5a3afa327848f6dcf77ec0e3f60_3" -> "getX#binary_conditional(class binary_conditional::X)#7708042186122353096.8825a5a3afa327848f6dcf77ec0e3f60_2" ;
-"getX#binary_conditional#7708042186122353096.ec6c66051810049a5e5688caadbf0f96_4" [label="4:  DeclStmt \n   n$5=_fun_binary_conditional::X_X(&x:binary_conditional::X*) [line 15, column 5]\n " shape="box"]
+"getX#binary_conditional(class binary_conditional::X)#7708042186122353096.8825a5a3afa327848f6dcf77ec0e3f60_4" [label="4:  DeclStmt \n   n$5=_fun_binary_conditional::X_X(&x:binary_conditional::X*) [line 15, column 5]\n " shape="box"]
 	
 
-	 "getX#binary_conditional#7708042186122353096.ec6c66051810049a5e5688caadbf0f96_4" -> "getX#binary_conditional#7708042186122353096.ec6c66051810049a5e5688caadbf0f96_3" ;
+	 "getX#binary_conditional(class binary_conditional::X)#7708042186122353096.8825a5a3afa327848f6dcf77ec0e3f60_4" -> "getX#binary_conditional(class binary_conditional::X)#7708042186122353096.8825a5a3afa327848f6dcf77ec0e3f60_3" ;
 "operator_bool#X#binary_conditional#(663222161121279878).1074e20ff76c2575638dad4d7c1539a7_1" [label="1: Start binary_conditional::X_operator_bool\nFormals:  this:binary_conditional::X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 11, column 3]\n " color=yellow style=filled]
 	
 

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

@@ -108,44 +108,44 @@ digraph cfg {
 	
 
 	 "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_8" -> "copyY_moveY_div1#copy_move_constructor#5827233588222911615.5716e8b7acbd3ff43f18c7c5954c6565_7" ;
-"getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_1" [label="1: Start copy_move_constructor::getX\nFormals:  f:int __return_param:copy_move_constructor::X*\nLocals:  x:copy_move_constructor::X \n   DECLARE_LOCALS(&return,&x); [line 27, column 1]\n " color=yellow style=filled]
+"getX#copy_move_constructor(class copy_move_constructor::X)#2211685783611424509.3ed1bf77442fb4e47b3afdd1dd669b7a_1" [label="1: Start copy_move_constructor::getX\nFormals:  f:int __return_param:copy_move_constructor::X*\nLocals:  x:copy_move_constructor::X \n   DECLARE_LOCALS(&return,&x); [line 27, column 1]\n " color=yellow style=filled]
 	
 
-	 "getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_1" -> "getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_5" ;
+	 "getX#copy_move_constructor(class copy_move_constructor::X)#2211685783611424509.3ed1bf77442fb4e47b3afdd1dd669b7a_1" -> "getX#copy_move_constructor(class copy_move_constructor::X)#2211685783611424509.3ed1bf77442fb4e47b3afdd1dd669b7a_5" ;
-"getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_2" [label="2: Exit copy_move_constructor::getX \n  " color=yellow style=filled]
+"getX#copy_move_constructor(class copy_move_constructor::X)#2211685783611424509.3ed1bf77442fb4e47b3afdd1dd669b7a_2" [label="2: Exit copy_move_constructor::getX \n  " color=yellow style=filled]
 	
 
-"getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_3" [label="3:  Return Stmt \n   n$0=*&__return_param:copy_move_constructor::X* [line 30, column 3]\n  n$1=_fun_copy_move_constructor::X_X(n$0:copy_move_constructor::X*,&x:copy_move_constructor::X&) [line 30, column 10]\n  _=*&x:copy_move_constructor::X [line 30, column 10]\n  n$3=_fun_copy_move_constructor::X_~X(&x:copy_move_constructor::X*) [line 30, column 10]\n " shape="box"]
+"getX#copy_move_constructor(class copy_move_constructor::X)#2211685783611424509.3ed1bf77442fb4e47b3afdd1dd669b7a_3" [label="3:  Return Stmt \n   n$0=*&__return_param:copy_move_constructor::X* [line 30, column 3]\n  n$1=_fun_copy_move_constructor::X_X(n$0:copy_move_constructor::X*,&x:copy_move_constructor::X&) [line 30, column 10]\n  _=*&x:copy_move_constructor::X [line 30, column 10]\n  n$3=_fun_copy_move_constructor::X_~X(&x:copy_move_constructor::X*) [line 30, column 10]\n " shape="box"]
 	
 
-	 "getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_3" -> "getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_2" ;
+	 "getX#copy_move_constructor(class copy_move_constructor::X)#2211685783611424509.3ed1bf77442fb4e47b3afdd1dd669b7a_3" -> "getX#copy_move_constructor(class copy_move_constructor::X)#2211685783611424509.3ed1bf77442fb4e47b3afdd1dd669b7a_2" ;
-"getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_4" [label="4:  BinaryOperatorStmt: Assign \n   n$5=*&f:int [line 29, column 9]\n  *&x.f:int=n$5 [line 29, column 3]\n " shape="box"]
+"getX#copy_move_constructor(class copy_move_constructor::X)#2211685783611424509.3ed1bf77442fb4e47b3afdd1dd669b7a_4" [label="4:  BinaryOperatorStmt: Assign \n   n$5=*&f:int [line 29, column 9]\n  *&x.f:int=n$5 [line 29, column 3]\n " shape="box"]
 	
 
-	 "getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_4" -> "getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_3" ;
+	 "getX#copy_move_constructor(class copy_move_constructor::X)#2211685783611424509.3ed1bf77442fb4e47b3afdd1dd669b7a_4" -> "getX#copy_move_constructor(class copy_move_constructor::X)#2211685783611424509.3ed1bf77442fb4e47b3afdd1dd669b7a_3" ;
-"getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_5" [label="5:  DeclStmt \n   n$6=_fun_copy_move_constructor::X_X(&x:copy_move_constructor::X*) [line 28, column 5]\n " shape="box"]
+"getX#copy_move_constructor(class copy_move_constructor::X)#2211685783611424509.3ed1bf77442fb4e47b3afdd1dd669b7a_5" [label="5:  DeclStmt \n   n$6=_fun_copy_move_constructor::X_X(&x:copy_move_constructor::X*) [line 28, column 5]\n " shape="box"]
 	
 
-	 "getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_5" -> "getX#copy_move_constructor#2211685783611424509.876b259ed079b8b199249e0c38ad55df_4" ;
+	 "getX#copy_move_constructor(class copy_move_constructor::X)#2211685783611424509.3ed1bf77442fb4e47b3afdd1dd669b7a_5" -> "getX#copy_move_constructor(class copy_move_constructor::X)#2211685783611424509.3ed1bf77442fb4e47b3afdd1dd669b7a_4" ;
-"getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_1" [label="1: Start copy_move_constructor::getY\nFormals:  f:int __return_param:copy_move_constructor::Y*\nLocals:  y:copy_move_constructor::Y \n   DECLARE_LOCALS(&return,&y); [line 33, column 1]\n " color=yellow style=filled]
+"getY#copy_move_constructor(class copy_move_constructor::Y)#1712013823822590270.ad9dd85c67bb69fcd76f4c34bc426f28_1" [label="1: Start copy_move_constructor::getY\nFormals:  f:int __return_param:copy_move_constructor::Y*\nLocals:  y:copy_move_constructor::Y \n   DECLARE_LOCALS(&return,&y); [line 33, column 1]\n " color=yellow style=filled]
 	
 
-	 "getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_1" -> "getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_5" ;
+	 "getY#copy_move_constructor(class copy_move_constructor::Y)#1712013823822590270.ad9dd85c67bb69fcd76f4c34bc426f28_1" -> "getY#copy_move_constructor(class copy_move_constructor::Y)#1712013823822590270.ad9dd85c67bb69fcd76f4c34bc426f28_5" ;
-"getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_2" [label="2: Exit copy_move_constructor::getY \n  " color=yellow style=filled]
+"getY#copy_move_constructor(class copy_move_constructor::Y)#1712013823822590270.ad9dd85c67bb69fcd76f4c34bc426f28_2" [label="2: Exit copy_move_constructor::getY \n  " color=yellow style=filled]
 	
 
-"getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_3" [label="3:  Return Stmt \n   n$0=*&__return_param:copy_move_constructor::Y* [line 36, column 3]\n  n$1=_fun_copy_move_constructor::Y_Y(n$0:copy_move_constructor::Y*,&y:copy_move_constructor::Y&) [line 36, column 10]\n  _=*&y:copy_move_constructor::Y [line 36, column 10]\n  n$3=_fun_copy_move_constructor::Y_~Y(&y:copy_move_constructor::Y*) [line 36, column 10]\n " shape="box"]
+"getY#copy_move_constructor(class copy_move_constructor::Y)#1712013823822590270.ad9dd85c67bb69fcd76f4c34bc426f28_3" [label="3:  Return Stmt \n   n$0=*&__return_param:copy_move_constructor::Y* [line 36, column 3]\n  n$1=_fun_copy_move_constructor::Y_Y(n$0:copy_move_constructor::Y*,&y:copy_move_constructor::Y&) [line 36, column 10]\n  _=*&y:copy_move_constructor::Y [line 36, column 10]\n  n$3=_fun_copy_move_constructor::Y_~Y(&y:copy_move_constructor::Y*) [line 36, column 10]\n " shape="box"]
 	
 
-	 "getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_3" -> "getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_2" ;
+	 "getY#copy_move_constructor(class copy_move_constructor::Y)#1712013823822590270.ad9dd85c67bb69fcd76f4c34bc426f28_3" -> "getY#copy_move_constructor(class copy_move_constructor::Y)#1712013823822590270.ad9dd85c67bb69fcd76f4c34bc426f28_2" ;
-"getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_4" [label="4:  BinaryOperatorStmt: Assign \n   n$5=*&f:int [line 35, column 9]\n  *&y.f:int=n$5 [line 35, column 3]\n " shape="box"]
+"getY#copy_move_constructor(class copy_move_constructor::Y)#1712013823822590270.ad9dd85c67bb69fcd76f4c34bc426f28_4" [label="4:  BinaryOperatorStmt: Assign \n   n$5=*&f:int [line 35, column 9]\n  *&y.f:int=n$5 [line 35, column 3]\n " shape="box"]
 	
 
-	 "getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_4" -> "getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_3" ;
+	 "getY#copy_move_constructor(class copy_move_constructor::Y)#1712013823822590270.ad9dd85c67bb69fcd76f4c34bc426f28_4" -> "getY#copy_move_constructor(class copy_move_constructor::Y)#1712013823822590270.ad9dd85c67bb69fcd76f4c34bc426f28_3" ;
-"getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_5" [label="5:  DeclStmt \n   n$6=_fun_copy_move_constructor::Y_Y(&y:copy_move_constructor::Y*) [line 34, column 5]\n " shape="box"]
+"getY#copy_move_constructor(class copy_move_constructor::Y)#1712013823822590270.ad9dd85c67bb69fcd76f4c34bc426f28_5" [label="5:  DeclStmt \n   n$6=_fun_copy_move_constructor::Y_Y(&y:copy_move_constructor::Y*) [line 34, column 5]\n " shape="box"]
 	
 
-	 "getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_5" -> "getY#copy_move_constructor#1712013823822590270.2c171bbad2707d6170d0b7974ac3c196_4" ;
+	 "getY#copy_move_constructor(class copy_move_constructor::Y)#1712013823822590270.ad9dd85c67bb69fcd76f4c34bc426f28_5" -> "getY#copy_move_constructor(class copy_move_constructor::Y)#1712013823822590270.ad9dd85c67bb69fcd76f4c34bc426f28_4" ;
 "moveX_div0#copy_move_constructor#2229557375196326562.f23c95e594ab41ba50090dccb989c3e3_1" [label="1: Start copy_move_constructor::moveX_div0\nFormals: \nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$0:copy_move_constructor::X \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 46, column 1]\n " color=yellow style=filled]
 	
 

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

@@ -26,17 +26,17 @@ digraph cfg {
 	
 
 	 "div#temp_object#8235742009211935218.2061ea7bd543a21042cf00f2dbeefd91_3" -> "div#temp_object#8235742009211935218.2061ea7bd543a21042cf00f2dbeefd91_2" ;
-"getX#temp_object#4720444219866178245.f48412a1530fe282a769812167194f6c_1" [label="1: Start temp_object::getX\nFormals:  a:int b:int __return_param:temp_object::X*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:temp_object::X const  \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 24, column 1]\n " color=yellow style=filled]
+"getX#temp_object(class temp_object::X)#4720444219866178245.c6d7bacbd2aa751dffef569ff17890e7_1" [label="1: Start temp_object::getX\nFormals:  a:int b:int __return_param:temp_object::X*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:temp_object::X const  \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 24, column 1]\n " color=yellow style=filled]
 	
 
-	 "getX#temp_object#4720444219866178245.f48412a1530fe282a769812167194f6c_1" -> "getX#temp_object#4720444219866178245.f48412a1530fe282a769812167194f6c_3" ;
+	 "getX#temp_object(class temp_object::X)#4720444219866178245.c6d7bacbd2aa751dffef569ff17890e7_1" -> "getX#temp_object(class temp_object::X)#4720444219866178245.c6d7bacbd2aa751dffef569ff17890e7_3" ;
-"getX#temp_object#4720444219866178245.f48412a1530fe282a769812167194f6c_2" [label="2: Exit temp_object::getX \n  " color=yellow style=filled]
+"getX#temp_object(class temp_object::X)#4720444219866178245.c6d7bacbd2aa751dffef569ff17890e7_2" [label="2: Exit temp_object::getX \n  " color=yellow style=filled]
 	
 
-"getX#temp_object#4720444219866178245.f48412a1530fe282a769812167194f6c_3" [label="3:  Return Stmt \n   n$0=*&__return_param:temp_object::X* [line 24, column 24]\n  n$2=*&a:int [line 24, column 33]\n  n$3=*&b:int [line 24, column 36]\n  n$4=_fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$1:temp_object::X const *,n$2:int,n$3:int) [line 24, column 31]\n  n$5=_fun_temp_object::X_X(n$0:temp_object::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:temp_object::X const &) [line 24, column 31]\n " shape="box"]
+"getX#temp_object(class temp_object::X)#4720444219866178245.c6d7bacbd2aa751dffef569ff17890e7_3" [label="3:  Return Stmt \n   n$0=*&__return_param:temp_object::X* [line 24, column 24]\n  n$2=*&a:int [line 24, column 33]\n  n$3=*&b:int [line 24, column 36]\n  n$4=_fun_temp_object::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$1:temp_object::X const *,n$2:int,n$3:int) [line 24, column 31]\n  n$5=_fun_temp_object::X_X(n$0:temp_object::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:temp_object::X const &) [line 24, column 31]\n " shape="box"]
 	
 
-	 "getX#temp_object#4720444219866178245.f48412a1530fe282a769812167194f6c_3" -> "getX#temp_object#4720444219866178245.f48412a1530fe282a769812167194f6c_2" ;
+	 "getX#temp_object(class temp_object::X)#4720444219866178245.c6d7bacbd2aa751dffef569ff17890e7_3" -> "getX#temp_object(class temp_object::X)#4720444219866178245.c6d7bacbd2aa751dffef569ff17890e7_2" ;
 "getX_field_div0#temp_object#12698122843139253036.854c4a3940ca05110785248e1303db49_1" [label="1: Start temp_object::getX_field_div0\nFormals: \nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$0:temp_object::X \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$0); [line 37, column 1]\n " color=yellow style=filled]
 	
 

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

@@ -77,47 +77,47 @@ digraph cfg {
 	
 
 	 "forward<int_&>#std#2714018779968350623.5a6c534312c02b38db42a98e7dfe7983_3" -> "forward<int_&>#std#2714018779968350623.5a6c534312c02b38db42a98e7dfe7983_2" ;
-"make_id<int,_int_&,_int_&,_int>#pass_by_val#6647322778693099135.2f2dd9bec9bb8475abd845248a5b9203_1" [label="1: Start pass_by_val::make_id<int,_int_&,_int_&,_int>\nFormals:  args:int& args:int& args:int& __return_param:pass_by_val::Id<int>*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int> \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 58, column 1]\n " color=yellow style=filled]
+"make_id<int,_int_&,_int_&,_int>#pass_by_val(class pass_by_val::Id<int>)#6647322778693099135.704a07df7f1fd4912e21bd274744a5e0_1" [label="1: Start pass_by_val::make_id<int,_int_&,_int_&,_int>\nFormals:  args:int& args:int& args:int& __return_param:pass_by_val::Id<int>*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int> \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 58, column 1]\n " color=yellow style=filled]
 	
 
-	 "make_id<int,_int_&,_int_&,_int>#pass_by_val#6647322778693099135.2f2dd9bec9bb8475abd845248a5b9203_1" -> "make_id<int,_int_&,_int_&,_int>#pass_by_val#6647322778693099135.2f2dd9bec9bb8475abd845248a5b9203_3" ;
+	 "make_id<int,_int_&,_int_&,_int>#pass_by_val(class pass_by_val::Id<int>)#6647322778693099135.704a07df7f1fd4912e21bd274744a5e0_1" -> "make_id<int,_int_&,_int_&,_int>#pass_by_val(class pass_by_val::Id<int>)#6647322778693099135.704a07df7f1fd4912e21bd274744a5e0_3" ;
-"make_id<int,_int_&,_int_&,_int>#pass_by_val#6647322778693099135.2f2dd9bec9bb8475abd845248a5b9203_2" [label="2: Exit pass_by_val::make_id<int,_int_&,_int_&,_int> \n  " color=yellow style=filled]
+"make_id<int,_int_&,_int_&,_int>#pass_by_val(class pass_by_val::Id<int>)#6647322778693099135.704a07df7f1fd4912e21bd274744a5e0_2" [label="2: Exit pass_by_val::make_id<int,_int_&,_int_&,_int> \n  " color=yellow style=filled]
 	
 
-"make_id<int,_int_&,_int_&,_int>#pass_by_val#6647322778693099135.2f2dd9bec9bb8475abd845248a5b9203_3" [label="3:  Return Stmt \n   n$0=*&__return_param:pass_by_val::Id<int>* [line 59, column 3]\n  n$2=*&args:int& [line 59, column 35]\n  n$3=_fun_std::forward<int_&>(n$2:int&) [line 59, column 16]\n  n$4=*n$3:int [line 59, column 16]\n  n$5=*&args:int& [line 59, column 35]\n  n$6=_fun_std::forward<int_&>(n$5:int&) [line 59, column 16]\n  n$7=*&args:int& [line 59, column 35]\n  n$8=_fun_std::forward<int>(n$7:int&) [line 59, column 16]\n  n$9=_fun_pass_by_val::Id<int>_Id(&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>*,n$4:int,n$6:int&,n$8:int&) [line 59, column 10]\n  n$10=_fun_pass_by_val::Id<int>_Id(n$0:pass_by_val::Id<int>*,&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>&) [line 59, column 10]\n " shape="box"]
+"make_id<int,_int_&,_int_&,_int>#pass_by_val(class pass_by_val::Id<int>)#6647322778693099135.704a07df7f1fd4912e21bd274744a5e0_3" [label="3:  Return Stmt \n   n$0=*&__return_param:pass_by_val::Id<int>* [line 59, column 3]\n  n$2=*&args:int& [line 59, column 35]\n  n$3=_fun_std::forward<int_&>(n$2:int&) [line 59, column 16]\n  n$4=*n$3:int [line 59, column 16]\n  n$5=*&args:int& [line 59, column 35]\n  n$6=_fun_std::forward<int_&>(n$5:int&) [line 59, column 16]\n  n$7=*&args:int& [line 59, column 35]\n  n$8=_fun_std::forward<int>(n$7:int&) [line 59, column 16]\n  n$9=_fun_pass_by_val::Id<int>_Id(&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>*,n$4:int,n$6:int&,n$8:int&) [line 59, column 10]\n  n$10=_fun_pass_by_val::Id<int>_Id(n$0:pass_by_val::Id<int>*,&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>&) [line 59, column 10]\n " shape="box"]
 	
 
-	 "make_id<int,_int_&,_int_&,_int>#pass_by_val#6647322778693099135.2f2dd9bec9bb8475abd845248a5b9203_3" -> "make_id<int,_int_&,_int_&,_int>#pass_by_val#6647322778693099135.2f2dd9bec9bb8475abd845248a5b9203_2" ;
+	 "make_id<int,_int_&,_int_&,_int>#pass_by_val(class pass_by_val::Id<int>)#6647322778693099135.704a07df7f1fd4912e21bd274744a5e0_3" -> "make_id<int,_int_&,_int_&,_int>#pass_by_val(class pass_by_val::Id<int>)#6647322778693099135.704a07df7f1fd4912e21bd274744a5e0_2" ;
-"perfect_forwarding_by_ref#pass_by_val#7578991627406493712.47db45acfc842e77ec927aa5a23ec0ee_1" [label="1: Start pass_by_val::perfect_forwarding_by_ref\nFormals:  __return_param:pass_by_val::Id<int>*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$2:int 0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int> b:int a:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$2,&0$?%__sil_tmpSIL_materialize_temp__n$1,&b,&a); [line 62, column 1]\n " color=yellow style=filled]
+"perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_1" [label="1: Start pass_by_val::perfect_forwarding_by_ref\nFormals:  __return_param:pass_by_val::Id<int>*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$2:int 0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int> b:int a:int \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$2,&0$?%__sil_tmpSIL_materialize_temp__n$1,&b,&a); [line 62, column 1]\n " color=yellow style=filled]
 	
 
-	 "perfect_forwarding_by_ref#pass_by_val#7578991627406493712.47db45acfc842e77ec927aa5a23ec0ee_1" -> "perfect_forwarding_by_ref#pass_by_val#7578991627406493712.47db45acfc842e77ec927aa5a23ec0ee_5" ;
+	 "perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_1" -> "perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_5" ;
-"perfect_forwarding_by_ref#pass_by_val#7578991627406493712.47db45acfc842e77ec927aa5a23ec0ee_2" [label="2: Exit pass_by_val::perfect_forwarding_by_ref \n  " color=yellow style=filled]
+"perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_2" [label="2: Exit pass_by_val::perfect_forwarding_by_ref \n  " color=yellow style=filled]
 	
 
-"perfect_forwarding_by_ref#pass_by_val#7578991627406493712.47db45acfc842e77ec927aa5a23ec0ee_3" [label="3:  Return Stmt \n   n$0=*&__return_param:pass_by_val::Id<int>* [line 64, column 3]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$2:int=2 [line 64, column 29]\n  n$4=_fun_pass_by_val::make_id<int,_int_&,_int_&,_int>(&a:int&,&b:int&,&0$?%__sil_tmpSIL_materialize_temp__n$2:int&,&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>*) [line 64, column 10]\n  n$5=_fun_pass_by_val::Id<int>_Id(n$0:pass_by_val::Id<int>*,&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>&) [line 64, column 10]\n " shape="box"]
+"perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_3" [label="3:  Return Stmt \n   n$0=*&__return_param:pass_by_val::Id<int>* [line 64, column 3]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$2:int=2 [line 64, column 29]\n  n$4=_fun_pass_by_val::make_id<int,_int_&,_int_&,_int>(&a:int&,&b:int&,&0$?%__sil_tmpSIL_materialize_temp__n$2:int&,&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>*) [line 64, column 10]\n  n$5=_fun_pass_by_val::Id<int>_Id(n$0:pass_by_val::Id<int>*,&0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id<int>&) [line 64, column 10]\n " shape="box"]
 	
 
-	 "perfect_forwarding_by_ref#pass_by_val#7578991627406493712.47db45acfc842e77ec927aa5a23ec0ee_3" -> "perfect_forwarding_by_ref#pass_by_val#7578991627406493712.47db45acfc842e77ec927aa5a23ec0ee_2" ;
+	 "perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_3" -> "perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_2" ;
-"perfect_forwarding_by_ref#pass_by_val#7578991627406493712.47db45acfc842e77ec927aa5a23ec0ee_4" [label="4:  DeclStmt \n   *&b:int=1 [line 63, column 3]\n " shape="box"]
+"perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_4" [label="4:  DeclStmt \n   *&b:int=1 [line 63, column 3]\n " shape="box"]
 	
 
-	 "perfect_forwarding_by_ref#pass_by_val#7578991627406493712.47db45acfc842e77ec927aa5a23ec0ee_4" -> "perfect_forwarding_by_ref#pass_by_val#7578991627406493712.47db45acfc842e77ec927aa5a23ec0ee_3" ;
+	 "perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_4" -> "perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_3" ;
-"perfect_forwarding_by_ref#pass_by_val#7578991627406493712.47db45acfc842e77ec927aa5a23ec0ee_5" [label="5:  DeclStmt \n   *&a:int=0 [line 63, column 3]\n " shape="box"]
+"perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_5" [label="5:  DeclStmt \n   *&a:int=0 [line 63, column 3]\n " shape="box"]
 	
 
-	 "perfect_forwarding_by_ref#pass_by_val#7578991627406493712.47db45acfc842e77ec927aa5a23ec0ee_5" -> "perfect_forwarding_by_ref#pass_by_val#7578991627406493712.47db45acfc842e77ec927aa5a23ec0ee_4" ;
+	 "perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_5" -> "perfect_forwarding_by_ref#pass_by_val(class pass_by_val::Id<int>)#7578991627406493712.4a78b0c805a8de47693f8c723da2ec49_4" ;
-"plain_struct_by_ref#pass_by_val#2657428317109106311.700667e64fd3e54821e50cc02318a193_1" [label="1: Start pass_by_val::plain_struct_by_ref\nFormals:  lref:pass_by_val::PlainStruct& rref:pass_by_val::PlainStruct& ptr:pass_by_val::PlainStruct*\nLocals:  \n   DECLARE_LOCALS(&return); [line 18, column 1]\n " color=yellow style=filled]
+"plain_struct_by_ref#pass_by_val(class pass_by_val::PlainStruct)#2657428317109106311.ebb1ec27d296c7f7c7c76440cd2435a6_1" [label="1: Start pass_by_val::plain_struct_by_ref\nFormals:  lref:pass_by_val::PlainStruct& rref:pass_by_val::PlainStruct& ptr:pass_by_val::PlainStruct*\nLocals:  \n   DECLARE_LOCALS(&return); [line 18, column 1]\n " color=yellow style=filled]
 	
 
-	 "plain_struct_by_ref#pass_by_val#2657428317109106311.700667e64fd3e54821e50cc02318a193_1" -> "plain_struct_by_ref#pass_by_val#2657428317109106311.700667e64fd3e54821e50cc02318a193_3" ;
+	 "plain_struct_by_ref#pass_by_val(class pass_by_val::PlainStruct)#2657428317109106311.ebb1ec27d296c7f7c7c76440cd2435a6_1" -> "plain_struct_by_ref#pass_by_val(class pass_by_val::PlainStruct)#2657428317109106311.ebb1ec27d296c7f7c7c76440cd2435a6_3" ;
-"plain_struct_by_ref#pass_by_val#2657428317109106311.700667e64fd3e54821e50cc02318a193_2" [label="2: Exit pass_by_val::plain_struct_by_ref \n  " color=yellow style=filled]
+"plain_struct_by_ref#pass_by_val(class pass_by_val::PlainStruct)#2657428317109106311.ebb1ec27d296c7f7c7c76440cd2435a6_2" [label="2: Exit pass_by_val::plain_struct_by_ref \n  " color=yellow style=filled]
 	
 
-"plain_struct_by_ref#pass_by_val#2657428317109106311.700667e64fd3e54821e50cc02318a193_3" [label="3:  Return Stmt \n   n$0=*&lref:pass_by_val::PlainStruct& [line 21, column 10]\n  n$1=*n$0.x:int [line 21, column 10]\n  n$2=*&rref:pass_by_val::PlainStruct& [line 21, column 19]\n  n$3=*n$2.x:int [line 21, column 19]\n  n$4=*&ptr:pass_by_val::PlainStruct* [line 21, column 28]\n  n$5=*n$4.x:int [line 21, column 28]\n  *&return:int=((n$1 + n$3) + n$5) [line 21, column 3]\n " shape="box"]
+"plain_struct_by_ref#pass_by_val(class pass_by_val::PlainStruct)#2657428317109106311.ebb1ec27d296c7f7c7c76440cd2435a6_3" [label="3:  Return Stmt \n   n$0=*&lref:pass_by_val::PlainStruct& [line 21, column 10]\n  n$1=*n$0.x:int [line 21, column 10]\n  n$2=*&rref:pass_by_val::PlainStruct& [line 21, column 19]\n  n$3=*n$2.x:int [line 21, column 19]\n  n$4=*&ptr:pass_by_val::PlainStruct* [line 21, column 28]\n  n$5=*n$4.x:int [line 21, column 28]\n  *&return:int=((n$1 + n$3) + n$5) [line 21, column 3]\n " shape="box"]
 	
 
-	 "plain_struct_by_ref#pass_by_val#2657428317109106311.700667e64fd3e54821e50cc02318a193_3" -> "plain_struct_by_ref#pass_by_val#2657428317109106311.700667e64fd3e54821e50cc02318a193_2" ;
+	 "plain_struct_by_ref#pass_by_val(class pass_by_val::PlainStruct)#2657428317109106311.ebb1ec27d296c7f7c7c76440cd2435a6_3" -> "plain_struct_by_ref#pass_by_val(class pass_by_val::PlainStruct)#2657428317109106311.ebb1ec27d296c7f7c7c76440cd2435a6_2" ;
 "plain_struct_by_val#pass_by_val#7415219466606029544.eb0e0bdde375e8d1716470ec792b2450_1" [label="1: Start pass_by_val::plain_struct_by_val\nFormals:  p:pass_by_val::PlainStruct&(byval)\nLocals:  \n   DECLARE_LOCALS(&return); [line 17, column 1]\n " color=yellow style=filled]
 	
 
@@ -151,17 +151,17 @@ digraph cfg {
 	
 
 	 "tricky_dependent_by_val#pass_by_val#11704838728234311959.2c9738321ba9545daa75926f2565403e_3" -> "tricky_dependent_by_val#pass_by_val#11704838728234311959.2c9738321ba9545daa75926f2565403e_2" ;
-"type_alias_by_ref#pass_by_val#1261506501219871814.f656e449ac4cf31b24b37d7b81156083_1" [label="1: Start pass_by_val::type_alias_by_ref\nFormals:  p1:pass_by_val::PlainStruct* p2:pass_by_val::PlainStruct const *\nLocals:  \n   DECLARE_LOCALS(&return); [line 32, column 1]\n " color=yellow style=filled]
+"type_alias_by_ref#pass_by_val(class pass_by_val::PlainStruct,class pass_by_val::PlainStruct)#1261506.a3dda6b37896a0f836342db8df5fffd2_1" [label="1: Start pass_by_val::type_alias_by_ref\nFormals:  p1:pass_by_val::PlainStruct* p2:pass_by_val::PlainStruct const *\nLocals:  \n   DECLARE_LOCALS(&return); [line 32, column 1]\n " color=yellow style=filled]
 	
 
-	 "type_alias_by_ref#pass_by_val#1261506501219871814.f656e449ac4cf31b24b37d7b81156083_1" -> "type_alias_by_ref#pass_by_val#1261506501219871814.f656e449ac4cf31b24b37d7b81156083_3" ;
+	 "type_alias_by_ref#pass_by_val(class pass_by_val::PlainStruct,class pass_by_val::PlainStruct)#1261506.a3dda6b37896a0f836342db8df5fffd2_1" -> "type_alias_by_ref#pass_by_val(class pass_by_val::PlainStruct,class pass_by_val::PlainStruct)#1261506.a3dda6b37896a0f836342db8df5fffd2_3" ;
-"type_alias_by_ref#pass_by_val#1261506501219871814.f656e449ac4cf31b24b37d7b81156083_2" [label="2: Exit pass_by_val::type_alias_by_ref \n  " color=yellow style=filled]
+"type_alias_by_ref#pass_by_val(class pass_by_val::PlainStruct,class pass_by_val::PlainStruct)#1261506.a3dda6b37896a0f836342db8df5fffd2_2" [label="2: Exit pass_by_val::type_alias_by_ref \n  " color=yellow style=filled]
 	
 
-"type_alias_by_ref#pass_by_val#1261506501219871814.f656e449ac4cf31b24b37d7b81156083_3" [label="3:  Return Stmt \n   n$0=*&p1:pass_by_val::PlainStruct* [line 33, column 10]\n  n$1=*n$0.x:int [line 33, column 10]\n  n$2=*&p2:pass_by_val::PlainStruct const * [line 33, column 18]\n  n$3=*n$2.x:int [line 33, column 18]\n  *&return:int=(n$1 + n$3) [line 33, column 3]\n " shape="box"]
+"type_alias_by_ref#pass_by_val(class pass_by_val::PlainStruct,class pass_by_val::PlainStruct)#1261506.a3dda6b37896a0f836342db8df5fffd2_3" [label="3:  Return Stmt \n   n$0=*&p1:pass_by_val::PlainStruct* [line 33, column 10]\n  n$1=*n$0.x:int [line 33, column 10]\n  n$2=*&p2:pass_by_val::PlainStruct const * [line 33, column 18]\n  n$3=*n$2.x:int [line 33, column 18]\n  *&return:int=(n$1 + n$3) [line 33, column 3]\n " shape="box"]
 	
 
-	 "type_alias_by_ref#pass_by_val#1261506501219871814.f656e449ac4cf31b24b37d7b81156083_3" -> "type_alias_by_ref#pass_by_val#1261506501219871814.f656e449ac4cf31b24b37d7b81156083_2" ;
+	 "type_alias_by_ref#pass_by_val(class pass_by_val::PlainStruct,class pass_by_val::PlainStruct)#1261506.a3dda6b37896a0f836342db8df5fffd2_3" -> "type_alias_by_ref#pass_by_val(class pass_by_val::PlainStruct,class pass_by_val::PlainStruct)#1261506.a3dda6b37896a0f836342db8df5fffd2_2" ;
 "type_alias_by_val#pass_by_val#9273827923998572097.425db1bd7e6b48116fa99ed40b0b6415_1" [label="1: Start pass_by_val::type_alias_by_val\nFormals:  p1:pass_by_val::PlainStruct&(byval) p2:pass_by_val::PlainStruct&(byval)\nLocals:  0$?%__sil_tmp__temp_construct_n$0:pass_by_val::PlainStruct 0$?%__sil_tmp__temp_construct_n$4:pass_by_val::PlainStruct \n   DECLARE_LOCALS(&return,&0$?%__sil_tmp__temp_construct_n$0,&0$?%__sil_tmp__temp_construct_n$4); [line 29, column 1]\n " color=yellow style=filled]
 	
 

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

@@ -220,17 +220,17 @@ digraph cfg {
 	
 
 	 "X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_4" -> "X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_3" ;
-"operator_X#Y#conversion_operator#(9875474444891926125).7f70b2cd003a12c6c9b239bf43d976ea_1" [label="1: Start conversion_operator::Y_operator_X\nFormals:  this:conversion_operator::Y* __return_param:conversion_operator::X*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X const  \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 27, column 3]\n " color=yellow style=filled]
+"operator_X#Y#conversion_operator(class conversion_operator::X)#(9875474444891926125).86894a9a1bdbf53dc3721d092420d60c_1" [label="1: Start conversion_operator::Y_operator_X\nFormals:  this:conversion_operator::Y* __return_param:conversion_operator::X*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X const  \n   DECLARE_LOCALS(&return,&0$?%__sil_tmpSIL_materialize_temp__n$1); [line 27, column 3]\n " color=yellow style=filled]
 	
 
-	 "operator_X#Y#conversion_operator#(9875474444891926125).7f70b2cd003a12c6c9b239bf43d976ea_1" -> "operator_X#Y#conversion_operator#(9875474444891926125).7f70b2cd003a12c6c9b239bf43d976ea_3" ;
+	 "operator_X#Y#conversion_operator(class conversion_operator::X)#(9875474444891926125).86894a9a1bdbf53dc3721d092420d60c_1" -> "operator_X#Y#conversion_operator(class conversion_operator::X)#(9875474444891926125).86894a9a1bdbf53dc3721d092420d60c_3" ;
-"operator_X#Y#conversion_operator#(9875474444891926125).7f70b2cd003a12c6c9b239bf43d976ea_2" [label="2: Exit conversion_operator::Y_operator_X \n  " color=yellow style=filled]
+"operator_X#Y#conversion_operator(class conversion_operator::X)#(9875474444891926125).86894a9a1bdbf53dc3721d092420d60c_2" [label="2: Exit conversion_operator::Y_operator_X \n  " color=yellow style=filled]
 	
 
-"operator_X#Y#conversion_operator#(9875474444891926125).7f70b2cd003a12c6c9b239bf43d976ea_3" [label="3:  Return Stmt \n   n$0=*&__return_param:conversion_operator::X* [line 27, column 18]\n  n$2=*&this:conversion_operator::Y* [line 27, column 27]\n  n$3=*n$2.f:int [line 27, column 27]\n  n$4=*&this:conversion_operator::Y* [line 27, column 30]\n  n$5=*n$4.b:int [line 27, column 30]\n  n$6=_fun_conversion_operator::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X const *,n$3:int,n$5:_Bool) [line 27, column 25]\n  n$7=_fun_conversion_operator::X_X(n$0:conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X const &) [line 27, column 25]\n " shape="box"]
+"operator_X#Y#conversion_operator(class conversion_operator::X)#(9875474444891926125).86894a9a1bdbf53dc3721d092420d60c_3" [label="3:  Return Stmt \n   n$0=*&__return_param:conversion_operator::X* [line 27, column 18]\n  n$2=*&this:conversion_operator::Y* [line 27, column 27]\n  n$3=*n$2.f:int [line 27, column 27]\n  n$4=*&this:conversion_operator::Y* [line 27, column 30]\n  n$5=*n$4.b:int [line 27, column 30]\n  n$6=_fun_conversion_operator::X_X(&0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X const *,n$3:int,n$5:_Bool) [line 27, column 25]\n  n$7=_fun_conversion_operator::X_X(n$0:conversion_operator::X*,&0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X const &) [line 27, column 25]\n " shape="box"]
 	
 
-	 "operator_X#Y#conversion_operator#(9875474444891926125).7f70b2cd003a12c6c9b239bf43d976ea_3" -> "operator_X#Y#conversion_operator#(9875474444891926125).7f70b2cd003a12c6c9b239bf43d976ea_2" ;
+	 "operator_X#Y#conversion_operator(class conversion_operator::X)#(9875474444891926125).86894a9a1bdbf53dc3721d092420d60c_3" -> "operator_X#Y#conversion_operator(class conversion_operator::X)#(9875474444891926125).86894a9a1bdbf53dc3721d092420d60c_2" ;
 "Y#Y#conversion_operator#{2209317117193064868}.b5b04122b8822499b024fd96b2c79e26_1" [label="1: Start conversion_operator::Y_Y\nFormals:  this:conversion_operator::Y*\nLocals:  \n   DECLARE_LOCALS(&return); [line 25, column 8]\n " color=yellow style=filled]
 	
 

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

@@ -1,35 +1,35 @@
 /* @generated */
 digraph cfg {
-"test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_1" [label="1: Start test\nFormals:  a:A*\nLocals:  x:X 0$?%__sil_tmpSIL_materialize_temp__n$4:X \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_materialize_temp__n$4); [line 19, column 1]\n " color=yellow style=filled]
+"test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_1" [label="1: Start test\nFormals:  a:A*\nLocals:  x:X 0$?%__sil_tmpSIL_materialize_temp__n$4:X \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_materialize_temp__n$4); [line 19, column 1]\n " color=yellow style=filled]
 	
 
-	 "test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_1" -> "test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_4" ;
+	 "test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_1" -> "test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_4" ;
-"test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_2" [label="2: Exit test \n  " color=yellow style=filled]
+"test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_2" [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-"test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_3" [label="3:  Return Stmt \n   n$0=*&x.f:int [line 21, column 14]\n  *&return:int=(1 / n$0) [line 21, column 3]\n  _=*&x:X [line 21, column 16]\n  n$2=_fun_X_~X(&x:X*) [line 21, column 16]\n " shape="box"]
+"test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_3" [label="3:  Return Stmt \n   n$0=*&x.f:int [line 21, column 14]\n  *&return:int=(1 / n$0) [line 21, column 3]\n  _=*&x:X [line 21, column 16]\n  n$2=_fun_X_~X(&x:X*) [line 21, column 16]\n " shape="box"]
 	
 
-	 "test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_3" -> "test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_2" ;
+	 "test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_3" -> "test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_2" ;
-"test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_4" [label="4:  DeclStmt \n   n$5=*&a:A* [line 20, column 9]\n  _=*n$5:A [line 20, column 9]\n  n$8=_fun_A_get(n$5:A*,1:int,&0$?%__sil_tmpSIL_materialize_temp__n$4:X*) [line 20, column 9]\n  n$9=_fun_X_X(&x:X*,&0$?%__sil_tmpSIL_materialize_temp__n$4:X&) [line 20, column 9]\n " shape="box"]
+"test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_4" [label="4:  DeclStmt \n   n$5=*&a:A* [line 20, column 9]\n  _=*n$5:A [line 20, column 9]\n  n$8=_fun_A_get(n$5:A*,1:int,&0$?%__sil_tmpSIL_materialize_temp__n$4:X*) [line 20, column 9]\n  n$9=_fun_X_X(&x:X*,&0$?%__sil_tmpSIL_materialize_temp__n$4:X&) [line 20, column 9]\n " shape="box"]
 	
 
-	 "test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_4" -> "test#14183353284361723530.9ab958283f2da536d334b673bc9197cb_3" ;
+	 "test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_4" -> "test(class A)#14183353284361723530.f22d37fbaacc66a7efb8fb240415be10_3" ;
-"get#A#(1761444600576643509).c838940fa5c6fe767006cf7dd748d7f6_1" [label="1: Start A_get\nFormals:  this:A* p:int __return_param:X*\nLocals:  x:X \n   DECLARE_LOCALS(&return,&x); [line 13, column 3]\n " color=yellow style=filled]
+"get#A(class X)#(1761444600576643509).0f83d3543d984a8645cb78162580d93f_1" [label="1: Start A_get\nFormals:  this:A* p:int __return_param:X*\nLocals:  x:X \n   DECLARE_LOCALS(&return,&x); [line 13, column 3]\n " color=yellow style=filled]
 	
 
-	 "get#A#(1761444600576643509).c838940fa5c6fe767006cf7dd748d7f6_1" -> "get#A#(1761444600576643509).c838940fa5c6fe767006cf7dd748d7f6_4" ;
+	 "get#A(class X)#(1761444600576643509).0f83d3543d984a8645cb78162580d93f_1" -> "get#A(class X)#(1761444600576643509).0f83d3543d984a8645cb78162580d93f_4" ;
-"get#A#(1761444600576643509).c838940fa5c6fe767006cf7dd748d7f6_2" [label="2: Exit A_get \n  " color=yellow style=filled]
+"get#A(class X)#(1761444600576643509).0f83d3543d984a8645cb78162580d93f_2" [label="2: Exit A_get \n  " color=yellow style=filled]
 	
 
-"get#A#(1761444600576643509).c838940fa5c6fe767006cf7dd748d7f6_3" [label="3:  Return Stmt \n   n$0=*&__return_param:X* [line 15, column 5]\n  n$1=_fun_X_X(n$0:X*,&x:X&) [line 15, column 12]\n  _=*&x:X [line 15, column 12]\n  n$3=_fun_X_~X(&x:X*) [line 15, column 12]\n " shape="box"]
+"get#A(class X)#(1761444600576643509).0f83d3543d984a8645cb78162580d93f_3" [label="3:  Return Stmt \n   n$0=*&__return_param:X* [line 15, column 5]\n  n$1=_fun_X_X(n$0:X*,&x:X&) [line 15, column 12]\n  _=*&x:X [line 15, column 12]\n  n$3=_fun_X_~X(&x:X*) [line 15, column 12]\n " shape="box"]
 	
 
-	 "get#A#(1761444600576643509).c838940fa5c6fe767006cf7dd748d7f6_3" -> "get#A#(1761444600576643509).c838940fa5c6fe767006cf7dd748d7f6_2" ;
+	 "get#A(class X)#(1761444600576643509).0f83d3543d984a8645cb78162580d93f_3" -> "get#A(class X)#(1761444600576643509).0f83d3543d984a8645cb78162580d93f_2" ;
-"get#A#(1761444600576643509).c838940fa5c6fe767006cf7dd748d7f6_4" [label="4:  DeclStmt \n   n$5=_fun_X_X(&x:X*) [line 14, column 7]\n " shape="box"]
+"get#A(class X)#(1761444600576643509).0f83d3543d984a8645cb78162580d93f_4" [label="4:  DeclStmt \n   n$5=_fun_X_X(&x:X*) [line 14, column 7]\n " shape="box"]
 	
 
-	 "get#A#(1761444600576643509).c838940fa5c6fe767006cf7dd748d7f6_4" -> "get#A#(1761444600576643509).c838940fa5c6fe767006cf7dd748d7f6_3" ;
+	 "get#A(class X)#(1761444600576643509).0f83d3543d984a8645cb78162580d93f_4" -> "get#A(class X)#(1761444600576643509).0f83d3543d984a8645cb78162580d93f_3" ;
 "X#X#{4662457305382278389|constexpr}.7a0af4be288b205dc1c04f6801938150_1" [label="1: Start X_X\nFormals:  this:X* __param_0:X&\nLocals:  \n   DECLARE_LOCALS(&return); [line 8, column 8]\n " color=yellow style=filled]
 	
 

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

@@ -11,17 +11,17 @@ digraph cfg {
 	
 
 	 "div0_class#4984704850372216251.260ce38d809793fc3e38787f8d1eb4d6_3" -> "div0_class#4984704850372216251.260ce38d809793fc3e38787f8d1eb4d6_2" ;
-"div0_instance#13376949534750090437.51640b59fd921707822fcc45f2fde64d_1" [label="1: Start div0_instance\nFormals:  a:A*\nLocals:  \n   DECLARE_LOCALS(&return); [line 17, column 1]\n " color=yellow style=filled]
+"div0_instance(class A)#13376949534750090437.fc775825a5031b981817dd20651240b0_1" [label="1: Start div0_instance\nFormals:  a:A*\nLocals:  \n   DECLARE_LOCALS(&return); [line 17, column 1]\n " color=yellow style=filled]
 	
 
-	 "div0_instance#13376949534750090437.51640b59fd921707822fcc45f2fde64d_1" -> "div0_instance#13376949534750090437.51640b59fd921707822fcc45f2fde64d_3" ;
+	 "div0_instance(class A)#13376949534750090437.fc775825a5031b981817dd20651240b0_1" -> "div0_instance(class A)#13376949534750090437.fc775825a5031b981817dd20651240b0_3" ;
-"div0_instance#13376949534750090437.51640b59fd921707822fcc45f2fde64d_2" [label="2: Exit div0_instance \n  " color=yellow style=filled]
+"div0_instance(class A)#13376949534750090437.fc775825a5031b981817dd20651240b0_2" [label="2: Exit div0_instance \n  " color=yellow style=filled]
 	
 
-"div0_instance#13376949534750090437.51640b59fd921707822fcc45f2fde64d_3" [label="3:  Call _fun_A_fun \n   n$1=*&a:A* [line 19, column 3]\n  n$3=_fun_A_fun(0:int) [line 19, column 3]\n " shape="box"]
+"div0_instance(class A)#13376949534750090437.fc775825a5031b981817dd20651240b0_3" [label="3:  Call _fun_A_fun \n   n$1=*&a:A* [line 19, column 3]\n  n$3=_fun_A_fun(0:int) [line 19, column 3]\n " shape="box"]
 	
 
-	 "div0_instance#13376949534750090437.51640b59fd921707822fcc45f2fde64d_3" -> "div0_instance#13376949534750090437.51640b59fd921707822fcc45f2fde64d_2" ;
+	 "div0_instance(class A)#13376949534750090437.fc775825a5031b981817dd20651240b0_3" -> "div0_instance(class A)#13376949534750090437.fc775825a5031b981817dd20651240b0_2" ;
 "fun#A#(6769534270530582672).0ab578f4190d39d2c1b23c6d46a310c6_1" [label="1: Start A_fun\nFormals:  a:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 13, column 1]\n " color=yellow style=filled]
 	
 

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

@@ -38,23 +38,23 @@ digraph cfg {
 	
 
 	 "div0_static_field#12231470699631142739.dca5ebae856e9b404facab8151fb6246_5" -> "div0_static_field#12231470699631142739.dca5ebae856e9b404facab8151fb6246_4" ;
-"div0_static_field_member_access#8775359855042425857.b606a4de40e2ad34cbe0f38ab2d7e485_1" [label="1: Start div0_static_field_member_access\nFormals:  a:f1::A* b:C*\nLocals:  \n   DECLARE_LOCALS(&return); [line 38, column 1]\n " color=yellow style=filled]
+"div0_static_field_member_access(class f1::A,class C)#8775359855042425857.e5b80b8e0139e41ba35ea98be6addc52_1" [label="1: Start div0_static_field_member_access\nFormals:  a:f1::A* b:C*\nLocals:  \n   DECLARE_LOCALS(&return); [line 38, column 1]\n " color=yellow style=filled]
 	
 
-	 "div0_static_field_member_access#8775359855042425857.b606a4de40e2ad34cbe0f38ab2d7e485_1" -> "div0_static_field_member_access#8775359855042425857.b606a4de40e2ad34cbe0f38ab2d7e485_5" ;
+	 "div0_static_field_member_access(class f1::A,class C)#8775359855042425857.e5b80b8e0139e41ba35ea98be6addc52_1" -> "div0_static_field_member_access(class f1::A,class C)#8775359855042425857.e5b80b8e0139e41ba35ea98be6addc52_5" ;
-"div0_static_field_member_access#8775359855042425857.b606a4de40e2ad34cbe0f38ab2d7e485_2" [label="2: Exit div0_static_field_member_access \n  " color=yellow style=filled]
+"div0_static_field_member_access(class f1::A,class C)#8775359855042425857.e5b80b8e0139e41ba35ea98be6addc52_2" [label="2: Exit div0_static_field_member_access \n  " color=yellow style=filled]
 	
 
-"div0_static_field_member_access#8775359855042425857.b606a4de40e2ad34cbe0f38ab2d7e485_3" [label="3:  Return Stmt \n   n$0=*&#GB<>$f1::A::v:int [line 41, column 15]\n  n$1=*&#GB<>$B::v:int [line 41, column 26]\n  *&return:int=(1 / ((n$0 + n$1) + 1)) [line 41, column 3]\n " shape="box"]
+"div0_static_field_member_access(class f1::A,class C)#8775359855042425857.e5b80b8e0139e41ba35ea98be6addc52_3" [label="3:  Return Stmt \n   n$0=*&#GB<>$f1::A::v:int [line 41, column 15]\n  n$1=*&#GB<>$B::v:int [line 41, column 26]\n  *&return:int=(1 / ((n$0 + n$1) + 1)) [line 41, column 3]\n " shape="box"]
 	
 
-	 "div0_static_field_member_access#8775359855042425857.b606a4de40e2ad34cbe0f38ab2d7e485_3" -> "div0_static_field_member_access#8775359855042425857.b606a4de40e2ad34cbe0f38ab2d7e485_2" ;
+	 "div0_static_field_member_access(class f1::A,class C)#8775359855042425857.e5b80b8e0139e41ba35ea98be6addc52_3" -> "div0_static_field_member_access(class f1::A,class C)#8775359855042425857.e5b80b8e0139e41ba35ea98be6addc52_2" ;
-"div0_static_field_member_access#8775359855042425857.b606a4de40e2ad34cbe0f38ab2d7e485_4" [label="4:  BinaryOperatorStmt: Assign \n   *&#GB<>$B::v:int=-2 [line 40, column 3]\n " shape="box"]
+"div0_static_field_member_access(class f1::A,class C)#8775359855042425857.e5b80b8e0139e41ba35ea98be6addc52_4" [label="4:  BinaryOperatorStmt: Assign \n   *&#GB<>$B::v:int=-2 [line 40, column 3]\n " shape="box"]
 	
 
-	 "div0_static_field_member_access#8775359855042425857.b606a4de40e2ad34cbe0f38ab2d7e485_4" -> "div0_static_field_member_access#8775359855042425857.b606a4de40e2ad34cbe0f38ab2d7e485_3" ;
+	 "div0_static_field_member_access(class f1::A,class C)#8775359855042425857.e5b80b8e0139e41ba35ea98be6addc52_4" -> "div0_static_field_member_access(class f1::A,class C)#8775359855042425857.e5b80b8e0139e41ba35ea98be6addc52_3" ;
-"div0_static_field_member_access#8775359855042425857.b606a4de40e2ad34cbe0f38ab2d7e485_5" [label="5:  BinaryOperatorStmt: Assign \n   *&#GB<>$f1::A::v:int=1 [line 39, column 3]\n " shape="box"]
+"div0_static_field_member_access(class f1::A,class C)#8775359855042425857.e5b80b8e0139e41ba35ea98be6addc52_5" [label="5:  BinaryOperatorStmt: Assign \n   *&#GB<>$f1::A::v:int=1 [line 39, column 3]\n " shape="box"]
 	
 
-	 "div0_static_field_member_access#8775359855042425857.b606a4de40e2ad34cbe0f38ab2d7e485_5" -> "div0_static_field_member_access#8775359855042425857.b606a4de40e2ad34cbe0f38ab2d7e485_4" ;
+	 "div0_static_field_member_access(class f1::A,class C)#8775359855042425857.e5b80b8e0139e41ba35ea98be6addc52_5" -> "div0_static_field_member_access(class f1::A,class C)#8775359855042425857.e5b80b8e0139e41ba35ea98be6addc52_4" ;
 }

infer/tests/codetoanalyze/cpp/shared/npe/method_call.cpp.dot

@@ -1,16 +1,16 @@
 /* @generated */
 digraph cfg {
-"call_with_forward_declaration#16178135517860387666.7dab8d0b16e63b8b27f5ae7c5c45a070_1" [label="1: Start call_with_forward_declaration\nFormals:  x:XForward*\nLocals:  \n   DECLARE_LOCALS(&return); [line 33, column 1]\n " color=yellow style=filled]
+"call_with_forward_declaration(class XForward)#16178135517860387666.c1f98de069e5c7098edbbc8efaea56a0_1" [label="1: Start call_with_forward_declaration\nFormals:  x:XForward*\nLocals:  \n   DECLARE_LOCALS(&return); [line 33, column 1]\n " color=yellow style=filled]
 	
 
-	 "call_with_forward_declaration#16178135517860387666.7dab8d0b16e63b8b27f5ae7c5c45a070_1" -> "call_with_forward_declaration#16178135517860387666.7dab8d0b16e63b8b27f5ae7c5c45a070_3" ;
+	 "call_with_forward_declaration(class XForward)#16178135517860387666.c1f98de069e5c7098edbbc8efaea56a0_1" -> "call_with_forward_declaration(class XForward)#16178135517860387666.c1f98de069e5c7098edbbc8efaea56a0_3" ;
-"call_with_forward_declaration#16178135517860387666.7dab8d0b16e63b8b27f5ae7c5c45a070_2" [label="2: Exit call_with_forward_declaration \n  " color=yellow style=filled]
+"call_with_forward_declaration(class XForward)#16178135517860387666.c1f98de069e5c7098edbbc8efaea56a0_2" [label="2: Exit call_with_forward_declaration \n  " color=yellow style=filled]
 	
 
-"call_with_forward_declaration#16178135517860387666.7dab8d0b16e63b8b27f5ae7c5c45a070_3" [label="3:  Call _fun_XForward_call \n   n$1=*&x:XForward* [line 33, column 51]\n  _=*n$1:XForward [line 33, column 51]\n  n$3=_fun_XForward_call(n$1:XForward*) [line 33, column 51]\n " shape="box"]
+"call_with_forward_declaration(class XForward)#16178135517860387666.c1f98de069e5c7098edbbc8efaea56a0_3" [label="3:  Call _fun_XForward_call \n   n$1=*&x:XForward* [line 33, column 51]\n  _=*n$1:XForward [line 33, column 51]\n  n$3=_fun_XForward_call(n$1:XForward*) [line 33, column 51]\n " shape="box"]
 	
 
-	 "call_with_forward_declaration#16178135517860387666.7dab8d0b16e63b8b27f5ae7c5c45a070_3" -> "call_with_forward_declaration#16178135517860387666.7dab8d0b16e63b8b27f5ae7c5c45a070_2" ;
+	 "call_with_forward_declaration(class XForward)#16178135517860387666.c1f98de069e5c7098edbbc8efaea56a0_3" -> "call_with_forward_declaration(class XForward)#16178135517860387666.c1f98de069e5c7098edbbc8efaea56a0_2" ;
 "getX#13708790503777666214.a992c0752db0283a341b47e16da10f48_1" [label="1: Start getX\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 18, column 1]\n " color=yellow style=filled]
 	
 

infer/tests/codetoanalyze/cpp/shared/reference/member_access.cpp.dot

@@ -1,20 +1,20 @@
 /* @generated */
 digraph cfg {
-"access_ptr#15321479508398739907.c982e7d4bf02ada6326387e65b321af4_1" [label="1: Start access_ptr\nFormals:  x:X*\nLocals:  c:int f:int \n   DECLARE_LOCALS(&return,&c,&f); [line 18, column 1]\n " color=yellow style=filled]
+"access_ptr(class X)#15321479508398739907.a2d5fea3989ac28d8e0f2d82bdcf9e45_1" [label="1: Start access_ptr\nFormals:  x:X*\nLocals:  c:int f:int \n   DECLARE_LOCALS(&return,&c,&f); [line 18, column 1]\n " color=yellow style=filled]
 	
 
-	 "access_ptr#15321479508398739907.c982e7d4bf02ada6326387e65b321af4_1" -> "access_ptr#15321479508398739907.c982e7d4bf02ada6326387e65b321af4_4" ;
+	 "access_ptr(class X)#15321479508398739907.a2d5fea3989ac28d8e0f2d82bdcf9e45_1" -> "access_ptr(class X)#15321479508398739907.a2d5fea3989ac28d8e0f2d82bdcf9e45_4" ;
-"access_ptr#15321479508398739907.c982e7d4bf02ada6326387e65b321af4_2" [label="2: Exit access_ptr \n  " color=yellow style=filled]
+"access_ptr(class X)#15321479508398739907.a2d5fea3989ac28d8e0f2d82bdcf9e45_2" [label="2: Exit access_ptr \n  " color=yellow style=filled]
 	
 
-"access_ptr#15321479508398739907.c982e7d4bf02ada6326387e65b321af4_3" [label="3:  DeclStmt \n   n$1=*&x:X* [line 20, column 11]\n  _=*n$1:X [line 20, column 11]\n  n$3=_fun_X_call(n$1:X*) [line 20, column 11]\n  *&c:int=n$3 [line 20, column 3]\n " shape="box"]
+"access_ptr(class X)#15321479508398739907.a2d5fea3989ac28d8e0f2d82bdcf9e45_3" [label="3:  DeclStmt \n   n$1=*&x:X* [line 20, column 11]\n  _=*n$1:X [line 20, column 11]\n  n$3=_fun_X_call(n$1:X*) [line 20, column 11]\n  *&c:int=n$3 [line 20, column 3]\n " shape="box"]
 	
 
-	 "access_ptr#15321479508398739907.c982e7d4bf02ada6326387e65b321af4_3" -> "access_ptr#15321479508398739907.c982e7d4bf02ada6326387e65b321af4_2" ;
+	 "access_ptr(class X)#15321479508398739907.a2d5fea3989ac28d8e0f2d82bdcf9e45_3" -> "access_ptr(class X)#15321479508398739907.a2d5fea3989ac28d8e0f2d82bdcf9e45_2" ;
-"access_ptr#15321479508398739907.c982e7d4bf02ada6326387e65b321af4_4" [label="4:  DeclStmt \n   n$4=*&x:X* [line 19, column 11]\n  n$5=*n$4.f:int [line 19, column 11]\n  *&f:int=n$5 [line 19, column 3]\n " shape="box"]
+"access_ptr(class X)#15321479508398739907.a2d5fea3989ac28d8e0f2d82bdcf9e45_4" [label="4:  DeclStmt \n   n$4=*&x:X* [line 19, column 11]\n  n$5=*n$4.f:int [line 19, column 11]\n  *&f:int=n$5 [line 19, column 3]\n " shape="box"]
 	
 
-	 "access_ptr#15321479508398739907.c982e7d4bf02ada6326387e65b321af4_4" -> "access_ptr#15321479508398739907.c982e7d4bf02ada6326387e65b321af4_3" ;
+	 "access_ptr(class X)#15321479508398739907.a2d5fea3989ac28d8e0f2d82bdcf9e45_4" -> "access_ptr(class X)#15321479508398739907.a2d5fea3989ac28d8e0f2d82bdcf9e45_3" ;
 "access_ref#4794488565171451856.2c0cb1f039897d6498c9fea4cbfec99e_1" [label="1: Start access_ref\nFormals:  x:X&\nLocals:  c:int f:int \n   DECLARE_LOCALS(&return,&c,&f); [line 13, column 1]\n " color=yellow style=filled]
 	
 

infer/tests/codetoanalyze/cpp/shared/reference/reference_struct_e2e.cpp.dot

@@ -11,38 +11,38 @@ digraph cfg {
 	
 
 	 "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_3" -> "__infer_globals_initializer_global.bdc08c089842ce08b974b22a75daf78e_2" ;
-"field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_1" [label="1: Start field_div0_ptr\nFormals:  x:X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 45, column 1]\n " color=yellow style=filled]
+"field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_1" [label="1: Start field_div0_ptr\nFormals:  x:X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 45, column 1]\n " color=yellow style=filled]
 	
 
-	 "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_1" -> "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_5" ;
+	 "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_1" -> "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_5" ;
-	 "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_1" -> "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_6" ;
+	 "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_1" -> "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_6" ;
-"field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_2" [label="2: Exit field_div0_ptr \n  " color=yellow style=filled]
+"field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_2" [label="2: Exit field_div0_ptr \n  " color=yellow style=filled]
 	
 
-"field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_3" [label="3: + \n  " ]
+"field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_3" [label="3: + \n  " ]
 	
 
-	 "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_3" -> "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_4" ;
+	 "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_3" -> "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_4" ;
-"field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_4" [label="4:  between_join_and_exit \n  " shape="box"]
+"field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
-	 "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_4" -> "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_2" ;
+	 "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_4" -> "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_2" ;
-"field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_5" [label="5: Prune (true branch, if) \n   n$1=*&x:X* [line 46, column 7]\n  PRUNE(n$1, true); [line 46, column 7]\n " shape="invhouse"]
+"field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_5" [label="5: Prune (true branch, if) \n   n$1=*&x:X* [line 46, column 7]\n  PRUNE(n$1, true); [line 46, column 7]\n " shape="invhouse"]
 	
 
-	 "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_5" -> "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_8" ;
+	 "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_5" -> "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_8" ;
-"field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_6" [label="6: Prune (false branch, if) \n   n$1=*&x:X* [line 46, column 7]\n  PRUNE(!n$1, false); [line 46, column 7]\n " shape="invhouse"]
+"field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_6" [label="6: Prune (false branch, if) \n   n$1=*&x:X* [line 46, column 7]\n  PRUNE(!n$1, false); [line 46, column 7]\n " shape="invhouse"]
 	
 
-	 "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_6" -> "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_3" ;
+	 "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_6" -> "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_3" ;
-"field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_7" [label="7:  Return Stmt \n   n$2=*&x:X* [line 48, column 12]\n  _=*n$2:X [line 48, column 12]\n  n$4=_fun_X_div(n$2:X*) [line 48, column 12]\n  *&return:int=n$4 [line 48, column 5]\n " shape="box"]
+"field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_7" [label="7:  Return Stmt \n   n$2=*&x:X* [line 48, column 12]\n  _=*n$2:X [line 48, column 12]\n  n$4=_fun_X_div(n$2:X*) [line 48, column 12]\n  *&return:int=n$4 [line 48, column 5]\n " shape="box"]
 	
 
-	 "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_7" -> "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_2" ;
+	 "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_7" -> "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_2" ;
-"field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_8" [label="8:  Call _fun_set_field_ptr \n   n$6=*&x:X* [line 47, column 19]\n  n$7=_fun_set_field_ptr(n$6:X*,0:int) [line 47, column 5]\n " shape="box"]
+"field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_8" [label="8:  Call _fun_set_field_ptr \n   n$6=*&x:X* [line 47, column 19]\n  n$7=_fun_set_field_ptr(n$6:X*,0:int) [line 47, column 5]\n " shape="box"]
 	
 
-	 "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_8" -> "field_div0_ptr#2555781581744357321.4ee118b9c5178d1d4e02dcf5eed47814_7" ;
+	 "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_8" -> "field_div0_ptr(class X)#2555781581744357321.6b797bfc0b5ae2232a6e90651b2c1e32_7" ;
 "field_div0_ref#11723804822630548942.b7eb5245bed0a75cdc2d181e5af92008_1" [label="1: Start field_div0_ref\nFormals:  x:X&\nLocals:  \n   DECLARE_LOCALS(&return); [line 93, column 1]\n " color=yellow style=filled]
 	
 
@@ -58,38 +58,38 @@ digraph cfg {
 	
 
 	 "field_div0_ref#11723804822630548942.b7eb5245bed0a75cdc2d181e5af92008_4" -> "field_div0_ref#11723804822630548942.b7eb5245bed0a75cdc2d181e5af92008_3" ;
-"field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_1" [label="1: Start field_div1_ptr\nFormals:  x:X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 52, column 1]\n " color=yellow style=filled]
+"field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_1" [label="1: Start field_div1_ptr\nFormals:  x:X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 52, column 1]\n " color=yellow style=filled]
 	
 
-	 "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_1" -> "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_5" ;
+	 "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_1" -> "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_5" ;
-	 "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_1" -> "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_6" ;
+	 "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_1" -> "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_6" ;
-"field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_2" [label="2: Exit field_div1_ptr \n  " color=yellow style=filled]
+"field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_2" [label="2: Exit field_div1_ptr \n  " color=yellow style=filled]
 	
 
-"field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_3" [label="3: + \n  " ]
+"field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_3" [label="3: + \n  " ]
 	
 
-	 "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_3" -> "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_4" ;
+	 "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_3" -> "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_4" ;
-"field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_4" [label="4:  between_join_and_exit \n  " shape="box"]
+"field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
-	 "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_4" -> "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_2" ;
+	 "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_4" -> "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_2" ;
-"field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_5" [label="5: Prune (true branch, if) \n   n$1=*&x:X* [line 53, column 7]\n  PRUNE(n$1, true); [line 53, column 7]\n " shape="invhouse"]
+"field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_5" [label="5: Prune (true branch, if) \n   n$1=*&x:X* [line 53, column 7]\n  PRUNE(n$1, true); [line 53, column 7]\n " shape="invhouse"]
 	
 
-	 "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_5" -> "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_8" ;
+	 "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_5" -> "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_8" ;
-"field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_6" [label="6: Prune (false branch, if) \n   n$1=*&x:X* [line 53, column 7]\n  PRUNE(!n$1, false); [line 53, column 7]\n " shape="invhouse"]
+"field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_6" [label="6: Prune (false branch, if) \n   n$1=*&x:X* [line 53, column 7]\n  PRUNE(!n$1, false); [line 53, column 7]\n " shape="invhouse"]
 	
 
-	 "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_6" -> "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_3" ;
+	 "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_6" -> "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_3" ;
-"field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_7" [label="7:  Return Stmt \n   n$2=*&x:X* [line 55, column 12]\n  _=*n$2:X [line 55, column 12]\n  n$4=_fun_X_div(n$2:X*) [line 55, column 12]\n  *&return:int=n$4 [line 55, column 5]\n " shape="box"]
+"field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_7" [label="7:  Return Stmt \n   n$2=*&x:X* [line 55, column 12]\n  _=*n$2:X [line 55, column 12]\n  n$4=_fun_X_div(n$2:X*) [line 55, column 12]\n  *&return:int=n$4 [line 55, column 5]\n " shape="box"]
 	
 
-	 "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_7" -> "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_2" ;
+	 "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_7" -> "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_2" ;
-"field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_8" [label="8:  Call _fun_set_field_ptr \n   n$6=*&x:X* [line 54, column 19]\n  n$7=_fun_set_field_ptr(n$6:X*,1:int) [line 54, column 5]\n " shape="box"]
+"field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_8" [label="8:  Call _fun_set_field_ptr \n   n$6=*&x:X* [line 54, column 19]\n  n$7=_fun_set_field_ptr(n$6:X*,1:int) [line 54, column 5]\n " shape="box"]
 	
 
-	 "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_8" -> "field_div1_ptr#10491775926176760544.af54450738e6dc8210ec4a97e984707b_7" ;
+	 "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_8" -> "field_div1_ptr(class X)#10491775926176760544.81717de1848fc0d3e24eb39e45b574dd_7" ;
 "field_div1_ref#1499715418357335887.5b6e5f87301df1903e4a04faae98d6d5_1" [label="1: Start field_div1_ref\nFormals:  x:X&\nLocals:  \n   DECLARE_LOCALS(&return); [line 98, column 1]\n " color=yellow style=filled]
 	
 
@@ -279,38 +279,38 @@ digraph cfg {
 	
 
 	 "get_global_ref_div1_method#9218905628510589917.1d66d8c44e8582bb6fcdcb7df79e3215_5" -> "get_global_ref_div1_method#9218905628510589917.1d66d8c44e8582bb6fcdcb7df79e3215_4" ;
-"method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_1" [label="1: Start method_div0_ptr\nFormals:  x:X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 31, column 1]\n " color=yellow style=filled]
+"method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_1" [label="1: Start method_div0_ptr\nFormals:  x:X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 31, column 1]\n " color=yellow style=filled]
 	
 
-	 "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_1" -> "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_5" ;
+	 "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_1" -> "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_5" ;
-	 "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_1" -> "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_6" ;
+	 "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_1" -> "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_6" ;
-"method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_2" [label="2: Exit method_div0_ptr \n  " color=yellow style=filled]
+"method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_2" [label="2: Exit method_div0_ptr \n  " color=yellow style=filled]
 	
 
-"method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_3" [label="3: + \n  " ]
+"method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_3" [label="3: + \n  " ]
 	
 
-	 "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_3" -> "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_4" ;
+	 "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_3" -> "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_4" ;
-"method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_4" [label="4:  between_join_and_exit \n  " shape="box"]
+"method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
-	 "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_4" -> "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_2" ;
+	 "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_4" -> "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_2" ;
-"method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_5" [label="5: Prune (true branch, if) \n   n$1=*&x:X* [line 32, column 7]\n  PRUNE(n$1, true); [line 32, column 7]\n " shape="invhouse"]
+"method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_5" [label="5: Prune (true branch, if) \n   n$1=*&x:X* [line 32, column 7]\n  PRUNE(n$1, true); [line 32, column 7]\n " shape="invhouse"]
 	
 
-	 "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_5" -> "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_8" ;
+	 "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_5" -> "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_8" ;
-"method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_6" [label="6: Prune (false branch, if) \n   n$1=*&x:X* [line 32, column 7]\n  PRUNE(!n$1, false); [line 32, column 7]\n " shape="invhouse"]
+"method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_6" [label="6: Prune (false branch, if) \n   n$1=*&x:X* [line 32, column 7]\n  PRUNE(!n$1, false); [line 32, column 7]\n " shape="invhouse"]
 	
 
-	 "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_6" -> "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_3" ;
+	 "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_6" -> "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_3" ;
-"method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_7" [label="7:  Return Stmt \n   n$2=*&x:X* [line 34, column 12]\n  _=*n$2:X [line 34, column 12]\n  n$4=_fun_X_div(n$2:X*) [line 34, column 12]\n  *&return:int=n$4 [line 34, column 5]\n " shape="box"]
+"method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_7" [label="7:  Return Stmt \n   n$2=*&x:X* [line 34, column 12]\n  _=*n$2:X [line 34, column 12]\n  n$4=_fun_X_div(n$2:X*) [line 34, column 12]\n  *&return:int=n$4 [line 34, column 5]\n " shape="box"]
 	
 
-	 "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_7" -> "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_2" ;
+	 "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_7" -> "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_2" ;
-"method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_8" [label="8:  Call _fun_zero_ptr \n   n$6=*&x:X* [line 33, column 14]\n  n$7=_fun_zero_ptr(n$6:X*) [line 33, column 5]\n " shape="box"]
+"method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_8" [label="8:  Call _fun_zero_ptr \n   n$6=*&x:X* [line 33, column 14]\n  n$7=_fun_zero_ptr(n$6:X*) [line 33, column 5]\n " shape="box"]
 	
 
-	 "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_8" -> "method_div0_ptr#6106785648087401281.a4bd2a817d503af4e1865afa4416bdb5_7" ;
+	 "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_8" -> "method_div0_ptr(class X)#6106785648087401281.dd62393e799ba25c316919114a8426e7_7" ;
 "method_div0_ref#12048348997540346822.5280d482da62ad0e098e3e6ad4e7915e_1" [label="1: Start method_div0_ref\nFormals:  x:X&\nLocals:  \n   DECLARE_LOCALS(&return); [line 83, column 1]\n " color=yellow style=filled]
 	
 
@@ -326,38 +326,38 @@ digraph cfg {
 	
 
 	 "method_div0_ref#12048348997540346822.5280d482da62ad0e098e3e6ad4e7915e_4" -> "method_div0_ref#12048348997540346822.5280d482da62ad0e098e3e6ad4e7915e_3" ;
-"method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_1" [label="1: Start method_div1_ptr\nFormals:  x:X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 38, column 1]\n " color=yellow style=filled]
+"method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_1" [label="1: Start method_div1_ptr\nFormals:  x:X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 38, column 1]\n " color=yellow style=filled]
 	
 
-	 "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_1" -> "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_5" ;
+	 "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_1" -> "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_5" ;
-	 "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_1" -> "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_6" ;
+	 "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_1" -> "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_6" ;
-"method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_2" [label="2: Exit method_div1_ptr \n  " color=yellow style=filled]
+"method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_2" [label="2: Exit method_div1_ptr \n  " color=yellow style=filled]
 	
 
-"method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_3" [label="3: + \n  " ]
+"method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_3" [label="3: + \n  " ]
 	
 
-	 "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_3" -> "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_4" ;
+	 "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_3" -> "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_4" ;
-"method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_4" [label="4:  between_join_and_exit \n  " shape="box"]
+"method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
-	 "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_4" -> "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_2" ;
+	 "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_4" -> "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_2" ;
-"method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_5" [label="5: Prune (true branch, if) \n   n$1=*&x:X* [line 39, column 7]\n  PRUNE(n$1, true); [line 39, column 7]\n " shape="invhouse"]
+"method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_5" [label="5: Prune (true branch, if) \n   n$1=*&x:X* [line 39, column 7]\n  PRUNE(n$1, true); [line 39, column 7]\n " shape="invhouse"]
 	
 
-	 "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_5" -> "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_8" ;
+	 "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_5" -> "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_8" ;
-"method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_6" [label="6: Prune (false branch, if) \n   n$1=*&x:X* [line 39, column 7]\n  PRUNE(!n$1, false); [line 39, column 7]\n " shape="invhouse"]
+"method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_6" [label="6: Prune (false branch, if) \n   n$1=*&x:X* [line 39, column 7]\n  PRUNE(!n$1, false); [line 39, column 7]\n " shape="invhouse"]
 	
 
-	 "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_6" -> "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_3" ;
+	 "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_6" -> "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_3" ;
-"method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_7" [label="7:  Return Stmt \n   n$2=*&x:X* [line 41, column 12]\n  _=*n$2:X [line 41, column 12]\n  n$4=_fun_X_div(n$2:X*) [line 41, column 12]\n  *&return:int=n$4 [line 41, column 5]\n " shape="box"]
+"method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_7" [label="7:  Return Stmt \n   n$2=*&x:X* [line 41, column 12]\n  _=*n$2:X [line 41, column 12]\n  n$4=_fun_X_div(n$2:X*) [line 41, column 12]\n  *&return:int=n$4 [line 41, column 5]\n " shape="box"]
 	
 
-	 "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_7" -> "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_2" ;
+	 "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_7" -> "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_2" ;
-"method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_8" [label="8:  Call _fun_nonzero_ptr \n   n$6=*&x:X* [line 40, column 17]\n  n$7=_fun_nonzero_ptr(n$6:X*) [line 40, column 5]\n " shape="box"]
+"method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_8" [label="8:  Call _fun_nonzero_ptr \n   n$6=*&x:X* [line 40, column 17]\n  n$7=_fun_nonzero_ptr(n$6:X*) [line 40, column 5]\n " shape="box"]
 	
 
-	 "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_8" -> "method_div1_ptr#3061685040798671000.94d1209c17222ffe12cc388ae1ff112d_7" ;
+	 "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_8" -> "method_div1_ptr(class X)#3061685040798671000.64eb0c6fbbafc7f2c6db9ccea560251c_7" ;
 "method_div1_ref#18445848838166655559.1ecfa9c02aff37ba12fb556cb038f32c_1" [label="1: Start method_div1_ref\nFormals:  x:X&\nLocals:  \n   DECLARE_LOCALS(&return); [line 88, column 1]\n " color=yellow style=filled]
 	
 
@@ -373,17 +373,17 @@ digraph cfg {
 	
 
 	 "method_div1_ref#18445848838166655559.1ecfa9c02aff37ba12fb556cb038f32c_4" -> "method_div1_ref#18445848838166655559.1ecfa9c02aff37ba12fb556cb038f32c_3" ;
-"nonzero_ptr#1716920554390102131.73cd383c8a42e9a8d0f617a226ea9df9_1" [label="1: Start nonzero_ptr\nFormals:  x:X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 17, column 1]\n " color=yellow style=filled]
+"nonzero_ptr(class X)#1716920554390102131.ab3e0f6dea34ce6bb6abf3732e2b1b66_1" [label="1: Start nonzero_ptr\nFormals:  x:X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 17, column 1]\n " color=yellow style=filled]
 	
 
-	 "nonzero_ptr#1716920554390102131.73cd383c8a42e9a8d0f617a226ea9df9_1" -> "nonzero_ptr#1716920554390102131.73cd383c8a42e9a8d0f617a226ea9df9_3" ;
+	 "nonzero_ptr(class X)#1716920554390102131.ab3e0f6dea34ce6bb6abf3732e2b1b66_1" -> "nonzero_ptr(class X)#1716920554390102131.ab3e0f6dea34ce6bb6abf3732e2b1b66_3" ;
-"nonzero_ptr#1716920554390102131.73cd383c8a42e9a8d0f617a226ea9df9_2" [label="2: Exit nonzero_ptr \n  " color=yellow style=filled]
+"nonzero_ptr(class X)#1716920554390102131.ab3e0f6dea34ce6bb6abf3732e2b1b66_2" [label="2: Exit nonzero_ptr \n  " color=yellow style=filled]
 	
 
-"nonzero_ptr#1716920554390102131.73cd383c8a42e9a8d0f617a226ea9df9_3" [label="3:  Call _fun_X_nonzero \n   n$1=*&x:X* [line 17, column 26]\n  _=*n$1:X [line 17, column 26]\n  n$3=_fun_X_nonzero(n$1:X*) [line 17, column 26]\n " shape="box"]
+"nonzero_ptr(class X)#1716920554390102131.ab3e0f6dea34ce6bb6abf3732e2b1b66_3" [label="3:  Call _fun_X_nonzero \n   n$1=*&x:X* [line 17, column 26]\n  _=*n$1:X [line 17, column 26]\n  n$3=_fun_X_nonzero(n$1:X*) [line 17, column 26]\n " shape="box"]
 	
 
-	 "nonzero_ptr#1716920554390102131.73cd383c8a42e9a8d0f617a226ea9df9_3" -> "nonzero_ptr#1716920554390102131.73cd383c8a42e9a8d0f617a226ea9df9_2" ;
+	 "nonzero_ptr(class X)#1716920554390102131.ab3e0f6dea34ce6bb6abf3732e2b1b66_3" -> "nonzero_ptr(class X)#1716920554390102131.ab3e0f6dea34ce6bb6abf3732e2b1b66_2" ;
 "nonzero_ref#2062801655575406720.e5794366c34a5ecd10e2fd062a659f30_1" [label="1: Start nonzero_ref\nFormals:  x:X&\nLocals:  \n   DECLARE_LOCALS(&return); [line 23, column 1]\n " color=yellow style=filled]
 	
 
@@ -395,17 +395,17 @@ digraph cfg {
 	
 
 	 "nonzero_ref#2062801655575406720.e5794366c34a5ecd10e2fd062a659f30_3" -> "nonzero_ref#2062801655575406720.e5794366c34a5ecd10e2fd062a659f30_2" ;
-"set_field_ptr#10262801862810946974.0df004d43278f4c67506fb9e7451494c_1" [label="1: Start set_field_ptr\nFormals:  x:X* val:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 19, column 1]\n " color=yellow style=filled]
+"set_field_ptr(class X)#10262801862810946974.624982a2696b528e07aa0054da333ca2_1" [label="1: Start set_field_ptr\nFormals:  x:X* val:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 19, column 1]\n " color=yellow style=filled]
 	
 
-	 "set_field_ptr#10262801862810946974.0df004d43278f4c67506fb9e7451494c_1" -> "set_field_ptr#10262801862810946974.0df004d43278f4c67506fb9e7451494c_3" ;
+	 "set_field_ptr(class X)#10262801862810946974.624982a2696b528e07aa0054da333ca2_1" -> "set_field_ptr(class X)#10262801862810946974.624982a2696b528e07aa0054da333ca2_3" ;
-"set_field_ptr#10262801862810946974.0df004d43278f4c67506fb9e7451494c_2" [label="2: Exit set_field_ptr \n  " color=yellow style=filled]
+"set_field_ptr(class X)#10262801862810946974.624982a2696b528e07aa0054da333ca2_2" [label="2: Exit set_field_ptr \n  " color=yellow style=filled]
 	
 
-"set_field_ptr#10262801862810946974.0df004d43278f4c67506fb9e7451494c_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&x:X* [line 19, column 37]\n  n$2=*&val:int [line 19, column 44]\n  *n$1.f:int=n$2 [line 19, column 37]\n " shape="box"]
+"set_field_ptr(class X)#10262801862810946974.624982a2696b528e07aa0054da333ca2_3" [label="3:  BinaryOperatorStmt: Assign \n   n$1=*&x:X* [line 19, column 37]\n  n$2=*&val:int [line 19, column 44]\n  *n$1.f:int=n$2 [line 19, column 37]\n " shape="box"]
 	
 
-	 "set_field_ptr#10262801862810946974.0df004d43278f4c67506fb9e7451494c_3" -> "set_field_ptr#10262801862810946974.0df004d43278f4c67506fb9e7451494c_2" ;
+	 "set_field_ptr(class X)#10262801862810946974.624982a2696b528e07aa0054da333ca2_3" -> "set_field_ptr(class X)#10262801862810946974.624982a2696b528e07aa0054da333ca2_2" ;
 "set_field_ref#15177497547761982491.aa4620ee8933c900acc4164344e57432_1" [label="1: Start set_field_ref\nFormals:  x:X& val:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 25, column 1]\n " color=yellow style=filled]
 	
 
@@ -417,17 +417,17 @@ digraph cfg {
 	
 
 	 "set_field_ref#15177497547761982491.aa4620ee8933c900acc4164344e57432_3" -> "set_field_ref#15177497547761982491.aa4620ee8933c900acc4164344e57432_2" ;
-"zero_ptr#12528709853087384868.d5a909d971ab439311f13a14aded5aa9_1" [label="1: Start zero_ptr\nFormals:  x:X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15, column 1]\n " color=yellow style=filled]
+"zero_ptr(class X)#12528709853087384868.d08145759acbbf21c345f01eb7eefc7e_1" [label="1: Start zero_ptr\nFormals:  x:X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15, column 1]\n " color=yellow style=filled]
 	
 
-	 "zero_ptr#12528709853087384868.d5a909d971ab439311f13a14aded5aa9_1" -> "zero_ptr#12528709853087384868.d5a909d971ab439311f13a14aded5aa9_3" ;
+	 "zero_ptr(class X)#12528709853087384868.d08145759acbbf21c345f01eb7eefc7e_1" -> "zero_ptr(class X)#12528709853087384868.d08145759acbbf21c345f01eb7eefc7e_3" ;
-"zero_ptr#12528709853087384868.d5a909d971ab439311f13a14aded5aa9_2" [label="2: Exit zero_ptr \n  " color=yellow style=filled]
+"zero_ptr(class X)#12528709853087384868.d08145759acbbf21c345f01eb7eefc7e_2" [label="2: Exit zero_ptr \n  " color=yellow style=filled]
 	
 
-"zero_ptr#12528709853087384868.d5a909d971ab439311f13a14aded5aa9_3" [label="3:  Call _fun_X_zero \n   n$1=*&x:X* [line 15, column 23]\n  _=*n$1:X [line 15, column 23]\n  n$3=_fun_X_zero(n$1:X*) [line 15, column 23]\n " shape="box"]
+"zero_ptr(class X)#12528709853087384868.d08145759acbbf21c345f01eb7eefc7e_3" [label="3:  Call _fun_X_zero \n   n$1=*&x:X* [line 15, column 23]\n  _=*n$1:X [line 15, column 23]\n  n$3=_fun_X_zero(n$1:X*) [line 15, column 23]\n " shape="box"]
 	
 
-	 "zero_ptr#12528709853087384868.d5a909d971ab439311f13a14aded5aa9_3" -> "zero_ptr#12528709853087384868.d5a909d971ab439311f13a14aded5aa9_2" ;
+	 "zero_ptr(class X)#12528709853087384868.d08145759acbbf21c345f01eb7eefc7e_3" -> "zero_ptr(class X)#12528709853087384868.d08145759acbbf21c345f01eb7eefc7e_2" ;
 "zero_ref#14077465191616488315.9f868765c76672369ef06a4d03ded4f3_1" [label="1: Start zero_ref\nFormals:  x:X&\nLocals:  \n   DECLARE_LOCALS(&return); [line 21, column 1]\n " color=yellow style=filled]
 	
 

infer/tests/codetoanalyze/cpp/shared/types/inheritance_casts.cpp.dot

@@ -55,44 +55,44 @@ digraph cfg {
 	
 
 	 "div1_B#inheritance_casts#15202051198007397773.6fa30ed113dcaca42095f52f33fb0c86_3" -> "div1_B#inheritance_casts#15202051198007397773.6fa30ed113dcaca42095f52f33fb0c86_2" ;
-"getA#inheritance_casts#5702196550029280494.a31441c26ae3c842bca5b13c0e4f700e_1" [label="1: Start inheritance_casts::getA\nFormals:  f:int __return_param:inheritance_casts::A*\nLocals:  x:inheritance_casts::A \n   DECLARE_LOCALS(&return,&x); [line 18, column 1]\n " color=yellow style=filled]
+"getA#inheritance_casts(class inheritance_casts::A)#5702196550029280494.bf770d8fdf04212f16e0b3beb3d4c512_1" [label="1: Start inheritance_casts::getA\nFormals:  f:int __return_param:inheritance_casts::A*\nLocals:  x:inheritance_casts::A \n   DECLARE_LOCALS(&return,&x); [line 18, column 1]\n " color=yellow style=filled]
 	
 
-	 "getA#inheritance_casts#5702196550029280494.a31441c26ae3c842bca5b13c0e4f700e_1" -> "getA#inheritance_casts#5702196550029280494.a31441c26ae3c842bca5b13c0e4f700e_5" ;
+	 "getA#inheritance_casts(class inheritance_casts::A)#5702196550029280494.bf770d8fdf04212f16e0b3beb3d4c512_1" -> "getA#inheritance_casts(class inheritance_casts::A)#5702196550029280494.bf770d8fdf04212f16e0b3beb3d4c512_5" ;
-"getA#inheritance_casts#5702196550029280494.a31441c26ae3c842bca5b13c0e4f700e_2" [label="2: Exit inheritance_casts::getA \n  " color=yellow style=filled]
+"getA#inheritance_casts(class inheritance_casts::A)#5702196550029280494.bf770d8fdf04212f16e0b3beb3d4c512_2" [label="2: Exit inheritance_casts::getA \n  " color=yellow style=filled]
 	
 
-"getA#inheritance_casts#5702196550029280494.a31441c26ae3c842bca5b13c0e4f700e_3" [label="3:  Return Stmt \n   n$0=*&__return_param:inheritance_casts::A* [line 21, column 3]\n  n$1=_fun_inheritance_casts::A_A(n$0:inheritance_casts::A*,&x:inheritance_casts::A&) [line 21, column 10]\n  _=*&x:inheritance_casts::A [line 21, column 10]\n  n$3=_fun_inheritance_casts::A_~A(&x:inheritance_casts::A*) [line 21, column 10]\n " shape="box"]
+"getA#inheritance_casts(class inheritance_casts::A)#5702196550029280494.bf770d8fdf04212f16e0b3beb3d4c512_3" [label="3:  Return Stmt \n   n$0=*&__return_param:inheritance_casts::A* [line 21, column 3]\n  n$1=_fun_inheritance_casts::A_A(n$0:inheritance_casts::A*,&x:inheritance_casts::A&) [line 21, column 10]\n  _=*&x:inheritance_casts::A [line 21, column 10]\n  n$3=_fun_inheritance_casts::A_~A(&x:inheritance_casts::A*) [line 21, column 10]\n " shape="box"]
 	
 
-	 "getA#inheritance_casts#5702196550029280494.a31441c26ae3c842bca5b13c0e4f700e_3" -> "getA#inheritance_casts#5702196550029280494.a31441c26ae3c842bca5b13c0e4f700e_2" ;
+	 "getA#inheritance_casts(class inheritance_casts::A)#5702196550029280494.bf770d8fdf04212f16e0b3beb3d4c512_3" -> "getA#inheritance_casts(class inheritance_casts::A)#5702196550029280494.bf770d8fdf04212f16e0b3beb3d4c512_2" ;
-"getA#inheritance_casts#5702196550029280494.a31441c26ae3c842bca5b13c0e4f700e_4" [label="4:  BinaryOperatorStmt: Assign \n   n$5=*&f:int [line 20, column 9]\n  *&x.f:int=n$5 [line 20, column 3]\n " shape="box"]
+"getA#inheritance_casts(class inheritance_casts::A)#5702196550029280494.bf770d8fdf04212f16e0b3beb3d4c512_4" [label="4:  BinaryOperatorStmt: Assign \n   n$5=*&f:int [line 20, column 9]\n  *&x.f:int=n$5 [line 20, column 3]\n " shape="box"]
 	
 
-	 "getA#inheritance_casts#5702196550029280494.a31441c26ae3c842bca5b13c0e4f700e_4" -> "getA#inheritance_casts#5702196550029280494.a31441c26ae3c842bca5b13c0e4f700e_3" ;
+	 "getA#inheritance_casts(class inheritance_casts::A)#5702196550029280494.bf770d8fdf04212f16e0b3beb3d4c512_4" -> "getA#inheritance_casts(class inheritance_casts::A)#5702196550029280494.bf770d8fdf04212f16e0b3beb3d4c512_3" ;
-"getA#inheritance_casts#5702196550029280494.a31441c26ae3c842bca5b13c0e4f700e_5" [label="5:  DeclStmt \n   n$6=_fun_inheritance_casts::A_A(&x:inheritance_casts::A*) [line 19, column 5]\n " shape="box"]
+"getA#inheritance_casts(class inheritance_casts::A)#5702196550029280494.bf770d8fdf04212f16e0b3beb3d4c512_5" [label="5:  DeclStmt \n   n$6=_fun_inheritance_casts::A_A(&x:inheritance_casts::A*) [line 19, column 5]\n " shape="box"]
 	
 
-	 "getA#inheritance_casts#5702196550029280494.a31441c26ae3c842bca5b13c0e4f700e_5" -> "getA#inheritance_casts#5702196550029280494.a31441c26ae3c842bca5b13c0e4f700e_4" ;
+	 "getA#inheritance_casts(class inheritance_casts::A)#5702196550029280494.bf770d8fdf04212f16e0b3beb3d4c512_5" -> "getA#inheritance_casts(class inheritance_casts::A)#5702196550029280494.bf770d8fdf04212f16e0b3beb3d4c512_4" ;
-"getB#inheritance_casts#7572693428029732371.2a52889292973e0a59e81bc3aa93b9cd_1" [label="1: Start inheritance_casts::getB\nFormals:  f:int __return_param:inheritance_casts::B*\nLocals:  x:inheritance_casts::B \n   DECLARE_LOCALS(&return,&x); [line 13, column 1]\n " color=yellow style=filled]
+"getB#inheritance_casts(class inheritance_casts::B)#7572693428029732371.903fb8dc56797768f6ca6ebdf511cdaf_1" [label="1: Start inheritance_casts::getB\nFormals:  f:int __return_param:inheritance_casts::B*\nLocals:  x:inheritance_casts::B \n   DECLARE_LOCALS(&return,&x); [line 13, column 1]\n " color=yellow style=filled]
 	
 
-	 "getB#inheritance_casts#7572693428029732371.2a52889292973e0a59e81bc3aa93b9cd_1" -> "getB#inheritance_casts#7572693428029732371.2a52889292973e0a59e81bc3aa93b9cd_5" ;
+	 "getB#inheritance_casts(class inheritance_casts::B)#7572693428029732371.903fb8dc56797768f6ca6ebdf511cdaf_1" -> "getB#inheritance_casts(class inheritance_casts::B)#7572693428029732371.903fb8dc56797768f6ca6ebdf511cdaf_5" ;
-"getB#inheritance_casts#7572693428029732371.2a52889292973e0a59e81bc3aa93b9cd_2" [label="2: Exit inheritance_casts::getB \n  " color=yellow style=filled]
+"getB#inheritance_casts(class inheritance_casts::B)#7572693428029732371.903fb8dc56797768f6ca6ebdf511cdaf_2" [label="2: Exit inheritance_casts::getB \n  " color=yellow style=filled]
 	
 
-"getB#inheritance_casts#7572693428029732371.2a52889292973e0a59e81bc3aa93b9cd_3" [label="3:  Return Stmt \n   n$0=*&__return_param:inheritance_casts::B* [line 16, column 3]\n  n$1=_fun_inheritance_casts::B_B(n$0:inheritance_casts::B*,&x:inheritance_casts::B&) [line 16, column 10]\n  _=*&x:inheritance_casts::B [line 16, column 10]\n  n$3=_fun_inheritance_casts::B_~B(&x:inheritance_casts::B*) [line 16, column 10]\n " shape="box"]
+"getB#inheritance_casts(class inheritance_casts::B)#7572693428029732371.903fb8dc56797768f6ca6ebdf511cdaf_3" [label="3:  Return Stmt \n   n$0=*&__return_param:inheritance_casts::B* [line 16, column 3]\n  n$1=_fun_inheritance_casts::B_B(n$0:inheritance_casts::B*,&x:inheritance_casts::B&) [line 16, column 10]\n  _=*&x:inheritance_casts::B [line 16, column 10]\n  n$3=_fun_inheritance_casts::B_~B(&x:inheritance_casts::B*) [line 16, column 10]\n " shape="box"]
 	
 
-	 "getB#inheritance_casts#7572693428029732371.2a52889292973e0a59e81bc3aa93b9cd_3" -> "getB#inheritance_casts#7572693428029732371.2a52889292973e0a59e81bc3aa93b9cd_2" ;
+	 "getB#inheritance_casts(class inheritance_casts::B)#7572693428029732371.903fb8dc56797768f6ca6ebdf511cdaf_3" -> "getB#inheritance_casts(class inheritance_casts::B)#7572693428029732371.903fb8dc56797768f6ca6ebdf511cdaf_2" ;
-"getB#inheritance_casts#7572693428029732371.2a52889292973e0a59e81bc3aa93b9cd_4" [label="4:  BinaryOperatorStmt: Assign \n   n$5=*&f:int [line 15, column 9]\n  *&x.f:int=n$5 [line 15, column 3]\n " shape="box"]
+"getB#inheritance_casts(class inheritance_casts::B)#7572693428029732371.903fb8dc56797768f6ca6ebdf511cdaf_4" [label="4:  BinaryOperatorStmt: Assign \n   n$5=*&f:int [line 15, column 9]\n  *&x.f:int=n$5 [line 15, column 3]\n " shape="box"]
 	
 
-	 "getB#inheritance_casts#7572693428029732371.2a52889292973e0a59e81bc3aa93b9cd_4" -> "getB#inheritance_casts#7572693428029732371.2a52889292973e0a59e81bc3aa93b9cd_3" ;
+	 "getB#inheritance_casts(class inheritance_casts::B)#7572693428029732371.903fb8dc56797768f6ca6ebdf511cdaf_4" -> "getB#inheritance_casts(class inheritance_casts::B)#7572693428029732371.903fb8dc56797768f6ca6ebdf511cdaf_3" ;
-"getB#inheritance_casts#7572693428029732371.2a52889292973e0a59e81bc3aa93b9cd_5" [label="5:  DeclStmt \n   n$6=_fun_inheritance_casts::B_B(&x:inheritance_casts::B*) [line 14, column 5]\n " shape="box"]
+"getB#inheritance_casts(class inheritance_casts::B)#7572693428029732371.903fb8dc56797768f6ca6ebdf511cdaf_5" [label="5:  DeclStmt \n   n$6=_fun_inheritance_casts::B_B(&x:inheritance_casts::B*) [line 14, column 5]\n " shape="box"]
 	
 
-	 "getB#inheritance_casts#7572693428029732371.2a52889292973e0a59e81bc3aa93b9cd_5" -> "getB#inheritance_casts#7572693428029732371.2a52889292973e0a59e81bc3aa93b9cd_4" ;
+	 "getB#inheritance_casts(class inheritance_casts::B)#7572693428029732371.903fb8dc56797768f6ca6ebdf511cdaf_5" -> "getB#inheritance_casts(class inheritance_casts::B)#7572693428029732371.903fb8dc56797768f6ca6ebdf511cdaf_4" ;
 "A#A#inheritance_casts#{10902709585585133973|constexpr}.68880ef701101d56bd12eca3d63ad60a_1" [label="1: Start inheritance_casts::A_A\nFormals:  this:inheritance_casts::A* __param_0:inheritance_casts::A&\nLocals:  \n   DECLARE_LOCALS(&return); [line 8, column 8]\n " color=yellow style=filled]
 	
 

infer/tests/codetoanalyze/cpp/shared/types/inheritance_field.cpp.dot

@@ -15,25 +15,25 @@ digraph cfg {
 	
 
 	 "div0_b1#17650173920024552929.38acfc238efbf35c1ac5da7290b49422_4" -> "div0_b1#17650173920024552929.38acfc238efbf35c1ac5da7290b49422_3" ;
-"div0_b1_s#4574535260514480977.c132b3496cd22a9bc4817c577b65da9e_1" [label="1: Start div0_b1_s\nFormals:  s:Sub*\nLocals:  \n   DECLARE_LOCALS(&return); [line 47, column 1]\n " color=yellow style=filled]
+"div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_1" [label="1: Start div0_b1_s\nFormals:  s:Sub*\nLocals:  \n   DECLARE_LOCALS(&return); [line 47, column 1]\n " color=yellow style=filled]
 	
 
-	 "div0_b1_s#4574535260514480977.c132b3496cd22a9bc4817c577b65da9e_1" -> "div0_b1_s#4574535260514480977.c132b3496cd22a9bc4817c577b65da9e_5" ;
+	 "div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_1" -> "div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_5" ;
-"div0_b1_s#4574535260514480977.c132b3496cd22a9bc4817c577b65da9e_2" [label="2: Exit div0_b1_s \n  " color=yellow style=filled]
+"div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_2" [label="2: Exit div0_b1_s \n  " color=yellow style=filled]
 	
 
-"div0_b1_s#4574535260514480977.c132b3496cd22a9bc4817c577b65da9e_3" [label="3:  Return Stmt \n   n$0=*&s:Sub* [line 50, column 15]\n  n$1=*n$0.b1:int [line 50, column 15]\n  n$2=*&s:Sub* [line 50, column 23]\n  n$3=*n$2.s:int [line 50, column 23]\n  *&return:int=(1 / (n$1 - n$3)) [line 50, column 3]\n " shape="box"]
+"div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_3" [label="3:  Return Stmt \n   n$0=*&s:Sub* [line 50, column 15]\n  n$1=*n$0.b1:int [line 50, column 15]\n  n$2=*&s:Sub* [line 50, column 23]\n  n$3=*n$2.s:int [line 50, column 23]\n  *&return:int=(1 / (n$1 - n$3)) [line 50, column 3]\n " shape="box"]
 	
 
-	 "div0_b1_s#4574535260514480977.c132b3496cd22a9bc4817c577b65da9e_3" -> "div0_b1_s#4574535260514480977.c132b3496cd22a9bc4817c577b65da9e_2" ;
+	 "div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_3" -> "div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_2" ;
-"div0_b1_s#4574535260514480977.c132b3496cd22a9bc4817c577b65da9e_4" [label="4:  BinaryOperatorStmt: Assign \n   n$5=*&s:Sub* [line 49, column 3]\n  *n$5.s:int=1 [line 49, column 3]\n " shape="box"]
+"div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_4" [label="4:  BinaryOperatorStmt: Assign \n   n$5=*&s:Sub* [line 49, column 3]\n  *n$5.s:int=1 [line 49, column 3]\n " shape="box"]
 	
 
-	 "div0_b1_s#4574535260514480977.c132b3496cd22a9bc4817c577b65da9e_4" -> "div0_b1_s#4574535260514480977.c132b3496cd22a9bc4817c577b65da9e_3" ;
+	 "div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_4" -> "div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_3" ;
-"div0_b1_s#4574535260514480977.c132b3496cd22a9bc4817c577b65da9e_5" [label="5:  BinaryOperatorStmt: Assign \n   n$6=*&s:Sub* [line 48, column 3]\n  *n$6.b1:int=1 [line 48, column 3]\n " shape="box"]
+"div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_5" [label="5:  BinaryOperatorStmt: Assign \n   n$6=*&s:Sub* [line 48, column 3]\n  *n$6.b1:int=1 [line 48, column 3]\n " shape="box"]
 	
 
-	 "div0_b1_s#4574535260514480977.c132b3496cd22a9bc4817c577b65da9e_5" -> "div0_b1_s#4574535260514480977.c132b3496cd22a9bc4817c577b65da9e_4" ;
+	 "div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_5" -> "div0_b1_s(class Sub)#4574535260514480977.bea603e96ca808f341ce0e5424d96c83_4" ;
 "div0_b2#6935029956526426132.ef88e6d1eac891cdde3f345b9b55439c_1" [label="1: Start div0_b2\nFormals:  s:Sub&(byval)\nLocals:  \n   DECLARE_LOCALS(&return); [line 25, column 1]\n " color=yellow style=filled]
 	
 
@@ -49,25 +49,25 @@ digraph cfg {
 	
 
 	 "div0_b2#6935029956526426132.ef88e6d1eac891cdde3f345b9b55439c_4" -> "div0_b2#6935029956526426132.ef88e6d1eac891cdde3f345b9b55439c_3" ;
-"div0_cast#5945090778893539301.687c05d84c9555932644bbb5c32ec8a3_1" [label="1: Start div0_cast\nFormals:  s:Sub*\nLocals:  b:Base1* \n   DECLARE_LOCALS(&return,&b); [line 35, column 1]\n " color=yellow style=filled]
+"div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_1" [label="1: Start div0_cast\nFormals:  s:Sub*\nLocals:  b:Base1* \n   DECLARE_LOCALS(&return,&b); [line 35, column 1]\n " color=yellow style=filled]
 	
 
-	 "div0_cast#5945090778893539301.687c05d84c9555932644bbb5c32ec8a3_1" -> "div0_cast#5945090778893539301.687c05d84c9555932644bbb5c32ec8a3_5" ;
+	 "div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_1" -> "div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_5" ;
-"div0_cast#5945090778893539301.687c05d84c9555932644bbb5c32ec8a3_2" [label="2: Exit div0_cast \n  " color=yellow style=filled]
+"div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_2" [label="2: Exit div0_cast \n  " color=yellow style=filled]
 	
 
-"div0_cast#5945090778893539301.687c05d84c9555932644bbb5c32ec8a3_3" [label="3:  Return Stmt \n   n$0=*&b:Base1* [line 38, column 14]\n  n$1=*n$0.b1:int [line 38, column 14]\n  *&return:int=(1 / n$1) [line 38, column 3]\n " shape="box"]
+"div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_3" [label="3:  Return Stmt \n   n$0=*&b:Base1* [line 38, column 14]\n  n$1=*n$0.b1:int [line 38, column 14]\n  *&return:int=(1 / n$1) [line 38, column 3]\n " shape="box"]
 	
 
-	 "div0_cast#5945090778893539301.687c05d84c9555932644bbb5c32ec8a3_3" -> "div0_cast#5945090778893539301.687c05d84c9555932644bbb5c32ec8a3_2" ;
+	 "div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_3" -> "div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_2" ;
-"div0_cast#5945090778893539301.687c05d84c9555932644bbb5c32ec8a3_4" [label="4:  DeclStmt \n   n$3=*&s:Sub* [line 37, column 14]\n  *&b:Sub*=n$3 [line 37, column 3]\n " shape="box"]
+"div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_4" [label="4:  DeclStmt \n   n$3=*&s:Sub* [line 37, column 14]\n  *&b:Sub*=n$3 [line 37, column 3]\n " shape="box"]
 	
 
-	 "div0_cast#5945090778893539301.687c05d84c9555932644bbb5c32ec8a3_4" -> "div0_cast#5945090778893539301.687c05d84c9555932644bbb5c32ec8a3_3" ;
+	 "div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_4" -> "div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_3" ;
-"div0_cast#5945090778893539301.687c05d84c9555932644bbb5c32ec8a3_5" [label="5:  BinaryOperatorStmt: Assign \n   n$4=*&s:Sub* [line 36, column 3]\n  *n$4.b1:int=0 [line 36, column 3]\n " shape="box"]
+"div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_5" [label="5:  BinaryOperatorStmt: Assign \n   n$4=*&s:Sub* [line 36, column 3]\n  *n$4.b1:int=0 [line 36, column 3]\n " shape="box"]
 	
 
-	 "div0_cast#5945090778893539301.687c05d84c9555932644bbb5c32ec8a3_5" -> "div0_cast#5945090778893539301.687c05d84c9555932644bbb5c32ec8a3_4" ;
+	 "div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_5" -> "div0_cast(class Sub)#5945090778893539301.57c132b2d87bb7310c8cb0085dede4d5_4" ;
 "div0_cast_ref#11427648331886451822.4f535c7752ac1b6e5f35ab1a83dc2bd8_1" [label="1: Start div0_cast_ref\nFormals:  s:Sub&(byval)\nLocals:  b:Base1& \n   DECLARE_LOCALS(&return,&b); [line 41, column 1]\n " color=yellow style=filled]
 	
 
@@ -102,25 +102,25 @@ digraph cfg {
 	
 
 	 "div0_s#16566672704220882536.127f1e4fb94cf0b77844a4e153e0f991_4" -> "div0_s#16566672704220882536.127f1e4fb94cf0b77844a4e153e0f991_3" ;
-"div0_s_b1#6365361903134380141.385a354053ffb314ee7bfcec6dee0475_1" [label="1: Start div0_s_b1\nFormals:  s:Sub*\nLocals:  \n   DECLARE_LOCALS(&return); [line 53, column 1]\n " color=yellow style=filled]
+"div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_1" [label="1: Start div0_s_b1\nFormals:  s:Sub*\nLocals:  \n   DECLARE_LOCALS(&return); [line 53, column 1]\n " color=yellow style=filled]
 	
 
-	 "div0_s_b1#6365361903134380141.385a354053ffb314ee7bfcec6dee0475_1" -> "div0_s_b1#6365361903134380141.385a354053ffb314ee7bfcec6dee0475_5" ;
+	 "div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_1" -> "div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_5" ;
-"div0_s_b1#6365361903134380141.385a354053ffb314ee7bfcec6dee0475_2" [label="2: Exit div0_s_b1 \n  " color=yellow style=filled]
+"div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_2" [label="2: Exit div0_s_b1 \n  " color=yellow style=filled]
 	
 
-"div0_s_b1#6365361903134380141.385a354053ffb314ee7bfcec6dee0475_3" [label="3:  Return Stmt \n   n$0=*&s:Sub* [line 56, column 15]\n  n$1=*n$0.b1:int [line 56, column 15]\n  n$2=*&s:Sub* [line 56, column 23]\n  n$3=*n$2.s:int [line 56, column 23]\n  *&return:int=(1 / (n$1 - n$3)) [line 56, column 3]\n " shape="box"]
+"div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_3" [label="3:  Return Stmt \n   n$0=*&s:Sub* [line 56, column 15]\n  n$1=*n$0.b1:int [line 56, column 15]\n  n$2=*&s:Sub* [line 56, column 23]\n  n$3=*n$2.s:int [line 56, column 23]\n  *&return:int=(1 / (n$1 - n$3)) [line 56, column 3]\n " shape="box"]
 	
 
-	 "div0_s_b1#6365361903134380141.385a354053ffb314ee7bfcec6dee0475_3" -> "div0_s_b1#6365361903134380141.385a354053ffb314ee7bfcec6dee0475_2" ;
+	 "div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_3" -> "div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_2" ;
-"div0_s_b1#6365361903134380141.385a354053ffb314ee7bfcec6dee0475_4" [label="4:  BinaryOperatorStmt: Assign \n   n$5=*&s:Sub* [line 55, column 3]\n  *n$5.s:int=1 [line 55, column 3]\n " shape="box"]
+"div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_4" [label="4:  BinaryOperatorStmt: Assign \n   n$5=*&s:Sub* [line 55, column 3]\n  *n$5.s:int=1 [line 55, column 3]\n " shape="box"]
 	
 
-	 "div0_s_b1#6365361903134380141.385a354053ffb314ee7bfcec6dee0475_4" -> "div0_s_b1#6365361903134380141.385a354053ffb314ee7bfcec6dee0475_3" ;
+	 "div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_4" -> "div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_3" ;
-"div0_s_b1#6365361903134380141.385a354053ffb314ee7bfcec6dee0475_5" [label="5:  BinaryOperatorStmt: Assign \n   n$6=*&s:Sub* [line 54, column 3]\n  *n$6.b1:int=1 [line 54, column 3]\n " shape="box"]
+"div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_5" [label="5:  BinaryOperatorStmt: Assign \n   n$6=*&s:Sub* [line 54, column 3]\n  *n$6.b1:int=1 [line 54, column 3]\n " shape="box"]
 	
 
-	 "div0_s_b1#6365361903134380141.385a354053ffb314ee7bfcec6dee0475_5" -> "div0_s_b1#6365361903134380141.385a354053ffb314ee7bfcec6dee0475_4" ;
+	 "div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_5" -> "div0_s_b1(class Sub)#6365361903134380141.eab3ecee328fdfa57b4dc825af3f2f72_4" ;
 "div1_b1#14974413951234929464.2d37fbc87faf449081172c1e2711163f_1" [label="1: Start div1_b1\nFormals:  s:Sub&(byval)\nLocals:  \n   DECLARE_LOCALS(&return); [line 59, column 1]\n " color=yellow style=filled]
 	
 
@@ -136,23 +136,23 @@ digraph cfg {
 	
 
 	 "div1_b1#14974413951234929464.2d37fbc87faf449081172c1e2711163f_4" -> "div1_b1#14974413951234929464.2d37fbc87faf449081172c1e2711163f_3" ;
-"div1_cast#4700794712628779370.bf330282d3921dae44676e58f54575fe_1" [label="1: Start div1_cast\nFormals:  s:Sub*\nLocals:  b:Base1* \n   DECLARE_LOCALS(&return,&b); [line 64, column 1]\n " color=yellow style=filled]
+"div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_1" [label="1: Start div1_cast\nFormals:  s:Sub*\nLocals:  b:Base1* \n   DECLARE_LOCALS(&return,&b); [line 64, column 1]\n " color=yellow style=filled]
 	
 
-	 "div1_cast#4700794712628779370.bf330282d3921dae44676e58f54575fe_1" -> "div1_cast#4700794712628779370.bf330282d3921dae44676e58f54575fe_5" ;
+	 "div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_1" -> "div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_5" ;
-"div1_cast#4700794712628779370.bf330282d3921dae44676e58f54575fe_2" [label="2: Exit div1_cast \n  " color=yellow style=filled]
+"div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_2" [label="2: Exit div1_cast \n  " color=yellow style=filled]
 	
 
-"div1_cast#4700794712628779370.bf330282d3921dae44676e58f54575fe_3" [label="3:  Return Stmt \n   n$0=*&b:Base1* [line 67, column 14]\n  n$1=*n$0.b1:int [line 67, column 14]\n  *&return:int=(1 / n$1) [line 67, column 3]\n " shape="box"]
+"div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_3" [label="3:  Return Stmt \n   n$0=*&b:Base1* [line 67, column 14]\n  n$1=*n$0.b1:int [line 67, column 14]\n  *&return:int=(1 / n$1) [line 67, column 3]\n " shape="box"]
 	
 
-	 "div1_cast#4700794712628779370.bf330282d3921dae44676e58f54575fe_3" -> "div1_cast#4700794712628779370.bf330282d3921dae44676e58f54575fe_2" ;
+	 "div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_3" -> "div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_2" ;
-"div1_cast#4700794712628779370.bf330282d3921dae44676e58f54575fe_4" [label="4:  DeclStmt \n   n$3=*&s:Sub* [line 66, column 14]\n  *&b:Sub*=n$3 [line 66, column 3]\n " shape="box"]
+"div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_4" [label="4:  DeclStmt \n   n$3=*&s:Sub* [line 66, column 14]\n  *&b:Sub*=n$3 [line 66, column 3]\n " shape="box"]
 	
 
-	 "div1_cast#4700794712628779370.bf330282d3921dae44676e58f54575fe_4" -> "div1_cast#4700794712628779370.bf330282d3921dae44676e58f54575fe_3" ;
+	 "div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_4" -> "div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_3" ;
-"div1_cast#4700794712628779370.bf330282d3921dae44676e58f54575fe_5" [label="5:  BinaryOperatorStmt: Assign \n   n$4=*&s:Sub* [line 65, column 3]\n  *n$4.b1:int=1 [line 65, column 3]\n " shape="box"]
+"div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_5" [label="5:  BinaryOperatorStmt: Assign \n   n$4=*&s:Sub* [line 65, column 3]\n  *n$4.b1:int=1 [line 65, column 3]\n " shape="box"]
 	
 
-	 "div1_cast#4700794712628779370.bf330282d3921dae44676e58f54575fe_5" -> "div1_cast#4700794712628779370.bf330282d3921dae44676e58f54575fe_4" ;
+	 "div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_5" -> "div1_cast(class Sub)#4700794712628779370.5f88f1a243823d843f8f8a851cbaf0d4_4" ;
 }

infer/tests/codetoanalyze/cpp/shared/types/operator_overload.cpp.dot

@@ -56,17 +56,17 @@ digraph cfg {
 	
 
 	 "div0_method_op#16458634010327501325.9f8c8af0fef3459b668ce9bd6f32558b_4" -> "div0_method_op#16458634010327501325.9f8c8af0fef3459b668ce9bd6f32558b_3" ;
-"div0_method_op_ptr#10912550985860444792.096d01aa199facb5a8d76aa262f16057_1" [label="1: Start div0_method_op_ptr\nFormals:  x:X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 24, column 1]\n " color=yellow style=filled]
+"div0_method_op_ptr(class X)#10912550985860444792.208aa82119402d74edf40f4f285108ee_1" [label="1: Start div0_method_op_ptr\nFormals:  x:X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 24, column 1]\n " color=yellow style=filled]
 	
 
-	 "div0_method_op_ptr#10912550985860444792.096d01aa199facb5a8d76aa262f16057_1" -> "div0_method_op_ptr#10912550985860444792.096d01aa199facb5a8d76aa262f16057_3" ;
+	 "div0_method_op_ptr(class X)#10912550985860444792.208aa82119402d74edf40f4f285108ee_1" -> "div0_method_op_ptr(class X)#10912550985860444792.208aa82119402d74edf40f4f285108ee_3" ;
-"div0_method_op_ptr#10912550985860444792.096d01aa199facb5a8d76aa262f16057_2" [label="2: Exit div0_method_op_ptr \n  " color=yellow style=filled]
+"div0_method_op_ptr(class X)#10912550985860444792.208aa82119402d74edf40f4f285108ee_2" [label="2: Exit div0_method_op_ptr \n  " color=yellow style=filled]
 	
 
-"div0_method_op_ptr#10912550985860444792.096d01aa199facb5a8d76aa262f16057_3" [label="3:  Return Stmt \n   n$1=*&x:X* [line 24, column 45]\n  n$2=_fun_X_operator[](n$1:X&,0:int) [line 24, column 43]\n  *&return:int=(1 / n$2) [line 24, column 32]\n " shape="box"]
+"div0_method_op_ptr(class X)#10912550985860444792.208aa82119402d74edf40f4f285108ee_3" [label="3:  Return Stmt \n   n$1=*&x:X* [line 24, column 45]\n  n$2=_fun_X_operator[](n$1:X&,0:int) [line 24, column 43]\n  *&return:int=(1 / n$2) [line 24, column 32]\n " shape="box"]
 	
 
-	 "div0_method_op_ptr#10912550985860444792.096d01aa199facb5a8d76aa262f16057_3" -> "div0_method_op_ptr#10912550985860444792.096d01aa199facb5a8d76aa262f16057_2" ;
+	 "div0_method_op_ptr(class X)#10912550985860444792.208aa82119402d74edf40f4f285108ee_3" -> "div0_method_op_ptr(class X)#10912550985860444792.208aa82119402d74edf40f4f285108ee_2" ;
 "div1_method_op#5439663249593761892.a2cc6fb171f5c009c72f5f33927b41f0_1" [label="1: Start div1_method_op\nFormals:  x:X&\nLocals:  \n   DECLARE_LOCALS(&return); [line 43, column 1]\n " color=yellow style=filled]
 	
 

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

@@ -1,24 +1,24 @@
 /* @generated */
 digraph cfg {
-"get#return_struct#15206943163581446197.ccfaa809d6b1c936572851236a9ccb10_1" [label="1: Start return_struct::get\nFormals:  a:int __return_param:return_struct::X*\nLocals:  x:return_struct::X \n   DECLARE_LOCALS(&return,&x); [line 19, column 1]\n " color=yellow style=filled]
+"get#return_struct(class return_struct::X)#15206943163581446197.86e6722206a41548a013622037de2b99_1" [label="1: Start return_struct::get\nFormals:  a:int __return_param:return_struct::X*\nLocals:  x:return_struct::X \n   DECLARE_LOCALS(&return,&x); [line 19, column 1]\n " color=yellow style=filled]
 	
 
-	 "get#return_struct#15206943163581446197.ccfaa809d6b1c936572851236a9ccb10_1" -> "get#return_struct#15206943163581446197.ccfaa809d6b1c936572851236a9ccb10_5" ;
+	 "get#return_struct(class return_struct::X)#15206943163581446197.86e6722206a41548a013622037de2b99_1" -> "get#return_struct(class return_struct::X)#15206943163581446197.86e6722206a41548a013622037de2b99_5" ;
-"get#return_struct#15206943163581446197.ccfaa809d6b1c936572851236a9ccb10_2" [label="2: Exit return_struct::get \n  " color=yellow style=filled]
+"get#return_struct(class return_struct::X)#15206943163581446197.86e6722206a41548a013622037de2b99_2" [label="2: Exit return_struct::get \n  " color=yellow style=filled]
 	
 
-"get#return_struct#15206943163581446197.ccfaa809d6b1c936572851236a9ccb10_3" [label="3:  Return Stmt \n   n$0=*&__return_param:return_struct::X* [line 22, column 3]\n  n$1=_fun_return_struct::X_X(n$0:return_struct::X*,&x:return_struct::X&) [line 22, column 10]\n  _=*&x:return_struct::X [line 22, column 10]\n  n$3=_fun_return_struct::X_~X(&x:return_struct::X*) [line 22, column 10]\n " shape="box"]
+"get#return_struct(class return_struct::X)#15206943163581446197.86e6722206a41548a013622037de2b99_3" [label="3:  Return Stmt \n   n$0=*&__return_param:return_struct::X* [line 22, column 3]\n  n$1=_fun_return_struct::X_X(n$0:return_struct::X*,&x:return_struct::X&) [line 22, column 10]\n  _=*&x:return_struct::X [line 22, column 10]\n  n$3=_fun_return_struct::X_~X(&x:return_struct::X*) [line 22, column 10]\n " shape="box"]
 	
 
-	 "get#return_struct#15206943163581446197.ccfaa809d6b1c936572851236a9ccb10_3" -> "get#return_struct#15206943163581446197.ccfaa809d6b1c936572851236a9ccb10_2" ;
+	 "get#return_struct(class return_struct::X)#15206943163581446197.86e6722206a41548a013622037de2b99_3" -> "get#return_struct(class return_struct::X)#15206943163581446197.86e6722206a41548a013622037de2b99_2" ;
-"get#return_struct#15206943163581446197.ccfaa809d6b1c936572851236a9ccb10_4" [label="4:  BinaryOperatorStmt: Assign \n   n$5=*&a:int [line 21, column 9]\n  *&x.f:int=n$5 [line 21, column 3]\n " shape="box"]
+"get#return_struct(class return_struct::X)#15206943163581446197.86e6722206a41548a013622037de2b99_4" [label="4:  BinaryOperatorStmt: Assign \n   n$5=*&a:int [line 21, column 9]\n  *&x.f:int=n$5 [line 21, column 3]\n " shape="box"]
 	
 
-	 "get#return_struct#15206943163581446197.ccfaa809d6b1c936572851236a9ccb10_4" -> "get#return_struct#15206943163581446197.ccfaa809d6b1c936572851236a9ccb10_3" ;
+	 "get#return_struct(class return_struct::X)#15206943163581446197.86e6722206a41548a013622037de2b99_4" -> "get#return_struct(class return_struct::X)#15206943163581446197.86e6722206a41548a013622037de2b99_3" ;
-"get#return_struct#15206943163581446197.ccfaa809d6b1c936572851236a9ccb10_5" [label="5:  DeclStmt \n   n$6=_fun_return_struct::X_X(&x:return_struct::X*) [line 20, column 5]\n " shape="box"]
+"get#return_struct(class return_struct::X)#15206943163581446197.86e6722206a41548a013622037de2b99_5" [label="5:  DeclStmt \n   n$6=_fun_return_struct::X_X(&x:return_struct::X*) [line 20, column 5]\n " shape="box"]
 	
 
-	 "get#return_struct#15206943163581446197.ccfaa809d6b1c936572851236a9ccb10_5" -> "get#return_struct#15206943163581446197.ccfaa809d6b1c936572851236a9ccb10_4" ;
+	 "get#return_struct(class return_struct::X)#15206943163581446197.86e6722206a41548a013622037de2b99_5" -> "get#return_struct(class return_struct::X)#15206943163581446197.86e6722206a41548a013622037de2b99_4" ;
 "get_div0#return_struct#3543093399648500387.0c3db3a444952aefeee44e54da50327a_1" [label="1: Start return_struct::get_div0\nFormals: \nLocals:  x:return_struct::X 0$?%__sil_tmpSIL_materialize_temp__n$4:return_struct::X const  \n   DECLARE_LOCALS(&return,&x,&0$?%__sil_tmpSIL_materialize_temp__n$4); [line 25, column 1]\n " color=yellow style=filled]
 	
 

infer/tests/codetoanalyze/cpp/shared/types/struct_forward_declare.cpp.dot

@@ -59,21 +59,21 @@ digraph cfg {
 	
 
 	 "X_div0#struct_forward_declare#14943490796844086809.e860fd7462df24ba7720802867a02ac2_5" -> "X_div0#struct_forward_declare#14943490796844086809.e860fd7462df24ba7720802867a02ac2_4" ;
-"X_ptr_div0#struct_forward_declare#16748991602723853091.556e298a3b72ac8fb2b17fe94b42ea70_1" [label="1: Start struct_forward_declare::X_ptr_div0\nFormals:  x:struct_forward_declare::X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 40, column 1]\n " color=yellow style=filled]
+"X_ptr_div0#struct_forward_declare(class struct_forward_declare::X)#16748991602723853091.a5c80332fff139355cc770fc0a47092e_1" [label="1: Start struct_forward_declare::X_ptr_div0\nFormals:  x:struct_forward_declare::X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 40, column 1]\n " color=yellow style=filled]
 	
 
-	 "X_ptr_div0#struct_forward_declare#16748991602723853091.556e298a3b72ac8fb2b17fe94b42ea70_1" -> "X_ptr_div0#struct_forward_declare#16748991602723853091.556e298a3b72ac8fb2b17fe94b42ea70_4" ;
+	 "X_ptr_div0#struct_forward_declare(class struct_forward_declare::X)#16748991602723853091.a5c80332fff139355cc770fc0a47092e_1" -> "X_ptr_div0#struct_forward_declare(class struct_forward_declare::X)#16748991602723853091.a5c80332fff139355cc770fc0a47092e_4" ;
-"X_ptr_div0#struct_forward_declare#16748991602723853091.556e298a3b72ac8fb2b17fe94b42ea70_2" [label="2: Exit struct_forward_declare::X_ptr_div0 \n  " color=yellow style=filled]
+"X_ptr_div0#struct_forward_declare(class struct_forward_declare::X)#16748991602723853091.a5c80332fff139355cc770fc0a47092e_2" [label="2: Exit struct_forward_declare::X_ptr_div0 \n  " color=yellow style=filled]
 	
 
-"X_ptr_div0#struct_forward_declare#16748991602723853091.556e298a3b72ac8fb2b17fe94b42ea70_3" [label="3:  Return Stmt \n   n$0=*&x:struct_forward_declare::X* [line 42, column 14]\n  _=*n$0:struct_forward_declare::X [line 42, column 14]\n  n$2=_fun_struct_forward_declare::X_getF(n$0:struct_forward_declare::X*) [line 42, column 14]\n  *&return:int=(1 / n$2) [line 42, column 3]\n " shape="box"]
+"X_ptr_div0#struct_forward_declare(class struct_forward_declare::X)#16748991602723853091.a5c80332fff139355cc770fc0a47092e_3" [label="3:  Return Stmt \n   n$0=*&x:struct_forward_declare::X* [line 42, column 14]\n  _=*n$0:struct_forward_declare::X [line 42, column 14]\n  n$2=_fun_struct_forward_declare::X_getF(n$0:struct_forward_declare::X*) [line 42, column 14]\n  *&return:int=(1 / n$2) [line 42, column 3]\n " shape="box"]
 	
 
-	 "X_ptr_div0#struct_forward_declare#16748991602723853091.556e298a3b72ac8fb2b17fe94b42ea70_3" -> "X_ptr_div0#struct_forward_declare#16748991602723853091.556e298a3b72ac8fb2b17fe94b42ea70_2" ;
+	 "X_ptr_div0#struct_forward_declare(class struct_forward_declare::X)#16748991602723853091.a5c80332fff139355cc770fc0a47092e_3" -> "X_ptr_div0#struct_forward_declare(class struct_forward_declare::X)#16748991602723853091.a5c80332fff139355cc770fc0a47092e_2" ;
-"X_ptr_div0#struct_forward_declare#16748991602723853091.556e298a3b72ac8fb2b17fe94b42ea70_4" [label="4:  BinaryOperatorStmt: Assign \n   n$4=*&x:struct_forward_declare::X* [line 41, column 3]\n  *n$4.f:int=0 [line 41, column 3]\n " shape="box"]
+"X_ptr_div0#struct_forward_declare(class struct_forward_declare::X)#16748991602723853091.a5c80332fff139355cc770fc0a47092e_4" [label="4:  BinaryOperatorStmt: Assign \n   n$4=*&x:struct_forward_declare::X* [line 41, column 3]\n  *n$4.f:int=0 [line 41, column 3]\n " shape="box"]
 	
 
-	 "X_ptr_div0#struct_forward_declare#16748991602723853091.556e298a3b72ac8fb2b17fe94b42ea70_4" -> "X_ptr_div0#struct_forward_declare#16748991602723853091.556e298a3b72ac8fb2b17fe94b42ea70_3" ;
+	 "X_ptr_div0#struct_forward_declare(class struct_forward_declare::X)#16748991602723853091.a5c80332fff139355cc770fc0a47092e_4" -> "X_ptr_div0#struct_forward_declare(class struct_forward_declare::X)#16748991602723853091.a5c80332fff139355cc770fc0a47092e_3" ;
 "Z_div0#struct_forward_declare#1627203008264837059.744970cb2a0863ceafbc26504cb09faf_1" [label="1: Start struct_forward_declare::Z_div0\nFormals: \nLocals:  z:struct_forward_declare::Z \n   DECLARE_LOCALS(&return,&z); [line 55, column 1]\n " color=yellow style=filled]
 	
 
@@ -93,32 +93,32 @@ digraph cfg {
 	
 
 	 "Z_div0#struct_forward_declare#1627203008264837059.744970cb2a0863ceafbc26504cb09faf_5" -> "Z_div0#struct_forward_declare#1627203008264837059.744970cb2a0863ceafbc26504cb09faf_4" ;
-"Z_ptr_div0#struct_forward_declare#18058661690516691263.44cb0d131c1ef6157feb3014da966171_1" [label="1: Start struct_forward_declare::Z_ptr_div0\nFormals:  z:struct_forward_declare::Z*\nLocals:  \n   DECLARE_LOCALS(&return); [line 61, column 1]\n " color=yellow style=filled]
+"Z_ptr_div0#struct_forward_declare(class struct_forward_declare::Z)#18058661690516691263.ce600c6da403f28f2c501df577604772_1" [label="1: Start struct_forward_declare::Z_ptr_div0\nFormals:  z:struct_forward_declare::Z*\nLocals:  \n   DECLARE_LOCALS(&return); [line 61, column 1]\n " color=yellow style=filled]
 	
 
-	 "Z_ptr_div0#struct_forward_declare#18058661690516691263.44cb0d131c1ef6157feb3014da966171_1" -> "Z_ptr_div0#struct_forward_declare#18058661690516691263.44cb0d131c1ef6157feb3014da966171_4" ;
+	 "Z_ptr_div0#struct_forward_declare(class struct_forward_declare::Z)#18058661690516691263.ce600c6da403f28f2c501df577604772_1" -> "Z_ptr_div0#struct_forward_declare(class struct_forward_declare::Z)#18058661690516691263.ce600c6da403f28f2c501df577604772_4" ;
-"Z_ptr_div0#struct_forward_declare#18058661690516691263.44cb0d131c1ef6157feb3014da966171_2" [label="2: Exit struct_forward_declare::Z_ptr_div0 \n  " color=yellow style=filled]
+"Z_ptr_div0#struct_forward_declare(class struct_forward_declare::Z)#18058661690516691263.ce600c6da403f28f2c501df577604772_2" [label="2: Exit struct_forward_declare::Z_ptr_div0 \n  " color=yellow style=filled]
 	
 
-"Z_ptr_div0#struct_forward_declare#18058661690516691263.44cb0d131c1ef6157feb3014da966171_3" [label="3:  Return Stmt \n   n$0=*&z:struct_forward_declare::Z* [line 66, column 14]\n  _=*n$0:struct_forward_declare::Z [line 66, column 14]\n  n$2=_fun_struct_forward_declare::Z_getF(n$0:struct_forward_declare::Z*) [line 66, column 14]\n  *&return:int=(1 / n$2) [line 66, column 3]\n " shape="box"]
+"Z_ptr_div0#struct_forward_declare(class struct_forward_declare::Z)#18058661690516691263.ce600c6da403f28f2c501df577604772_3" [label="3:  Return Stmt \n   n$0=*&z:struct_forward_declare::Z* [line 66, column 14]\n  _=*n$0:struct_forward_declare::Z [line 66, column 14]\n  n$2=_fun_struct_forward_declare::Z_getF(n$0:struct_forward_declare::Z*) [line 66, column 14]\n  *&return:int=(1 / n$2) [line 66, column 3]\n " shape="box"]
 	
 
-	 "Z_ptr_div0#struct_forward_declare#18058661690516691263.44cb0d131c1ef6157feb3014da966171_3" -> "Z_ptr_div0#struct_forward_declare#18058661690516691263.44cb0d131c1ef6157feb3014da966171_2" ;
+	 "Z_ptr_div0#struct_forward_declare(class struct_forward_declare::Z)#18058661690516691263.ce600c6da403f28f2c501df577604772_3" -> "Z_ptr_div0#struct_forward_declare(class struct_forward_declare::Z)#18058661690516691263.ce600c6da403f28f2c501df577604772_2" ;
-"Z_ptr_div0#struct_forward_declare#18058661690516691263.44cb0d131c1ef6157feb3014da966171_4" [label="4:  BinaryOperatorStmt: Assign \n   n$4=*&z:struct_forward_declare::Z* [line 65, column 3]\n  *n$4.f:int=0 [line 65, column 3]\n " shape="box"]
+"Z_ptr_div0#struct_forward_declare(class struct_forward_declare::Z)#18058661690516691263.ce600c6da403f28f2c501df577604772_4" [label="4:  BinaryOperatorStmt: Assign \n   n$4=*&z:struct_forward_declare::Z* [line 65, column 3]\n  *n$4.f:int=0 [line 65, column 3]\n " shape="box"]
 	
 
-	 "Z_ptr_div0#struct_forward_declare#18058661690516691263.44cb0d131c1ef6157feb3014da966171_4" -> "Z_ptr_div0#struct_forward_declare#18058661690516691263.44cb0d131c1ef6157feb3014da966171_3" ;
+	 "Z_ptr_div0#struct_forward_declare(class struct_forward_declare::Z)#18058661690516691263.ce600c6da403f28f2c501df577604772_4" -> "Z_ptr_div0#struct_forward_declare(class struct_forward_declare::Z)#18058661690516691263.ce600c6da403f28f2c501df577604772_3" ;
-"fun_with_Z#struct_forward_declare#10740368644462176169.5b35208973ee3067771f8ce79f1cde31_1" [label="1: Start struct_forward_declare::fun_with_Z\nFormals:  z1:struct_forward_declare::Z*\nLocals:  z2:struct_forward_declare::Z* \n   DECLARE_LOCALS(&return,&z2); [line 24, column 1]\n " color=yellow style=filled]
+"fun_with_Z#struct_forward_declare(class struct_forward_declare::Z)#10740368644462176169.d708d356d0748993ed722a0113d84853_1" [label="1: Start struct_forward_declare::fun_with_Z\nFormals:  z1:struct_forward_declare::Z*\nLocals:  z2:struct_forward_declare::Z* \n   DECLARE_LOCALS(&return,&z2); [line 24, column 1]\n " color=yellow style=filled]
 	
 
-	 "fun_with_Z#struct_forward_declare#10740368644462176169.5b35208973ee3067771f8ce79f1cde31_1" -> "fun_with_Z#struct_forward_declare#10740368644462176169.5b35208973ee3067771f8ce79f1cde31_3" ;
+	 "fun_with_Z#struct_forward_declare(class struct_forward_declare::Z)#10740368644462176169.d708d356d0748993ed722a0113d84853_1" -> "fun_with_Z#struct_forward_declare(class struct_forward_declare::Z)#10740368644462176169.d708d356d0748993ed722a0113d84853_3" ;
-"fun_with_Z#struct_forward_declare#10740368644462176169.5b35208973ee3067771f8ce79f1cde31_2" [label="2: Exit struct_forward_declare::fun_with_Z \n  " color=yellow style=filled]
+"fun_with_Z#struct_forward_declare(class struct_forward_declare::Z)#10740368644462176169.d708d356d0748993ed722a0113d84853_2" [label="2: Exit struct_forward_declare::fun_with_Z \n  " color=yellow style=filled]
 	
 
-"fun_with_Z#struct_forward_declare#10740368644462176169.5b35208973ee3067771f8ce79f1cde31_3" [label="3:  DeclStmt \n   n$1=*&z1:struct_forward_declare::Z* [line 24, column 34]\n  *&z2:struct_forward_declare::Z*=n$1 [line 24, column 26]\n " shape="box"]
+"fun_with_Z#struct_forward_declare(class struct_forward_declare::Z)#10740368644462176169.d708d356d0748993ed722a0113d84853_3" [label="3:  DeclStmt \n   n$1=*&z1:struct_forward_declare::Z* [line 24, column 34]\n  *&z2:struct_forward_declare::Z*=n$1 [line 24, column 26]\n " shape="box"]
 	
 
-	 "fun_with_Z#struct_forward_declare#10740368644462176169.5b35208973ee3067771f8ce79f1cde31_3" -> "fun_with_Z#struct_forward_declare#10740368644462176169.5b35208973ee3067771f8ce79f1cde31_2" ;
+	 "fun_with_Z#struct_forward_declare(class struct_forward_declare::Z)#10740368644462176169.d708d356d0748993ed722a0113d84853_3" -> "fun_with_Z#struct_forward_declare(class struct_forward_declare::Z)#10740368644462176169.d708d356d0748993ed722a0113d84853_2" ;
 "getF#X#struct_forward_declare#(234869530037436282).15dd2207cd05d172845e5598032cd97a_1" [label="1: Start struct_forward_declare::X_getF\nFormals:  this:struct_forward_declare::X*\nLocals:  \n   DECLARE_LOCALS(&return); [line 19, column 3]\n " color=yellow style=filled]
 	
 

infer/tests/codetoanalyze/objc/frontend/fast_enumeration/Fast_enumeration.m.dot

@@ -1,49 +1,49 @@
 /* @generated */
 digraph cfg {
-"fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_1" [label="1: Start A_fast_loop:\nFormals:  self:A* items:NSArray*\nLocals:  item:NSArray* size:int \n   DECLARE_LOCALS(&return,&item,&size); [line 19, column 1]\n " color=yellow style=filled]
+"fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_1" [label="1: Start A_fast_loop:\nFormals:  self:A* items:NSArray*\nLocals:  item:NSArray* size:int \n   DECLARE_LOCALS(&return,&item,&size); [line 19, column 1]\n " color=yellow style=filled]
 	
 
-	 "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_1" -> "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_11" ;
+	 "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_1" -> "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_11" ;
-"fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_2" [label="2: Exit A_fast_loop: \n  " color=yellow style=filled]
+"fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_2" [label="2: Exit A_fast_loop: \n  " color=yellow style=filled]
 	
 
-"fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_3" [label="3:  Return Stmt \n   n$0=*&size:int [line 24, column 10]\n  *&return:int=n$0 [line 24, column 3]\n " shape="box"]
+"fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_3" [label="3:  Return Stmt \n   n$0=*&size:int [line 24, column 10]\n  *&return:int=n$0 [line 24, column 3]\n " shape="box"]
 	
 
-	 "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_3" -> "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_2" ;
+	 "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_3" -> "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_2" ;
-"fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_4" [label="4: + \n  " ]
+"fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_4" [label="4: + \n  " ]
 	
 
-	 "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_4" -> "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_5" ;
+	 "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_4" -> "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_5" ;
-"fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_5" [label="5:  BinaryOperatorStmt: NE \n   n$1=*&item:NSArray* [line 21, column 3]\n " shape="box"]
+"fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_5" [label="5:  BinaryOperatorStmt: NE \n   n$1=*&item:NSArray* [line 21, column 3]\n " shape="box"]
 	
 
-	 "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_5" -> "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_6" ;
+	 "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_5" -> "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_6" ;
-	 "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_5" -> "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_7" ;
+	 "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_5" -> "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_7" ;
-"fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_6" [label="6: Prune (true branch, while) \n   PRUNE((n$1 != null), true); [line 21, column 3]\n " shape="invhouse"]
+"fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_6" [label="6: Prune (true branch, while) \n   PRUNE((n$1 != null), true); [line 21, column 3]\n " shape="invhouse"]
 	
 
-	 "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_6" -> "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_9" ;
+	 "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_6" -> "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_9" ;
-"fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_7" [label="7: Prune (false branch, while) \n   PRUNE(!(n$1 != null), false); [line 21, column 3]\n " shape="invhouse"]
+"fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_7" [label="7: Prune (false branch, while) \n   PRUNE(!(n$1 != null), false); [line 21, column 3]\n " shape="invhouse"]
 	
 
-	 "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_7" -> "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_3" ;
+	 "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_7" -> "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_3" ;
-"fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_8" [label="8:  BinaryOperatorStmt: Assign \n   n$2=*&items:NSArray* [line 21, column 25]\n  n$3=_fun_NSArray_nextObject(n$2:NSArray*) virtual [line 21, column 3]\n  *&item:NSArray*=n$3 [line 21, column 3]\n " shape="box"]
+"fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_8" [label="8:  BinaryOperatorStmt: Assign \n   n$2=*&items:NSArray* [line 21, column 25]\n  n$3=_fun_NSArray_nextObject(n$2:NSArray*) virtual [line 21, column 3]\n  *&item:NSArray*=n$3 [line 21, column 3]\n " shape="box"]
 	
 
-	 "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_8" -> "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_4" ;
+	 "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_8" -> "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_4" ;
-"fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_9" [label="9:  BinaryOperatorStmt: AddAssign \n   n$4=*&item:NSArray* [line 22, column 14]\n  n$5=_fun_NSArray_count(n$4:NSArray*) [line 22, column 13]\n  n$6=*&size:int [line 22, column 5]\n  *&size:int=(n$6 + n$5) [line 22, column 5]\n " shape="box"]
+"fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_9" [label="9:  BinaryOperatorStmt: AddAssign \n   n$4=*&item:NSArray* [line 22, column 14]\n  n$5=_fun_NSArray_count(n$4:NSArray*) [line 22, column 13]\n  n$6=*&size:int [line 22, column 5]\n  *&size:int=(n$6 + n$5) [line 22, column 5]\n " shape="box"]
 	
 
-	 "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_9" -> "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_8" ;
+	 "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_9" -> "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_8" ;
-"fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_10" [label="10:  BinaryOperatorStmt: Assign \n   n$8=*&items:NSArray* [line 21, column 25]\n  n$9=_fun_NSArray_nextObject(n$8:NSArray*) virtual [line 21, column 3]\n  *&item:NSArray*=n$9 [line 21, column 3]\n " shape="box"]
+"fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_10" [label="10:  BinaryOperatorStmt: Assign \n   n$8=*&items:NSArray* [line 21, column 25]\n  n$9=_fun_NSArray_nextObject(n$8:NSArray*) virtual [line 21, column 3]\n  *&item:NSArray*=n$9 [line 21, column 3]\n " shape="box"]
 	
 
-	 "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_10" -> "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_4" ;
+	 "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_10" -> "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_4" ;
-"fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_11" [label="11:  DeclStmt \n   *&size:int=0 [line 20, column 3]\n " shape="box"]
+"fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_11" [label="11:  DeclStmt \n   *&size:int=0 [line 20, column 3]\n " shape="box"]
 	
 
-	 "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_11" -> "fast_loop:#A#instance.9cd800cb29c7a698fe4cc371a7448f6e_10" ;
+	 "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_11" -> "fast_loop:#A(class NSArray)#instance.26b39d1106e4365a40bc2f6305401611_10" ;
 "fast_loop_no_crash#A#instance.eaee56a1051009329a3989c3a10fb432_1" [label="1: Start A_fast_loop_no_crash\nFormals:  self:A*\nLocals:  obj:objc_object* \n   DECLARE_LOCALS(&return,&obj); [line 36, column 1]\n " color=yellow style=filled]
 	
 
@@ -84,44 +84,44 @@ digraph cfg {
 	
 
 	 "fast_loop_no_crash#A#instance.eaee56a1051009329a3989c3a10fb432_10" -> "fast_loop_no_crash#A#instance.eaee56a1051009329a3989c3a10fb432_9" ;
-"while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_1" [label="1: Start A_while_loop:\nFormals:  self:A* items:NSArray*\nLocals:  item:NSArray* size:int \n   DECLARE_LOCALS(&return,&item,&size); [line 27, column 1]\n " color=yellow style=filled]
+"while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_1" [label="1: Start A_while_loop:\nFormals:  self:A* items:NSArray*\nLocals:  item:NSArray* size:int \n   DECLARE_LOCALS(&return,&item,&size); [line 27, column 1]\n " color=yellow style=filled]
 	
 
-	 "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_1" -> "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_10" ;
+	 "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_1" -> "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_10" ;
-"while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_2" [label="2: Exit A_while_loop: \n  " color=yellow style=filled]
+"while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_2" [label="2: Exit A_while_loop: \n  " color=yellow style=filled]
 	
 
-"while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_3" [label="3:  Return Stmt \n   n$10=*&size:int [line 33, column 10]\n  *&return:int=n$10 [line 33, column 3]\n " shape="box"]
+"while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_3" [label="3:  Return Stmt \n   n$10=*&size:int [line 33, column 10]\n  *&return:int=n$10 [line 33, column 3]\n " shape="box"]
 	
 
-	 "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_3" -> "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_2" ;
+	 "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_3" -> "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_2" ;
-"while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_4" [label="4: + \n  " ]
+"while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_4" [label="4: + \n  " ]
 	
 
-	 "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_4" -> "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_5" ;
+	 "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_4" -> "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_5" ;
-"while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_5" [label="5:  BinaryOperatorStmt: Assign \n   n$11=*&items:NSArray* [line 30, column 19]\n  n$12=_fun_NSArray_objectAtIndex:(n$11:NSArray*,3:unsigned long) virtual [line 30, column 18]\n  *&item:NSArray*=n$12 [line 30, column 11]\n  n$13=*&item:NSArray* [line 30, column 11]\n " shape="box"]
+"while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_5" [label="5:  BinaryOperatorStmt: Assign \n   n$11=*&items:NSArray* [line 30, column 19]\n  n$12=_fun_NSArray_objectAtIndex:(n$11:NSArray*,3:unsigned long) virtual [line 30, column 18]\n  *&item:NSArray*=n$12 [line 30, column 11]\n  n$13=*&item:NSArray* [line 30, column 11]\n " shape="box"]
 	
 
-	 "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_5" -> "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_6" ;
+	 "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_5" -> "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_6" ;
-	 "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_5" -> "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_7" ;
+	 "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_5" -> "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_7" ;
-"while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_6" [label="6: Prune (true branch, while) \n   PRUNE(n$13, true); [line 30, column 11]\n " shape="invhouse"]
+"while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_6" [label="6: Prune (true branch, while) \n   PRUNE(n$13, true); [line 30, column 11]\n " shape="invhouse"]
 	
 
-	 "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_6" -> "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_8" ;
+	 "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_6" -> "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_8" ;
-"while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_7" [label="7: Prune (false branch, while) \n   PRUNE(!n$13, false); [line 30, column 11]\n " shape="invhouse"]
+"while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_7" [label="7: Prune (false branch, while) \n   PRUNE(!n$13, false); [line 30, column 11]\n " shape="invhouse"]
 	
 
-	 "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_7" -> "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_3" ;
+	 "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_7" -> "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_3" ;
-"while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_8" [label="8:  BinaryOperatorStmt: AddAssign \n   n$14=*&item:NSArray* [line 31, column 14]\n  n$15=_fun_NSArray_count(n$14:NSArray*) [line 31, column 13]\n  n$16=*&size:int [line 31, column 5]\n  *&size:int=(n$16 + n$15) [line 31, column 5]\n " shape="box"]
+"while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_8" [label="8:  BinaryOperatorStmt: AddAssign \n   n$14=*&item:NSArray* [line 31, column 14]\n  n$15=_fun_NSArray_count(n$14:NSArray*) [line 31, column 13]\n  n$16=*&size:int [line 31, column 5]\n  *&size:int=(n$16 + n$15) [line 31, column 5]\n " shape="box"]
 	
 
-	 "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_8" -> "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_4" ;
+	 "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_8" -> "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_4" ;
-"while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_9" [label="9:  DeclStmt \n   *&item:NSArray*=null [line 29, column 3]\n " shape="box"]
+"while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_9" [label="9:  DeclStmt \n   *&item:NSArray*=null [line 29, column 3]\n " shape="box"]
 	
 
-	 "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_9" -> "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_4" ;
+	 "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_9" -> "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_4" ;
-"while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_10" [label="10:  DeclStmt \n   *&size:int=0 [line 28, column 3]\n " shape="box"]
+"while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_10" [label="10:  DeclStmt \n   *&size:int=0 [line 28, column 3]\n " shape="box"]
 	
 
-	 "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_10" -> "while_loop:#A#instance.30e9692b3abdc47bcb262e353f292a28_9" ;
+	 "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_10" -> "while_loop:#A(class NSArray)#instance.225f55f19f886cfaa14fc056eca2399b_9" ;
 }

infer/tests/codetoanalyze/objc/frontend/property/Property_getter.m.dot

@@ -1,14 +1,14 @@
 /* @generated */
 digraph cfg {
-"addTarget:#A#instance.c7aa036c11ea8510fec5cb7bd35bee01_1" [label="1: Start A_addTarget:\nFormals:  self:A* target:A*\nLocals:  \n   DECLARE_LOCALS(&return); [line 16, column 1]\n " color=yellow style=filled]
+"addTarget:#A(class A)#instance.ca26ddd02ac11fb266531b38b6edef27_1" [label="1: Start A_addTarget:\nFormals:  self:A* target:A*\nLocals:  \n   DECLARE_LOCALS(&return); [line 16, column 1]\n " color=yellow style=filled]
 	
 
-	 "addTarget:#A#instance.c7aa036c11ea8510fec5cb7bd35bee01_1" -> "addTarget:#A#instance.c7aa036c11ea8510fec5cb7bd35bee01_3" ;
+	 "addTarget:#A(class A)#instance.ca26ddd02ac11fb266531b38b6edef27_1" -> "addTarget:#A(class A)#instance.ca26ddd02ac11fb266531b38b6edef27_3" ;
-"addTarget:#A#instance.c7aa036c11ea8510fec5cb7bd35bee01_2" [label="2: Exit A_addTarget: \n  " color=yellow style=filled]
+"addTarget:#A(class A)#instance.ca26ddd02ac11fb266531b38b6edef27_2" [label="2: Exit A_addTarget: \n  " color=yellow style=filled]
 	
 
-"addTarget:#A#instance.c7aa036c11ea8510fec5cb7bd35bee01_3" [label="3:  Return Stmt \n   n$0=*&target:A* [line 17, column 10]\n  n$1=_fun_A_x(n$0:A*) [line 17, column 17]\n  *&return:int=n$1 [line 17, column 3]\n " shape="box"]
+"addTarget:#A(class A)#instance.ca26ddd02ac11fb266531b38b6edef27_3" [label="3:  Return Stmt \n   n$0=*&target:A* [line 17, column 10]\n  n$1=_fun_A_x(n$0:A*) [line 17, column 17]\n  *&return:int=n$1 [line 17, column 3]\n " shape="box"]
 	
 
-	 "addTarget:#A#instance.c7aa036c11ea8510fec5cb7bd35bee01_3" -> "addTarget:#A#instance.c7aa036c11ea8510fec5cb7bd35bee01_2" ;
+	 "addTarget:#A(class A)#instance.ca26ddd02ac11fb266531b38b6edef27_3" -> "addTarget:#A(class A)#instance.ca26ddd02ac11fb266531b38b6edef27_2" ;
 }

infer/tests/codetoanalyze/objc/frontend/self_static/Self.m.dot

@@ -72,42 +72,42 @@ digraph cfg {
 "test_class#A#class.97324b18f626e66a3c32cec03286eb8d_2" [label="2: Exit A_test_class \n  " color=yellow style=filled]
 	
 
-"used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_1" [label="1: Start A_used_in_binary_op:\nFormals:  c:objc_class*\nLocals:  \n   DECLARE_LOCALS(&return); [line 92, column 1]\n " color=yellow style=filled]
+"used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_1" [label="1: Start A_used_in_binary_op:\nFormals:  c:objc_class*\nLocals:  \n   DECLARE_LOCALS(&return); [line 92, column 1]\n " color=yellow style=filled]
 	
 
-	 "used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_1" -> "used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_5" ;
+	 "used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_1" -> "used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_5" ;
-"used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_2" [label="2: Exit A_used_in_binary_op: \n  " color=yellow style=filled]
+"used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_2" [label="2: Exit A_used_in_binary_op: \n  " color=yellow style=filled]
 	
 
-"used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_3" [label="3: + \n  " ]
+"used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_3" [label="3: + \n  " ]
 	
 
-	 "used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_3" -> "used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_4" ;
+	 "used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_3" -> "used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_4" ;
-"used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_4" [label="4:  between_join_and_exit \n  " shape="box"]
+"used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
-	 "used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_4" -> "used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_2" ;
+	 "used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_4" -> "used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_2" ;
-"used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_5" [label="5:  BinaryOperatorStmt: NE \n   n$23=*sizeof(t=A):objc_class* [line 93, column 7]\n  n$24=*&c:objc_class* [line 93, column 15]\n " shape="box"]
+"used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_5" [label="5:  BinaryOperatorStmt: NE \n   n$23=*sizeof(t=A):objc_class* [line 93, column 7]\n  n$24=*&c:objc_class* [line 93, column 15]\n " shape="box"]
 	
 
-	 "used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_5" -> "used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_6" ;
+	 "used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_5" -> "used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_6" ;
-	 "used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_5" -> "used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_7" ;
+	 "used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_5" -> "used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_7" ;
-"used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_6" [label="6: Prune (true branch, if) \n   PRUNE((n$23 != n$24), true); [line 93, column 7]\n " shape="invhouse"]
+"used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_6" [label="6: Prune (true branch, if) \n   PRUNE((n$23 != n$24), true); [line 93, column 7]\n " shape="invhouse"]
 	
 
-	 "used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_6" -> "used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_8" ;
+	 "used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_6" -> "used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_8" ;
-"used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$23 != n$24), false); [line 93, column 7]\n " shape="invhouse"]
+"used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_7" [label="7: Prune (false branch, if) \n   PRUNE(!(n$23 != n$24), false); [line 93, column 7]\n " shape="invhouse"]
 	
 
-	 "used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_7" -> "used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_9" ;
+	 "used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_7" -> "used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_9" ;
-"used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_8" [label="8:  Return Stmt \n   *&return:int=1 [line 94, column 5]\n " shape="box"]
+"used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_8" [label="8:  Return Stmt \n   *&return:int=1 [line 94, column 5]\n " shape="box"]
 	
 
-	 "used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_8" -> "used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_2" ;
+	 "used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_8" -> "used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_2" ;
-"used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_9" [label="9:  Return Stmt \n   *&return:int=0 [line 96, column 5]\n " shape="box"]
+"used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_9" [label="9:  Return Stmt \n   *&return:int=0 [line 96, column 5]\n " shape="box"]
 	
 
-	 "used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_9" -> "used_in_binary_op:#A#class.9f855a338b344f4b5060d2d4a2a955ed_2" ;
+	 "used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_9" -> "used_in_binary_op:#A(struct objc_class)#class.da9fc6494d494952f5246c6cf4478263_2" ;
 "call_alloc_instance#A#instance.70a20314d55f22fb46408deb70d9aabb_1" [label="1: Start A_call_alloc_instance\nFormals:  self:A*\nLocals:  \n   DECLARE_LOCALS(&return); [line 59, column 1]\n " color=yellow style=filled]
 	
 
@@ -196,17 +196,17 @@ digraph cfg {
 "test#A#instance.561395dd5ffb844cbbb6c52cf21ce047_2" [label="2: Exit A_test \n  " color=yellow style=filled]
 	
 
-"use_class_in_other_ways:#A#instance.cbf4e00d3f8c81248ee881a47ed7e84f_1" [label="1: Start A_use_class_in_other_ways:\nFormals:  self:A* object:B*\nLocals:  \n   DECLARE_LOCALS(&return); [line 76, column 1]\n " color=yellow style=filled]
+"use_class_in_other_ways:#A(class B)#instance.7a96604c2c855db834d214f72f83a306_1" [label="1: Start A_use_class_in_other_ways:\nFormals:  self:A* object:B*\nLocals:  \n   DECLARE_LOCALS(&return); [line 76, column 1]\n " color=yellow style=filled]
 	
 
-	 "use_class_in_other_ways:#A#instance.cbf4e00d3f8c81248ee881a47ed7e84f_1" -> "use_class_in_other_ways:#A#instance.cbf4e00d3f8c81248ee881a47ed7e84f_3" ;
+	 "use_class_in_other_ways:#A(class B)#instance.7a96604c2c855db834d214f72f83a306_1" -> "use_class_in_other_ways:#A(class B)#instance.7a96604c2c855db834d214f72f83a306_3" ;
-"use_class_in_other_ways:#A#instance.cbf4e00d3f8c81248ee881a47ed7e84f_2" [label="2: Exit A_use_class_in_other_ways: \n  " color=yellow style=filled]
+"use_class_in_other_ways:#A(class B)#instance.7a96604c2c855db834d214f72f83a306_2" [label="2: Exit A_use_class_in_other_ways: \n  " color=yellow style=filled]
 	
 
-"use_class_in_other_ways:#A#instance.cbf4e00d3f8c81248ee881a47ed7e84f_3" [label="3:  Return Stmt \n   n$16=*&object:B* [line 77, column 11]\n  n$17=_fun_B_isC:(n$16:B*,sizeof(t=A):unsigned long) virtual [line 77, column 10]\n  *&return:_Bool=n$17 [line 77, column 3]\n " shape="box"]
+"use_class_in_other_ways:#A(class B)#instance.7a96604c2c855db834d214f72f83a306_3" [label="3:  Return Stmt \n   n$16=*&object:B* [line 77, column 11]\n  n$17=_fun_B_isC:(n$16:B*,sizeof(t=A):unsigned long) virtual [line 77, column 10]\n  *&return:_Bool=n$17 [line 77, column 3]\n " shape="box"]
 	
 
-	 "use_class_in_other_ways:#A#instance.cbf4e00d3f8c81248ee881a47ed7e84f_3" -> "use_class_in_other_ways:#A#instance.cbf4e00d3f8c81248ee881a47ed7e84f_2" ;
+	 "use_class_in_other_ways:#A(class B)#instance.7a96604c2c855db834d214f72f83a306_3" -> "use_class_in_other_ways:#A(class B)#instance.7a96604c2c855db834d214f72f83a306_2" ;
 "b_m#B#class.82af96ad418803b2f96fc1bfa1572c10_1" [label="1: Start B_b_m\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 18, column 1]\n " color=yellow style=filled]
 	
 
@@ -214,15 +214,15 @@ digraph cfg {
 "b_m#B#class.82af96ad418803b2f96fc1bfa1572c10_2" [label="2: Exit B_b_m \n  " color=yellow style=filled]
 	
 
-"isC:#B#instance.d3c47b42de9626ee49d20d57a1f26839_1" [label="1: Start B_isC:\nFormals:  self:B* aClass:objc_class*\nLocals:  \n   DECLARE_LOCALS(&return); [line 21, column 1]\n " color=yellow style=filled]
+"isC:#B(struct objc_class)#instance.ab14fb7a19510df6032d65aa27b0f12d_1" [label="1: Start B_isC:\nFormals:  self:B* aClass:objc_class*\nLocals:  \n   DECLARE_LOCALS(&return); [line 21, column 1]\n " color=yellow style=filled]
 	
 
-	 "isC:#B#instance.d3c47b42de9626ee49d20d57a1f26839_1" -> "isC:#B#instance.d3c47b42de9626ee49d20d57a1f26839_3" ;
+	 "isC:#B(struct objc_class)#instance.ab14fb7a19510df6032d65aa27b0f12d_1" -> "isC:#B(struct objc_class)#instance.ab14fb7a19510df6032d65aa27b0f12d_3" ;
-"isC:#B#instance.d3c47b42de9626ee49d20d57a1f26839_2" [label="2: Exit B_isC: \n  " color=yellow style=filled]
+"isC:#B(struct objc_class)#instance.ab14fb7a19510df6032d65aa27b0f12d_2" [label="2: Exit B_isC: \n  " color=yellow style=filled]
 	
 
-"isC:#B#instance.d3c47b42de9626ee49d20d57a1f26839_3" [label="3:  Return Stmt \n   *&return:_Bool=1 [line 22, column 3]\n " shape="box"]
+"isC:#B(struct objc_class)#instance.ab14fb7a19510df6032d65aa27b0f12d_3" [label="3:  Return Stmt \n   *&return:_Bool=1 [line 22, column 3]\n " shape="box"]
 	
 
-	 "isC:#B#instance.d3c47b42de9626ee49d20d57a1f26839_3" -> "isC:#B#instance.d3c47b42de9626ee49d20d57a1f26839_2" ;
+	 "isC:#B(struct objc_class)#instance.ab14fb7a19510df6032d65aa27b0f12d_3" -> "isC:#B(struct objc_class)#instance.ab14fb7a19510df6032d65aa27b0f12d_2" ;
 }

infer/tests/codetoanalyze/objc/shared/annotations/nonnull_annotations.m.dot

@@ -11,36 +11,36 @@ digraph cfg {
 	
 
 	 "init#A#instance.eee79aaaddd644404e17691a7e7d809a_3" -> "init#A#instance.eee79aaaddd644404e17691a7e7d809a_2" ;
-"test1:#A#instance.ebd5eea0b404af619c50927f18bab354_1" [label="1: Start A_test1:\nFormals:  self:A* a:A*\nLocals:  aa:A* \n   DECLARE_LOCALS(&return,&aa); [line 23, column 1]\n " color=yellow style=filled]
+"test1:#A(class A)#instance.61440711d4e2388d4be3731c34a61289_1" [label="1: Start A_test1:\nFormals:  self:A* a:A*\nLocals:  aa:A* \n   DECLARE_LOCALS(&return,&aa); [line 23, column 1]\n " color=yellow style=filled]
 	
 
-	 "test1:#A#instance.ebd5eea0b404af619c50927f18bab354_1" -> "test1:#A#instance.ebd5eea0b404af619c50927f18bab354_4" ;
+	 "test1:#A(class A)#instance.61440711d4e2388d4be3731c34a61289_1" -> "test1:#A(class A)#instance.61440711d4e2388d4be3731c34a61289_4" ;
-"test1:#A#instance.ebd5eea0b404af619c50927f18bab354_2" [label="2: Exit A_test1: \n  " color=yellow style=filled]
+"test1:#A(class A)#instance.61440711d4e2388d4be3731c34a61289_2" [label="2: Exit A_test1: \n  " color=yellow style=filled]
 	
 
-"test1:#A#instance.ebd5eea0b404af619c50927f18bab354_3" [label="3:  Return Stmt \n   n$1=*&aa:A* [line 25, column 10]\n  n$2=*n$1.x:int [line 25, column 10]\n  *&return:int=n$2 [line 25, column 3]\n " shape="box"]
+"test1:#A(class A)#instance.61440711d4e2388d4be3731c34a61289_3" [label="3:  Return Stmt \n   n$1=*&aa:A* [line 25, column 10]\n  n$2=*n$1.x:int [line 25, column 10]\n  *&return:int=n$2 [line 25, column 3]\n " shape="box"]
 	
 
-	 "test1:#A#instance.ebd5eea0b404af619c50927f18bab354_3" -> "test1:#A#instance.ebd5eea0b404af619c50927f18bab354_2" ;
+	 "test1:#A(class A)#instance.61440711d4e2388d4be3731c34a61289_3" -> "test1:#A(class A)#instance.61440711d4e2388d4be3731c34a61289_2" ;
-"test1:#A#instance.ebd5eea0b404af619c50927f18bab354_4" [label="4:  DeclStmt \n   n$3=*&a:A* [line 24, column 12]\n  n$4=_fun_A_child(n$3:A*) [line 24, column 11]\n  *&aa:A*=n$4 [line 24, column 3]\n " shape="box"]
+"test1:#A(class A)#instance.61440711d4e2388d4be3731c34a61289_4" [label="4:  DeclStmt \n   n$3=*&a:A* [line 24, column 12]\n  n$4=_fun_A_child(n$3:A*) [line 24, column 11]\n  *&aa:A*=n$4 [line 24, column 3]\n " shape="box"]
 	
 
-	 "test1:#A#instance.ebd5eea0b404af619c50927f18bab354_4" -> "test1:#A#instance.ebd5eea0b404af619c50927f18bab354_3" ;
+	 "test1:#A(class A)#instance.61440711d4e2388d4be3731c34a61289_4" -> "test1:#A(class A)#instance.61440711d4e2388d4be3731c34a61289_3" ;
-"test2:#A#instance.da747e16db8f3c52e20363adcaf73615_1" [label="1: Start A_test2:\nFormals:  self:A* a:A*\nLocals:  aa:A*\nAnnotation: <> A_test2:(<> <_Nonnull>) \n   DECLARE_LOCALS(&return,&aa); [line 28, column 1]\n " color=yellow style=filled]
+"test2:#A(class A)#instance.3b9594b6f023617f19d57dee6d35cf80_1" [label="1: Start A_test2:\nFormals:  self:A* a:A*\nLocals:  aa:A*\nAnnotation: <> A_test2:(<> <_Nonnull>) \n   DECLARE_LOCALS(&return,&aa); [line 28, column 1]\n " color=yellow style=filled]
 	
 
-	 "test2:#A#instance.da747e16db8f3c52e20363adcaf73615_1" -> "test2:#A#instance.da747e16db8f3c52e20363adcaf73615_4" ;
+	 "test2:#A(class A)#instance.3b9594b6f023617f19d57dee6d35cf80_1" -> "test2:#A(class A)#instance.3b9594b6f023617f19d57dee6d35cf80_4" ;
-"test2:#A#instance.da747e16db8f3c52e20363adcaf73615_2" [label="2: Exit A_test2: \n  " color=yellow style=filled]
+"test2:#A(class A)#instance.3b9594b6f023617f19d57dee6d35cf80_2" [label="2: Exit A_test2: \n  " color=yellow style=filled]
 	
 
-"test2:#A#instance.da747e16db8f3c52e20363adcaf73615_3" [label="3:  Return Stmt \n   n$5=*&aa:A* [line 30, column 10]\n  n$6=*n$5.x:int [line 30, column 10]\n  *&return:int=n$6 [line 30, column 3]\n " shape="box"]
+"test2:#A(class A)#instance.3b9594b6f023617f19d57dee6d35cf80_3" [label="3:  Return Stmt \n   n$5=*&aa:A* [line 30, column 10]\n  n$6=*n$5.x:int [line 30, column 10]\n  *&return:int=n$6 [line 30, column 3]\n " shape="box"]
 	
 
-	 "test2:#A#instance.da747e16db8f3c52e20363adcaf73615_3" -> "test2:#A#instance.da747e16db8f3c52e20363adcaf73615_2" ;
+	 "test2:#A(class A)#instance.3b9594b6f023617f19d57dee6d35cf80_3" -> "test2:#A(class A)#instance.3b9594b6f023617f19d57dee6d35cf80_2" ;
-"test2:#A#instance.da747e16db8f3c52e20363adcaf73615_4" [label="4:  DeclStmt \n   n$7=*&a:A* [line 29, column 12]\n  n$8=_fun_A_child(n$7:A*) [line 29, column 11]\n  *&aa:A*=n$8 [line 29, column 3]\n " shape="box"]
+"test2:#A(class A)#instance.3b9594b6f023617f19d57dee6d35cf80_4" [label="4:  DeclStmt \n   n$7=*&a:A* [line 29, column 12]\n  n$8=_fun_A_child(n$7:A*) [line 29, column 11]\n  *&aa:A*=n$8 [line 29, column 3]\n " shape="box"]
 	
 
-	 "test2:#A#instance.da747e16db8f3c52e20363adcaf73615_4" -> "test2:#A#instance.da747e16db8f3c52e20363adcaf73615_3" ;
+	 "test2:#A(class A)#instance.3b9594b6f023617f19d57dee6d35cf80_4" -> "test2:#A(class A)#instance.3b9594b6f023617f19d57dee6d35cf80_3" ;
 "test3:#A#instance.28bc2df8df797b21818dc2037239f326_1" [label="1: Start A_test3:\nFormals:  self:A* successBlock:_fn_(*)\nLocals:  \n   DECLARE_LOCALS(&return); [line 33, column 1]\n " color=yellow style=filled]
 	
 

infer/tests/codetoanalyze/objc/shared/annotations/nullable_annotations.m.dot

@@ -19,17 +19,17 @@ digraph cfg {
 	
 
 	 "npe_property_nullable.ba4461b16b55481ab8de5124734d2bf3_5" -> "npe_property_nullable.ba4461b16b55481ab8de5124734d2bf3_4" ;
-"initWithName:#User#instance.e074182198c39906ef7606c27f655686_1" [label="1: Start User_initWithName:\nFormals:  self:User* name:NSString*\nLocals: \nAnnotation: <_Nullable> User_initWithName:(<> <_Nullable>) \n   DECLARE_LOCALS(&return); [line 29, column 1]\n " color=yellow style=filled]
+"initWithName:#User(class NSString)#instance.1755f5e97d3aa5318dd071b864db9bb7_1" [label="1: Start User_initWithName:\nFormals:  self:User* name:NSString*\nLocals: \nAnnotation: <_Nullable> User_initWithName:(<> <_Nullable>) \n   DECLARE_LOCALS(&return); [line 29, column 1]\n " color=yellow style=filled]
 	
 
-	 "initWithName:#User#instance.e074182198c39906ef7606c27f655686_1" -> "initWithName:#User#instance.e074182198c39906ef7606c27f655686_3" ;
+	 "initWithName:#User(class NSString)#instance.1755f5e97d3aa5318dd071b864db9bb7_1" -> "initWithName:#User(class NSString)#instance.1755f5e97d3aa5318dd071b864db9bb7_3" ;
-"initWithName:#User#instance.e074182198c39906ef7606c27f655686_2" [label="2: Exit User_initWithName: \n  " color=yellow style=filled]
+"initWithName:#User(class NSString)#instance.1755f5e97d3aa5318dd071b864db9bb7_2" [label="2: Exit User_initWithName: \n  " color=yellow style=filled]
 	
 
-"initWithName:#User#instance.e074182198c39906ef7606c27f655686_3" [label="3:  Return Stmt \n   n$0=*&self:User* [line 30, column 10]\n  *&return:objc_object*=n$0 [line 30, column 3]\n " shape="box"]
+"initWithName:#User(class NSString)#instance.1755f5e97d3aa5318dd071b864db9bb7_3" [label="3:  Return Stmt \n   n$0=*&self:User* [line 30, column 10]\n  *&return:objc_object*=n$0 [line 30, column 3]\n " shape="box"]
 	
 
-	 "initWithName:#User#instance.e074182198c39906ef7606c27f655686_3" -> "initWithName:#User#instance.e074182198c39906ef7606c27f655686_2" ;
+	 "initWithName:#User(class NSString)#instance.1755f5e97d3aa5318dd071b864db9bb7_3" -> "initWithName:#User(class NSString)#instance.1755f5e97d3aa5318dd071b864db9bb7_2" ;
 "otherUserName#User#instance.7b86b8d2191be71dec320c3203056cd7_1" [label="1: Start User_otherUserName\nFormals:  self:User*\nLocals:  ou:User* \n   DECLARE_LOCALS(&return,&ou); [line 48, column 1]\n " color=yellow style=filled]
 	
 
@@ -56,17 +56,17 @@ digraph cfg {
 	
 
 	 "tellMeSomething#User#instance.5ed632cdc46e048613dbc2d7030419cf_3" -> "tellMeSomething#User#instance.5ed632cdc46e048613dbc2d7030419cf_2" ;
-"tellMeSomething:and:and:and:#User#instance.eedc1cc1313630d342198a5528c9eaec_1" [label="1: Start User_tellMeSomething:and:and:and:\nFormals:  self:User* s1:NSString* s2:NSString* s3:NSString* s4:NSString*\nLocals: \nAnnotation: <> User_tellMeSomething:and:and:and:(<> <> <> <_Nullable> <>) \n   DECLARE_LOCALS(&return); [line 41, column 1]\n " color=yellow style=filled]
+"tellMeSomething:and:and:and:#User(class NSString,class NSString,class NSString,class NSString)#insta.486c16409126581cc0a8d6141cb33574_1" [label="1: Start User_tellMeSomething:and:and:and:\nFormals:  self:User* s1:NSString* s2:NSString* s3:NSString* s4:NSString*\nLocals: \nAnnotation: <> User_tellMeSomething:and:and:and:(<> <> <> <_Nullable> <>) \n   DECLARE_LOCALS(&return); [line 41, column 1]\n " color=yellow style=filled]
 	
 
-	 "tellMeSomething:and:and:and:#User#instance.eedc1cc1313630d342198a5528c9eaec_1" -> "tellMeSomething:and:and:and:#User#instance.eedc1cc1313630d342198a5528c9eaec_3" ;
+	 "tellMeSomething:and:and:and:#User(class NSString,class NSString,class NSString,class NSString)#insta.486c16409126581cc0a8d6141cb33574_1" -> "tellMeSomething:and:and:and:#User(class NSString,class NSString,class NSString,class NSString)#insta.486c16409126581cc0a8d6141cb33574_3" ;
-"tellMeSomething:and:and:and:#User#instance.eedc1cc1313630d342198a5528c9eaec_2" [label="2: Exit User_tellMeSomething:and:and:and: \n  " color=yellow style=filled]
+"tellMeSomething:and:and:and:#User(class NSString,class NSString,class NSString,class NSString)#insta.486c16409126581cc0a8d6141cb33574_2" [label="2: Exit User_tellMeSomething:and:and:and: \n  " color=yellow style=filled]
 	
 
-"tellMeSomething:and:and:and:#User#instance.eedc1cc1313630d342198a5528c9eaec_3" [label="3:  Return Stmt \n   n$3=_fun_NSString_stringWithUTF8String:(\"Hi\":char* const ) [line 45, column 10]\n  *&return:NSString*=n$3 [line 45, column 3]\n " shape="box"]
+"tellMeSomething:and:and:and:#User(class NSString,class NSString,class NSString,class NSString)#insta.486c16409126581cc0a8d6141cb33574_3" [label="3:  Return Stmt \n   n$3=_fun_NSString_stringWithUTF8String:(\"Hi\":char* const ) [line 45, column 10]\n  *&return:NSString*=n$3 [line 45, column 3]\n " shape="box"]
 	
 
-	 "tellMeSomething:and:and:and:#User#instance.eedc1cc1313630d342198a5528c9eaec_3" -> "tellMeSomething:and:and:and:#User#instance.eedc1cc1313630d342198a5528c9eaec_2" ;
+	 "tellMeSomething:and:and:and:#User(class NSString,class NSString,class NSString,class NSString)#insta.486c16409126581cc0a8d6141cb33574_3" -> "tellMeSomething:and:and:and:#User(class NSString,class NSString,class NSString,class NSString)#insta.486c16409126581cc0a8d6141cb33574_2" ;
 "tellMeSomethingNotNullable#User#instance.245a0cd3ebd907a23c846151021de342_1" [label="1: Start User_tellMeSomethingNotNullable\nFormals:  self:User*\nLocals:  \n   DECLARE_LOCALS(&return); [line 37, column 1]\n " color=yellow style=filled]
 	
 

infer/tests/codetoanalyze/objc/shared/block/BlockVar.m.dot

@@ -44,21 +44,21 @@ digraph cfg {
 	
 
 	 "objc_blockBlockVar_capturedNullDeref_4.1bdaeaa4f18868112cc189c7d6e42bf9_3" -> "objc_blockBlockVar_capturedNullDeref_4.1bdaeaa4f18868112cc189c7d6e42bf9_2" ;
-"objc_blockBlockVar_navigateToURLInBackground_1(,).214e3f42254fcf8bcc046c91bb4b2a89_1" [label="1: Start objc_blockBlockVar_navigateToURLInBackground_1\nFormals:  a:int b:int\nLocals:  res:int \n   DECLARE_LOCALS(&return,&res); [line 17, column 35]\n " color=yellow style=filled]
+"objc_blockBlockVar_navigateToURLInBackground_1.3f33ba208d462b81a235e03653494b18_1" [label="1: Start objc_blockBlockVar_navigateToURLInBackground_1\nFormals:  a:int b:int\nLocals:  res:int \n   DECLARE_LOCALS(&return,&res); [line 17, column 35]\n " color=yellow style=filled]
 	
 
-	 "objc_blockBlockVar_navigateToURLInBackground_1(,).214e3f42254fcf8bcc046c91bb4b2a89_1" -> "objc_blockBlockVar_navigateToURLInBackground_1(,).214e3f42254fcf8bcc046c91bb4b2a89_4" ;
+	 "objc_blockBlockVar_navigateToURLInBackground_1.3f33ba208d462b81a235e03653494b18_1" -> "objc_blockBlockVar_navigateToURLInBackground_1.3f33ba208d462b81a235e03653494b18_4" ;
-"objc_blockBlockVar_navigateToURLInBackground_1(,).214e3f42254fcf8bcc046c91bb4b2a89_2" [label="2: Exit objc_blockBlockVar_navigateToURLInBackground_1 \n  " color=yellow style=filled]
+"objc_blockBlockVar_navigateToURLInBackground_1.3f33ba208d462b81a235e03653494b18_2" [label="2: Exit objc_blockBlockVar_navigateToURLInBackground_1 \n  " color=yellow style=filled]
 	
 
-"objc_blockBlockVar_navigateToURLInBackground_1(,).214e3f42254fcf8bcc046c91bb4b2a89_3" [label="3:  Return Stmt \n   n$7=*&a:int [line 19, column 12]\n  n$8=*&b:int [line 19, column 16]\n  n$9=*&res:int [line 19, column 20]\n  *&return:int=((n$7 + n$8) + n$9) [line 19, column 5]\n " shape="box"]
+"objc_blockBlockVar_navigateToURLInBackground_1.3f33ba208d462b81a235e03653494b18_3" [label="3:  Return Stmt \n   n$7=*&a:int [line 19, column 12]\n  n$8=*&b:int [line 19, column 16]\n  n$9=*&res:int [line 19, column 20]\n  *&return:int=((n$7 + n$8) + n$9) [line 19, column 5]\n " shape="box"]
 	
 
-	 "objc_blockBlockVar_navigateToURLInBackground_1(,).214e3f42254fcf8bcc046c91bb4b2a89_3" -> "objc_blockBlockVar_navigateToURLInBackground_1(,).214e3f42254fcf8bcc046c91bb4b2a89_2" ;
+	 "objc_blockBlockVar_navigateToURLInBackground_1.3f33ba208d462b81a235e03653494b18_3" -> "objc_blockBlockVar_navigateToURLInBackground_1.3f33ba208d462b81a235e03653494b18_2" ;
-"objc_blockBlockVar_navigateToURLInBackground_1(,).214e3f42254fcf8bcc046c91bb4b2a89_4" [label="4:  DeclStmt \n   n$10=_fun_BlockVar_test() [line 18, column 15]\n  *&res:int=n$10 [line 18, column 5]\n " shape="box"]
+"objc_blockBlockVar_navigateToURLInBackground_1.3f33ba208d462b81a235e03653494b18_4" [label="4:  DeclStmt \n   n$10=_fun_BlockVar_test() [line 18, column 15]\n  *&res:int=n$10 [line 18, column 5]\n " shape="box"]
 	
 
-	 "objc_blockBlockVar_navigateToURLInBackground_1(,).214e3f42254fcf8bcc046c91bb4b2a89_4" -> "objc_blockBlockVar_navigateToURLInBackground_1(,).214e3f42254fcf8bcc046c91bb4b2a89_3" ;
+	 "objc_blockBlockVar_navigateToURLInBackground_1.3f33ba208d462b81a235e03653494b18_4" -> "objc_blockBlockVar_navigateToURLInBackground_1.3f33ba208d462b81a235e03653494b18_3" ;
 "navigateToURLInBackground#BlockVar#class.f4e64a7a224e4dae5096c3b731a4233e_1" [label="1: Start BlockVar_navigateToURLInBackground\nFormals: \nLocals:  p:int* x:int addBlock:_fn_(*) \n   DECLARE_LOCALS(&return,&p,&x,&addBlock); [line 16, column 1]\n " color=yellow style=filled]
 	
 

infer/tests/codetoanalyze/objc/shared/block/block-it.m.dot

@@ -1,61 +1,61 @@
 /* @generated */
 digraph cfg {
-"objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_1" [label="1: Start objc_blockMyBlock_array_1\nFormals:  object:objc_object* idx:unsigned long stop:_Bool*\nLocals:  ShouldStop:int \n   DECLARE_LOCALS(&return,&ShouldStop); [line 19, column 33]\n " color=yellow style=filled]
+"objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_1" [label="1: Start objc_blockMyBlock_array_1\nFormals:  object:objc_object* idx:unsigned long stop:_Bool*\nLocals:  ShouldStop:int \n   DECLARE_LOCALS(&return,&ShouldStop); [line 19, column 33]\n " color=yellow style=filled]
 	
 
-	 "objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_1" -> "objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_5" ;
+	 "objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_1" -> "objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_5" ;
-	 "objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_1" -> "objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_6" ;
+	 "objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_1" -> "objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_6" ;
-"objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_2" [label="2: Exit objc_blockMyBlock_array_1 \n  " color=yellow style=filled]
+"objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_2" [label="2: Exit objc_blockMyBlock_array_1 \n  " color=yellow style=filled]
 	
 
-"objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_3" [label="3: + \n  " ]
+"objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_3" [label="3: + \n  " ]
 	
 
-	 "objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_3" -> "objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_4" ;
+	 "objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_3" -> "objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_4" ;
-"objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_4" [label="4:  between_join_and_exit \n  " shape="box"]
+"objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
-	 "objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_4" -> "objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_2" ;
+	 "objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_4" -> "objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_2" ;
-"objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_5" [label="5: Prune (true branch, if) \n   n$1=*&ShouldStop:int [line 24, column 9]\n  PRUNE(n$1, true); [line 24, column 9]\n " shape="invhouse"]
+"objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_5" [label="5: Prune (true branch, if) \n   n$1=*&ShouldStop:int [line 24, column 9]\n  PRUNE(n$1, true); [line 24, column 9]\n " shape="invhouse"]
 	
 
-	 "objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_5" -> "objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_7" ;
+	 "objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_5" -> "objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_7" ;
-"objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_6" [label="6: Prune (false branch, if) \n   n$1=*&ShouldStop:int [line 24, column 9]\n  PRUNE(!n$1, false); [line 24, column 9]\n " shape="invhouse"]
+"objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_6" [label="6: Prune (false branch, if) \n   n$1=*&ShouldStop:int [line 24, column 9]\n  PRUNE(!n$1, false); [line 24, column 9]\n " shape="invhouse"]
 	
 
-	 "objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_6" -> "objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_3" ;
+	 "objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_6" -> "objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_3" ;
-"objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_7" [label="7:  BinaryOperatorStmt: Assign \n   n$2=*&stop:_Bool* [line 25, column 8]\n  *n$2:_Bool=1 [line 25, column 7]\n " shape="box"]
+"objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_7" [label="7:  BinaryOperatorStmt: Assign \n   n$2=*&stop:_Bool* [line 25, column 8]\n  *n$2:_Bool=1 [line 25, column 7]\n " shape="box"]
 	
 
-	 "objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_7" -> "objc_blockMyBlock_array_1(struct objc_object,,).0792f643a089a5608262e353ef51fe57_3" ;
+	 "objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_7" -> "objc_blockMyBlock_array_1(struct objc_object).7651ebbbe5ad11f35ec8fca80283945b_3" ;
-"objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_1" [label="1: Start objc_blockMyBlock_array_trans_2\nFormals:  object:objc_object* idx:unsigned long stop:_Bool*\nLocals:  ShouldStop:int \n   DECLARE_LOCALS(&return,&ShouldStop); [line 38, column 7]\n " color=yellow style=filled]
+"objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_1" [label="1: Start objc_blockMyBlock_array_trans_2\nFormals:  object:objc_object* idx:unsigned long stop:_Bool*\nLocals:  ShouldStop:int \n   DECLARE_LOCALS(&return,&ShouldStop); [line 38, column 7]\n " color=yellow style=filled]
 	
 
-	 "objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_1" -> "objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_5" ;
+	 "objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_1" -> "objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_5" ;
-	 "objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_1" -> "objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_6" ;
+	 "objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_1" -> "objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_6" ;
-"objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_2" [label="2: Exit objc_blockMyBlock_array_trans_2 \n  " color=yellow style=filled]
+"objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_2" [label="2: Exit objc_blockMyBlock_array_trans_2 \n  " color=yellow style=filled]
 	
 
-"objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_3" [label="3: + \n  " ]
+"objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_3" [label="3: + \n  " ]
 	
 
-	 "objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_3" -> "objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_4" ;
+	 "objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_3" -> "objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_4" ;
-"objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_4" [label="4:  between_join_and_exit \n  " shape="box"]
+"objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
-	 "objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_4" -> "objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_2" ;
+	 "objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_4" -> "objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_2" ;
-"objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_5" [label="5: Prune (true branch, if) \n   n$32=*&ShouldStop:int [line 41, column 13]\n  PRUNE(n$32, true); [line 41, column 13]\n " shape="invhouse"]
+"objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_5" [label="5: Prune (true branch, if) \n   n$32=*&ShouldStop:int [line 41, column 13]\n  PRUNE(n$32, true); [line 41, column 13]\n " shape="invhouse"]
 	
 
-	 "objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_5" -> "objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_7" ;
+	 "objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_5" -> "objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_7" ;
-"objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_6" [label="6: Prune (false branch, if) \n   n$32=*&ShouldStop:int [line 41, column 13]\n  PRUNE(!n$32, false); [line 41, column 13]\n " shape="invhouse"]
+"objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_6" [label="6: Prune (false branch, if) \n   n$32=*&ShouldStop:int [line 41, column 13]\n  PRUNE(!n$32, false); [line 41, column 13]\n " shape="invhouse"]
 	
 
-	 "objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_6" -> "objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_3" ;
+	 "objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_6" -> "objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_3" ;
-"objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_7" [label="7:  BinaryOperatorStmt: Assign \n   n$33=*&stop:_Bool* [line 42, column 12]\n  *n$33:_Bool=1 [line 42, column 11]\n " shape="box"]
+"objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_7" [label="7:  BinaryOperatorStmt: Assign \n   n$33=*&stop:_Bool* [line 42, column 12]\n  *n$33:_Bool=1 [line 42, column 11]\n " shape="box"]
 	
 
-	 "objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_7" -> "objc_blockMyBlock_array_trans_2(struct objc_object,,).36d8a0fe60a37558476a3f75be86ba69_3" ;
+	 "objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_7" -> "objc_blockMyBlock_array_trans_2(struct objc_object).933574d9d3bae3fa7584d130e160b2ad_3" ;
 "array#MyBlock#instance.8be6e5b5e968d186440e1931c9eb40de_1" [label="1: Start MyBlock_array\nFormals:  self:MyBlock*\nLocals:  a:NSArray* \n   DECLARE_LOCALS(&return,&a); [line 16, column 1]\n " color=yellow style=filled]
 	
 

infer/tests/codetoanalyze/objc/shared/block/block.m.dot

@@ -50,49 +50,49 @@ digraph cfg {
 	
 
 	 "main1.38f534a9576db7ec6ebcbca8c111f942_10" -> "main1.38f534a9576db7ec6ebcbca8c111f942_9" ;
-"objc_blockmain1_1(,).07867a0430fad29de49f9df4bd82ab9f_1" [label="1: Start objc_blockmain1_1\nFormals:  e:int f:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 31, column 14]\n " color=yellow style=filled]
+"objc_blockmain1_1.74199543de3b6a9a736f23ef5e45586a_1" [label="1: Start objc_blockmain1_1\nFormals:  e:int f:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 31, column 14]\n " color=yellow style=filled]
 	
 
-	 "objc_blockmain1_1(,).07867a0430fad29de49f9df4bd82ab9f_1" -> "objc_blockmain1_1(,).07867a0430fad29de49f9df4bd82ab9f_3" ;
+	 "objc_blockmain1_1.74199543de3b6a9a736f23ef5e45586a_1" -> "objc_blockmain1_1.74199543de3b6a9a736f23ef5e45586a_3" ;
-"objc_blockmain1_1(,).07867a0430fad29de49f9df4bd82ab9f_2" [label="2: Exit objc_blockmain1_1 \n  " color=yellow style=filled]
+"objc_blockmain1_1.74199543de3b6a9a736f23ef5e45586a_2" [label="2: Exit objc_blockmain1_1 \n  " color=yellow style=filled]
 	
 
-"objc_blockmain1_1(,).07867a0430fad29de49f9df4bd82ab9f_3" [label="3:  Return Stmt \n   n$5=*&e:int [line 32, column 12]\n  n$6=*&#GB<codetoanalyze/objc/shared/block/block.m>$main1.s:int [line 32, column 16]\n  *&return:int=(n$5 - n$6) [line 32, column 5]\n " shape="box"]
+"objc_blockmain1_1.74199543de3b6a9a736f23ef5e45586a_3" [label="3:  Return Stmt \n   n$5=*&e:int [line 32, column 12]\n  n$6=*&#GB<codetoanalyze/objc/shared/block/block.m>$main1.s:int [line 32, column 16]\n  *&return:int=(n$5 - n$6) [line 32, column 5]\n " shape="box"]
 	
 
-	 "objc_blockmain1_1(,).07867a0430fad29de49f9df4bd82ab9f_3" -> "objc_blockmain1_1(,).07867a0430fad29de49f9df4bd82ab9f_2" ;
+	 "objc_blockmain1_1.74199543de3b6a9a736f23ef5e45586a_3" -> "objc_blockmain1_1.74199543de3b6a9a736f23ef5e45586a_2" ;
-"objc_blockmain1_2(,).8f5ecb906b7d055c3a188971e75756fc_1" [label="1: Start objc_blockmain1_2\nFormals:  x:int c:int d:int\nLocals:  bla:int add2:int addblock2:_fn_(*)\nCaptured:  x:int \n   DECLARE_LOCALS(&return,&bla,&add2,&addblock2); [line 16, column 14]\n " color=yellow style=filled]
+"objc_blockmain1_2.0d332204bbe33f46a9283d2c0df5700a_1" [label="1: Start objc_blockmain1_2\nFormals:  x:int c:int d:int\nLocals:  bla:int add2:int addblock2:_fn_(*)\nCaptured:  x:int \n   DECLARE_LOCALS(&return,&bla,&add2,&addblock2); [line 16, column 14]\n " color=yellow style=filled]
 	
 
-	 "objc_blockmain1_2(,).8f5ecb906b7d055c3a188971e75756fc_1" -> "objc_blockmain1_2(,).8f5ecb906b7d055c3a188971e75756fc_6" ;
+	 "objc_blockmain1_2.0d332204bbe33f46a9283d2c0df5700a_1" -> "objc_blockmain1_2.0d332204bbe33f46a9283d2c0df5700a_6" ;
-"objc_blockmain1_2(,).8f5ecb906b7d055c3a188971e75756fc_2" [label="2: Exit objc_blockmain1_2 \n  " color=yellow style=filled]
+"objc_blockmain1_2.0d332204bbe33f46a9283d2c0df5700a_2" [label="2: Exit objc_blockmain1_2 \n  " color=yellow style=filled]
 	
 
-"objc_blockmain1_2(,).8f5ecb906b7d055c3a188971e75756fc_3" [label="3:  Return Stmt \n   n$10=*&c:int [line 26, column 12]\n  n$11=*&add2:int [line 26, column 16]\n  n$12=*&bla:int [line 26, column 23]\n  *&return:int=((n$10 + n$11) + n$12) [line 26, column 5]\n " shape="box"]
+"objc_blockmain1_2.0d332204bbe33f46a9283d2c0df5700a_3" [label="3:  Return Stmt \n   n$10=*&c:int [line 26, column 12]\n  n$11=*&add2:int [line 26, column 16]\n  n$12=*&bla:int [line 26, column 23]\n  *&return:int=((n$10 + n$11) + n$12) [line 26, column 5]\n " shape="box"]
 	
 
-	 "objc_blockmain1_2(,).8f5ecb906b7d055c3a188971e75756fc_3" -> "objc_blockmain1_2(,).8f5ecb906b7d055c3a188971e75756fc_2" ;
+	 "objc_blockmain1_2.0d332204bbe33f46a9283d2c0df5700a_3" -> "objc_blockmain1_2.0d332204bbe33f46a9283d2c0df5700a_2" ;
-"objc_blockmain1_2(,).8f5ecb906b7d055c3a188971e75756fc_4" [label="4:  BinaryOperatorStmt: Assign \n   n$13=*&addblock2:_fn_(*) [line 25, column 12]\n  n$14=n$13(1:int) [line 25, column 12]\n  *&add2:int=n$14 [line 25, column 5]\n " shape="box"]
+"objc_blockmain1_2.0d332204bbe33f46a9283d2c0df5700a_4" [label="4:  BinaryOperatorStmt: Assign \n   n$13=*&addblock2:_fn_(*) [line 25, column 12]\n  n$14=n$13(1:int) [line 25, column 12]\n  *&add2:int=n$14 [line 25, column 5]\n " shape="box"]
 	
 
-	 "objc_blockmain1_2(,).8f5ecb906b7d055c3a188971e75756fc_4" -> "objc_blockmain1_2(,).8f5ecb906b7d055c3a188971e75756fc_3" ;
+	 "objc_blockmain1_2.0d332204bbe33f46a9283d2c0df5700a_4" -> "objc_blockmain1_2.0d332204bbe33f46a9283d2c0df5700a_3" ;
-"objc_blockmain1_2(,).8f5ecb906b7d055c3a188971e75756fc_5" [label="5:  BinaryOperatorStmt: Assign \n   n$15=*&x:int [line 21, column 17]\n  n$16=*&bla:int [line 21, column 17]\n  *&addblock2:_fn_(*)=(_fun_objc_blockobjc_blockmain1_2_3,(n$15 &x:int),(n$16 &bla:int)) [line 21, column 5]\n " shape="box"]
+"objc_blockmain1_2.0d332204bbe33f46a9283d2c0df5700a_5" [label="5:  BinaryOperatorStmt: Assign \n   n$15=*&x:int [line 21, column 17]\n  n$16=*&bla:int [line 21, column 17]\n  *&addblock2:_fn_(*)=(_fun_objc_blockobjc_blockmain1_2_3,(n$15 &x:int),(n$16 &bla:int)) [line 21, column 5]\n " shape="box"]
 	
 
-	 "objc_blockmain1_2(,).8f5ecb906b7d055c3a188971e75756fc_5" -> "objc_blockmain1_2(,).8f5ecb906b7d055c3a188971e75756fc_4" ;
+	 "objc_blockmain1_2.0d332204bbe33f46a9283d2c0df5700a_5" -> "objc_blockmain1_2.0d332204bbe33f46a9283d2c0df5700a_4" ;
-"objc_blockmain1_2(,).8f5ecb906b7d055c3a188971e75756fc_6" [label="6:  DeclStmt \n   *&bla:int=3 [line 19, column 5]\n " shape="box"]
+"objc_blockmain1_2.0d332204bbe33f46a9283d2c0df5700a_6" [label="6:  DeclStmt \n   *&bla:int=3 [line 19, column 5]\n " shape="box"]
 	
 
-	 "objc_blockmain1_2(,).8f5ecb906b7d055c3a188971e75756fc_6" -> "objc_blockmain1_2(,).8f5ecb906b7d055c3a188971e75756fc_5" ;
+	 "objc_blockmain1_2.0d332204bbe33f46a9283d2c0df5700a_6" -> "objc_blockmain1_2.0d332204bbe33f46a9283d2c0df5700a_5" ;
-"objc_blockobjc_blockmain1_2_3().383f8888fb9ddfe5deed04a47cf0e633_1" [label="1: Start objc_blockobjc_blockmain1_2_3\nFormals:  x:int bla:int z:int\nLocals: \nCaptured:  x:int bla:int \n   DECLARE_LOCALS(&return); [line 21, column 17]\n " color=yellow style=filled]
+"objc_blockobjc_blockmain1_2_3.0824f0806cf4ebad2920e9a12535d20e_1" [label="1: Start objc_blockobjc_blockmain1_2_3\nFormals:  x:int bla:int z:int\nLocals: \nCaptured:  x:int bla:int \n   DECLARE_LOCALS(&return); [line 21, column 17]\n " color=yellow style=filled]
 	
 
-	 "objc_blockobjc_blockmain1_2_3().383f8888fb9ddfe5deed04a47cf0e633_1" -> "objc_blockobjc_blockmain1_2_3().383f8888fb9ddfe5deed04a47cf0e633_3" ;
+	 "objc_blockobjc_blockmain1_2_3.0824f0806cf4ebad2920e9a12535d20e_1" -> "objc_blockobjc_blockmain1_2_3.0824f0806cf4ebad2920e9a12535d20e_3" ;
-"objc_blockobjc_blockmain1_2_3().383f8888fb9ddfe5deed04a47cf0e633_2" [label="2: Exit objc_blockobjc_blockmain1_2_3 \n  " color=yellow style=filled]
+"objc_blockobjc_blockmain1_2_3.0824f0806cf4ebad2920e9a12535d20e_2" [label="2: Exit objc_blockobjc_blockmain1_2_3 \n  " color=yellow style=filled]
 	
 
-"objc_blockobjc_blockmain1_2_3().383f8888fb9ddfe5deed04a47cf0e633_3" [label="3:  Return Stmt \n   n$17=*&z:int [line 22, column 14]\n  n$18=*&#GB<codetoanalyze/objc/shared/block/block.m>$main1.s:int [line 22, column 18]\n  n$19=*&x:int [line 22, column 22]\n  n$20=*&bla:int [line 22, column 26]\n  *&return:int=(((n$17 + n$18) + n$19) + n$20) [line 22, column 7]\n " shape="box"]
+"objc_blockobjc_blockmain1_2_3.0824f0806cf4ebad2920e9a12535d20e_3" [label="3:  Return Stmt \n   n$17=*&z:int [line 22, column 14]\n  n$18=*&#GB<codetoanalyze/objc/shared/block/block.m>$main1.s:int [line 22, column 18]\n  n$19=*&x:int [line 22, column 22]\n  n$20=*&bla:int [line 22, column 26]\n  *&return:int=(((n$17 + n$18) + n$19) + n$20) [line 22, column 7]\n " shape="box"]
 	
 
-	 "objc_blockobjc_blockmain1_2_3().383f8888fb9ddfe5deed04a47cf0e633_3" -> "objc_blockobjc_blockmain1_2_3().383f8888fb9ddfe5deed04a47cf0e633_2" ;
+	 "objc_blockobjc_blockmain1_2_3.0824f0806cf4ebad2920e9a12535d20e_3" -> "objc_blockobjc_blockmain1_2_3.0824f0806cf4ebad2920e9a12535d20e_2" ;
 }

infer/tests/codetoanalyze/objc/shared/block/block_release.m.dot

@@ -1,33 +1,33 @@
 /* @generated */
 digraph cfg {
-"objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_1" [label="1: Start objc_blockMy_manager_blockReleaseNoLeak_1\nFormals:  newImage:CGImage* a:int\nLocals: \nCaptured:  newImage:CGImage* \n   DECLARE_LOCALS(&return); [line 23, column 7]\n " color=yellow style=filled]
+"objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_1" [label="1: Start objc_blockMy_manager_blockReleaseNoLeak_1\nFormals:  newImage:CGImage* a:int\nLocals: \nCaptured:  newImage:CGImage* \n   DECLARE_LOCALS(&return); [line 23, column 7]\n " color=yellow style=filled]
 	
 
-	 "objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_1" -> "objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_5" ;
+	 "objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_1" -> "objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_5" ;
-	 "objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_1" -> "objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_6" ;
+	 "objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_1" -> "objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_6" ;
-"objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_2" [label="2: Exit objc_blockMy_manager_blockReleaseNoLeak_1 \n  " color=yellow style=filled]
+"objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_2" [label="2: Exit objc_blockMy_manager_blockReleaseNoLeak_1 \n  " color=yellow style=filled]
 	
 
-"objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_3" [label="3: + \n  " ]
+"objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_3" [label="3: + \n  " ]
 	
 
-	 "objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_3" -> "objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_4" ;
+	 "objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_3" -> "objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_4" ;
-"objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_4" [label="4:  between_join_and_exit \n  " shape="box"]
+"objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_4" [label="4:  between_join_and_exit \n  " shape="box"]
 	
 
-	 "objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_4" -> "objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_2" ;
+	 "objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_4" -> "objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_2" ;
-"objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_5" [label="5: Prune (true branch, if) \n   n$10=*&newImage:CGImage* [line 24, column 9]\n  PRUNE(n$10, true); [line 24, column 9]\n " shape="invhouse"]
+"objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_5" [label="5: Prune (true branch, if) \n   n$10=*&newImage:CGImage* [line 24, column 9]\n  PRUNE(n$10, true); [line 24, column 9]\n " shape="invhouse"]
 	
 
-	 "objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_5" -> "objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_7" ;
+	 "objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_5" -> "objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_7" ;
-"objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_6" [label="6: Prune (false branch, if) \n   n$10=*&newImage:CGImage* [line 24, column 9]\n  PRUNE(!n$10, false); [line 24, column 9]\n " shape="invhouse"]
+"objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_6" [label="6: Prune (false branch, if) \n   n$10=*&newImage:CGImage* [line 24, column 9]\n  PRUNE(!n$10, false); [line 24, column 9]\n " shape="invhouse"]
 	
 
-	 "objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_6" -> "objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_3" ;
+	 "objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_6" -> "objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_3" ;
-"objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_7" [label="7:  Call _fun_CGImageRelease \n   n$11=*&newImage:CGImage* [line 25, column 22]\n  n$12=_fun_CGImageRelease(n$11:CGImage*) [line 25, column 7]\n " shape="box"]
+"objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_7" [label="7:  Call _fun_CGImageRelease \n   n$11=*&newImage:CGImage* [line 25, column 22]\n  n$12=_fun_CGImageRelease(n$11:CGImage*) [line 25, column 7]\n " shape="box"]
 	
 
-	 "objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_7" -> "objc_blockMy_manager_blockReleaseNoLeak_1().fe4d6068a17b5696b0d04437f05f62a8_3" ;
+	 "objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_7" -> "objc_blockMy_manager_blockReleaseNoLeak_1.a1f2f2c370e78fee994cf9a9d53a7210_3" ;
 "blockReleaseNoLeak#My_manager#instance.0c48f80f024250b18a529440f1313af6_1" [label="1: Start My_manager_blockReleaseNoLeak\nFormals:  self:My_manager*\nLocals:  newImage:CGImage* context:CGContext* z:int b:_fn_(*) \n   DECLARE_LOCALS(&return,&newImage,&context,&z,&b); [line 18, column 1]\n " color=yellow style=filled]
 	
 

infer/tests/codetoanalyze/objc/shared/memory_leaks_benchmark/MemoryLeakExample.m.dot

@@ -90,17 +90,17 @@ digraph cfg {
 	
 
 	 "measureFrameSizeForTextNoLeak#MemoryLeakExample#class.9443bec011166230e1709abbe3c930d4_4" -> "measureFrameSizeForTextNoLeak#MemoryLeakExample#class.9443bec011166230e1709abbe3c930d4_3" ;
-"test1:#MemoryLeakExample#class.6a178021c88203c49ec4a36c5d873685_1" [label="1: Start MemoryLeakExample_test1:\nFormals:  str:__CFAttributedString const *\nLocals:  \n   DECLARE_LOCALS(&return); [line 42, column 1]\n " color=yellow style=filled]
+"test1:#MemoryLeakExample(struct __CFAttributedString)#class.5c69af4eb9da1845df6efe64785fd0c9_1" [label="1: Start MemoryLeakExample_test1:\nFormals:  str:__CFAttributedString const *\nLocals:  \n   DECLARE_LOCALS(&return); [line 42, column 1]\n " color=yellow style=filled]
 	
 
-	 "test1:#MemoryLeakExample#class.6a178021c88203c49ec4a36c5d873685_1" -> "test1:#MemoryLeakExample#class.6a178021c88203c49ec4a36c5d873685_3" ;
+	 "test1:#MemoryLeakExample(struct __CFAttributedString)#class.5c69af4eb9da1845df6efe64785fd0c9_1" -> "test1:#MemoryLeakExample(struct __CFAttributedString)#class.5c69af4eb9da1845df6efe64785fd0c9_3" ;
-"test1:#MemoryLeakExample#class.6a178021c88203c49ec4a36c5d873685_2" [label="2: Exit MemoryLeakExample_test1: \n  " color=yellow style=filled]
+"test1:#MemoryLeakExample(struct __CFAttributedString)#class.5c69af4eb9da1845df6efe64785fd0c9_2" [label="2: Exit MemoryLeakExample_test1: \n  " color=yellow style=filled]
 	
 
-"test1:#MemoryLeakExample#class.6a178021c88203c49ec4a36c5d873685_3" [label="3:  Call _fun_CTFramesetterCreateWithAttributedString \n   n$21=*&str:__CFAttributedString const * [line 43, column 43]\n  n$22=_fun_CTFramesetterCreateWithAttributedString(n$21:__CFAttributedString const *) [line 43, column 3]\n " shape="box"]
+"test1:#MemoryLeakExample(struct __CFAttributedString)#class.5c69af4eb9da1845df6efe64785fd0c9_3" [label="3:  Call _fun_CTFramesetterCreateWithAttributedString \n   n$21=*&str:__CFAttributedString const * [line 43, column 43]\n  n$22=_fun_CTFramesetterCreateWithAttributedString(n$21:__CFAttributedString const *) [line 43, column 3]\n " shape="box"]
 	
 
-	 "test1:#MemoryLeakExample#class.6a178021c88203c49ec4a36c5d873685_3" -> "test1:#MemoryLeakExample#class.6a178021c88203c49ec4a36c5d873685_2" ;
+	 "test1:#MemoryLeakExample(struct __CFAttributedString)#class.5c69af4eb9da1845df6efe64785fd0c9_3" -> "test1:#MemoryLeakExample(struct __CFAttributedString)#class.5c69af4eb9da1845df6efe64785fd0c9_2" ;
 "test1NoLeak#MemoryLeakExample#class.7e0d9640dbd86a21622e801793707bd9_1" [label="1: Start MemoryLeakExample_test1NoLeak\nFormals: \nLocals:  framesetter:__CTFramesetter const * \n   DECLARE_LOCALS(&return,&framesetter); [line 46, column 1]\n " color=yellow style=filled]
 	
 
@@ -116,17 +116,17 @@ digraph cfg {
 	
 
 	 "test1NoLeak#MemoryLeakExample#class.7e0d9640dbd86a21622e801793707bd9_4" -> "test1NoLeak#MemoryLeakExample#class.7e0d9640dbd86a21622e801793707bd9_3" ;
-"test2:#MemoryLeakExample#class.4d854f1c80289cc8e5422233831af105_1" [label="1: Start MemoryLeakExample_test2:\nFormals:  trust:__SecTrust*\nLocals:  \n   DECLARE_LOCALS(&return); [line 64, column 1]\n " color=yellow style=filled]
+"test2:#MemoryLeakExample(struct __SecTrust)#class.0351c8bd25e5a49860146e05fbc5b49a_1" [label="1: Start MemoryLeakExample_test2:\nFormals:  trust:__SecTrust*\nLocals:  \n   DECLARE_LOCALS(&return); [line 64, column 1]\n " color=yellow style=filled]
 	
 
-	 "test2:#MemoryLeakExample#class.4d854f1c80289cc8e5422233831af105_1" -> "test2:#MemoryLeakExample#class.4d854f1c80289cc8e5422233831af105_3" ;
+	 "test2:#MemoryLeakExample(struct __SecTrust)#class.0351c8bd25e5a49860146e05fbc5b49a_1" -> "test2:#MemoryLeakExample(struct __SecTrust)#class.0351c8bd25e5a49860146e05fbc5b49a_3" ;
-"test2:#MemoryLeakExample#class.4d854f1c80289cc8e5422233831af105_2" [label="2: Exit MemoryLeakExample_test2: \n  " color=yellow style=filled]
+"test2:#MemoryLeakExample(struct __SecTrust)#class.0351c8bd25e5a49860146e05fbc5b49a_2" [label="2: Exit MemoryLeakExample_test2: \n  " color=yellow style=filled]
 	
 
-"test2:#MemoryLeakExample#class.4d854f1c80289cc8e5422233831af105_3" [label="3:  Call _fun_SecTrustCopyPublicKey \n   n$34=*&trust:__SecTrust* [line 65, column 25]\n  n$35=_fun_SecTrustCopyPublicKey(n$34:__SecTrust*) [line 65, column 3]\n " shape="box"]
+"test2:#MemoryLeakExample(struct __SecTrust)#class.0351c8bd25e5a49860146e05fbc5b49a_3" [label="3:  Call _fun_SecTrustCopyPublicKey \n   n$34=*&trust:__SecTrust* [line 65, column 25]\n  n$35=_fun_SecTrustCopyPublicKey(n$34:__SecTrust*) [line 65, column 3]\n " shape="box"]
 	
 
-	 "test2:#MemoryLeakExample#class.4d854f1c80289cc8e5422233831af105_3" -> "test2:#MemoryLeakExample#class.4d854f1c80289cc8e5422233831af105_2" ;
+	 "test2:#MemoryLeakExample(struct __SecTrust)#class.0351c8bd25e5a49860146e05fbc5b49a_3" -> "test2:#MemoryLeakExample(struct __SecTrust)#class.0351c8bd25e5a49860146e05fbc5b49a_2" ;
 "test2NoLeak#MemoryLeakExample#class.69cf0c35f7df26deefa723cac655894d_1" [label="1: Start MemoryLeakExample_test2NoLeak\nFormals: \nLocals:  allowedPublicKey:__SecKey* \n   DECLARE_LOCALS(&return,&allowedPublicKey); [line 68, column 1]\n " color=yellow style=filled]
 	
 

infer/tests/codetoanalyze/objc/shared/npe/Nonnull_attribute_example.m.dot

@@ -22,23 +22,23 @@ digraph cfg {
 	
 
 	 "getA#NonnullA#instance.d4b29ece551a370c3f0c0c12526b3def_3" -> "getA#NonnullA#instance.d4b29ece551a370c3f0c0c12526b3def_2" ;
-"initWithCoder:and:#NonnullC#instance.0360cbf0c434f47ea58689c925d7c008_1" [label="1: Start NonnullC_initWithCoder:and:\nFormals:  self:NonnullC* aDecoder:NSString* a:NonnullA*\nLocals:  y:int a1:NonnullA*\nAnnotation: <> NonnullC_initWithCoder:and:(<> <> <_Nonnull>) \n   DECLARE_LOCALS(&return,&y,&a1); [line 36, column 1]\n " color=yellow style=filled]
+"initWithCoder:and:#NonnullC(class NSString,class NonnullA)#instance.e23828ce4467c2001440771e2c4692f8_1" [label="1: Start NonnullC_initWithCoder:and:\nFormals:  self:NonnullC* aDecoder:NSString* a:NonnullA*\nLocals:  y:int a1:NonnullA*\nAnnotation: <> NonnullC_initWithCoder:and:(<> <> <_Nonnull>) \n   DECLARE_LOCALS(&return,&y,&a1); [line 36, column 1]\n " color=yellow style=filled]
 	
 
-	 "initWithCoder:and:#NonnullC#instance.0360cbf0c434f47ea58689c925d7c008_1" -> "initWithCoder:and:#NonnullC#instance.0360cbf0c434f47ea58689c925d7c008_5" ;
+	 "initWithCoder:and:#NonnullC(class NSString,class NonnullA)#instance.e23828ce4467c2001440771e2c4692f8_1" -> "initWithCoder:and:#NonnullC(class NSString,class NonnullA)#instance.e23828ce4467c2001440771e2c4692f8_5" ;
-"initWithCoder:and:#NonnullC#instance.0360cbf0c434f47ea58689c925d7c008_2" [label="2: Exit NonnullC_initWithCoder:and: \n  " color=yellow style=filled]
+"initWithCoder:and:#NonnullC(class NSString,class NonnullA)#instance.e23828ce4467c2001440771e2c4692f8_2" [label="2: Exit NonnullC_initWithCoder:and: \n  " color=yellow style=filled]
 	
 
-"initWithCoder:and:#NonnullC#instance.0360cbf0c434f47ea58689c925d7c008_3" [label="3:  Return Stmt \n   n$0=*&self:NonnullC* [line 39, column 10]\n  *&return:objc_object*=n$0 [line 39, column 3]\n " shape="box"]
+"initWithCoder:and:#NonnullC(class NSString,class NonnullA)#instance.e23828ce4467c2001440771e2c4692f8_3" [label="3:  Return Stmt \n   n$0=*&self:NonnullC* [line 39, column 10]\n  *&return:objc_object*=n$0 [line 39, column 3]\n " shape="box"]
 	
 
-	 "initWithCoder:and:#NonnullC#instance.0360cbf0c434f47ea58689c925d7c008_3" -> "initWithCoder:and:#NonnullC#instance.0360cbf0c434f47ea58689c925d7c008_2" ;
+	 "initWithCoder:and:#NonnullC(class NSString,class NonnullA)#instance.e23828ce4467c2001440771e2c4692f8_3" -> "initWithCoder:and:#NonnullC(class NSString,class NonnullA)#instance.e23828ce4467c2001440771e2c4692f8_2" ;
-"initWithCoder:and:#NonnullC#instance.0360cbf0c434f47ea58689c925d7c008_4" [label="4:  DeclStmt \n   n$1=*&a1:NonnullA* [line 38, column 11]\n  n$2=*n$1.x:int [line 38, column 11]\n  *&y:int=n$2 [line 38, column 3]\n " shape="box"]
+"initWithCoder:and:#NonnullC(class NSString,class NonnullA)#instance.e23828ce4467c2001440771e2c4692f8_4" [label="4:  DeclStmt \n   n$1=*&a1:NonnullA* [line 38, column 11]\n  n$2=*n$1.x:int [line 38, column 11]\n  *&y:int=n$2 [line 38, column 3]\n " shape="box"]
 	
 
-	 "initWithCoder:and:#NonnullC#instance.0360cbf0c434f47ea58689c925d7c008_4" -> "initWithCoder:and:#NonnullC#instance.0360cbf0c434f47ea58689c925d7c008_3" ;
+	 "initWithCoder:and:#NonnullC(class NSString,class NonnullA)#instance.e23828ce4467c2001440771e2c4692f8_4" -> "initWithCoder:and:#NonnullC(class NSString,class NonnullA)#instance.e23828ce4467c2001440771e2c4692f8_3" ;
-"initWithCoder:and:#NonnullC#instance.0360cbf0c434f47ea58689c925d7c008_5" [label="5:  DeclStmt \n   n$3=*&a:NonnullA* [line 37, column 19]\n  n$4=_fun_NonnullA_getA(n$3:NonnullA*) virtual [line 37, column 18]\n  *&a1:NonnullA*=n$4 [line 37, column 3]\n " shape="box"]
+"initWithCoder:and:#NonnullC(class NSString,class NonnullA)#instance.e23828ce4467c2001440771e2c4692f8_5" [label="5:  DeclStmt \n   n$3=*&a:NonnullA* [line 37, column 19]\n  n$4=_fun_NonnullA_getA(n$3:NonnullA*) virtual [line 37, column 18]\n  *&a1:NonnullA*=n$4 [line 37, column 3]\n " shape="box"]
 	
 
-	 "initWithCoder:and:#NonnullC#instance.0360cbf0c434f47ea58689c925d7c008_5" -> "initWithCoder:and:#NonnullC#instance.0360cbf0c434f47ea58689c925d7c008_4" ;
+	 "initWithCoder:and:#NonnullC(class NSString,class NonnullA)#instance.e23828ce4467c2001440771e2c4692f8_5" -> "initWithCoder:and:#NonnullC(class NSString,class NonnullA)#instance.e23828ce4467c2001440771e2c4692f8_4" ;
 }

infer/tests/codetoanalyze/objc/shared/protocol_procdesc/Bicycle.m.dot

@@ -1,16 +1,16 @@
 /* @generated */
 digraph cfg {
-"lockToStructure:#Bicycle#instance.1d748844e64f333b251ddf4475286342_1" [label="1: Start Bicycle_lockToStructure:\nFormals:  self:Bicycle* theStructure:objc_object*\nLocals:  \n   DECLARE_LOCALS(&return); [line 30, column 1]\n " color=yellow style=filled]
+"lockToStructure:#Bicycle(struct objc_object)#instance.08c84c9f07aafb2f30ed48101344ca7a_1" [label="1: Start Bicycle_lockToStructure:\nFormals:  self:Bicycle* theStructure:objc_object*\nLocals:  \n   DECLARE_LOCALS(&return); [line 30, column 1]\n " color=yellow style=filled]
 	
 
-	 "lockToStructure:#Bicycle#instance.1d748844e64f333b251ddf4475286342_1" -> "lockToStructure:#Bicycle#instance.1d748844e64f333b251ddf4475286342_3" ;
+	 "lockToStructure:#Bicycle(struct objc_object)#instance.08c84c9f07aafb2f30ed48101344ca7a_1" -> "lockToStructure:#Bicycle(struct objc_object)#instance.08c84c9f07aafb2f30ed48101344ca7a_3" ;
-"lockToStructure:#Bicycle#instance.1d748844e64f333b251ddf4475286342_2" [label="2: Exit Bicycle_lockToStructure: \n  " color=yellow style=filled]
+"lockToStructure:#Bicycle(struct objc_object)#instance.08c84c9f07aafb2f30ed48101344ca7a_2" [label="2: Exit Bicycle_lockToStructure: \n  " color=yellow style=filled]
 	
 
-"lockToStructure:#Bicycle#instance.1d748844e64f333b251ddf4475286342_3" [label="3:  Call _fun_NSLog \n   n$10=_fun_NSString_stringWithUTF8String:(\"Locked to structure. Don't forget the combination!\":char* const ) [line 31, column 9]\n  n$11=_fun_NSLog(n$10:objc_object*) [line 31, column 3]\n " shape="box"]
+"lockToStructure:#Bicycle(struct objc_object)#instance.08c84c9f07aafb2f30ed48101344ca7a_3" [label="3:  Call _fun_NSLog \n   n$10=_fun_NSString_stringWithUTF8String:(\"Locked to structure. Don't forget the combination!\":char* const ) [line 31, column 9]\n  n$11=_fun_NSLog(n$10:objc_object*) [line 31, column 3]\n " shape="box"]
 	
 
-	 "lockToStructure:#Bicycle#instance.1d748844e64f333b251ddf4475286342_3" -> "lockToStructure:#Bicycle#instance.1d748844e64f333b251ddf4475286342_2" ;
+	 "lockToStructure:#Bicycle(struct objc_object)#instance.08c84c9f07aafb2f30ed48101344ca7a_3" -> "lockToStructure:#Bicycle(struct objc_object)#instance.08c84c9f07aafb2f30ed48101344ca7a_2" ;
 "removeFrontWheel#Bicycle#instance.30147087e52fa1526931dfcd2d381f31_1" [label="1: Start Bicycle_removeFrontWheel\nFormals:  self:Bicycle*\nLocals:  \n   DECLARE_LOCALS(&return); [line 25, column 1]\n " color=yellow style=filled]
 	
 

infer/tests/codetoanalyze/objcpp/frontend/funcoverloading/af_test.mm.dot

@@ -11,15 +11,15 @@ digraph cfg {
 	
 
 	 "POPSelectValueType#13202608325161396336.7f6967bed79eb95ec02bca4d934e7bf7_3" -> "POPSelectValueType#13202608325161396336.7f6967bed79eb95ec02bca4d934e7bf7_2" ;
-"POPSelectValueType#4590621362721862851.100c5a1fcd7deab0dea5c6fefbfaf7e9_1" [label="1: Start POPSelectValueType\nFormals:  obj:objc_object*\nLocals:  \n   DECLARE_LOCALS(&return); [line 10, column 1]\n " color=yellow style=filled]
+"POPSelectValueType(struct objc_object)#4590621362721862851.2ae895f0ed31789a8ee1d7db61fbe87f_1" [label="1: Start POPSelectValueType\nFormals:  obj:objc_object*\nLocals:  \n   DECLARE_LOCALS(&return); [line 10, column 1]\n " color=yellow style=filled]
 	
 
-	 "POPSelectValueType#4590621362721862851.100c5a1fcd7deab0dea5c6fefbfaf7e9_1" -> "POPSelectValueType#4590621362721862851.100c5a1fcd7deab0dea5c6fefbfaf7e9_3" ;
+	 "POPSelectValueType(struct objc_object)#4590621362721862851.2ae895f0ed31789a8ee1d7db61fbe87f_1" -> "POPSelectValueType(struct objc_object)#4590621362721862851.2ae895f0ed31789a8ee1d7db61fbe87f_3" ;
-"POPSelectValueType#4590621362721862851.100c5a1fcd7deab0dea5c6fefbfaf7e9_2" [label="2: Exit POPSelectValueType \n  " color=yellow style=filled]
+"POPSelectValueType(struct objc_object)#4590621362721862851.2ae895f0ed31789a8ee1d7db61fbe87f_2" [label="2: Exit POPSelectValueType \n  " color=yellow style=filled]
 	
 
-"POPSelectValueType#4590621362721862851.100c5a1fcd7deab0dea5c6fefbfaf7e9_3" [label="3:  Return Stmt \n   *&return:int=1 [line 10, column 34]\n " shape="box"]
+"POPSelectValueType(struct objc_object)#4590621362721862851.2ae895f0ed31789a8ee1d7db61fbe87f_3" [label="3:  Return Stmt \n   *&return:int=1 [line 10, column 34]\n " shape="box"]
 	
 
-	 "POPSelectValueType#4590621362721862851.100c5a1fcd7deab0dea5c6fefbfaf7e9_3" -> "POPSelectValueType#4590621362721862851.100c5a1fcd7deab0dea5c6fefbfaf7e9_2" ;
+	 "POPSelectValueType(struct objc_object)#4590621362721862851.2ae895f0ed31789a8ee1d7db61fbe87f_3" -> "POPSelectValueType(struct objc_object)#4590621362721862851.2ae895f0ed31789a8ee1d7db61fbe87f_2" ;
 }

infer/tests/codetoanalyze/objcpp/frontend/global_const/global_const.mm.dot

@@ -11,17 +11,17 @@ digraph cfg {
 	
 
 	 "__infer_globals_initializer___someFields#305cac08d8197bd145f7f55cc8a06d16.794b83eea8b5794c71808060b1f3b5c7_3" -> "__infer_globals_initializer___someFields#305cac08d8197bd145f7f55cc8a06d16.794b83eea8b5794c71808060b1f3b5c7_2" ;
-"fields#3037629886785813687.69ed098353fab08d543db5cb8ab409b5_1" [label="1: Start fields\nFormals:  __return_param:Fields*\nLocals:  \n   DECLARE_LOCALS(&return); [line 20, column 1]\n " color=yellow style=filled]
+"fields(class Fields)#3037629886785813687.ade89225d198ce505301d5cdffda48f1_1" [label="1: Start fields\nFormals:  __return_param:Fields*\nLocals:  \n   DECLARE_LOCALS(&return); [line 20, column 1]\n " color=yellow style=filled]
 	
 
-	 "fields#3037629886785813687.69ed098353fab08d543db5cb8ab409b5_1" -> "fields#3037629886785813687.69ed098353fab08d543db5cb8ab409b5_3" ;
+	 "fields(class Fields)#3037629886785813687.ade89225d198ce505301d5cdffda48f1_1" -> "fields(class Fields)#3037629886785813687.ade89225d198ce505301d5cdffda48f1_3" ;
-"fields#3037629886785813687.69ed098353fab08d543db5cb8ab409b5_2" [label="2: Exit fields \n  " color=yellow style=filled]
+"fields(class Fields)#3037629886785813687.ade89225d198ce505301d5cdffda48f1_2" [label="2: Exit fields \n  " color=yellow style=filled]
 	
 
-"fields#3037629886785813687.69ed098353fab08d543db5cb8ab409b5_3" [label="3:  Return Stmt \n   n$0=*&__return_param:Fields* [line 20, column 19]\n  n$1=_fun_Fields_(n$0:Fields*,&#GB<codetoanalyze/objcpp/frontend/global_const/global_const.mm>$__someFields:Fields const &) [line 20, column 26]\n " shape="box"]
+"fields(class Fields)#3037629886785813687.ade89225d198ce505301d5cdffda48f1_3" [label="3:  Return Stmt \n   n$0=*&__return_param:Fields* [line 20, column 19]\n  n$1=_fun_Fields_(n$0:Fields*,&#GB<codetoanalyze/objcpp/frontend/global_const/global_const.mm>$__someFields:Fields const &) [line 20, column 26]\n " shape="box"]
 	
 
-	 "fields#3037629886785813687.69ed098353fab08d543db5cb8ab409b5_3" -> "fields#3037629886785813687.69ed098353fab08d543db5cb8ab409b5_2" ;
+	 "fields(class Fields)#3037629886785813687.ade89225d198ce505301d5cdffda48f1_3" -> "fields(class Fields)#3037629886785813687.ade89225d198ce505301d5cdffda48f1_2" ;
 "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_1" [label="1: Start Fields_\nFormals:  this:Fields* __param_0:Fields const &\nLocals:  \n   DECLARE_LOCALS(&return); [line 8, column 9]\n " color=yellow style=filled]