[clang] Inline namespaces disappear, simplify infer's code

Reviewed By: jvillard

Differential Revision: D4660341

fbshipit-source-id: beafe26

facebook-clang-plugins

@@ -1 +1 @@
-Subproject commit bd84ec6c5afd9931603a9a1a3ce4c3c22c4472b6
+Subproject commit e1dce5cb9676dfa0bf2f54111f74e54b6f9e4b88

infer/src/IR/QualifiedCppName.re

@@ -10,17 +10,7 @@ open! IStd;
 
 type quals_matcher = Str.regexp;
 
-let regexp_string_of_qualifiers quals => {
+let regexp_string_of_qualifiers quals => Str.quote (String.concat sep::"::" quals) ^ "$";
-  let is_std_qual = String.equal "std";
-  let qualifiers_simple_matcher quals => Str.quote (String.concat sep::"::" quals) ^ "$";
-  switch quals {
-  | [first, ...[_, ..._] as rest] when is_std_qual first =>
-    /* add special handling for std:: namespace to avoid problems with inconsistent
-       inline namespaces (such as __1 in libc++) */
-    Str.quote first ^ "\\(::[^:]*\\)?::" ^ qualifiers_simple_matcher rest
-  | _ => qualifiers_simple_matcher quals
-  }
-};
 
 let qualifiers_list_matcher quals_list =>
   (

infer/src/unit/clang/QualifiedCppNameTests.ml

@@ -96,22 +96,22 @@ let test_fuzzy_match =
       false
     );
     (
-      "test_std_fuzzy_match1",
+      "test_std_no_fuzzy_match1",
       ["std::foo"],
       ["std"; "__1"; "foo"],
-      true
+      false
     );
     (
-      "test_std_fuzzy_match2",
+      "test_std_no_fuzzy_match2",
       ["std::foo"],
       ["std"; "goo<int>"; "foo"],
-      true
+      false
     );
     (
-      "test_std_fuzzy_match3",
+      "test_std_no_fuzzy_match3",
       ["std::foo"],
       ["std"; "goo<int>"; "foo<const X&>"],
-      true
+      false
     );
     (
       "test_std_fuzzy_no_match1",

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

@@ -1,17 +1,17 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  s:class std::__1::basic_string<8d2d7b7b909d4c24> x:int* \n   DECLARE_LOCALS(&return,&s,&x); [line 17]\n " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  s:class std::basic_string<8d2d7b7b909d4c24> x:int* \n   DECLARE_LOCALS(&return,&s,&x); [line 17]\n " color=yellow style=filled]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   _fun_std::__1::basic_string<8d2d7b7b909d4c24>_basic_string(&s:class std::__1::basic_string<8d2d7b7b909d4c24>*,\"1234\":char*) [line 22]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   _fun_std::basic_string<8d2d7b7b909d4c24>_basic_string(&s:class std::basic_string<8d2d7b7b909d4c24>*,\"1234\":char*) [line 22]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   _fun_std::__1::shared_ptr<int>_shared_ptr(&x:int**) [line 21]\n  n$0=*&x:int* [line 21]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   _fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 21]\n  n$0=*&x:int* [line 21]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
@@ -64,63 +64,63 @@ digraph iCFG {
 	
 
 	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_1" [label="1: Start std::__1::shared_ptr<int>_model_set\nFormals:  self:void** value:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 53]\n " color=yellow style=filled]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_1" [label="1: Start std::shared_ptr<int>_model_set\nFormals:  self:void** value:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 53]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_1" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_3" ;
+	 "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_1" -> "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_3" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_2" [label="2: Exit std::__1::shared_ptr<int>_model_set \n  " color=yellow style=filled]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_2" [label="2: Exit std::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 54]\n  n$1=*&value:int [line 54]\n  *n$0:void*=n$1 [line 54]\n " shape="box"]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 54]\n  n$1=*&value:int [line 54]\n  *n$0:void*=n$1 [line 54]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_3" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_2" ;
+	 "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_3" -> "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_2" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_1" [label="1: Start std::__1::shared_ptr<int>_model_set\nFormals:  self:void** value:void*\nLocals:  \n   DECLARE_LOCALS(&return); [line 65]\n " color=yellow style=filled]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_1" [label="1: Start std::shared_ptr<int>_model_set\nFormals:  self:void** value:void*\nLocals:  \n   DECLARE_LOCALS(&return); [line 65]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_1" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_3" ;
+	 "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_1" -> "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_3" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_2" [label="2: Exit std::__1::shared_ptr<int>_model_set \n  " color=yellow style=filled]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_2" [label="2: Exit std::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 66]\n  n$1=*&value:void* [line 66]\n  *n$0:void*=n$1 [line 66]\n " shape="box"]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 66]\n  n$1=*&value:void* [line 66]\n  *n$0:void*=n$1 [line 66]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_3" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_2" ;
+	 "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_3" -> "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_2" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_1" [label="1: Start std::__1::shared_ptr<int>_shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 99]\n " color=yellow style=filled]
+"std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_1" [label="1: Start std::shared_ptr<int>_shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 99]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_1" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_4" ;
+	 "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_1" -> "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_4" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_2" [label="2: Exit std::__1::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
+"std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_2" [label="2: Exit std::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 100]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,null:int) [line 100]\n " shape="box"]
+"std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 100]\n  _fun_std::shared_ptr<int>_model_set(n$0:void**,null:int) [line 100]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_3" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_2" ;
+	 "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_3" -> "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_2" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_4" [label="4:  Constructor Init \n   n$1=*&this:int** [line 100]\n  _fun_std::__1::std__shared_ptr<int>_std__shared_ptr(n$1:int**) [line 99]\n  n$2=*n$1:int* [line 99]\n " shape="box"]
+"std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_4" [label="4:  Constructor Init \n   n$1=*&this:int** [line 100]\n  _fun_std::std__shared_ptr<int>_std__shared_ptr(n$1:int**) [line 99]\n  n$2=*n$1:int* [line 99]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_4" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_3" ;
+	 "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_4" -> "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_3" ;
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" [label="1: Start std::__1::shared_ptr<int>_~shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 180]\n " color=yellow style=filled]
+"std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_1" [label="1: Start std::shared_ptr<int>_~shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 180]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" ;
+	 "std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_1" -> "std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_3" ;
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" [label="2: Exit std::__1::shared_ptr<int>_~shared_ptr \n  " color=yellow style=filled]
+"std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_2" [label="2: Exit std::shared_ptr<int>_~shared_ptr \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_reset<int,_void> \n   n$0=*&this:int** [line 180]\n  _=*n$0:int* [line 180]\n  _fun_std::__1::shared_ptr<int>_reset<int,_void>(n$0:int**,null:int*) [line 180]\n " shape="box"]
+"std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_3" [label="3:  Call _fun_std::shared_ptr<int>_reset<int,_void> \n   n$0=*&this:int** [line 180]\n  _=*n$0:int* [line 180]\n  _fun_std::shared_ptr<int>_reset<int,_void>(n$0:int**,null:int*) [line 180]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" ;
+	 "std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_3" -> "std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_2" ;
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" [label="1: Start std::__1::shared_ptr<int>_reset<int,_void>\nFormals:  this:int** p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 232]\n " color=yellow style=filled]
+"std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_1" [label="1: Start std::shared_ptr<int>_reset<int,_void>\nFormals:  this:int** p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 232]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" ;
+	 "std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_1" -> "std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_3" ;
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" [label="2: Exit std::__1::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
+"std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_2" [label="2: Exit std::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 238]\n  n$1=*&p:int* [line 238]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,n$1:void*) [line 238]\n " shape="box"]
+"std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 238]\n  n$1=*&p:int* [line 238]\n  _fun_std::shared_ptr<int>_model_set(n$0:void**,n$1:void*) [line 238]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" ;
+	 "std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_3" -> "std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_2" ;
 }

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

@@ -1,17 +1,17 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  s:class std::__1::basic_string<8d2d7b7b909d4c24> x:int* \n   DECLARE_LOCALS(&return,&s,&x); [line 17]\n " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  s:class std::basic_string<8d2d7b7b909d4c24> x:int* \n   DECLARE_LOCALS(&return,&s,&x); [line 17]\n " color=yellow style=filled]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   _fun_std::__1::basic_string<8d2d7b7b909d4c24>_basic_string(&s:class std::__1::basic_string<8d2d7b7b909d4c24>*,\"1234\":char*) [line 22]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   _fun_std::basic_string<8d2d7b7b909d4c24>_basic_string(&s:class std::basic_string<8d2d7b7b909d4c24>*,\"1234\":char*) [line 22]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   _fun_std::__1::shared_ptr<int>_shared_ptr(&x:int**) [line 21]\n  n$0=*&x:int* [line 21]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   _fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 21]\n  n$0=*&x:int* [line 21]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
@@ -64,63 +64,63 @@ digraph iCFG {
 	
 
 	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_1" [label="1: Start std::__1::shared_ptr<int>_model_set\nFormals:  self:void** value:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 53]\n " color=yellow style=filled]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_1" [label="1: Start std::shared_ptr<int>_model_set\nFormals:  self:void** value:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 53]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_1" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_3" ;
+	 "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_1" -> "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_3" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_2" [label="2: Exit std::__1::shared_ptr<int>_model_set \n  " color=yellow style=filled]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_2" [label="2: Exit std::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 54]\n  n$1=*&value:int [line 54]\n  *n$0:void*=n$1 [line 54]\n " shape="box"]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 54]\n  n$1=*&value:int [line 54]\n  *n$0:void*=n$1 [line 54]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_3" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_2" ;
+	 "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_3" -> "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_2" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_1" [label="1: Start std::__1::shared_ptr<int>_model_set\nFormals:  self:void** value:void*\nLocals:  \n   DECLARE_LOCALS(&return); [line 65]\n " color=yellow style=filled]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_1" [label="1: Start std::shared_ptr<int>_model_set\nFormals:  self:void** value:void*\nLocals:  \n   DECLARE_LOCALS(&return); [line 65]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_1" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_3" ;
+	 "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_1" -> "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_3" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_2" [label="2: Exit std::__1::shared_ptr<int>_model_set \n  " color=yellow style=filled]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_2" [label="2: Exit std::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 66]\n  n$1=*&value:void* [line 66]\n  *n$0:void*=n$1 [line 66]\n " shape="box"]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 66]\n  n$1=*&value:void* [line 66]\n  *n$0:void*=n$1 [line 66]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_3" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_2" ;
+	 "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_3" -> "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_2" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_1" [label="1: Start std::__1::shared_ptr<int>_shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 99]\n " color=yellow style=filled]
+"std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_1" [label="1: Start std::shared_ptr<int>_shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 99]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_1" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_4" ;
+	 "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_1" -> "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_4" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_2" [label="2: Exit std::__1::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
+"std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_2" [label="2: Exit std::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 100]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,null:int) [line 100]\n " shape="box"]
+"std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 100]\n  _fun_std::shared_ptr<int>_model_set(n$0:void**,null:int) [line 100]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_3" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_2" ;
+	 "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_3" -> "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_2" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_4" [label="4:  Constructor Init \n   n$1=*&this:int** [line 100]\n  _fun_std::__1::std__shared_ptr<int>_std__shared_ptr(n$1:int**) [line 99]\n  n$2=*n$1:int* [line 99]\n " shape="box"]
+"std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_4" [label="4:  Constructor Init \n   n$1=*&this:int** [line 100]\n  _fun_std::std__shared_ptr<int>_std__shared_ptr(n$1:int**) [line 99]\n  n$2=*n$1:int* [line 99]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_4" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_3" ;
+	 "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_4" -> "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_3" ;
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" [label="1: Start std::__1::shared_ptr<int>_~shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 180]\n " color=yellow style=filled]
+"std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_1" [label="1: Start std::shared_ptr<int>_~shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 180]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" ;
+	 "std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_1" -> "std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_3" ;
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" [label="2: Exit std::__1::shared_ptr<int>_~shared_ptr \n  " color=yellow style=filled]
+"std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_2" [label="2: Exit std::shared_ptr<int>_~shared_ptr \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_reset<int,_void> \n   n$0=*&this:int** [line 180]\n  _=*n$0:int* [line 180]\n  _fun_std::__1::shared_ptr<int>_reset<int,_void>(n$0:int**,null:int*) [line 180]\n " shape="box"]
+"std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_3" [label="3:  Call _fun_std::shared_ptr<int>_reset<int,_void> \n   n$0=*&this:int** [line 180]\n  _=*n$0:int* [line 180]\n  _fun_std::shared_ptr<int>_reset<int,_void>(n$0:int**,null:int*) [line 180]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" ;
+	 "std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_3" -> "std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_2" ;
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" [label="1: Start std::__1::shared_ptr<int>_reset<int,_void>\nFormals:  this:int** p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 232]\n " color=yellow style=filled]
+"std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_1" [label="1: Start std::shared_ptr<int>_reset<int,_void>\nFormals:  this:int** p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 232]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" ;
+	 "std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_1" -> "std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_3" ;
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" [label="2: Exit std::__1::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
+"std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_2" [label="2: Exit std::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 238]\n  n$1=*&p:int* [line 238]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,n$1:void*) [line 238]\n " shape="box"]
+"std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 238]\n  n$1=*&p:int* [line 238]\n  _fun_std::shared_ptr<int>_model_set(n$0:void**,n$1:void*) [line 238]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" ;
+	 "std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_3" -> "std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_2" ;
 }

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

@@ -1,17 +1,17 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  s:class std::__1::basic_string<8d2d7b7b909d4c24> x:int* \n   DECLARE_LOCALS(&return,&s,&x); [line 17]\n " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  s:class std::basic_string<8d2d7b7b909d4c24> x:int* \n   DECLARE_LOCALS(&return,&s,&x); [line 17]\n " color=yellow style=filled]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   _fun_std::__1::basic_string<8d2d7b7b909d4c24>_basic_string(&s:class std::__1::basic_string<8d2d7b7b909d4c24>*,\"1234\":char*) [line 22]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   _fun_std::basic_string<8d2d7b7b909d4c24>_basic_string(&s:class std::basic_string<8d2d7b7b909d4c24>*,\"1234\":char*) [line 22]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   _fun_std::__1::shared_ptr<int>_shared_ptr(&x:int**) [line 21]\n  n$0=*&x:int* [line 21]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   _fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 21]\n  n$0=*&x:int* [line 21]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
@@ -64,63 +64,63 @@ digraph iCFG {
 	
 
 	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_1" [label="1: Start std::__1::shared_ptr<int>_model_set\nFormals:  self:void** value:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 53]\n " color=yellow style=filled]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_1" [label="1: Start std::shared_ptr<int>_model_set\nFormals:  self:void** value:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 53]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_1" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_3" ;
+	 "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_1" -> "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_3" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_2" [label="2: Exit std::__1::shared_ptr<int>_model_set \n  " color=yellow style=filled]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_2" [label="2: Exit std::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 54]\n  n$1=*&value:int [line 54]\n  *n$0:void*=n$1 [line 54]\n " shape="box"]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 54]\n  n$1=*&value:int [line 54]\n  *n$0:void*=n$1 [line 54]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_3" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_2" ;
+	 "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_3" -> "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_2" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_1" [label="1: Start std::__1::shared_ptr<int>_model_set\nFormals:  self:void** value:void*\nLocals:  \n   DECLARE_LOCALS(&return); [line 65]\n " color=yellow style=filled]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_1" [label="1: Start std::shared_ptr<int>_model_set\nFormals:  self:void** value:void*\nLocals:  \n   DECLARE_LOCALS(&return); [line 65]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_1" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_3" ;
+	 "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_1" -> "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_3" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_2" [label="2: Exit std::__1::shared_ptr<int>_model_set \n  " color=yellow style=filled]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_2" [label="2: Exit std::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 66]\n  n$1=*&value:void* [line 66]\n  *n$0:void*=n$1 [line 66]\n " shape="box"]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 66]\n  n$1=*&value:void* [line 66]\n  *n$0:void*=n$1 [line 66]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_3" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_2" ;
+	 "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_3" -> "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_2" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_1" [label="1: Start std::__1::shared_ptr<int>_shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 99]\n " color=yellow style=filled]
+"std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_1" [label="1: Start std::shared_ptr<int>_shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 99]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_1" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_4" ;
+	 "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_1" -> "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_4" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_2" [label="2: Exit std::__1::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
+"std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_2" [label="2: Exit std::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 100]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,null:int) [line 100]\n " shape="box"]
+"std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 100]\n  _fun_std::shared_ptr<int>_model_set(n$0:void**,null:int) [line 100]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_3" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_2" ;
+	 "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_3" -> "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_2" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_4" [label="4:  Constructor Init \n   n$1=*&this:int** [line 100]\n  _fun_std::__1::std__shared_ptr<int>_std__shared_ptr(n$1:int**) [line 99]\n  n$2=*n$1:int* [line 99]\n " shape="box"]
+"std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_4" [label="4:  Constructor Init \n   n$1=*&this:int** [line 100]\n  _fun_std::std__shared_ptr<int>_std__shared_ptr(n$1:int**) [line 99]\n  n$2=*n$1:int* [line 99]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_4" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_3" ;
+	 "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_4" -> "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_3" ;
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" [label="1: Start std::__1::shared_ptr<int>_~shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 180]\n " color=yellow style=filled]
+"std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_1" [label="1: Start std::shared_ptr<int>_~shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 180]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" ;
+	 "std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_1" -> "std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_3" ;
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" [label="2: Exit std::__1::shared_ptr<int>_~shared_ptr \n  " color=yellow style=filled]
+"std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_2" [label="2: Exit std::shared_ptr<int>_~shared_ptr \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_reset<int,_void> \n   n$0=*&this:int** [line 180]\n  _=*n$0:int* [line 180]\n  _fun_std::__1::shared_ptr<int>_reset<int,_void>(n$0:int**,null:int*) [line 180]\n " shape="box"]
+"std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_3" [label="3:  Call _fun_std::shared_ptr<int>_reset<int,_void> \n   n$0=*&this:int** [line 180]\n  _=*n$0:int* [line 180]\n  _fun_std::shared_ptr<int>_reset<int,_void>(n$0:int**,null:int*) [line 180]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" ;
+	 "std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_3" -> "std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_2" ;
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" [label="1: Start std::__1::shared_ptr<int>_reset<int,_void>\nFormals:  this:int** p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 232]\n " color=yellow style=filled]
+"std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_1" [label="1: Start std::shared_ptr<int>_reset<int,_void>\nFormals:  this:int** p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 232]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" ;
+	 "std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_1" -> "std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_3" ;
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" [label="2: Exit std::__1::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
+"std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_2" [label="2: Exit std::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 238]\n  n$1=*&p:int* [line 238]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,n$1:void*) [line 238]\n " shape="box"]
+"std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 238]\n  n$1=*&p:int* [line 238]\n  _fun_std::shared_ptr<int>_model_set(n$0:void**,n$1:void*) [line 238]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" ;
+	 "std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_3" -> "std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_2" ;
 }

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

@@ -1,17 +1,17 @@
 /* @generated */
 digraph iCFG {
-"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  s:class std::__1::basic_string<8d2d7b7b909d4c24> x:int* \n   DECLARE_LOCALS(&return,&s,&x); [line 17]\n " color=yellow style=filled]
+"main.fad58de7366495db4650cfefac2fcd61_1" [label="1: Start main\nFormals: \nLocals:  s:class std::basic_string<8d2d7b7b909d4c24> x:int* \n   DECLARE_LOCALS(&return,&s,&x); [line 17]\n " color=yellow style=filled]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_1" -> "main.fad58de7366495db4650cfefac2fcd61_7" ;
 "main.fad58de7366495db4650cfefac2fcd61_2" [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   _fun_std::__1::basic_string<8d2d7b7b909d4c24>_basic_string(&s:class std::__1::basic_string<8d2d7b7b909d4c24>*,\"1234\":char*) [line 22]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_3" [label="3:  DeclStmt \n   _fun_std::basic_string<8d2d7b7b909d4c24>_basic_string(&s:class std::basic_string<8d2d7b7b909d4c24>*,\"1234\":char*) [line 22]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_3" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   _fun_std::__1::shared_ptr<int>_shared_ptr(&x:int**) [line 21]\n  n$0=*&x:int* [line 21]\n " shape="box"]
+"main.fad58de7366495db4650cfefac2fcd61_4" [label="4:  DeclStmt \n   _fun_std::shared_ptr<int>_shared_ptr(&x:int**) [line 21]\n  n$0=*&x:int* [line 21]\n " shape="box"]
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_4" -> "main.fad58de7366495db4650cfefac2fcd61_3" ;
@@ -64,63 +64,63 @@ digraph iCFG {
 	
 
 	 "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_4" -> "unused_deref_in_header{d41d8cd98f00b204e9800998ecf8427e_Z22unused_deref_in_headerPi}.78f023ac84a54d52e15a570dccffee2c_3" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_1" [label="1: Start std::__1::shared_ptr<int>_model_set\nFormals:  self:void** value:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 53]\n " color=yellow style=filled]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_1" [label="1: Start std::shared_ptr<int>_model_set\nFormals:  self:void** value:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 53]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_1" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_3" ;
+	 "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_1" -> "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_3" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_2" [label="2: Exit std::__1::shared_ptr<int>_model_set \n  " color=yellow style=filled]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_2" [label="2: Exit std::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 54]\n  n$1=*&value:int [line 54]\n  *n$0:void*=n$1 [line 54]\n " shape="box"]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 54]\n  n$1=*&value:int [line 54]\n  *n$0:void*=n$1 [line 54]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_3" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).603a5b50e9cb50a015cb89275a6b4a02_2" ;
+	 "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_3" -> "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvDn).3b1290c385ad3bc65370a4113ff16618_2" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_1" [label="1: Start std::__1::shared_ptr<int>_model_set\nFormals:  self:void** value:void*\nLocals:  \n   DECLARE_LOCALS(&return); [line 65]\n " color=yellow style=filled]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_1" [label="1: Start std::shared_ptr<int>_model_set\nFormals:  self:void** value:void*\nLocals:  \n   DECLARE_LOCALS(&return); [line 65]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_1" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_3" ;
+	 "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_1" -> "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_3" ;
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_2" [label="2: Exit std::__1::shared_ptr<int>_model_set \n  " color=yellow style=filled]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_2" [label="2: Exit std::shared_ptr<int>_model_set \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 66]\n  n$1=*&value:void* [line 66]\n  *n$0:void*=n$1 [line 66]\n " shape="box"]
+"std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&self:void** [line 66]\n  n$1=*&value:void* [line 66]\n  *n$0:void*=n$1 [line 66]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_3" -> "std::__1::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).f20560d1c1b5289ad1a513e8f9e363c5_2" ;
+	 "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_3" -> "std::shared_ptr<int>_model_set(_ZNSt3__110shared_ptrIiE9model_setEPPKvPv).3384906822d7c60ea1da0523ee8d388f_2" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_1" [label="1: Start std::__1::shared_ptr<int>_shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 99]\n " color=yellow style=filled]
+"std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_1" [label="1: Start std::shared_ptr<int>_shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 99]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_1" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_4" ;
+	 "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_1" -> "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_4" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_2" [label="2: Exit std::__1::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
+"std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_2" [label="2: Exit std::shared_ptr<int>_shared_ptr \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 100]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,null:int) [line 100]\n " shape="box"]
+"std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 100]\n  _fun_std::shared_ptr<int>_model_set(n$0:void**,null:int) [line 100]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_3" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_2" ;
+	 "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_3" -> "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_2" ;
-"std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_4" [label="4:  Constructor Init \n   n$1=*&this:int** [line 100]\n  _fun_std::__1::std__shared_ptr<int>_std__shared_ptr(n$1:int**) [line 99]\n  n$2=*n$1:int* [line 99]\n " shape="box"]
+"std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_4" [label="4:  Constructor Init \n   n$1=*&this:int** [line 100]\n  _fun_std::std__shared_ptr<int>_std__shared_ptr(n$1:int**) [line 99]\n  n$2=*n$1:int* [line 99]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_4" -> "std::__1::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.be99763d4002918a1c3f3b37430d6542_3" ;
+	 "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_4" -> "std::shared_ptr<int>_shared_ptr{_ZNSt3__110shared_ptrIiEC1Ev|constexpr}.8b8b2744319538cf253dc48f9e13621b_3" ;
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" [label="1: Start std::__1::shared_ptr<int>_~shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 180]\n " color=yellow style=filled]
+"std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_1" [label="1: Start std::shared_ptr<int>_~shared_ptr\nFormals:  this:int**\nLocals:  \n   DECLARE_LOCALS(&return); [line 180]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_1" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" ;
+	 "std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_1" -> "std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_3" ;
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" [label="2: Exit std::__1::shared_ptr<int>_~shared_ptr \n  " color=yellow style=filled]
+"std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_2" [label="2: Exit std::shared_ptr<int>_~shared_ptr \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_reset<int,_void> \n   n$0=*&this:int** [line 180]\n  _=*n$0:int* [line 180]\n  _fun_std::__1::shared_ptr<int>_reset<int,_void>(n$0:int**,null:int*) [line 180]\n " shape="box"]
+"std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_3" [label="3:  Call _fun_std::shared_ptr<int>_reset<int,_void> \n   n$0=*&this:int** [line 180]\n  _=*n$0:int* [line 180]\n  _fun_std::shared_ptr<int>_reset<int,_void>(n$0:int**,null:int*) [line 180]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_3" -> "std::__1::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).388e7f06faa2f498fd08f3d3c50ca31a_2" ;
+	 "std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_3" -> "std::shared_ptr<int>_~shared_ptr(_ZNSt3__110shared_ptrIiED0Ev).04b85d2d7f1c3c4ffa7f5c0b56e9edeb_2" ;
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" [label="1: Start std::__1::shared_ptr<int>_reset<int,_void>\nFormals:  this:int** p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 232]\n " color=yellow style=filled]
+"std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_1" [label="1: Start std::shared_ptr<int>_reset<int,_void>\nFormals:  this:int** p:int*\nLocals:  \n   DECLARE_LOCALS(&return); [line 232]\n " color=yellow style=filled]
 	
 
-	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_1" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" ;
+	 "std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_1" -> "std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_3" ;
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" [label="2: Exit std::__1::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
+"std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_2" [label="2: Exit std::shared_ptr<int>_reset<int,_void> \n  " color=yellow style=filled]
 	
 
-"std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" [label="3:  Call _fun_std::__1::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 238]\n  n$1=*&p:int* [line 238]\n  _fun_std::__1::shared_ptr<int>_model_set(n$0:void**,n$1:void*) [line 238]\n " shape="box"]
+"std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_3" [label="3:  Call _fun_std::shared_ptr<int>_model_set \n   n$0=*&this:int** [line 238]\n  n$1=*&p:int* [line 238]\n  _fun_std::shared_ptr<int>_model_set(n$0:void**,n$1:void*) [line 238]\n " shape="box"]
 	
 
-	 "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_3" -> "std::__1::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).29e462552cba695192437aa4bfbf146e_2" ;
+	 "std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_3" -> "std::shared_ptr<int>_reset<int,_void>(_ZNSt3__110shared_ptrIiE5resetIivEEvPT_).e8a3aa068a7198430323d88b83b470eb_2" ;
 }

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

@@ -7,4 +7,4 @@ codetoanalyze/cpp/checkers/siof/siof.cpp, __infer_globals_initializer_pod_access
 codetoanalyze/cpp/checkers/siof/siof_templated.cpp, __infer_globals_initializer_another_templated_global_object, 0, STATIC_INITIALIZATION_ORDER_FIASCO, [initialization of another_templated_global_object,call to SomeOtherTemplatedNonPODObject<_Bool>_SomeOtherTemplatedNonPODObject,access to extern_global_object]
 codetoanalyze/cpp/checkers/siof/siof_templated.cpp, __infer_globals_initializer_another_templated_global_object2, 0, STATIC_INITIALIZATION_ORDER_FIASCO, [initialization of another_templated_global_object2,call to access_to_non_pod,access to global_object2,access to some_other_global_object2]
 codetoanalyze/cpp/checkers/siof/siof_templated.cpp, __infer_globals_initializer_another_templated_global_object3, 0, STATIC_INITIALIZATION_ORDER_FIASCO, [initialization of another_templated_global_object3,call to access_to_templated_non_pod,access to global_object3]
-codetoanalyze/cpp/checkers/siof/std_ios_base_init.cpp, __infer_globals_initializer_global_bad_std_cerr_access, 0, STATIC_INITIALIZATION_ORDER_FIASCO, [initialization of global_bad_std_cerr_access,call to return_4_SIOF,call to printing_SIOF,access to std::__1::cerr]
+codetoanalyze/cpp/checkers/siof/std_ios_base_init.cpp, __infer_globals_initializer_global_bad_std_cerr_access, 0, STATIC_INITIALIZATION_ORDER_FIASCO, [initialization of global_bad_std_cerr_access,call to return_4_SIOF,call to printing_SIOF,access to std::cerr]

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

@@ -180,105 +180,105 @@ digraph iCFG {
 	
 
 	 "template_type_id_person{d41d8cd98f00b204e9800998ecf8427e_Z23template_type_id_personv}.154c731fb4cc46eb6a0490070c230d19_10" -> "template_type_id_person{d41d8cd98f00b204e9800998ecf8427e_Z23template_type_id_personv}.154c731fb4cc46eb6a0490070c230d19_5" ;
-"__infer_globals_initializer_std::__1::__numeric_type<void>::value.57c383a785ca57f6432142c6cac8d773_1" [label="1: Start __infer_globals_initializer_std::__1::__numeric_type<void>::value\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 1697]\n " color=yellow style=filled]
+"__infer_globals_initializer_std::__numeric_type<void>::value.b45fbeae70eb63b2ce063d12b196376f_1" [label="1: Start __infer_globals_initializer_std::__numeric_type<void>::value\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 1697]\n " color=yellow style=filled]
 	
 
-	 "__infer_globals_initializer_std::__1::__numeric_type<void>::value.57c383a785ca57f6432142c6cac8d773_1" -> "__infer_globals_initializer_std::__1::__numeric_type<void>::value.57c383a785ca57f6432142c6cac8d773_3" ;
+	 "__infer_globals_initializer_std::__numeric_type<void>::value.b45fbeae70eb63b2ce063d12b196376f_1" -> "__infer_globals_initializer_std::__numeric_type<void>::value.b45fbeae70eb63b2ce063d12b196376f_3" ;
-"__infer_globals_initializer_std::__1::__numeric_type<void>::value.57c383a785ca57f6432142c6cac8d773_2" [label="2: Exit __infer_globals_initializer_std::__1::__numeric_type<void>::value \n  " color=yellow style=filled]
+"__infer_globals_initializer_std::__numeric_type<void>::value.b45fbeae70eb63b2ce063d12b196376f_2" [label="2: Exit __infer_globals_initializer_std::__numeric_type<void>::value \n  " color=yellow style=filled]
 	
 
-"__infer_globals_initializer_std::__1::__numeric_type<void>::value.57c383a785ca57f6432142c6cac8d773_3" [label="3:  DeclStmt \n   *&#GB<codetoanalyze/cpp/shared/types/typeid_expr.cpp>$std::__1::__numeric_type<void>::value:_Bool=1 [line 1697]\n " shape="box"]
+"__infer_globals_initializer_std::__numeric_type<void>::value.b45fbeae70eb63b2ce063d12b196376f_3" [label="3:  DeclStmt \n   *&#GB<codetoanalyze/cpp/shared/types/typeid_expr.cpp>$std::__numeric_type<void>::value:_Bool=1 [line 1697]\n " shape="box"]
 	
 
-	 "__infer_globals_initializer_std::__1::__numeric_type<void>::value.57c383a785ca57f6432142c6cac8d773_3" -> "__infer_globals_initializer_std::__1::__numeric_type<void>::value.57c383a785ca57f6432142c6cac8d773_2" ;
+	 "__infer_globals_initializer_std::__numeric_type<void>::value.b45fbeae70eb63b2ce063d12b196376f_3" -> "__infer_globals_initializer_std::__numeric_type<void>::value.b45fbeae70eb63b2ce063d12b196376f_2" ;
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEi}.65bc03ff4b5c7c87c05f0ddf70269c40_1" [label="1: Start std::__1::__convert_to_integral\nFormals:  __val:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 4309]\n " color=yellow style=filled]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEi}.1eb7f164a9403005045ae70ce737ebe8_1" [label="1: Start std::__convert_to_integral\nFormals:  __val:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 4309]\n " color=yellow style=filled]
 	
 
-	 "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEi}.65bc03ff4b5c7c87c05f0ddf70269c40_1" -> "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEi}.65bc03ff4b5c7c87c05f0ddf70269c40_3" ;
+	 "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEi}.1eb7f164a9403005045ae70ce737ebe8_1" -> "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEi}.1eb7f164a9403005045ae70ce737ebe8_3" ;
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEi}.65bc03ff4b5c7c87c05f0ddf70269c40_2" [label="2: Exit std::__1::__convert_to_integral \n  " color=yellow style=filled]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEi}.1eb7f164a9403005045ae70ce737ebe8_2" [label="2: Exit std::__convert_to_integral \n  " color=yellow style=filled]
 	
 
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEi}.65bc03ff4b5c7c87c05f0ddf70269c40_3" [label="3:  Return Stmt \n   n$0=*&__val:int [line 4310]\n  *&return:int=n$0 [line 4310]\n " shape="box"]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEi}.1eb7f164a9403005045ae70ce737ebe8_3" [label="3:  Return Stmt \n   n$0=*&__val:int [line 4310]\n  *&return:int=n$0 [line 4310]\n " shape="box"]
 	
 
-	 "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEi}.65bc03ff4b5c7c87c05f0ddf70269c40_3" -> "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEi}.65bc03ff4b5c7c87c05f0ddf70269c40_2" ;
+	 "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEi}.1eb7f164a9403005045ae70ce737ebe8_3" -> "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEi}.1eb7f164a9403005045ae70ce737ebe8_2" ;
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEn}.eb349199a034880b323b3efc14338a06_1" [label="1: Start std::__1::__convert_to_integral\nFormals:  __val:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 4328]\n " color=yellow style=filled]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEn}.ed84a855c3a44044ce0105648e0684e6_1" [label="1: Start std::__convert_to_integral\nFormals:  __val:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 4328]\n " color=yellow style=filled]
 	
 
-	 "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEn}.eb349199a034880b323b3efc14338a06_1" -> "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEn}.eb349199a034880b323b3efc14338a06_3" ;
+	 "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEn}.ed84a855c3a44044ce0105648e0684e6_1" -> "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEn}.ed84a855c3a44044ce0105648e0684e6_3" ;
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEn}.eb349199a034880b323b3efc14338a06_2" [label="2: Exit std::__1::__convert_to_integral \n  " color=yellow style=filled]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEn}.ed84a855c3a44044ce0105648e0684e6_2" [label="2: Exit std::__convert_to_integral \n  " color=yellow style=filled]
 	
 
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEn}.eb349199a034880b323b3efc14338a06_3" [label="3:  Return Stmt \n   n$0=*&__val:int [line 4329]\n  *&return:int=n$0 [line 4329]\n " shape="box"]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEn}.ed84a855c3a44044ce0105648e0684e6_3" [label="3:  Return Stmt \n   n$0=*&__val:int [line 4329]\n  *&return:int=n$0 [line 4329]\n " shape="box"]
 	
 
-	 "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEn}.eb349199a034880b323b3efc14338a06_3" -> "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEn}.eb349199a034880b323b3efc14338a06_2" ;
+	 "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEn}.ed84a855c3a44044ce0105648e0684e6_3" -> "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEn}.ed84a855c3a44044ce0105648e0684e6_2" ;
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEj}.c1ea8052a0274e72f3c3e5e76298d994_1" [label="1: Start std::__1::__convert_to_integral\nFormals:  __val:unsigned int\nLocals:  \n   DECLARE_LOCALS(&return); [line 4312]\n " color=yellow style=filled]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEj}.f1dd0af4bcd5f7680fb3650df8859f81_1" [label="1: Start std::__convert_to_integral\nFormals:  __val:unsigned int\nLocals:  \n   DECLARE_LOCALS(&return); [line 4312]\n " color=yellow style=filled]
 	
 
-	 "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEj}.c1ea8052a0274e72f3c3e5e76298d994_1" -> "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEj}.c1ea8052a0274e72f3c3e5e76298d994_3" ;
+	 "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEj}.f1dd0af4bcd5f7680fb3650df8859f81_1" -> "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEj}.f1dd0af4bcd5f7680fb3650df8859f81_3" ;
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEj}.c1ea8052a0274e72f3c3e5e76298d994_2" [label="2: Exit std::__1::__convert_to_integral \n  " color=yellow style=filled]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEj}.f1dd0af4bcd5f7680fb3650df8859f81_2" [label="2: Exit std::__convert_to_integral \n  " color=yellow style=filled]
 	
 
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEj}.c1ea8052a0274e72f3c3e5e76298d994_3" [label="3:  Return Stmt \n   n$0=*&__val:unsigned int [line 4313]\n  *&return:unsigned int=n$0 [line 4313]\n " shape="box"]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEj}.f1dd0af4bcd5f7680fb3650df8859f81_3" [label="3:  Return Stmt \n   n$0=*&__val:unsigned int [line 4313]\n  *&return:unsigned int=n$0 [line 4313]\n " shape="box"]
 	
 
-	 "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEj}.c1ea8052a0274e72f3c3e5e76298d994_3" -> "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEj}.c1ea8052a0274e72f3c3e5e76298d994_2" ;
+	 "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEj}.f1dd0af4bcd5f7680fb3650df8859f81_3" -> "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEj}.f1dd0af4bcd5f7680fb3650df8859f81_2" ;
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEo}.ea63971267d44b573f5b71db4f63f67c_1" [label="1: Start std::__1::__convert_to_integral\nFormals:  __val:unsigned int\nLocals:  \n   DECLARE_LOCALS(&return); [line 4331]\n " color=yellow style=filled]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEo}.30929731b2e6d7996f82f1b5483cb0a9_1" [label="1: Start std::__convert_to_integral\nFormals:  __val:unsigned int\nLocals:  \n   DECLARE_LOCALS(&return); [line 4331]\n " color=yellow style=filled]
 	
 
-	 "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEo}.ea63971267d44b573f5b71db4f63f67c_1" -> "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEo}.ea63971267d44b573f5b71db4f63f67c_3" ;
+	 "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEo}.30929731b2e6d7996f82f1b5483cb0a9_1" -> "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEo}.30929731b2e6d7996f82f1b5483cb0a9_3" ;
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEo}.ea63971267d44b573f5b71db4f63f67c_2" [label="2: Exit std::__1::__convert_to_integral \n  " color=yellow style=filled]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEo}.30929731b2e6d7996f82f1b5483cb0a9_2" [label="2: Exit std::__convert_to_integral \n  " color=yellow style=filled]
 	
 
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEo}.ea63971267d44b573f5b71db4f63f67c_3" [label="3:  Return Stmt \n   n$0=*&__val:unsigned int [line 4332]\n  *&return:unsigned int=n$0 [line 4332]\n " shape="box"]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEo}.30929731b2e6d7996f82f1b5483cb0a9_3" [label="3:  Return Stmt \n   n$0=*&__val:unsigned int [line 4332]\n  *&return:unsigned int=n$0 [line 4332]\n " shape="box"]
 	
 
-	 "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEo}.ea63971267d44b573f5b71db4f63f67c_3" -> "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEo}.ea63971267d44b573f5b71db4f63f67c_2" ;
+	 "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEo}.30929731b2e6d7996f82f1b5483cb0a9_3" -> "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEo}.30929731b2e6d7996f82f1b5483cb0a9_2" ;
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEl}.a4872a5a50db0df00a8a22cb8a916d21_1" [label="1: Start std::__1::__convert_to_integral\nFormals:  __val:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 4315]\n " color=yellow style=filled]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEl}.348707900bb8fd1e28ad5f08f30568e7_1" [label="1: Start std::__convert_to_integral\nFormals:  __val:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 4315]\n " color=yellow style=filled]
 	
 
-	 "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEl}.a4872a5a50db0df00a8a22cb8a916d21_1" -> "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEl}.a4872a5a50db0df00a8a22cb8a916d21_3" ;
+	 "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEl}.348707900bb8fd1e28ad5f08f30568e7_1" -> "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEl}.348707900bb8fd1e28ad5f08f30568e7_3" ;
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEl}.a4872a5a50db0df00a8a22cb8a916d21_2" [label="2: Exit std::__1::__convert_to_integral \n  " color=yellow style=filled]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEl}.348707900bb8fd1e28ad5f08f30568e7_2" [label="2: Exit std::__convert_to_integral \n  " color=yellow style=filled]
 	
 
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEl}.a4872a5a50db0df00a8a22cb8a916d21_3" [label="3:  Return Stmt \n   n$0=*&__val:long [line 4316]\n  *&return:long=n$0 [line 4316]\n " shape="box"]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEl}.348707900bb8fd1e28ad5f08f30568e7_3" [label="3:  Return Stmt \n   n$0=*&__val:long [line 4316]\n  *&return:long=n$0 [line 4316]\n " shape="box"]
 	
 
-	 "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEl}.a4872a5a50db0df00a8a22cb8a916d21_3" -> "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEl}.a4872a5a50db0df00a8a22cb8a916d21_2" ;
+	 "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEl}.348707900bb8fd1e28ad5f08f30568e7_3" -> "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEl}.348707900bb8fd1e28ad5f08f30568e7_2" ;
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEm}.8aa64ebbd1a4ca322418eee8c80dfd72_1" [label="1: Start std::__1::__convert_to_integral\nFormals:  __val:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 4318]\n " color=yellow style=filled]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEm}.84bd0a09103d5e0c258cab85557a68bc_1" [label="1: Start std::__convert_to_integral\nFormals:  __val:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 4318]\n " color=yellow style=filled]
 	
 
-	 "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEm}.8aa64ebbd1a4ca322418eee8c80dfd72_1" -> "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEm}.8aa64ebbd1a4ca322418eee8c80dfd72_3" ;
+	 "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEm}.84bd0a09103d5e0c258cab85557a68bc_1" -> "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEm}.84bd0a09103d5e0c258cab85557a68bc_3" ;
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEm}.8aa64ebbd1a4ca322418eee8c80dfd72_2" [label="2: Exit std::__1::__convert_to_integral \n  " color=yellow style=filled]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEm}.84bd0a09103d5e0c258cab85557a68bc_2" [label="2: Exit std::__convert_to_integral \n  " color=yellow style=filled]
 	
 
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEm}.8aa64ebbd1a4ca322418eee8c80dfd72_3" [label="3:  Return Stmt \n   n$0=*&__val:unsigned long [line 4319]\n  *&return:unsigned long=n$0 [line 4319]\n " shape="box"]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEm}.84bd0a09103d5e0c258cab85557a68bc_3" [label="3:  Return Stmt \n   n$0=*&__val:unsigned long [line 4319]\n  *&return:unsigned long=n$0 [line 4319]\n " shape="box"]
 	
 
-	 "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEm}.8aa64ebbd1a4ca322418eee8c80dfd72_3" -> "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEm}.8aa64ebbd1a4ca322418eee8c80dfd72_2" ;
+	 "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEm}.84bd0a09103d5e0c258cab85557a68bc_3" -> "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEm}.84bd0a09103d5e0c258cab85557a68bc_2" ;
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEx}.286c3247660b2e1d8184603d8ff6f452_1" [label="1: Start std::__1::__convert_to_integral\nFormals:  __val:long long\nLocals:  \n   DECLARE_LOCALS(&return); [line 4321]\n " color=yellow style=filled]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEx}.f066969bc6f8422cf6ceaa1297bc58d6_1" [label="1: Start std::__convert_to_integral\nFormals:  __val:long long\nLocals:  \n   DECLARE_LOCALS(&return); [line 4321]\n " color=yellow style=filled]
 	
 
-	 "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEx}.286c3247660b2e1d8184603d8ff6f452_1" -> "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEx}.286c3247660b2e1d8184603d8ff6f452_3" ;
+	 "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEx}.f066969bc6f8422cf6ceaa1297bc58d6_1" -> "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEx}.f066969bc6f8422cf6ceaa1297bc58d6_3" ;
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEx}.286c3247660b2e1d8184603d8ff6f452_2" [label="2: Exit std::__1::__convert_to_integral \n  " color=yellow style=filled]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEx}.f066969bc6f8422cf6ceaa1297bc58d6_2" [label="2: Exit std::__convert_to_integral \n  " color=yellow style=filled]
 	
 
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEx}.286c3247660b2e1d8184603d8ff6f452_3" [label="3:  Return Stmt \n   n$0=*&__val:long long [line 4322]\n  *&return:long long=n$0 [line 4322]\n " shape="box"]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEx}.f066969bc6f8422cf6ceaa1297bc58d6_3" [label="3:  Return Stmt \n   n$0=*&__val:long long [line 4322]\n  *&return:long long=n$0 [line 4322]\n " shape="box"]
 	
 
-	 "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEx}.286c3247660b2e1d8184603d8ff6f452_3" -> "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEx}.286c3247660b2e1d8184603d8ff6f452_2" ;
+	 "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEx}.f066969bc6f8422cf6ceaa1297bc58d6_3" -> "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEx}.f066969bc6f8422cf6ceaa1297bc58d6_2" ;
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEy}.107767dea09906200ae3ba4020266a5f_1" [label="1: Start std::__1::__convert_to_integral\nFormals:  __val:unsigned long long\nLocals:  \n   DECLARE_LOCALS(&return); [line 4324]\n " color=yellow style=filled]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEy}.000db57bf43524036cc598dc72fc1cb7_1" [label="1: Start std::__convert_to_integral\nFormals:  __val:unsigned long long\nLocals:  \n   DECLARE_LOCALS(&return); [line 4324]\n " color=yellow style=filled]
 	
 
-	 "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEy}.107767dea09906200ae3ba4020266a5f_1" -> "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEy}.107767dea09906200ae3ba4020266a5f_3" ;
+	 "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEy}.000db57bf43524036cc598dc72fc1cb7_1" -> "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEy}.000db57bf43524036cc598dc72fc1cb7_3" ;
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEy}.107767dea09906200ae3ba4020266a5f_2" [label="2: Exit std::__1::__convert_to_integral \n  " color=yellow style=filled]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEy}.000db57bf43524036cc598dc72fc1cb7_2" [label="2: Exit std::__convert_to_integral \n  " color=yellow style=filled]
 	
 
-"std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEy}.107767dea09906200ae3ba4020266a5f_3" [label="3:  Return Stmt \n   n$0=*&__val:unsigned long long [line 4325]\n  *&return:unsigned long long=n$0 [line 4325]\n " shape="box"]
+"std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEy}.000db57bf43524036cc598dc72fc1cb7_3" [label="3:  Return Stmt \n   n$0=*&__val:unsigned long long [line 4325]\n  *&return:unsigned long long=n$0 [line 4325]\n " shape="box"]
 	
 
-	 "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEy}.107767dea09906200ae3ba4020266a5f_3" -> "std::__1::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEy}.107767dea09906200ae3ba4020266a5f_2" ;
+	 "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEy}.000db57bf43524036cc598dc72fc1cb7_3" -> "std::__convert_to_integral{d41d8cd98f00b204e9800998ecf8427e_ZNSt3__121__convert_to_integralEy}.000db57bf43524036cc598dc72fc1cb7_2" ;
 "person_ptr_typeid{d41d8cd98f00b204e9800998ecf8427e_Z17person_ptr_typeidP6Person}.6bb28dca3178f0fdd15c7c17fa602118_1" [label="1: Start person_ptr_typeid\nFormals:  ptr:class Person*\nLocals:  person:class Person \n   DECLARE_LOCALS(&return,&person); [line 48]\n " color=yellow style=filled]