fix infinitely-expanding types in the backend

Summary:
Simple instance of the problem: analyzing the following program times out.

```
#include <tuple>
void foo() {
  std::tuple<std::tuple<int>> x;
}
```

Replacing `std::tuple<std::tuple<int>>` by `std::tuple<int>` makes the analysis
terminate.

In the AST, both tuple<tuple<int>> and tuple<int> have the same template
specialization type: "Pack" (which means we're supposed to go look into the
arguments of the template to get their values). This is not information enough
and that's the plugin fault.

On the backend side, this means that two types have the same Typ.Name.t, namely
"std::tuple<_>", so they collide in the tenv. The definition of
tuple<tuple<int>> is the one making it into the tenv. One of the fields of the
corresponding CxxRecord is of type "tuple<int>", which we see as the same
"tuple<_>", which causes the loop.

update-submodule: facebook-clang-plugins

Reviewed By: mbouaziz

Differential Revision: D5775840

fbshipit-source-id: 0528604

facebook-clang-plugins

@@ -1 +1 @@
-Subproject commit ea5e6c489aff5924f0fdeeb1270ee4a878492c8f
+Subproject commit cc047c7fa7a4899c95320e4a5520b2d469040344

infer/src/IR/Typ.ml

@@ -138,7 +138,18 @@ module T = struct
     | ObjcProtocol of QualifiedCppName.t
     [@@deriving compare]
 
-  and template_spec_info = NoTemplate | Template of t option list [@@deriving compare]
+  and template_arg =
+    | TType of t
+    | TInt of Int64.t
+    | TNull
+    | TNullPtr
+    | TOpaque
+    [@@deriving compare]
+
+  and template_spec_info =
+    | NoTemplate
+    | Template of {mangled: string option; args: template_arg list}
+    [@@deriving compare]
 
   let equal_desc = [%compare.equal : desc]
 
@@ -221,12 +232,18 @@ and pp_name_c_syntax pe f = function
 and pp_template_spec_info pe f = function
   | NoTemplate
    -> ()
-  | Template args
+  | Template {args}
    -> let pp_arg_opt f = function
-        | Some typ
-         -> F.fprintf f "%a" (pp_full pe) typ
-        | None
-         -> F.fprintf f "_"
+        | TType typ
+         -> pp_full pe f typ
+        | TInt i
+         -> Int64.pp f i
+        | TNull
+         -> Pp.string f "null"
+        | TNullPtr
+         -> Pp.string f "NullPtr"
+        | TOpaque
+         -> Pp.string f "Opaque"
       in
       F.fprintf f "%s%a%s" (escape pe "<") (Pp.comma_seq pp_arg_opt) args (escape pe ">")
 
@@ -266,17 +283,17 @@ let rec sub_type subst generic_typ : t =
 
 and sub_tname subst tname =
   match tname with
-  | CppClass (name, Template spec_info)
+  | CppClass (name, Template {mangled; args})
    -> let sub_typ_opt typ_opt =
         match typ_opt with
-        | Some typ
+        | TType typ
          -> let typ' = sub_type subst typ in
-            if phys_equal typ typ' then typ_opt else Some typ'
-        | None
+            if phys_equal typ typ' then typ_opt else TType typ'
+        | TInt _ | TNull | TNullPtr | TOpaque
          -> typ_opt
       in
-      let spec_info' = IList.map_changed sub_typ_opt spec_info in
-      if phys_equal spec_info spec_info' then tname else CppClass (name, Template spec_info')
+      let args' = IList.map_changed sub_typ_opt args in
+      if phys_equal args args' then tname else CppClass (name, Template {mangled; args= args'})
   | _
    -> tname
 
@@ -304,7 +321,7 @@ module Name = struct
 
   let name n =
     match n with
-    | CStruct _ | CUnion _ | CppClass (_, _) | ObjcClass _ | ObjcProtocol _
+    | CStruct _ | CUnion _ | CppClass _ | ObjcClass _ | ObjcProtocol _
      -> qual_name n |> QualifiedCppName.to_qual_string
     | JavaClass name
      -> Mangled.to_string name
@@ -315,7 +332,7 @@ module Name = struct
        -> "struct"
       | CUnion _
        -> "union"
-      | CppClass (_, _) | JavaClass _ | ObjcClass _
+      | CppClass _ | JavaClass _ | ObjcClass _
        -> "class"
       | ObjcProtocol _
        -> "protocol"
@@ -324,13 +341,13 @@ module Name = struct
 
   let to_string = F.asprintf "%a" pp
 
-  let is_class = function CppClass (_, _) | JavaClass _ | ObjcClass _ -> true | _ -> false
+  let is_class = function CppClass _ | JavaClass _ | ObjcClass _ -> true | _ -> false
 
   let is_same_type t1 t2 =
     match (t1, t2) with
     | CStruct _, CStruct _
     | CUnion _, CUnion _
-    | CppClass (_, _), CppClass (_, _)
+    | CppClass _, CppClass _
     | JavaClass _, JavaClass _
     | ObjcClass _, ObjcClass _
     | ObjcProtocol _, ObjcProtocol _
@@ -1019,7 +1036,7 @@ module Procname = struct
   let get_template_args_mapping generic_procname concrete_procname =
     let mapping_for_template_args (generic_name, generic_args) (concrete_name, concrete_args) =
       match (generic_args, concrete_args) with
-      | Template generic_typs, Template concrete_typs
+      | Template {args= generic_typs}, Template {args= concrete_typs}
         when QualifiedCppName.equal generic_name concrete_name -> (
         try
           `Valid
@@ -1030,7 +1047,7 @@ module Procname = struct
                ctyp
                ->
                  match (gtyp, ctyp) with
-                 | Some {desc= TVar name}, Some concrete
+                 | TType {desc= TVar name}, TType concrete
                   -> (name, concrete) :: result
                  | _
                   -> result ))

infer/src/IR/Typ.mli

@@ -98,7 +98,17 @@ and name =
   | ObjcProtocol of QualifiedCppName.t
   [@@deriving compare]
 
-and template_spec_info = NoTemplate | Template of t option list [@@deriving compare]
+and template_arg = TType of t | TInt of Int64.t | TNull | TNullPtr | TOpaque [@@deriving compare]
+
+and template_spec_info =
+  | NoTemplate
+  | Template of
+      { mangled: string option
+            (** WARNING: because of type substitutions performed by [sub_type] and [sub_tname],
+                mangling is not guaranteed to be unique to a single type. All the information in
+                the template arguments is also needed for uniqueness. *)
+      ; args: template_arg list }
+  [@@deriving compare]
 
 val mk : ?default:t -> ?quals:type_quals -> desc -> t
 (** Create Typ.t from given desc. if [default] is passed then use its value to set other fields such as quals *)

infer/src/backend/prop.ml

@@ -451,8 +451,14 @@ let atom_const_lt_exp (atom: Sil.atom) =
 
 let exp_reorder e1 e2 = if Exp.compare e1 e2 <= 0 then (e1, e2) else (e2, e1)
 
+let rec pp_path f = function
+  | []
+   -> ()
+  | (name, fld) :: path
+   -> F.fprintf f "%a.%a: " Typ.Name.pp name Typ.Fieldname.pp fld ; pp_path f path
+
 (** create a strexp of the given type, populating the structures if [struct_init_mode] is [Fld_init] *)
-let rec create_strexp_of_type tenv struct_init_mode (typ: Typ.t) len inst : Sil.strexp =
+let rec create_strexp_of_type ~path tenv struct_init_mode (typ: Typ.t) len inst : Sil.strexp =
   let init_value () =
     let create_fresh_var () =
       let fresh_id =
@@ -467,20 +473,30 @@ let rec create_strexp_of_type tenv struct_init_mode (typ: Typ.t) len inst : Sil.
   match (typ.desc, len) with
   | (Tint _ | Tfloat _ | Tvoid | Tfun _ | Tptr _ | TVar _), None
    -> Eexp (init_value (), inst)
-  | Tstruct name, _ -> (
-    match (struct_init_mode, Tenv.lookup tenv name) with
-    | Fld_init, Some {fields}
-     -> (* pass len as an accumulator, so that it is passed to create_strexp_of_type for the last
+  | Tstruct name, _
+   -> (
+      if List.exists ~f:(fun (n, _) -> Typ.Name.equal n name) path then
+        L.die InternalError
+          "Ill-founded recursion in [create_strexp_of_type]: a sub-element of struct %a is also of type struct %a: %a:%a"
+          Typ.Name.pp name Typ.Name.pp name pp_path (List.rev path) Typ.Name.pp name ;
+      match (struct_init_mode, Tenv.lookup tenv name) with
+      | Fld_init, Some {fields}
+       -> (* pass len as an accumulator, so that it is passed to create_strexp_of_type for the last
              field, but always return None so that only the last field receives len *)
-        let f (fld, t, a) (flds, len) =
-          if Typ.Struct.is_objc_ref_counter_field (fld, t, a) then
-            ((fld, Sil.Eexp (Exp.one, inst)) :: flds, None)
-          else ((fld, create_strexp_of_type tenv struct_init_mode t len inst) :: flds, None)
-        in
-        let flds, _ = List.fold_right ~f fields ~init:([], len) in
-        Estruct (flds, inst)
-    | _
-     -> Estruct ([], inst) )
+          let f (fld, t, a) (flds, len) =
+            if Typ.Struct.is_objc_ref_counter_field (fld, t, a) then
+              ((fld, Sil.Eexp (Exp.one, inst)) :: flds, None)
+            else
+              ( ( fld
+                , create_strexp_of_type ~path:((name, fld) :: path) tenv struct_init_mode t len
+                    inst )
+                :: flds
+              , None )
+          in
+          let flds, _ = List.fold_right ~f fields ~init:([], len) in
+          Estruct (flds, inst)
+      | _
+       -> Estruct ([], inst) )
   | Tarray (_, len_opt, _), None
    -> let len =
         match len_opt with None -> Exp.get_undefined false | Some len -> Exp.Const (Cint len)
@@ -491,6 +507,9 @@ let rec create_strexp_of_type tenv struct_init_mode (typ: Typ.t) len inst : Sil.
   | (Tint _ | Tfloat _ | Tvoid | Tfun _ | Tptr _ | TVar _), Some _
    -> assert false
 
+let create_strexp_of_type tenv struct_init_mode (typ: Typ.t) len inst : Sil.strexp =
+  create_strexp_of_type ~path:[] tenv struct_init_mode (typ : Typ.t) len inst
+
 let replace_array_contents (hpred: Sil.hpred) esel : Sil.hpred =
   match hpred with
   | Hpointsto (root, Sil.Earray (len, [], inst), te)

infer/src/clang/CProcname.ml

@@ -31,15 +31,11 @@ let rec get_mangled_method_name function_decl_info method_decl_info =
       | _
        -> assert false
 
-let get_template_info tenv (fdi: Clang_ast_t.function_decl_info) : Typ.template_spec_info =
+let get_template_info tenv (fdi: Clang_ast_t.function_decl_info) =
   match fdi.fdi_template_specialization with
   | Some spec_info
    -> Typ.Template
-        (List.map spec_info.tsi_specialization_args ~f:(function
-          | `Type qual_type
-           -> Some (CType_decl.qual_type_to_sil_type tenv qual_type)
-          | _
-           -> None ))
+        {mangled= fdi.fdi_mangled_name; args= CType_decl.get_template_args tenv spec_info}
   | None
    -> Typ.NoTemplate
 

infer/src/clang/CType_decl.ml

@@ -46,7 +46,7 @@ let get_superclass_decls decl =
   let open Clang_ast_t in
   match decl with
   | CXXRecordDecl (_, _, _, _, _, _, _, cxx_rec_info)
-  | ClassTemplateSpecializationDecl (_, _, _, _, _, _, _, cxx_rec_info, _)
+  | ClassTemplateSpecializationDecl (_, _, _, _, _, _, _, cxx_rec_info, _, _)
    -> (* there is no concept of virtual inheritance in the backend right now *)
       let base_ptr = cxx_rec_info.Clang_ast_t.xrdi_bases @ cxx_rec_info.Clang_ast_t.xrdi_vbases in
       let get_decl_or_fail typ_ptr =
@@ -86,7 +86,7 @@ let get_translate_as_friend_decl decl_list =
   match get_friend_decl_opt (List.find_exn ~f:is_translate_as_friend_decl decl_list) with
   | Some
       Clang_ast_t.ClassTemplateSpecializationDecl
-        (_, _, _, _, _, _, _, _, {tsi_specialization_args= [(`Type t_ptr)]})
+        (_, _, _, _, _, _, _, _, _, {tsi_specialization_args= [(`Type t_ptr)]})
    -> Some t_ptr
   | _
    -> None
@@ -97,7 +97,7 @@ let get_record_definition decl =
   let open Clang_ast_t in
   match decl with
   | ClassTemplateSpecializationDecl
-      (_, _, _, _, _, _, {rdi_is_complete_definition; rdi_definition_ptr}, _, _)
+      (_, _, _, _, _, _, {rdi_is_complete_definition; rdi_definition_ptr}, _, _, _)
   | CXXRecordDecl (_, _, _, _, _, _, {rdi_is_complete_definition; rdi_definition_ptr}, _)
   | RecordDecl (_, _, _, _, _, _, {rdi_is_complete_definition; rdi_definition_ptr})
     when not rdi_is_complete_definition && rdi_definition_ptr <> 0
@@ -109,7 +109,7 @@ let rec get_struct_fields tenv decl =
   let open Clang_ast_t in
   let decl_list =
     match decl with
-    | ClassTemplateSpecializationDecl (_, _, _, _, decl_list, _, _, _, _)
+    | ClassTemplateSpecializationDecl (_, _, _, _, decl_list, _, _, _, _, _)
     | CXXRecordDecl (_, _, _, _, decl_list, _, _, _)
     | RecordDecl (_, _, _, _, decl_list, _, _)
      -> decl_list
@@ -149,7 +149,7 @@ and get_record_custom_type tenv definition_decl =
 and get_record_friend_decl_type tenv definition_decl =
   let open Clang_ast_t in
   match definition_decl with
-  | ClassTemplateSpecializationDecl (_, _, _, _, decl_list, _, _, _, _)
+  | ClassTemplateSpecializationDecl (_, _, _, _, decl_list, _, _, _, _, _)
   | CXXRecordDecl (_, _, _, _, decl_list, _, _, _)
    -> Option.map ~f:(qual_type_to_sil_type tenv) (get_translate_as_friend_decl decl_list)
   | _
@@ -181,7 +181,7 @@ and get_record_typename ?tenv decl =
   match (decl, tenv) with
   | RecordDecl (_, name_info, opt_type, _, _, _, _), _
    -> CAst_utils.get_qualified_name ~linters_mode name_info |> create_c_record_typename opt_type
-  | ClassTemplateSpecializationDecl (_, _, _, _, _, _, _, _, spec_info), Some tenv
+  | ClassTemplateSpecializationDecl (_, _, _, _, _, _, _, _, mangling, spec_info), Some tenv
    -> let tname =
         match CAst_utils.get_decl spec_info.tsi_template_decl with
         | Some dec
@@ -189,16 +189,11 @@ and get_record_typename ?tenv decl =
         | None
          -> assert false
       in
-      let args_in_sil =
-        List.map spec_info.tsi_specialization_args ~f:(function
-          | `Type qual_type
-           -> Some (qual_type_to_sil_type tenv qual_type)
-          | _
-           -> None )
-      in
-      Typ.Name.Cpp.from_qual_name (Typ.Template args_in_sil) tname
+      let args = get_template_args tenv spec_info in
+      let mangled = if String.equal "" mangling then None else Some mangling in
+      Typ.Name.Cpp.from_qual_name (Typ.Template {mangled; args}) tname
   | CXXRecordDecl (_, name_info, _, _, _, _, _, _), _
-  | ClassTemplateSpecializationDecl (_, name_info, _, _, _, _, _, _, _), _
+  | ClassTemplateSpecializationDecl (_, name_info, _, _, _, _, _, _, _, _), _
    -> (* we use Typ.CppClass for C++ because we expect Typ.CppClass from *)
       (* types that have methods. And in C++ struct/class/union can have methods *)
       Typ.Name.Cpp.from_qual_name Typ.NoTemplate
@@ -226,7 +221,7 @@ and get_superclass_list_cpp tenv decl =
 and get_record_struct_type tenv definition_decl : Typ.desc =
   let open Clang_ast_t in
   match definition_decl with
-  | ClassTemplateSpecializationDecl (_, _, _, type_ptr, _, _, record_decl_info, _, _)
+  | ClassTemplateSpecializationDecl (_, _, _, type_ptr, _, _, record_decl_info, _, _, _)
   | CXXRecordDecl (_, _, _, type_ptr, _, _, record_decl_info, _)
   | RecordDecl (_, _, _, type_ptr, _, _, record_decl_info)
    -> (
@@ -287,6 +282,23 @@ and add_types_from_decl_to_tenv tenv decl =
   | _
    -> assert false
 
+and get_template_args tenv (tsi: Clang_ast_t.template_specialization_info) =
+  let rec aux = function
+    | `Type qual_type
+     -> [Typ.TType (qual_type_to_sil_type tenv qual_type)]
+    | `Expression | `TemplateExpansion | `Template | `Declaration _
+     -> [Typ.TOpaque]
+    | `Integral i -> (
+      match Int64.of_string i with x -> [Typ.TInt x] | exception Failure _ -> [Typ.TOpaque] )
+    | `Null
+     -> [Typ.TNull]
+    | `NullPtr
+     -> [Typ.TNullPtr]
+    | `Pack p
+     -> List.concat_map ~f:aux p
+  in
+  List.concat_map ~f:aux tsi.tsi_specialization_args
+
 and qual_type_to_sil_type tenv qual_type =
   CType_to_sil_type.qual_type_to_sil_type add_types_from_decl_to_tenv tenv qual_type
 

infer/src/clang/CType_decl.mli

@@ -28,3 +28,5 @@ val get_class_type_np :
   Tenv.t -> Clang_ast_t.expr_info -> Clang_ast_t.obj_c_message_expr_info -> Typ.t
 
 val get_type_from_expr_info : Clang_ast_t.expr_info -> Tenv.t -> Typ.t
+
+val get_template_args : Tenv.t -> Clang_ast_t.template_specialization_info -> Typ.template_arg list

infer/src/clang/cAst_utils.ml

@@ -425,8 +425,8 @@ let type_of_decl decl =
   | EnumDecl (_, _, _, type_ptr, _, _, _)
   | RecordDecl (_, _, _, type_ptr, _, _, _)
   | CXXRecordDecl (_, _, _, type_ptr, _, _, _, _)
-  | ClassTemplateSpecializationDecl (_, _, _, type_ptr, _, _, _, _, _)
-  | ClassTemplatePartialSpecializationDecl (_, _, _, type_ptr, _, _, _, _, _)
+  | ClassTemplateSpecializationDecl (_, _, _, type_ptr, _, _, _, _, _, _)
+  | ClassTemplatePartialSpecializationDecl (_, _, _, type_ptr, _, _, _, _, _, _)
   | TemplateTypeParmDecl (_, _, _, type_ptr)
   | ObjCTypeParamDecl (_, _, _, type_ptr)
   | TypeAliasDecl (_, _, _, type_ptr)
@@ -462,7 +462,7 @@ let type_of_decl decl =
 let get_record_fields decl =
   let open Clang_ast_t in
   match decl with
-  | ClassTemplateSpecializationDecl (_, _, _, _, decl_list, _, _, _, _)
+  | ClassTemplateSpecializationDecl (_, _, _, _, decl_list, _, _, _, _, _)
   | CXXRecordDecl (_, _, _, _, decl_list, _, _, _)
   | RecordDecl (_, _, _, _, decl_list, _, _)
    -> List.filter ~f:(function FieldDecl _ -> true | _ -> false) decl_list
@@ -473,7 +473,7 @@ let get_cxx_base_classes decl =
   let open Clang_ast_t in
   match decl with
   | CXXRecordDecl (_, _, _, _, _, _, _, cxx_record_info)
-  | ClassTemplateSpecializationDecl (_, _, _, _, _, _, _, cxx_record_info, _)
+  | ClassTemplateSpecializationDecl (_, _, _, _, _, _, _, cxx_record_info, _, _)
    -> cxx_record_info.xrdi_bases
   | _
    -> []

infer/src/clang/cFrontend_decl.ml

@@ -284,7 +284,7 @@ module CFrontend_decl_funct (T : CModule_type.CTranslation) : CModule_type.CFron
         (* Note that C and C++ records are treated the same way
           Skip translating implicit struct declarations, unless they have
           full definition (which happens with C++ lambdas) *)
-        | ClassTemplateSpecializationDecl (di, _, _, _, decl_list, _, rdi, _, _)
+        | ClassTemplateSpecializationDecl (di, _, _, _, decl_list, _, rdi, _, _, _)
         | CXXRecordDecl (di, _, _, _, decl_list, _, rdi, _)
         | RecordDecl (di, _, _, _, decl_list, _, rdi)
           when not di.di_is_implicit || rdi.rdi_is_complete_definition

infer/src/clang/cGeneral_utils.ml

@@ -156,7 +156,7 @@ let mk_sil_global_var {CFrontend_config.source_file} ?(mk_name= fun _ x -> x) na
           -> None )
     |> Option.value_map ~default:true ~f:(function
          | Clang_ast_t.CXXRecordDecl (_, _, _, _, _, _, _, {xrdi_is_pod})
-         | Clang_ast_t.ClassTemplateSpecializationDecl (_, _, _, _, _, _, _, {xrdi_is_pod}, _)
+         | Clang_ast_t.ClassTemplateSpecializationDecl (_, _, _, _, _, _, _, {xrdi_is_pod}, _, _)
           -> xrdi_is_pod
          | _
           -> true )

infer/src/clang/cTrans.ml

@@ -678,7 +678,7 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s
     let destruct_decl_ref_opt =
       match CAst_utils.get_decl_from_typ_ptr class_type_ptr with
       | Some CXXRecordDecl (_, _, _, _, _, _, _, cxx_record_info)
-      | Some ClassTemplateSpecializationDecl (_, _, _, _, _, _, _, cxx_record_info, _)
+      | Some ClassTemplateSpecializationDecl (_, _, _, _, _, _, _, cxx_record_info, _, _)
        -> cxx_record_info.xrdi_destructor
       | _
        -> None

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

@@ -255,39 +255,28 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIDsEC1EDs|constexpr.e48e36eb28676496059120d4d7907128_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIDsEC1EDs|constexpr.e48e36eb28676496059120d4d7907128_2" ;
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_1" [label="1: Start std::__infer_atomic_base<char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<char>* desired:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
-	
-
-	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_1" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" ;
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
-	
-
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167]\n  n$1=*&desired:char [line 167]\n  *n$0._wrapped_value:char=n$1 [line 167]\n " shape="box"]
-	
-
-	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_2" ;
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_1" [label="1: Start std::__infer_atomic_base<char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<char>* desired:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_1" [label="1: Start std::__infer_atomic_base<signed char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<signed char>* desired:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_1" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" ;
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
+	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_1" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" ;
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_2" [label="2: Exit std::__infer_atomic_base<signed char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167]\n  n$1=*&desired:char [line 167]\n  *n$0._wrapped_value:char=n$1 [line 167]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<signed char>* [line 167]\n  n$1=*&desired:signed char [line 167]\n  *n$0._wrapped_value:signed char=n$1 [line 167]\n " shape="box"]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_2" ;
-"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_1" [label="1: Start std::__infer_atomic_base<signed char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<signed char>* desired:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_2" ;
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_1" [label="1: Start std::__infer_atomic_base<char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<char>* desired:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_1" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" ;
-"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_2" [label="2: Exit std::__infer_atomic_base<signed char>___infer_atomic_base \n  " color=yellow style=filled]
+	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_1" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" ;
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<signed char>* [line 167]\n  n$1=*&desired:signed char [line 167]\n  *n$0._wrapped_value:signed char=n$1 [line 167]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167]\n  n$1=*&desired:char [line 167]\n  *n$0._wrapped_value:char=n$1 [line 167]\n " shape="box"]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_2" ;
+	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_2" ;
 "__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{_ZNSt3__119__infer_atomic_baseIhEC1Eh|co.35a038cbc05f9d1300913840f6ef44cb_1" [label="1: Start std::__infer_atomic_base<unsigned char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<unsigned char>* desired:unsigned char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
@@ -321,6 +310,28 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{_ZNSt3__119__infer_atomic_baseIjEC1Ej|con.13f39942a78d48eb0e3a4271c113c29e_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{_ZNSt3__119__infer_atomic_baseIjEC1Ej|con.13f39942a78d48eb0e3a4271c113c29e_2" ;
+"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_1" [label="1: Start std::__infer_atomic_base<long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<long>* desired:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+	
+
+	 "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_1" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" ;
+"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_2" [label="2: Exit std::__infer_atomic_base<long>___infer_atomic_base \n  " color=yellow style=filled]
+	
+
+"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<long>* [line 167]\n  n$1=*&desired:long [line 167]\n  *n$0._wrapped_value:long=n$1 [line 167]\n " shape="box"]
+	
+
+	 "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_2" ;
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_1" [label="1: Start std::__infer_atomic_base<unsigned long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<unsigned long>* desired:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+	
+
+	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_1" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" ;
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_2" [label="2: Exit std::__infer_atomic_base<unsigned long>___infer_atomic_base \n  " color=yellow style=filled]
+	
+
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned long>* [line 167]\n  n$1=*&desired:unsigned long [line 167]\n  *n$0._wrapped_value:unsigned long=n$1 [line 167]\n " shape="box"]
+	
+
+	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_2" ;
 "__infer_atomic_base#__infer_atomic_base<short>#std#{_ZNSt3__119__infer_atomic_baseIsEC1Es|constexpr}.f8911481350c5debb235ad1125f46c7a_1" [label="1: Start std::__infer_atomic_base<short>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<short>* desired:short\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
@@ -343,28 +354,17 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{_ZNSt3__119__infer_atomic_baseItEC1Et|c.9be7294cf3a57183581f7bb55f891706_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{_ZNSt3__119__infer_atomic_baseItEC1Et|c.9be7294cf3a57183581f7bb55f891706_2" ;
-"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_1" [label="1: Start std::__infer_atomic_base<long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<long>* desired:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
-	
-
-	 "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_1" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" ;
-"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_2" [label="2: Exit std::__infer_atomic_base<long>___infer_atomic_base \n  " color=yellow style=filled]
-	
-
-"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<long>* [line 167]\n  n$1=*&desired:long [line 167]\n  *n$0._wrapped_value:long=n$1 [line 167]\n " shape="box"]
-	
-
-	 "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_2" ;
-"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_1" [label="1: Start std::__infer_atomic_base<unsigned long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<unsigned long>* desired:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_1" [label="1: Start std::__infer_atomic_base<char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<char>* desired:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_1" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" ;
-"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_2" [label="2: Exit std::__infer_atomic_base<unsigned long>___infer_atomic_base \n  " color=yellow style=filled]
+	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_1" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" ;
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned long>* [line 167]\n  n$1=*&desired:unsigned long [line 167]\n  *n$0._wrapped_value:unsigned long=n$1 [line 167]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167]\n  n$1=*&desired:char [line 167]\n  *n$0._wrapped_value:char=n$1 [line 167]\n " shape="box"]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_2" ;
+	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_2" ;
 "__infer_atomic_base#__infer_atomic_base<long long>#std#{_ZNSt3__119__infer_atomic_baseIxEC1Ex|conste.e29345999d93d718f00833c638386d56_1" [label="1: Start std::__infer_atomic_base<long long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<long long>* desired:long long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
@@ -409,39 +409,28 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIDsEC1E.0d2db929f8e8cacadc22b38baa8dc516_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIDsEC1E.0d2db929f8e8cacadc22b38baa8dc516_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_1" [label="1: Start std::__infer_atomic_integral<char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
-	
-
-	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_1" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
-	
-
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187]\n  n$1=*&d:char [line 187]\n  _fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187]\n " shape="box"]
-	
-
-	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_1" [label="1: Start std::__infer_atomic_integral<char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_1" [label="1: Start std::__infer_atomic_integral<signed char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<signed char>* d:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_1" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
+	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_1" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_2" [label="2: Exit std::__infer_atomic_integral<signed char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187]\n  n$1=*&d:char [line 187]\n  _fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<signed char>* [line 187]\n  n$1=*&d:signed char [line 187]\n  _fun_std::__infer_atomic_base<signed char>___infer_atomic_base(n$0:std::__infer_atomic_integral<signed char>*,n$1:signed char) [line 187]\n " shape="box"]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_1" [label="1: Start std::__infer_atomic_integral<signed char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<signed char>* d:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_2" ;
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_1" [label="1: Start std::__infer_atomic_integral<char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_1" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_2" [label="2: Exit std::__infer_atomic_integral<signed char>___infer_atomic_integral \n  " color=yellow style=filled]
+	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_1" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<signed char>* [line 187]\n  n$1=*&d:signed char [line 187]\n  _fun_std::__infer_atomic_base<signed char>___infer_atomic_base(n$0:std::__infer_atomic_integral<signed char>*,n$1:signed char) [line 187]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187]\n  n$1=*&d:char [line 187]\n  _fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187]\n " shape="box"]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_2" ;
+	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_2" ;
 "__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{_ZNSt3__123__infer_atomic_integr.d8ea1d6307fafb7cd6022b49373ca8cf_1" [label="1: Start std::__infer_atomic_integral<unsigned char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<unsigned char>* d:unsigned char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
@@ -475,6 +464,28 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{_ZNSt3__123__infer_atomic_integra.a93dba5fe093f4e72a6b13746c6f64c3_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{_ZNSt3__123__infer_atomic_integra.a93dba5fe093f4e72a6b13746c6f64c3_2" ;
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_1" [label="1: Start std::__infer_atomic_integral<long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<long>* d:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+	
+
+	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_1" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_2" [label="2: Exit std::__infer_atomic_integral<long>___infer_atomic_integral \n  " color=yellow style=filled]
+	
+
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<long>* [line 187]\n  n$1=*&d:long [line 187]\n  _fun_std::__infer_atomic_base<long>___infer_atomic_base(n$0:std::__infer_atomic_integral<long>*,n$1:long) [line 187]\n " shape="box"]
+	
+
+	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_2" ;
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_1" [label="1: Start std::__infer_atomic_integral<unsigned long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<unsigned long>* d:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+	
+
+	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_1" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_2" [label="2: Exit std::__infer_atomic_integral<unsigned long>___infer_atomic_integral \n  " color=yellow style=filled]
+	
+
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned long>* [line 187]\n  n$1=*&d:unsigned long [line 187]\n  _fun_std::__infer_atomic_base<unsigned long>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned long>*,n$1:unsigned long) [line 187]\n " shape="box"]
+	
+
+	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_2" ;
 "__infer_atomic_integral#__infer_atomic_integral<short>#std#{_ZNSt3__123__infer_atomic_integralIsEC1E.724cc7992e11b1aca07332e64de63724_1" [label="1: Start std::__infer_atomic_integral<short>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<short>* d:short\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
@@ -497,28 +508,17 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{_ZNSt3__123__infer_atomic_integ.30e0e95c8f599ac8947ad142f023b691_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{_ZNSt3__123__infer_atomic_integ.30e0e95c8f599ac8947ad142f023b691_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_1" [label="1: Start std::__infer_atomic_integral<long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<long>* d:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
-	
-
-	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_1" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_2" [label="2: Exit std::__infer_atomic_integral<long>___infer_atomic_integral \n  " color=yellow style=filled]
-	
-
-"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<long>* [line 187]\n  n$1=*&d:long [line 187]\n  _fun_std::__infer_atomic_base<long>___infer_atomic_base(n$0:std::__infer_atomic_integral<long>*,n$1:long) [line 187]\n " shape="box"]
-	
-
-	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_1" [label="1: Start std::__infer_atomic_integral<unsigned long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<unsigned long>* d:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_1" [label="1: Start std::__infer_atomic_integral<char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_1" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_2" [label="2: Exit std::__infer_atomic_integral<unsigned long>___infer_atomic_integral \n  " color=yellow style=filled]
+	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_1" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned long>* [line 187]\n  n$1=*&d:unsigned long [line 187]\n  _fun_std::__infer_atomic_base<unsigned long>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned long>*,n$1:unsigned long) [line 187]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187]\n  n$1=*&d:char [line 187]\n  _fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187]\n " shape="box"]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_2" ;
+	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_2" ;
 "__infer_atomic_integral#__infer_atomic_integral<long long>#std#{_ZNSt3__123__infer_atomic_integralIx.60ee52f3e27050a0f9e3234d3b005c14_1" [label="1: Start std::__infer_atomic_integral<long long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<long long>* d:long long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
@@ -541,28 +541,17 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{_ZNSt3__123__infer_atomic_i.672d560d738dcc3fe42e493ebf903f57_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{_ZNSt3__123__infer_atomic_i.672d560d738dcc3fe42e493ebf903f57_2" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 372]\n " color=yellow style=filled]
-	
-
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
-	
-
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 372]\n  n$1=*&d:char [line 372]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 372]\n " shape="box"]
-	
-
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_2" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 472]\n " color=yellow style=filled]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 490]\n " color=yellow style=filled]
 	
 
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" ;
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 472]\n  n$1=*&d:char [line 472]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 472]\n " shape="box"]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 490]\n  n$1=*&d:char [line 490]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 490]\n " shape="box"]
 	
 
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_2" ;
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_2" ;
 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDsEC1EDs|constexpr}.328f9fc44df67ff03471755357c36459_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 481]\n " color=yellow style=filled]
 	
 
@@ -574,28 +563,28 @@ digraph iCFG {
 	
 
 	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDsEC1EDs|constexpr}.328f9fc44df67ff03471755357c36459_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDsEC1EDs|constexpr}.328f9fc44df67ff03471755357c36459_2" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 490]\n " color=yellow style=filled]
+"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_1" [label="1: Start std::atomic<signed char>_atomic\nFormals:  this:std::atomic<signed char>* d:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 381]\n " color=yellow style=filled]
 	
 
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
+	 "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_1" -> "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" ;
+"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_2" [label="2: Exit std::atomic<signed char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 490]\n  n$1=*&d:char [line 490]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 490]\n " shape="box"]
+"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<signed char>* [line 381]\n  n$1=*&d:signed char [line 381]\n  _fun_std::__infer_atomic_integral<signed char>___infer_atomic_integral(n$0:std::atomic<signed char>*,n$1:signed char) [line 381]\n " shape="box"]
 	
 
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_2" ;
-"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_1" [label="1: Start std::atomic<signed char>_atomic\nFormals:  this:std::atomic<signed char>* d:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 381]\n " color=yellow style=filled]
+	 "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" -> "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_2" ;
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 372]\n " color=yellow style=filled]
 	
 
-	 "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_1" -> "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" ;
-"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_2" [label="2: Exit std::atomic<signed char>_atomic \n  " color=yellow style=filled]
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" ;
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<signed char>* [line 381]\n  n$1=*&d:signed char [line 381]\n  _fun_std::__infer_atomic_integral<signed char>___infer_atomic_integral(n$0:std::atomic<signed char>*,n$1:signed char) [line 381]\n " shape="box"]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 372]\n  n$1=*&d:char [line 372]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 372]\n " shape="box"]
 	
 
-	 "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" -> "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_2" ;
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_2" ;
 "atomic#atomic<unsigned char>#std#{_ZNSt3__16atomicIhEC1Eh|constexpr}.9e68a2136a0f553b2c163542d64f2ece_1" [label="1: Start std::atomic<unsigned char>_atomic\nFormals:  this:std::atomic<unsigned char>* d:unsigned char\nLocals:  \n   DECLARE_LOCALS(&return); [line 390]\n " color=yellow style=filled]
 	
 
@@ -629,6 +618,28 @@ digraph iCFG {
 	
 
 	 "atomic#atomic<unsigned int>#std#{_ZNSt3__16atomicIjEC1Ej|constexpr}.b54ee1db0928147396870d2f8c92e1f0_3" -> "atomic#atomic<unsigned int>#std#{_ZNSt3__16atomicIjEC1Ej|constexpr}.b54ee1db0928147396870d2f8c92e1f0_2" ;
+"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_1" [label="1: Start std::atomic<long>_atomic\nFormals:  this:std::atomic<long>* d:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 435]\n " color=yellow style=filled]
+	
+
+	 "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_1" -> "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" ;
+"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_2" [label="2: Exit std::atomic<long>_atomic \n  " color=yellow style=filled]
+	
+
+"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<long>* [line 435]\n  n$1=*&d:long [line 435]\n  _fun_std::__infer_atomic_integral<long>___infer_atomic_integral(n$0:std::atomic<long>*,n$1:long) [line 435]\n " shape="box"]
+	
+
+	 "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" -> "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_2" ;
+"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_1" [label="1: Start std::atomic<unsigned long>_atomic\nFormals:  this:std::atomic<unsigned long>* d:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 444]\n " color=yellow style=filled]
+	
+
+	 "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_1" -> "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" ;
+"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_2" [label="2: Exit std::atomic<unsigned long>_atomic \n  " color=yellow style=filled]
+	
+
+"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned long>* [line 444]\n  n$1=*&d:unsigned long [line 444]\n  _fun_std::__infer_atomic_integral<unsigned long>___infer_atomic_integral(n$0:std::atomic<unsigned long>*,n$1:unsigned long) [line 444]\n " shape="box"]
+	
+
+	 "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" -> "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_2" ;
 "atomic#atomic<short>#std#{_ZNSt3__16atomicIsEC1Es|constexpr}.ba1ed1dd304ea271923e139e3e3cc1de_1" [label="1: Start std::atomic<short>_atomic\nFormals:  this:std::atomic<short>* d:short\nLocals:  \n   DECLARE_LOCALS(&return); [line 399]\n " color=yellow style=filled]
 	
 
@@ -651,28 +662,17 @@ digraph iCFG {
 	
 
 	 "atomic#atomic<unsigned short>#std#{_ZNSt3__16atomicItEC1Et|constexpr}.147e38f53ec9d80ba8216f91c55cffa0_3" -> "atomic#atomic<unsigned short>#std#{_ZNSt3__16atomicItEC1Et|constexpr}.147e38f53ec9d80ba8216f91c55cffa0_2" ;
-"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_1" [label="1: Start std::atomic<long>_atomic\nFormals:  this:std::atomic<long>* d:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 435]\n " color=yellow style=filled]
-	
-
-	 "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_1" -> "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" ;
-"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_2" [label="2: Exit std::atomic<long>_atomic \n  " color=yellow style=filled]
-	
-
-"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<long>* [line 435]\n  n$1=*&d:long [line 435]\n  _fun_std::__infer_atomic_integral<long>___infer_atomic_integral(n$0:std::atomic<long>*,n$1:long) [line 435]\n " shape="box"]
-	
-
-	 "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" -> "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_2" ;
-"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_1" [label="1: Start std::atomic<unsigned long>_atomic\nFormals:  this:std::atomic<unsigned long>* d:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 444]\n " color=yellow style=filled]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 472]\n " color=yellow style=filled]
 	
 
-	 "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_1" -> "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" ;
-"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_2" [label="2: Exit std::atomic<unsigned long>_atomic \n  " color=yellow style=filled]
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" ;
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned long>* [line 444]\n  n$1=*&d:unsigned long [line 444]\n  _fun_std::__infer_atomic_integral<unsigned long>___infer_atomic_integral(n$0:std::atomic<unsigned long>*,n$1:unsigned long) [line 444]\n " shape="box"]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 472]\n  n$1=*&d:char [line 472]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 472]\n " shape="box"]
 	
 
-	 "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" -> "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_2" ;
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_2" ;
 "atomic#atomic<long long>#std#{_ZNSt3__16atomicIxEC1Ex|constexpr}.6e1b6a2eb7efef598d96d0416e18b010_1" [label="1: Start std::atomic<long long>_atomic\nFormals:  this:std::atomic<long long>* d:long long\nLocals:  \n   DECLARE_LOCALS(&return); [line 453]\n " color=yellow style=filled]
 	
 

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

@@ -255,39 +255,28 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIDsEC1EDs|constexpr.e48e36eb28676496059120d4d7907128_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIDsEC1EDs|constexpr.e48e36eb28676496059120d4d7907128_2" ;
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_1" [label="1: Start std::__infer_atomic_base<char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<char>* desired:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
-	
-
-	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_1" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" ;
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
-	
-
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167]\n  n$1=*&desired:char [line 167]\n  *n$0._wrapped_value:char=n$1 [line 167]\n " shape="box"]
-	
-
-	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_2" ;
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_1" [label="1: Start std::__infer_atomic_base<char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<char>* desired:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_1" [label="1: Start std::__infer_atomic_base<signed char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<signed char>* desired:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_1" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" ;
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
+	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_1" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" ;
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_2" [label="2: Exit std::__infer_atomic_base<signed char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167]\n  n$1=*&desired:char [line 167]\n  *n$0._wrapped_value:char=n$1 [line 167]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<signed char>* [line 167]\n  n$1=*&desired:signed char [line 167]\n  *n$0._wrapped_value:signed char=n$1 [line 167]\n " shape="box"]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_2" ;
-"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_1" [label="1: Start std::__infer_atomic_base<signed char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<signed char>* desired:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_2" ;
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_1" [label="1: Start std::__infer_atomic_base<char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<char>* desired:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_1" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" ;
-"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_2" [label="2: Exit std::__infer_atomic_base<signed char>___infer_atomic_base \n  " color=yellow style=filled]
+	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_1" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" ;
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<signed char>* [line 167]\n  n$1=*&desired:signed char [line 167]\n  *n$0._wrapped_value:signed char=n$1 [line 167]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167]\n  n$1=*&desired:char [line 167]\n  *n$0._wrapped_value:char=n$1 [line 167]\n " shape="box"]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_2" ;
+	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_2" ;
 "__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{_ZNSt3__119__infer_atomic_baseIhEC1Eh|co.35a038cbc05f9d1300913840f6ef44cb_1" [label="1: Start std::__infer_atomic_base<unsigned char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<unsigned char>* desired:unsigned char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
@@ -321,6 +310,28 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{_ZNSt3__119__infer_atomic_baseIjEC1Ej|con.13f39942a78d48eb0e3a4271c113c29e_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{_ZNSt3__119__infer_atomic_baseIjEC1Ej|con.13f39942a78d48eb0e3a4271c113c29e_2" ;
+"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_1" [label="1: Start std::__infer_atomic_base<long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<long>* desired:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+	
+
+	 "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_1" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" ;
+"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_2" [label="2: Exit std::__infer_atomic_base<long>___infer_atomic_base \n  " color=yellow style=filled]
+	
+
+"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<long>* [line 167]\n  n$1=*&desired:long [line 167]\n  *n$0._wrapped_value:long=n$1 [line 167]\n " shape="box"]
+	
+
+	 "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_2" ;
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_1" [label="1: Start std::__infer_atomic_base<unsigned long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<unsigned long>* desired:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+	
+
+	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_1" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" ;
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_2" [label="2: Exit std::__infer_atomic_base<unsigned long>___infer_atomic_base \n  " color=yellow style=filled]
+	
+
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned long>* [line 167]\n  n$1=*&desired:unsigned long [line 167]\n  *n$0._wrapped_value:unsigned long=n$1 [line 167]\n " shape="box"]
+	
+
+	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_2" ;
 "__infer_atomic_base#__infer_atomic_base<short>#std#{_ZNSt3__119__infer_atomic_baseIsEC1Es|constexpr}.f8911481350c5debb235ad1125f46c7a_1" [label="1: Start std::__infer_atomic_base<short>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<short>* desired:short\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
@@ -343,28 +354,17 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{_ZNSt3__119__infer_atomic_baseItEC1Et|c.9be7294cf3a57183581f7bb55f891706_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{_ZNSt3__119__infer_atomic_baseItEC1Et|c.9be7294cf3a57183581f7bb55f891706_2" ;
-"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_1" [label="1: Start std::__infer_atomic_base<long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<long>* desired:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
-	
-
-	 "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_1" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" ;
-"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_2" [label="2: Exit std::__infer_atomic_base<long>___infer_atomic_base \n  " color=yellow style=filled]
-	
-
-"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<long>* [line 167]\n  n$1=*&desired:long [line 167]\n  *n$0._wrapped_value:long=n$1 [line 167]\n " shape="box"]
-	
-
-	 "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_2" ;
-"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_1" [label="1: Start std::__infer_atomic_base<unsigned long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<unsigned long>* desired:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_1" [label="1: Start std::__infer_atomic_base<char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<char>* desired:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_1" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" ;
-"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_2" [label="2: Exit std::__infer_atomic_base<unsigned long>___infer_atomic_base \n  " color=yellow style=filled]
+	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_1" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" ;
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned long>* [line 167]\n  n$1=*&desired:unsigned long [line 167]\n  *n$0._wrapped_value:unsigned long=n$1 [line 167]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167]\n  n$1=*&desired:char [line 167]\n  *n$0._wrapped_value:char=n$1 [line 167]\n " shape="box"]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_2" ;
+	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_2" ;
 "__infer_atomic_base#__infer_atomic_base<long long>#std#{_ZNSt3__119__infer_atomic_baseIxEC1Ex|conste.e29345999d93d718f00833c638386d56_1" [label="1: Start std::__infer_atomic_base<long long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<long long>* desired:long long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
@@ -409,39 +409,28 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIDsEC1E.0d2db929f8e8cacadc22b38baa8dc516_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIDsEC1E.0d2db929f8e8cacadc22b38baa8dc516_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_1" [label="1: Start std::__infer_atomic_integral<char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
-	
-
-	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_1" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
-	
-
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187]\n  n$1=*&d:char [line 187]\n  _fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187]\n " shape="box"]
-	
-
-	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_1" [label="1: Start std::__infer_atomic_integral<char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_1" [label="1: Start std::__infer_atomic_integral<signed char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<signed char>* d:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_1" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
+	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_1" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_2" [label="2: Exit std::__infer_atomic_integral<signed char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187]\n  n$1=*&d:char [line 187]\n  _fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<signed char>* [line 187]\n  n$1=*&d:signed char [line 187]\n  _fun_std::__infer_atomic_base<signed char>___infer_atomic_base(n$0:std::__infer_atomic_integral<signed char>*,n$1:signed char) [line 187]\n " shape="box"]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_1" [label="1: Start std::__infer_atomic_integral<signed char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<signed char>* d:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_2" ;
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_1" [label="1: Start std::__infer_atomic_integral<char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_1" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_2" [label="2: Exit std::__infer_atomic_integral<signed char>___infer_atomic_integral \n  " color=yellow style=filled]
+	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_1" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<signed char>* [line 187]\n  n$1=*&d:signed char [line 187]\n  _fun_std::__infer_atomic_base<signed char>___infer_atomic_base(n$0:std::__infer_atomic_integral<signed char>*,n$1:signed char) [line 187]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187]\n  n$1=*&d:char [line 187]\n  _fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187]\n " shape="box"]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_2" ;
+	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_2" ;
 "__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{_ZNSt3__123__infer_atomic_integr.d8ea1d6307fafb7cd6022b49373ca8cf_1" [label="1: Start std::__infer_atomic_integral<unsigned char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<unsigned char>* d:unsigned char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
@@ -475,6 +464,28 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{_ZNSt3__123__infer_atomic_integra.a93dba5fe093f4e72a6b13746c6f64c3_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{_ZNSt3__123__infer_atomic_integra.a93dba5fe093f4e72a6b13746c6f64c3_2" ;
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_1" [label="1: Start std::__infer_atomic_integral<long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<long>* d:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+	
+
+	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_1" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_2" [label="2: Exit std::__infer_atomic_integral<long>___infer_atomic_integral \n  " color=yellow style=filled]
+	
+
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<long>* [line 187]\n  n$1=*&d:long [line 187]\n  _fun_std::__infer_atomic_base<long>___infer_atomic_base(n$0:std::__infer_atomic_integral<long>*,n$1:long) [line 187]\n " shape="box"]
+	
+
+	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_2" ;
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_1" [label="1: Start std::__infer_atomic_integral<unsigned long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<unsigned long>* d:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+	
+
+	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_1" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_2" [label="2: Exit std::__infer_atomic_integral<unsigned long>___infer_atomic_integral \n  " color=yellow style=filled]
+	
+
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned long>* [line 187]\n  n$1=*&d:unsigned long [line 187]\n  _fun_std::__infer_atomic_base<unsigned long>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned long>*,n$1:unsigned long) [line 187]\n " shape="box"]
+	
+
+	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_2" ;
 "__infer_atomic_integral#__infer_atomic_integral<short>#std#{_ZNSt3__123__infer_atomic_integralIsEC1E.724cc7992e11b1aca07332e64de63724_1" [label="1: Start std::__infer_atomic_integral<short>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<short>* d:short\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
@@ -497,28 +508,17 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{_ZNSt3__123__infer_atomic_integ.30e0e95c8f599ac8947ad142f023b691_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{_ZNSt3__123__infer_atomic_integ.30e0e95c8f599ac8947ad142f023b691_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_1" [label="1: Start std::__infer_atomic_integral<long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<long>* d:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
-	
-
-	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_1" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_2" [label="2: Exit std::__infer_atomic_integral<long>___infer_atomic_integral \n  " color=yellow style=filled]
-	
-
-"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<long>* [line 187]\n  n$1=*&d:long [line 187]\n  _fun_std::__infer_atomic_base<long>___infer_atomic_base(n$0:std::__infer_atomic_integral<long>*,n$1:long) [line 187]\n " shape="box"]
-	
-
-	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_1" [label="1: Start std::__infer_atomic_integral<unsigned long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<unsigned long>* d:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_1" [label="1: Start std::__infer_atomic_integral<char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_1" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_2" [label="2: Exit std::__infer_atomic_integral<unsigned long>___infer_atomic_integral \n  " color=yellow style=filled]
+	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_1" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned long>* [line 187]\n  n$1=*&d:unsigned long [line 187]\n  _fun_std::__infer_atomic_base<unsigned long>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned long>*,n$1:unsigned long) [line 187]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187]\n  n$1=*&d:char [line 187]\n  _fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187]\n " shape="box"]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_2" ;
+	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_2" ;
 "__infer_atomic_integral#__infer_atomic_integral<long long>#std#{_ZNSt3__123__infer_atomic_integralIx.60ee52f3e27050a0f9e3234d3b005c14_1" [label="1: Start std::__infer_atomic_integral<long long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<long long>* d:long long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
@@ -541,28 +541,17 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{_ZNSt3__123__infer_atomic_i.672d560d738dcc3fe42e493ebf903f57_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{_ZNSt3__123__infer_atomic_i.672d560d738dcc3fe42e493ebf903f57_2" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 372]\n " color=yellow style=filled]
-	
-
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
-	
-
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 372]\n  n$1=*&d:char [line 372]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 372]\n " shape="box"]
-	
-
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_2" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 472]\n " color=yellow style=filled]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 490]\n " color=yellow style=filled]
 	
 
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" ;
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 472]\n  n$1=*&d:char [line 472]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 472]\n " shape="box"]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 490]\n  n$1=*&d:char [line 490]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 490]\n " shape="box"]
 	
 
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_2" ;
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_2" ;
 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDsEC1EDs|constexpr}.328f9fc44df67ff03471755357c36459_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 481]\n " color=yellow style=filled]
 	
 
@@ -574,28 +563,28 @@ digraph iCFG {
 	
 
 	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDsEC1EDs|constexpr}.328f9fc44df67ff03471755357c36459_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDsEC1EDs|constexpr}.328f9fc44df67ff03471755357c36459_2" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 490]\n " color=yellow style=filled]
+"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_1" [label="1: Start std::atomic<signed char>_atomic\nFormals:  this:std::atomic<signed char>* d:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 381]\n " color=yellow style=filled]
 	
 
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
+	 "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_1" -> "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" ;
+"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_2" [label="2: Exit std::atomic<signed char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 490]\n  n$1=*&d:char [line 490]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 490]\n " shape="box"]
+"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<signed char>* [line 381]\n  n$1=*&d:signed char [line 381]\n  _fun_std::__infer_atomic_integral<signed char>___infer_atomic_integral(n$0:std::atomic<signed char>*,n$1:signed char) [line 381]\n " shape="box"]
 	
 
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_2" ;
-"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_1" [label="1: Start std::atomic<signed char>_atomic\nFormals:  this:std::atomic<signed char>* d:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 381]\n " color=yellow style=filled]
+	 "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" -> "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_2" ;
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 372]\n " color=yellow style=filled]
 	
 
-	 "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_1" -> "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" ;
-"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_2" [label="2: Exit std::atomic<signed char>_atomic \n  " color=yellow style=filled]
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" ;
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<signed char>* [line 381]\n  n$1=*&d:signed char [line 381]\n  _fun_std::__infer_atomic_integral<signed char>___infer_atomic_integral(n$0:std::atomic<signed char>*,n$1:signed char) [line 381]\n " shape="box"]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 372]\n  n$1=*&d:char [line 372]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 372]\n " shape="box"]
 	
 
-	 "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" -> "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_2" ;
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_2" ;
 "atomic#atomic<unsigned char>#std#{_ZNSt3__16atomicIhEC1Eh|constexpr}.9e68a2136a0f553b2c163542d64f2ece_1" [label="1: Start std::atomic<unsigned char>_atomic\nFormals:  this:std::atomic<unsigned char>* d:unsigned char\nLocals:  \n   DECLARE_LOCALS(&return); [line 390]\n " color=yellow style=filled]
 	
 
@@ -629,6 +618,28 @@ digraph iCFG {
 	
 
 	 "atomic#atomic<unsigned int>#std#{_ZNSt3__16atomicIjEC1Ej|constexpr}.b54ee1db0928147396870d2f8c92e1f0_3" -> "atomic#atomic<unsigned int>#std#{_ZNSt3__16atomicIjEC1Ej|constexpr}.b54ee1db0928147396870d2f8c92e1f0_2" ;
+"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_1" [label="1: Start std::atomic<long>_atomic\nFormals:  this:std::atomic<long>* d:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 435]\n " color=yellow style=filled]
+	
+
+	 "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_1" -> "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" ;
+"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_2" [label="2: Exit std::atomic<long>_atomic \n  " color=yellow style=filled]
+	
+
+"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<long>* [line 435]\n  n$1=*&d:long [line 435]\n  _fun_std::__infer_atomic_integral<long>___infer_atomic_integral(n$0:std::atomic<long>*,n$1:long) [line 435]\n " shape="box"]
+	
+
+	 "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" -> "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_2" ;
+"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_1" [label="1: Start std::atomic<unsigned long>_atomic\nFormals:  this:std::atomic<unsigned long>* d:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 444]\n " color=yellow style=filled]
+	
+
+	 "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_1" -> "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" ;
+"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_2" [label="2: Exit std::atomic<unsigned long>_atomic \n  " color=yellow style=filled]
+	
+
+"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned long>* [line 444]\n  n$1=*&d:unsigned long [line 444]\n  _fun_std::__infer_atomic_integral<unsigned long>___infer_atomic_integral(n$0:std::atomic<unsigned long>*,n$1:unsigned long) [line 444]\n " shape="box"]
+	
+
+	 "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" -> "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_2" ;
 "atomic#atomic<short>#std#{_ZNSt3__16atomicIsEC1Es|constexpr}.ba1ed1dd304ea271923e139e3e3cc1de_1" [label="1: Start std::atomic<short>_atomic\nFormals:  this:std::atomic<short>* d:short\nLocals:  \n   DECLARE_LOCALS(&return); [line 399]\n " color=yellow style=filled]
 	
 
@@ -651,28 +662,17 @@ digraph iCFG {
 	
 
 	 "atomic#atomic<unsigned short>#std#{_ZNSt3__16atomicItEC1Et|constexpr}.147e38f53ec9d80ba8216f91c55cffa0_3" -> "atomic#atomic<unsigned short>#std#{_ZNSt3__16atomicItEC1Et|constexpr}.147e38f53ec9d80ba8216f91c55cffa0_2" ;
-"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_1" [label="1: Start std::atomic<long>_atomic\nFormals:  this:std::atomic<long>* d:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 435]\n " color=yellow style=filled]
-	
-
-	 "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_1" -> "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" ;
-"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_2" [label="2: Exit std::atomic<long>_atomic \n  " color=yellow style=filled]
-	
-
-"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<long>* [line 435]\n  n$1=*&d:long [line 435]\n  _fun_std::__infer_atomic_integral<long>___infer_atomic_integral(n$0:std::atomic<long>*,n$1:long) [line 435]\n " shape="box"]
-	
-
-	 "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" -> "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_2" ;
-"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_1" [label="1: Start std::atomic<unsigned long>_atomic\nFormals:  this:std::atomic<unsigned long>* d:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 444]\n " color=yellow style=filled]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 472]\n " color=yellow style=filled]
 	
 
-	 "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_1" -> "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" ;
-"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_2" [label="2: Exit std::atomic<unsigned long>_atomic \n  " color=yellow style=filled]
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" ;
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned long>* [line 444]\n  n$1=*&d:unsigned long [line 444]\n  _fun_std::__infer_atomic_integral<unsigned long>___infer_atomic_integral(n$0:std::atomic<unsigned long>*,n$1:unsigned long) [line 444]\n " shape="box"]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 472]\n  n$1=*&d:char [line 472]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 472]\n " shape="box"]
 	
 
-	 "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" -> "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_2" ;
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_2" ;
 "atomic#atomic<long long>#std#{_ZNSt3__16atomicIxEC1Ex|constexpr}.6e1b6a2eb7efef598d96d0416e18b010_1" [label="1: Start std::atomic<long long>_atomic\nFormals:  this:std::atomic<long long>* d:long long\nLocals:  \n   DECLARE_LOCALS(&return); [line 453]\n " color=yellow style=filled]
 	
 

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

@@ -255,39 +255,28 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIDsEC1EDs|constexpr.e48e36eb28676496059120d4d7907128_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIDsEC1EDs|constexpr.e48e36eb28676496059120d4d7907128_2" ;
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_1" [label="1: Start std::__infer_atomic_base<char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<char>* desired:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
-	
-
-	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_1" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" ;
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
-	
-
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167]\n  n$1=*&desired:char [line 167]\n  *n$0._wrapped_value:char=n$1 [line 167]\n " shape="box"]
-	
-
-	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_2" ;
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_1" [label="1: Start std::__infer_atomic_base<char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<char>* desired:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_1" [label="1: Start std::__infer_atomic_base<signed char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<signed char>* desired:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_1" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" ;
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
+	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_1" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" ;
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_2" [label="2: Exit std::__infer_atomic_base<signed char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167]\n  n$1=*&desired:char [line 167]\n  *n$0._wrapped_value:char=n$1 [line 167]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<signed char>* [line 167]\n  n$1=*&desired:signed char [line 167]\n  *n$0._wrapped_value:signed char=n$1 [line 167]\n " shape="box"]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_2" ;
-"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_1" [label="1: Start std::__infer_atomic_base<signed char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<signed char>* desired:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_2" ;
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_1" [label="1: Start std::__infer_atomic_base<char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<char>* desired:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_1" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" ;
-"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_2" [label="2: Exit std::__infer_atomic_base<signed char>___infer_atomic_base \n  " color=yellow style=filled]
+	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_1" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" ;
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<signed char>* [line 167]\n  n$1=*&desired:signed char [line 167]\n  *n$0._wrapped_value:signed char=n$1 [line 167]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167]\n  n$1=*&desired:char [line 167]\n  *n$0._wrapped_value:char=n$1 [line 167]\n " shape="box"]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_2" ;
+	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_2" ;
 "__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{_ZNSt3__119__infer_atomic_baseIhEC1Eh|co.35a038cbc05f9d1300913840f6ef44cb_1" [label="1: Start std::__infer_atomic_base<unsigned char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<unsigned char>* desired:unsigned char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
@@ -321,6 +310,28 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{_ZNSt3__119__infer_atomic_baseIjEC1Ej|con.13f39942a78d48eb0e3a4271c113c29e_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{_ZNSt3__119__infer_atomic_baseIjEC1Ej|con.13f39942a78d48eb0e3a4271c113c29e_2" ;
+"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_1" [label="1: Start std::__infer_atomic_base<long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<long>* desired:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+	
+
+	 "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_1" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" ;
+"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_2" [label="2: Exit std::__infer_atomic_base<long>___infer_atomic_base \n  " color=yellow style=filled]
+	
+
+"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<long>* [line 167]\n  n$1=*&desired:long [line 167]\n  *n$0._wrapped_value:long=n$1 [line 167]\n " shape="box"]
+	
+
+	 "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_2" ;
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_1" [label="1: Start std::__infer_atomic_base<unsigned long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<unsigned long>* desired:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+	
+
+	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_1" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" ;
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_2" [label="2: Exit std::__infer_atomic_base<unsigned long>___infer_atomic_base \n  " color=yellow style=filled]
+	
+
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned long>* [line 167]\n  n$1=*&desired:unsigned long [line 167]\n  *n$0._wrapped_value:unsigned long=n$1 [line 167]\n " shape="box"]
+	
+
+	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_2" ;
 "__infer_atomic_base#__infer_atomic_base<short>#std#{_ZNSt3__119__infer_atomic_baseIsEC1Es|constexpr}.f8911481350c5debb235ad1125f46c7a_1" [label="1: Start std::__infer_atomic_base<short>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<short>* desired:short\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
@@ -343,28 +354,17 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{_ZNSt3__119__infer_atomic_baseItEC1Et|c.9be7294cf3a57183581f7bb55f891706_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{_ZNSt3__119__infer_atomic_baseItEC1Et|c.9be7294cf3a57183581f7bb55f891706_2" ;
-"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_1" [label="1: Start std::__infer_atomic_base<long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<long>* desired:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
-	
-
-	 "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_1" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" ;
-"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_2" [label="2: Exit std::__infer_atomic_base<long>___infer_atomic_base \n  " color=yellow style=filled]
-	
-
-"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<long>* [line 167]\n  n$1=*&desired:long [line 167]\n  *n$0._wrapped_value:long=n$1 [line 167]\n " shape="box"]
-	
-
-	 "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_2" ;
-"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_1" [label="1: Start std::__infer_atomic_base<unsigned long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<unsigned long>* desired:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_1" [label="1: Start std::__infer_atomic_base<char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<char>* desired:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_1" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" ;
-"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_2" [label="2: Exit std::__infer_atomic_base<unsigned long>___infer_atomic_base \n  " color=yellow style=filled]
+	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_1" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" ;
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned long>* [line 167]\n  n$1=*&desired:unsigned long [line 167]\n  *n$0._wrapped_value:unsigned long=n$1 [line 167]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167]\n  n$1=*&desired:char [line 167]\n  *n$0._wrapped_value:char=n$1 [line 167]\n " shape="box"]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_2" ;
+	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_2" ;
 "__infer_atomic_base#__infer_atomic_base<long long>#std#{_ZNSt3__119__infer_atomic_baseIxEC1Ex|conste.e29345999d93d718f00833c638386d56_1" [label="1: Start std::__infer_atomic_base<long long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<long long>* desired:long long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
@@ -409,39 +409,28 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIDsEC1E.0d2db929f8e8cacadc22b38baa8dc516_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIDsEC1E.0d2db929f8e8cacadc22b38baa8dc516_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_1" [label="1: Start std::__infer_atomic_integral<char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
-	
-
-	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_1" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
-	
-
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187]\n  n$1=*&d:char [line 187]\n  _fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187]\n " shape="box"]
-	
-
-	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_1" [label="1: Start std::__infer_atomic_integral<char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_1" [label="1: Start std::__infer_atomic_integral<signed char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<signed char>* d:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_1" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
+	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_1" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_2" [label="2: Exit std::__infer_atomic_integral<signed char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187]\n  n$1=*&d:char [line 187]\n  _fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<signed char>* [line 187]\n  n$1=*&d:signed char [line 187]\n  _fun_std::__infer_atomic_base<signed char>___infer_atomic_base(n$0:std::__infer_atomic_integral<signed char>*,n$1:signed char) [line 187]\n " shape="box"]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_1" [label="1: Start std::__infer_atomic_integral<signed char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<signed char>* d:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_2" ;
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_1" [label="1: Start std::__infer_atomic_integral<char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_1" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_2" [label="2: Exit std::__infer_atomic_integral<signed char>___infer_atomic_integral \n  " color=yellow style=filled]
+	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_1" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<signed char>* [line 187]\n  n$1=*&d:signed char [line 187]\n  _fun_std::__infer_atomic_base<signed char>___infer_atomic_base(n$0:std::__infer_atomic_integral<signed char>*,n$1:signed char) [line 187]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187]\n  n$1=*&d:char [line 187]\n  _fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187]\n " shape="box"]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_2" ;
+	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_2" ;
 "__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{_ZNSt3__123__infer_atomic_integr.d8ea1d6307fafb7cd6022b49373ca8cf_1" [label="1: Start std::__infer_atomic_integral<unsigned char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<unsigned char>* d:unsigned char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
@@ -475,6 +464,28 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{_ZNSt3__123__infer_atomic_integra.a93dba5fe093f4e72a6b13746c6f64c3_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{_ZNSt3__123__infer_atomic_integra.a93dba5fe093f4e72a6b13746c6f64c3_2" ;
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_1" [label="1: Start std::__infer_atomic_integral<long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<long>* d:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+	
+
+	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_1" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_2" [label="2: Exit std::__infer_atomic_integral<long>___infer_atomic_integral \n  " color=yellow style=filled]
+	
+
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<long>* [line 187]\n  n$1=*&d:long [line 187]\n  _fun_std::__infer_atomic_base<long>___infer_atomic_base(n$0:std::__infer_atomic_integral<long>*,n$1:long) [line 187]\n " shape="box"]
+	
+
+	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_2" ;
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_1" [label="1: Start std::__infer_atomic_integral<unsigned long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<unsigned long>* d:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+	
+
+	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_1" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_2" [label="2: Exit std::__infer_atomic_integral<unsigned long>___infer_atomic_integral \n  " color=yellow style=filled]
+	
+
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned long>* [line 187]\n  n$1=*&d:unsigned long [line 187]\n  _fun_std::__infer_atomic_base<unsigned long>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned long>*,n$1:unsigned long) [line 187]\n " shape="box"]
+	
+
+	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_2" ;
 "__infer_atomic_integral#__infer_atomic_integral<short>#std#{_ZNSt3__123__infer_atomic_integralIsEC1E.724cc7992e11b1aca07332e64de63724_1" [label="1: Start std::__infer_atomic_integral<short>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<short>* d:short\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
@@ -497,28 +508,17 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{_ZNSt3__123__infer_atomic_integ.30e0e95c8f599ac8947ad142f023b691_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{_ZNSt3__123__infer_atomic_integ.30e0e95c8f599ac8947ad142f023b691_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_1" [label="1: Start std::__infer_atomic_integral<long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<long>* d:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
-	
-
-	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_1" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_2" [label="2: Exit std::__infer_atomic_integral<long>___infer_atomic_integral \n  " color=yellow style=filled]
-	
-
-"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<long>* [line 187]\n  n$1=*&d:long [line 187]\n  _fun_std::__infer_atomic_base<long>___infer_atomic_base(n$0:std::__infer_atomic_integral<long>*,n$1:long) [line 187]\n " shape="box"]
-	
-
-	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_1" [label="1: Start std::__infer_atomic_integral<unsigned long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<unsigned long>* d:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_1" [label="1: Start std::__infer_atomic_integral<char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_1" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_2" [label="2: Exit std::__infer_atomic_integral<unsigned long>___infer_atomic_integral \n  " color=yellow style=filled]
+	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_1" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned long>* [line 187]\n  n$1=*&d:unsigned long [line 187]\n  _fun_std::__infer_atomic_base<unsigned long>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned long>*,n$1:unsigned long) [line 187]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187]\n  n$1=*&d:char [line 187]\n  _fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187]\n " shape="box"]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_2" ;
+	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_2" ;
 "__infer_atomic_integral#__infer_atomic_integral<long long>#std#{_ZNSt3__123__infer_atomic_integralIx.60ee52f3e27050a0f9e3234d3b005c14_1" [label="1: Start std::__infer_atomic_integral<long long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<long long>* d:long long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
@@ -541,28 +541,17 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{_ZNSt3__123__infer_atomic_i.672d560d738dcc3fe42e493ebf903f57_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{_ZNSt3__123__infer_atomic_i.672d560d738dcc3fe42e493ebf903f57_2" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 372]\n " color=yellow style=filled]
-	
-
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
-	
-
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 372]\n  n$1=*&d:char [line 372]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 372]\n " shape="box"]
-	
-
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_2" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 472]\n " color=yellow style=filled]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 490]\n " color=yellow style=filled]
 	
 
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" ;
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 472]\n  n$1=*&d:char [line 472]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 472]\n " shape="box"]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 490]\n  n$1=*&d:char [line 490]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 490]\n " shape="box"]
 	
 
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_2" ;
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_2" ;
 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDsEC1EDs|constexpr}.328f9fc44df67ff03471755357c36459_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 481]\n " color=yellow style=filled]
 	
 
@@ -574,28 +563,28 @@ digraph iCFG {
 	
 
 	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDsEC1EDs|constexpr}.328f9fc44df67ff03471755357c36459_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDsEC1EDs|constexpr}.328f9fc44df67ff03471755357c36459_2" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 490]\n " color=yellow style=filled]
+"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_1" [label="1: Start std::atomic<signed char>_atomic\nFormals:  this:std::atomic<signed char>* d:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 381]\n " color=yellow style=filled]
 	
 
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
+	 "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_1" -> "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" ;
+"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_2" [label="2: Exit std::atomic<signed char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 490]\n  n$1=*&d:char [line 490]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 490]\n " shape="box"]
+"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<signed char>* [line 381]\n  n$1=*&d:signed char [line 381]\n  _fun_std::__infer_atomic_integral<signed char>___infer_atomic_integral(n$0:std::atomic<signed char>*,n$1:signed char) [line 381]\n " shape="box"]
 	
 
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_2" ;
-"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_1" [label="1: Start std::atomic<signed char>_atomic\nFormals:  this:std::atomic<signed char>* d:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 381]\n " color=yellow style=filled]
+	 "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" -> "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_2" ;
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 372]\n " color=yellow style=filled]
 	
 
-	 "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_1" -> "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" ;
-"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_2" [label="2: Exit std::atomic<signed char>_atomic \n  " color=yellow style=filled]
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" ;
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<signed char>* [line 381]\n  n$1=*&d:signed char [line 381]\n  _fun_std::__infer_atomic_integral<signed char>___infer_atomic_integral(n$0:std::atomic<signed char>*,n$1:signed char) [line 381]\n " shape="box"]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 372]\n  n$1=*&d:char [line 372]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 372]\n " shape="box"]
 	
 
-	 "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" -> "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_2" ;
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_2" ;
 "atomic#atomic<unsigned char>#std#{_ZNSt3__16atomicIhEC1Eh|constexpr}.9e68a2136a0f553b2c163542d64f2ece_1" [label="1: Start std::atomic<unsigned char>_atomic\nFormals:  this:std::atomic<unsigned char>* d:unsigned char\nLocals:  \n   DECLARE_LOCALS(&return); [line 390]\n " color=yellow style=filled]
 	
 
@@ -629,6 +618,28 @@ digraph iCFG {
 	
 
 	 "atomic#atomic<unsigned int>#std#{_ZNSt3__16atomicIjEC1Ej|constexpr}.b54ee1db0928147396870d2f8c92e1f0_3" -> "atomic#atomic<unsigned int>#std#{_ZNSt3__16atomicIjEC1Ej|constexpr}.b54ee1db0928147396870d2f8c92e1f0_2" ;
+"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_1" [label="1: Start std::atomic<long>_atomic\nFormals:  this:std::atomic<long>* d:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 435]\n " color=yellow style=filled]
+	
+
+	 "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_1" -> "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" ;
+"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_2" [label="2: Exit std::atomic<long>_atomic \n  " color=yellow style=filled]
+	
+
+"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<long>* [line 435]\n  n$1=*&d:long [line 435]\n  _fun_std::__infer_atomic_integral<long>___infer_atomic_integral(n$0:std::atomic<long>*,n$1:long) [line 435]\n " shape="box"]
+	
+
+	 "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" -> "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_2" ;
+"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_1" [label="1: Start std::atomic<unsigned long>_atomic\nFormals:  this:std::atomic<unsigned long>* d:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 444]\n " color=yellow style=filled]
+	
+
+	 "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_1" -> "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" ;
+"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_2" [label="2: Exit std::atomic<unsigned long>_atomic \n  " color=yellow style=filled]
+	
+
+"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned long>* [line 444]\n  n$1=*&d:unsigned long [line 444]\n  _fun_std::__infer_atomic_integral<unsigned long>___infer_atomic_integral(n$0:std::atomic<unsigned long>*,n$1:unsigned long) [line 444]\n " shape="box"]
+	
+
+	 "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" -> "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_2" ;
 "atomic#atomic<short>#std#{_ZNSt3__16atomicIsEC1Es|constexpr}.ba1ed1dd304ea271923e139e3e3cc1de_1" [label="1: Start std::atomic<short>_atomic\nFormals:  this:std::atomic<short>* d:short\nLocals:  \n   DECLARE_LOCALS(&return); [line 399]\n " color=yellow style=filled]
 	
 
@@ -651,28 +662,17 @@ digraph iCFG {
 	
 
 	 "atomic#atomic<unsigned short>#std#{_ZNSt3__16atomicItEC1Et|constexpr}.147e38f53ec9d80ba8216f91c55cffa0_3" -> "atomic#atomic<unsigned short>#std#{_ZNSt3__16atomicItEC1Et|constexpr}.147e38f53ec9d80ba8216f91c55cffa0_2" ;
-"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_1" [label="1: Start std::atomic<long>_atomic\nFormals:  this:std::atomic<long>* d:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 435]\n " color=yellow style=filled]
-	
-
-	 "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_1" -> "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" ;
-"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_2" [label="2: Exit std::atomic<long>_atomic \n  " color=yellow style=filled]
-	
-
-"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<long>* [line 435]\n  n$1=*&d:long [line 435]\n  _fun_std::__infer_atomic_integral<long>___infer_atomic_integral(n$0:std::atomic<long>*,n$1:long) [line 435]\n " shape="box"]
-	
-
-	 "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" -> "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_2" ;
-"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_1" [label="1: Start std::atomic<unsigned long>_atomic\nFormals:  this:std::atomic<unsigned long>* d:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 444]\n " color=yellow style=filled]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 472]\n " color=yellow style=filled]
 	
 
-	 "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_1" -> "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" ;
-"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_2" [label="2: Exit std::atomic<unsigned long>_atomic \n  " color=yellow style=filled]
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" ;
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned long>* [line 444]\n  n$1=*&d:unsigned long [line 444]\n  _fun_std::__infer_atomic_integral<unsigned long>___infer_atomic_integral(n$0:std::atomic<unsigned long>*,n$1:unsigned long) [line 444]\n " shape="box"]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 472]\n  n$1=*&d:char [line 472]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 472]\n " shape="box"]
 	
 
-	 "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" -> "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_2" ;
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_2" ;
 "atomic#atomic<long long>#std#{_ZNSt3__16atomicIxEC1Ex|constexpr}.6e1b6a2eb7efef598d96d0416e18b010_1" [label="1: Start std::atomic<long long>_atomic\nFormals:  this:std::atomic<long long>* d:long long\nLocals:  \n   DECLARE_LOCALS(&return); [line 453]\n " color=yellow style=filled]
 	
 

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

@@ -255,39 +255,28 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIDsEC1EDs|constexpr.e48e36eb28676496059120d4d7907128_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIDsEC1EDs|constexpr.e48e36eb28676496059120d4d7907128_2" ;
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_1" [label="1: Start std::__infer_atomic_base<char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<char>* desired:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
-	
-
-	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_1" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" ;
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
-	
-
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167]\n  n$1=*&desired:char [line 167]\n  *n$0._wrapped_value:char=n$1 [line 167]\n " shape="box"]
-	
-
-	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_2" ;
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_1" [label="1: Start std::__infer_atomic_base<char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<char>* desired:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_1" [label="1: Start std::__infer_atomic_base<signed char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<signed char>* desired:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_1" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" ;
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
+	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_1" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" ;
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_2" [label="2: Exit std::__infer_atomic_base<signed char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167]\n  n$1=*&desired:char [line 167]\n  *n$0._wrapped_value:char=n$1 [line 167]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<signed char>* [line 167]\n  n$1=*&desired:signed char [line 167]\n  *n$0._wrapped_value:signed char=n$1 [line 167]\n " shape="box"]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_2" ;
-"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_1" [label="1: Start std::__infer_atomic_base<signed char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<signed char>* desired:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_2" ;
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_1" [label="1: Start std::__infer_atomic_base<char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<char>* desired:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_1" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" ;
-"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_2" [label="2: Exit std::__infer_atomic_base<signed char>___infer_atomic_base \n  " color=yellow style=filled]
+	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_1" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" ;
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<signed char>* [line 167]\n  n$1=*&desired:signed char [line 167]\n  *n$0._wrapped_value:signed char=n$1 [line 167]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167]\n  n$1=*&desired:char [line 167]\n  *n$0._wrapped_value:char=n$1 [line 167]\n " shape="box"]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_3" -> "__infer_atomic_base#__infer_atomic_base<signed char>#std#{_ZNSt3__119__infer_atomic_baseIaEC1Ea|cons.accb4df87a574717a14eeb4f0363eac3_2" ;
+	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIcEC1Ec|constexpr}.38dd2118d097ff3bf8136e35497fbf28_2" ;
 "__infer_atomic_base#__infer_atomic_base<unsigned char>#std#{_ZNSt3__119__infer_atomic_baseIhEC1Eh|co.35a038cbc05f9d1300913840f6ef44cb_1" [label="1: Start std::__infer_atomic_base<unsigned char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<unsigned char>* desired:unsigned char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
@@ -321,6 +310,28 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{_ZNSt3__119__infer_atomic_baseIjEC1Ej|con.13f39942a78d48eb0e3a4271c113c29e_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned int>#std#{_ZNSt3__119__infer_atomic_baseIjEC1Ej|con.13f39942a78d48eb0e3a4271c113c29e_2" ;
+"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_1" [label="1: Start std::__infer_atomic_base<long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<long>* desired:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+	
+
+	 "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_1" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" ;
+"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_2" [label="2: Exit std::__infer_atomic_base<long>___infer_atomic_base \n  " color=yellow style=filled]
+	
+
+"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<long>* [line 167]\n  n$1=*&desired:long [line 167]\n  *n$0._wrapped_value:long=n$1 [line 167]\n " shape="box"]
+	
+
+	 "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_2" ;
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_1" [label="1: Start std::__infer_atomic_base<unsigned long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<unsigned long>* desired:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+	
+
+	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_1" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" ;
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_2" [label="2: Exit std::__infer_atomic_base<unsigned long>___infer_atomic_base \n  " color=yellow style=filled]
+	
+
+"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned long>* [line 167]\n  n$1=*&desired:unsigned long [line 167]\n  *n$0._wrapped_value:unsigned long=n$1 [line 167]\n " shape="box"]
+	
+
+	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_2" ;
 "__infer_atomic_base#__infer_atomic_base<short>#std#{_ZNSt3__119__infer_atomic_baseIsEC1Es|constexpr}.f8911481350c5debb235ad1125f46c7a_1" [label="1: Start std::__infer_atomic_base<short>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<short>* desired:short\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
@@ -343,28 +354,17 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{_ZNSt3__119__infer_atomic_baseItEC1Et|c.9be7294cf3a57183581f7bb55f891706_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned short>#std#{_ZNSt3__119__infer_atomic_baseItEC1Et|c.9be7294cf3a57183581f7bb55f891706_2" ;
-"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_1" [label="1: Start std::__infer_atomic_base<long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<long>* desired:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
-	
-
-	 "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_1" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" ;
-"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_2" [label="2: Exit std::__infer_atomic_base<long>___infer_atomic_base \n  " color=yellow style=filled]
-	
-
-"__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<long>* [line 167]\n  n$1=*&desired:long [line 167]\n  *n$0._wrapped_value:long=n$1 [line 167]\n " shape="box"]
-	
-
-	 "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_3" -> "__infer_atomic_base#__infer_atomic_base<long>#std#{_ZNSt3__119__infer_atomic_baseIlEC1El|constexpr}.3ab7ff414736b3f17f4420c462d3efa9_2" ;
-"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_1" [label="1: Start std::__infer_atomic_base<unsigned long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<unsigned long>* desired:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_1" [label="1: Start std::__infer_atomic_base<char>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<char>* desired:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_1" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" ;
-"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_2" [label="2: Exit std::__infer_atomic_base<unsigned long>___infer_atomic_base \n  " color=yellow style=filled]
+	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_1" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" ;
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_2" [label="2: Exit std::__infer_atomic_base<char>___infer_atomic_base \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<unsigned long>* [line 167]\n  n$1=*&desired:unsigned long [line 167]\n  *n$0._wrapped_value:unsigned long=n$1 [line 167]\n " shape="box"]
+"__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_base<char>* [line 167]\n  n$1=*&desired:char [line 167]\n  *n$0._wrapped_value:char=n$1 [line 167]\n " shape="box"]
 	
 
-	 "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_3" -> "__infer_atomic_base#__infer_atomic_base<unsigned long>#std#{_ZNSt3__119__infer_atomic_baseImEC1Em|co.c4bb4001f40f0f6614a72189b5bb02af_2" ;
+	 "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_3" -> "__infer_atomic_base#__infer_atomic_base<char>#std#{_ZNSt3__119__infer_atomic_baseIwEC1Ew|constexpr}.871be1c7d24eef6cbc6ce32555da4d12_2" ;
 "__infer_atomic_base#__infer_atomic_base<long long>#std#{_ZNSt3__119__infer_atomic_baseIxEC1Ex|conste.e29345999d93d718f00833c638386d56_1" [label="1: Start std::__infer_atomic_base<long long>___infer_atomic_base\nFormals:  this:std::__infer_atomic_base<long long>* desired:long long\nLocals:  \n   DECLARE_LOCALS(&return); [line 167]\n " color=yellow style=filled]
 	
 
@@ -409,39 +409,28 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIDsEC1E.0d2db929f8e8cacadc22b38baa8dc516_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIDsEC1E.0d2db929f8e8cacadc22b38baa8dc516_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_1" [label="1: Start std::__infer_atomic_integral<char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
-	
-
-	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_1" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
-	
-
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187]\n  n$1=*&d:char [line 187]\n  _fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187]\n " shape="box"]
-	
-
-	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_1" [label="1: Start std::__infer_atomic_integral<char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_1" [label="1: Start std::__infer_atomic_integral<signed char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<signed char>* d:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_1" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
+	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_1" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_2" [label="2: Exit std::__infer_atomic_integral<signed char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187]\n  n$1=*&d:char [line 187]\n  _fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<signed char>* [line 187]\n  n$1=*&d:signed char [line 187]\n  _fun_std::__infer_atomic_base<signed char>___infer_atomic_base(n$0:std::__infer_atomic_integral<signed char>*,n$1:signed char) [line 187]\n " shape="box"]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_1" [label="1: Start std::__infer_atomic_integral<signed char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<signed char>* d:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_2" ;
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_1" [label="1: Start std::__infer_atomic_integral<char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_1" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_2" [label="2: Exit std::__infer_atomic_integral<signed char>___infer_atomic_integral \n  " color=yellow style=filled]
+	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_1" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<signed char>* [line 187]\n  n$1=*&d:signed char [line 187]\n  _fun_std::__infer_atomic_base<signed char>___infer_atomic_base(n$0:std::__infer_atomic_integral<signed char>*,n$1:signed char) [line 187]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187]\n  n$1=*&d:char [line 187]\n  _fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187]\n " shape="box"]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_3" -> "__infer_atomic_integral#__infer_atomic_integral<signed char>#std#{_ZNSt3__123__infer_atomic_integral.fd5baaee7e6622dba8448a9515825022_2" ;
+	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIcEC1Ec.77a7acc92b4b1f4856a8c6a8efdda1ef_2" ;
 "__infer_atomic_integral#__infer_atomic_integral<unsigned char>#std#{_ZNSt3__123__infer_atomic_integr.d8ea1d6307fafb7cd6022b49373ca8cf_1" [label="1: Start std::__infer_atomic_integral<unsigned char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<unsigned char>* d:unsigned char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
@@ -475,6 +464,28 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{_ZNSt3__123__infer_atomic_integra.a93dba5fe093f4e72a6b13746c6f64c3_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned int>#std#{_ZNSt3__123__infer_atomic_integra.a93dba5fe093f4e72a6b13746c6f64c3_2" ;
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_1" [label="1: Start std::__infer_atomic_integral<long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<long>* d:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+	
+
+	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_1" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_2" [label="2: Exit std::__infer_atomic_integral<long>___infer_atomic_integral \n  " color=yellow style=filled]
+	
+
+"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<long>* [line 187]\n  n$1=*&d:long [line 187]\n  _fun_std::__infer_atomic_base<long>___infer_atomic_base(n$0:std::__infer_atomic_integral<long>*,n$1:long) [line 187]\n " shape="box"]
+	
+
+	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_2" ;
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_1" [label="1: Start std::__infer_atomic_integral<unsigned long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<unsigned long>* d:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+	
+
+	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_1" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_2" [label="2: Exit std::__infer_atomic_integral<unsigned long>___infer_atomic_integral \n  " color=yellow style=filled]
+	
+
+"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned long>* [line 187]\n  n$1=*&d:unsigned long [line 187]\n  _fun_std::__infer_atomic_base<unsigned long>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned long>*,n$1:unsigned long) [line 187]\n " shape="box"]
+	
+
+	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_2" ;
 "__infer_atomic_integral#__infer_atomic_integral<short>#std#{_ZNSt3__123__infer_atomic_integralIsEC1E.724cc7992e11b1aca07332e64de63724_1" [label="1: Start std::__infer_atomic_integral<short>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<short>* d:short\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
@@ -497,28 +508,17 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{_ZNSt3__123__infer_atomic_integ.30e0e95c8f599ac8947ad142f023b691_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned short>#std#{_ZNSt3__123__infer_atomic_integ.30e0e95c8f599ac8947ad142f023b691_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_1" [label="1: Start std::__infer_atomic_integral<long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<long>* d:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
-	
-
-	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_1" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_2" [label="2: Exit std::__infer_atomic_integral<long>___infer_atomic_integral \n  " color=yellow style=filled]
-	
-
-"__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<long>* [line 187]\n  n$1=*&d:long [line 187]\n  _fun_std::__infer_atomic_base<long>___infer_atomic_base(n$0:std::__infer_atomic_integral<long>*,n$1:long) [line 187]\n " shape="box"]
-	
-
-	 "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_3" -> "__infer_atomic_integral#__infer_atomic_integral<long>#std#{_ZNSt3__123__infer_atomic_integralIlEC1El.092c57453dadce988a19bd0734c21fcc_2" ;
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_1" [label="1: Start std::__infer_atomic_integral<unsigned long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<unsigned long>* d:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_1" [label="1: Start std::__infer_atomic_integral<char>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_1" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" ;
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_2" [label="2: Exit std::__infer_atomic_integral<unsigned long>___infer_atomic_integral \n  " color=yellow style=filled]
+	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_1" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" ;
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_2" [label="2: Exit std::__infer_atomic_integral<char>___infer_atomic_integral \n  " color=yellow style=filled]
 	
 
-"__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<unsigned long>* [line 187]\n  n$1=*&d:unsigned long [line 187]\n  _fun_std::__infer_atomic_base<unsigned long>___infer_atomic_base(n$0:std::__infer_atomic_integral<unsigned long>*,n$1:unsigned long) [line 187]\n " shape="box"]
+"__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" [label="3:  Constructor Init \n   n$0=*&this:std::__infer_atomic_integral<char>* [line 187]\n  n$1=*&d:char [line 187]\n  _fun_std::__infer_atomic_base<char>___infer_atomic_base(n$0:std::__infer_atomic_integral<char>*,n$1:char) [line 187]\n " shape="box"]
 	
 
-	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long>#std#{_ZNSt3__123__infer_atomic_integr.07845a64d305cef004e3f5c585614bbc_2" ;
+	 "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_3" -> "__infer_atomic_integral#__infer_atomic_integral<char>#std#{_ZNSt3__123__infer_atomic_integralIwEC1Ew.34a5289f7e94efe645ad68e6061a2d38_2" ;
 "__infer_atomic_integral#__infer_atomic_integral<long long>#std#{_ZNSt3__123__infer_atomic_integralIx.60ee52f3e27050a0f9e3234d3b005c14_1" [label="1: Start std::__infer_atomic_integral<long long>___infer_atomic_integral\nFormals:  this:std::__infer_atomic_integral<long long>* d:long long\nLocals:  \n   DECLARE_LOCALS(&return); [line 187]\n " color=yellow style=filled]
 	
 
@@ -541,28 +541,17 @@ digraph iCFG {
 	
 
 	 "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{_ZNSt3__123__infer_atomic_i.672d560d738dcc3fe42e493ebf903f57_3" -> "__infer_atomic_integral#__infer_atomic_integral<unsigned long long>#std#{_ZNSt3__123__infer_atomic_i.672d560d738dcc3fe42e493ebf903f57_2" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 372]\n " color=yellow style=filled]
-	
-
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
-	
-
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 372]\n  n$1=*&d:char [line 372]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 372]\n " shape="box"]
-	
-
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_2" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 472]\n " color=yellow style=filled]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 490]\n " color=yellow style=filled]
 	
 
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" ;
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 472]\n  n$1=*&d:char [line 472]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 472]\n " shape="box"]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 490]\n  n$1=*&d:char [line 490]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 490]\n " shape="box"]
 	
 
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_2" ;
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_2" ;
 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDsEC1EDs|constexpr}.328f9fc44df67ff03471755357c36459_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 481]\n " color=yellow style=filled]
 	
 
@@ -574,28 +563,28 @@ digraph iCFG {
 	
 
 	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDsEC1EDs|constexpr}.328f9fc44df67ff03471755357c36459_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDsEC1EDs|constexpr}.328f9fc44df67ff03471755357c36459_2" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 490]\n " color=yellow style=filled]
+"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_1" [label="1: Start std::atomic<signed char>_atomic\nFormals:  this:std::atomic<signed char>* d:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 381]\n " color=yellow style=filled]
 	
 
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" ;
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
+	 "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_1" -> "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" ;
+"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_2" [label="2: Exit std::atomic<signed char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 490]\n  n$1=*&d:char [line 490]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 490]\n " shape="box"]
+"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<signed char>* [line 381]\n  n$1=*&d:signed char [line 381]\n  _fun_std::__infer_atomic_integral<signed char>___infer_atomic_integral(n$0:std::atomic<signed char>*,n$1:signed char) [line 381]\n " shape="box"]
 	
 
-	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIDiEC1EDi|constexpr}.29cb966f98532f98ffdd90f0a89114a9_2" ;
-"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_1" [label="1: Start std::atomic<signed char>_atomic\nFormals:  this:std::atomic<signed char>* d:signed char\nLocals:  \n   DECLARE_LOCALS(&return); [line 381]\n " color=yellow style=filled]
+	 "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" -> "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_2" ;
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 372]\n " color=yellow style=filled]
 	
 
-	 "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_1" -> "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" ;
-"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_2" [label="2: Exit std::atomic<signed char>_atomic \n  " color=yellow style=filled]
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" ;
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<signed char>* [line 381]\n  n$1=*&d:signed char [line 381]\n  _fun_std::__infer_atomic_integral<signed char>___infer_atomic_integral(n$0:std::atomic<signed char>*,n$1:signed char) [line 381]\n " shape="box"]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 372]\n  n$1=*&d:char [line 372]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 372]\n " shape="box"]
 	
 
-	 "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_3" -> "atomic#atomic<signed char>#std#{_ZNSt3__16atomicIaEC1Ea|constexpr}.5badc45d6951ddfd0198145e6a45b44c_2" ;
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIcEC1Ec|constexpr}.931d5f5e17722c73c68bd01c6bd79e26_2" ;
 "atomic#atomic<unsigned char>#std#{_ZNSt3__16atomicIhEC1Eh|constexpr}.9e68a2136a0f553b2c163542d64f2ece_1" [label="1: Start std::atomic<unsigned char>_atomic\nFormals:  this:std::atomic<unsigned char>* d:unsigned char\nLocals:  \n   DECLARE_LOCALS(&return); [line 390]\n " color=yellow style=filled]
 	
 
@@ -629,6 +618,28 @@ digraph iCFG {
 	
 
 	 "atomic#atomic<unsigned int>#std#{_ZNSt3__16atomicIjEC1Ej|constexpr}.b54ee1db0928147396870d2f8c92e1f0_3" -> "atomic#atomic<unsigned int>#std#{_ZNSt3__16atomicIjEC1Ej|constexpr}.b54ee1db0928147396870d2f8c92e1f0_2" ;
+"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_1" [label="1: Start std::atomic<long>_atomic\nFormals:  this:std::atomic<long>* d:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 435]\n " color=yellow style=filled]
+	
+
+	 "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_1" -> "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" ;
+"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_2" [label="2: Exit std::atomic<long>_atomic \n  " color=yellow style=filled]
+	
+
+"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<long>* [line 435]\n  n$1=*&d:long [line 435]\n  _fun_std::__infer_atomic_integral<long>___infer_atomic_integral(n$0:std::atomic<long>*,n$1:long) [line 435]\n " shape="box"]
+	
+
+	 "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" -> "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_2" ;
+"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_1" [label="1: Start std::atomic<unsigned long>_atomic\nFormals:  this:std::atomic<unsigned long>* d:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 444]\n " color=yellow style=filled]
+	
+
+	 "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_1" -> "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" ;
+"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_2" [label="2: Exit std::atomic<unsigned long>_atomic \n  " color=yellow style=filled]
+	
+
+"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned long>* [line 444]\n  n$1=*&d:unsigned long [line 444]\n  _fun_std::__infer_atomic_integral<unsigned long>___infer_atomic_integral(n$0:std::atomic<unsigned long>*,n$1:unsigned long) [line 444]\n " shape="box"]
+	
+
+	 "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" -> "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_2" ;
 "atomic#atomic<short>#std#{_ZNSt3__16atomicIsEC1Es|constexpr}.ba1ed1dd304ea271923e139e3e3cc1de_1" [label="1: Start std::atomic<short>_atomic\nFormals:  this:std::atomic<short>* d:short\nLocals:  \n   DECLARE_LOCALS(&return); [line 399]\n " color=yellow style=filled]
 	
 
@@ -651,28 +662,17 @@ digraph iCFG {
 	
 
 	 "atomic#atomic<unsigned short>#std#{_ZNSt3__16atomicItEC1Et|constexpr}.147e38f53ec9d80ba8216f91c55cffa0_3" -> "atomic#atomic<unsigned short>#std#{_ZNSt3__16atomicItEC1Et|constexpr}.147e38f53ec9d80ba8216f91c55cffa0_2" ;
-"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_1" [label="1: Start std::atomic<long>_atomic\nFormals:  this:std::atomic<long>* d:long\nLocals:  \n   DECLARE_LOCALS(&return); [line 435]\n " color=yellow style=filled]
-	
-
-	 "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_1" -> "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" ;
-"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_2" [label="2: Exit std::atomic<long>_atomic \n  " color=yellow style=filled]
-	
-
-"atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<long>* [line 435]\n  n$1=*&d:long [line 435]\n  _fun_std::__infer_atomic_integral<long>___infer_atomic_integral(n$0:std::atomic<long>*,n$1:long) [line 435]\n " shape="box"]
-	
-
-	 "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_3" -> "atomic#atomic<long>#std#{_ZNSt3__16atomicIlEC1El|constexpr}.ef846b444228412c7aca88802365d535_2" ;
-"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_1" [label="1: Start std::atomic<unsigned long>_atomic\nFormals:  this:std::atomic<unsigned long>* d:unsigned long\nLocals:  \n   DECLARE_LOCALS(&return); [line 444]\n " color=yellow style=filled]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_1" [label="1: Start std::atomic<char>_atomic\nFormals:  this:std::atomic<char>* d:char\nLocals:  \n   DECLARE_LOCALS(&return); [line 472]\n " color=yellow style=filled]
 	
 
-	 "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_1" -> "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" ;
-"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_2" [label="2: Exit std::atomic<unsigned long>_atomic \n  " color=yellow style=filled]
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_1" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" ;
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_2" [label="2: Exit std::atomic<char>_atomic \n  " color=yellow style=filled]
 	
 
-"atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<unsigned long>* [line 444]\n  n$1=*&d:unsigned long [line 444]\n  _fun_std::__infer_atomic_integral<unsigned long>___infer_atomic_integral(n$0:std::atomic<unsigned long>*,n$1:unsigned long) [line 444]\n " shape="box"]
+"atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" [label="3:  Constructor Init \n   n$0=*&this:std::atomic<char>* [line 472]\n  n$1=*&d:char [line 472]\n  _fun_std::__infer_atomic_integral<char>___infer_atomic_integral(n$0:std::atomic<char>*,n$1:char) [line 472]\n " shape="box"]
 	
 
-	 "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_3" -> "atomic#atomic<unsigned long>#std#{_ZNSt3__16atomicImEC1Em|constexpr}.f2825c2693fba33fdf630f887ab628e6_2" ;
+	 "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_3" -> "atomic#atomic<char>#std#{_ZNSt3__16atomicIwEC1Ew|constexpr}.43425186af66f0acf929cfb006a33115_2" ;
 "atomic#atomic<long long>#std#{_ZNSt3__16atomicIxEC1Ex|constexpr}.6e1b6a2eb7efef598d96d0416e18b010_1" [label="1: Start std::atomic<long long>_atomic\nFormals:  this:std::atomic<long long>* d:long long\nLocals:  \n   DECLARE_LOCALS(&return); [line 453]\n " color=yellow style=filled]
 	
 

infer/tests/codetoanalyze/cpp/errors/Makefile

@@ -9,6 +9,7 @@ TESTS_DIR = ../../..
 
 ANALYZER = infer
 
+# use our own clang's standard library so that the tests are uniform across distributions
 CLANG_OPTIONS = -x c++ -std=c++1y -isystem$(ROOT_DIR) -c
 INFER_OPTIONS = --ml-buckets cpp --no-filtering --debug-exceptions --project-root $(TESTS_DIR) \
                 --no-keep-going --pmd-xml --report-custom-error
@@ -64,6 +65,7 @@ SOURCES = \
 	$(wildcard stack_escape/*.cpp) \
 	$(wildcard static_local/*.cpp) \
   $(wildcard subtyping/*.cpp) \
+  $(wildcard templates/*.cpp) \
   $(wildcard types/*.cpp) \
   $(wildcard vector/*.cpp) \
 

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

@@ -191,6 +191,10 @@ codetoanalyze/cpp/errors/subtyping/dynamic_cast.cpp, dynamic__cast::wrongReferen
 codetoanalyze/cpp/errors/subtyping/implicit_cast_with_const.cpp, implicit_cast_with_const::BaseDerefNPE, 2, NULL_DEREFERENCE, [start of procedure implicit_cast_with_const::BaseDerefNPE(),start of procedure Base,return from a call to implicit_cast_with_const::Base_Base,start of procedure implicit_cast_with_const::deref()]
 codetoanalyze/cpp/errors/subtyping/implicit_cast_with_const.cpp, implicit_cast_with_const::DerivedDerefNPE, 2, NULL_DEREFERENCE, [start of procedure implicit_cast_with_const::DerivedDerefNPE(),start of procedure Derived,start of procedure Base,return from a call to implicit_cast_with_const::Base_Base,return from a call to implicit_cast_with_const::Derived_Derived,start of procedure implicit_cast_with_const::deref()]
 codetoanalyze/cpp/errors/subtyping/subtyping_check.cpp, B_setFG, 4, DIVIDE_BY_ZERO, [start of procedure setFG,start of procedure setF,return from a call to A_setF,Condition is true]
+codetoanalyze/cpp/errors/templates/mangling.cpp, bad_integral_types_templates, 4, DIVIDE_BY_ZERO, [start of procedure bad_integral_types_templates(),start of procedure IntTemplate,return from a call to IntTemplate<0>_IntTemplate,start of procedure CharTemplate,return from a call to CharTemplate<99>_CharTemplate,start of procedure LongTemplate,return from a call to LongTemplate<1234567890>_LongTemplate]
+codetoanalyze/cpp/errors/templates/mangling.cpp, bad_nullptr_templates, 2, DIVIDE_BY_ZERO, [start of procedure bad_nullptr_templates(),start of procedure NullPtrTemplate,return from a call to NullPtrTemplate<NullPtr>_NullPtrTemplate]
+codetoanalyze/cpp/errors/templates/mangling.cpp, bad_packed_templates, 2, DIVIDE_BY_ZERO, [start of procedure bad_packed_templates(),start of procedure Tuple,return from a call to Tuple<Tuple<int>>_Tuple]
+codetoanalyze/cpp/errors/templates/mangling.cpp, bad_reference_and_pointer_templates, 5, DIVIDE_BY_ZERO, [start of procedure bad_reference_and_pointer_templates(),start of procedure PointerTypeTemplate,return from a call to PointerTypeTemplate<Opaque>_PointerTypeTemplate,start of procedure PointerTypeTemplate2,return from a call to PointerTypeTemplate2<Opaque>_PointerTypeTemplate2,start of procedure FunctionPointerTemplate,return from a call to FunctionPointerTemplate<Opaque>_FunctionPointerTemplate,start of procedure ReferenceTypeTemplate,return from a call to ReferenceTypeTemplate<Opaque>_ReferenceTypeTemplate]
 codetoanalyze/cpp/errors/types/typeid_expr.cpp, employee_typeid, 3, MEMORY_LEAK, [start of procedure employee_typeid(),start of procedure Employee,start of procedure Person,return from a call to Person_Person,return from a call to Employee_Employee]
 codetoanalyze/cpp/errors/types/typeid_expr.cpp, employee_typeid, 4, DIVIDE_BY_ZERO, [start of procedure employee_typeid(),start of procedure Employee,start of procedure Person,return from a call to Person_Person,return from a call to Employee_Employee,Condition is true]
 codetoanalyze/cpp/errors/types/typeid_expr.cpp, person_ptr_typeid, 2, MEMORY_LEAK, [start of procedure person_ptr_typeid(),start of procedure Person,return from a call to Person_Person]

infer/tests/codetoanalyze/cpp/errors/templates/mangling.cpp

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2017 - present Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+// test that templated types are sufficiently unique'd by the frontend, so that
+// it doesn't conflate different types
+
+template <typename... Types>
+struct Tuple {};
+
+int bad_packed_templates() {
+  Tuple<Tuple<int>> x;
+  return 1 / 0;
+}
+
+typedef decltype(nullptr) nullptr_t;
+template <nullptr_t X>
+struct NullPtrTemplate {};
+
+int bad_nullptr_templates() {
+  NullPtrTemplate<nullptr> x1;
+  return 1 / 0;
+}
+
+template <int x>
+struct IntTemplate {};
+
+template <char x>
+struct CharTemplate {};
+template <long x>
+struct LongTemplate {};
+
+int bad_integral_types_templates() {
+  IntTemplate<0> x2;
+  CharTemplate<'c'> x3;
+  LongTemplate<1234567890L> x4;
+  return 1 / 0;
+}
+
+template <const int* pci>
+struct PointerTypeTemplate {};
+int array_is_pointer_type[10];
+
+template <int (&pa)[5]>
+struct PointerTypeTemplate2 {};
+int array_of_size_5[5];
+
+template <void (*pf)(int)>
+struct FunctionPointerTemplate {};
+void some_fun(int);
+
+struct SomeStruct {};
+template <const SomeStruct& b>
+struct ReferenceTypeTemplate {};
+SomeStruct some_struct;
+
+int bad_reference_and_pointer_templates() {
+  PointerTypeTemplate<array_is_pointer_type> a;
+  PointerTypeTemplate2<array_of_size_5> c;
+  FunctionPointerTemplate<&some_fun> d;
+  ReferenceTypeTemplate<some_struct> b;
+  return 1 / 0;
+}

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

@@ -96,40 +96,40 @@ digraph iCFG {
 	
 
 	 "div0#A#(_ZN1A4div0Ev).1a6f91584aabeebe049737afeb476378_3" -> "div0#A#(_ZN1A4div0Ev).1a6f91584aabeebe049737afeb476378_2" ;
-"div0#B<int>#(_ZN1BIiE4div0Ev).7928d23b80a07771917a21f2f65199b6_1" [label="1: Start B<int>_div0\nFormals:  this:B<int>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 16]\n " color=yellow style=filled]
+"div0#B<A>#(_ZN1BI1AE4div0Ev).95154c4eecaa5aa2388f6884c1f2eb1f_1" [label="1: Start B<A>_div0\nFormals:  this:B<A>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 16]\n " color=yellow style=filled]
 	
 
-	 "div0#B<int>#(_ZN1BIiE4div0Ev).7928d23b80a07771917a21f2f65199b6_1" -> "div0#B<int>#(_ZN1BIiE4div0Ev).7928d23b80a07771917a21f2f65199b6_3" ;
-"div0#B<int>#(_ZN1BIiE4div0Ev).7928d23b80a07771917a21f2f65199b6_2" [label="2: Exit B<int>_div0 \n  " color=yellow style=filled]
+	 "div0#B<A>#(_ZN1BI1AE4div0Ev).95154c4eecaa5aa2388f6884c1f2eb1f_1" -> "div0#B<A>#(_ZN1BI1AE4div0Ev).95154c4eecaa5aa2388f6884c1f2eb1f_3" ;
+"div0#B<A>#(_ZN1BI1AE4div0Ev).95154c4eecaa5aa2388f6884c1f2eb1f_2" [label="2: Exit B<A>_div0 \n  " color=yellow style=filled]
 	
 
-"div0#B<int>#(_ZN1BIiE4div0Ev).7928d23b80a07771917a21f2f65199b6_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 16]\n " shape="box"]
+"div0#B<A>#(_ZN1BI1AE4div0Ev).95154c4eecaa5aa2388f6884c1f2eb1f_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 16]\n " shape="box"]
 	
 
-	 "div0#B<int>#(_ZN1BIiE4div0Ev).7928d23b80a07771917a21f2f65199b6_3" -> "div0#B<int>#(_ZN1BIiE4div0Ev).7928d23b80a07771917a21f2f65199b6_2" ;
-"B#B<int>#{_ZN1BIiEC1Ev|constexpr}.0a6e40da0e7d400cfcd0dfa1df7ad995_1" [label="1: Start B<int>_B\nFormals:  this:B<int>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
+	 "div0#B<A>#(_ZN1BI1AE4div0Ev).95154c4eecaa5aa2388f6884c1f2eb1f_3" -> "div0#B<A>#(_ZN1BI1AE4div0Ev).95154c4eecaa5aa2388f6884c1f2eb1f_2" ;
+"B#B<A>#{_ZN1BI1AEC1Ev|constexpr}.37a0dc804dbb70abe9c0cba5d0d4b75d_1" [label="1: Start B<A>_B\nFormals:  this:B<A>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
-	 "B#B<int>#{_ZN1BIiEC1Ev|constexpr}.0a6e40da0e7d400cfcd0dfa1df7ad995_1" -> "B#B<int>#{_ZN1BIiEC1Ev|constexpr}.0a6e40da0e7d400cfcd0dfa1df7ad995_2" ;
-"B#B<int>#{_ZN1BIiEC1Ev|constexpr}.0a6e40da0e7d400cfcd0dfa1df7ad995_2" [label="2: Exit B<int>_B \n  " color=yellow style=filled]
+	 "B#B<A>#{_ZN1BI1AEC1Ev|constexpr}.37a0dc804dbb70abe9c0cba5d0d4b75d_1" -> "B#B<A>#{_ZN1BI1AEC1Ev|constexpr}.37a0dc804dbb70abe9c0cba5d0d4b75d_2" ;
+"B#B<A>#{_ZN1BI1AEC1Ev|constexpr}.37a0dc804dbb70abe9c0cba5d0d4b75d_2" [label="2: Exit B<A>_B \n  " color=yellow style=filled]
 	
 
-"div0#B<A>#(_ZN1BI1AE4div0Ev).95154c4eecaa5aa2388f6884c1f2eb1f_1" [label="1: Start B<A>_div0\nFormals:  this:B<A>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 16]\n " color=yellow style=filled]
+"div0#B<int>#(_ZN1BIiE4div0Ev).7928d23b80a07771917a21f2f65199b6_1" [label="1: Start B<int>_div0\nFormals:  this:B<int>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 16]\n " color=yellow style=filled]
 	
 
-	 "div0#B<A>#(_ZN1BI1AE4div0Ev).95154c4eecaa5aa2388f6884c1f2eb1f_1" -> "div0#B<A>#(_ZN1BI1AE4div0Ev).95154c4eecaa5aa2388f6884c1f2eb1f_3" ;
-"div0#B<A>#(_ZN1BI1AE4div0Ev).95154c4eecaa5aa2388f6884c1f2eb1f_2" [label="2: Exit B<A>_div0 \n  " color=yellow style=filled]
+	 "div0#B<int>#(_ZN1BIiE4div0Ev).7928d23b80a07771917a21f2f65199b6_1" -> "div0#B<int>#(_ZN1BIiE4div0Ev).7928d23b80a07771917a21f2f65199b6_3" ;
+"div0#B<int>#(_ZN1BIiE4div0Ev).7928d23b80a07771917a21f2f65199b6_2" [label="2: Exit B<int>_div0 \n  " color=yellow style=filled]
 	
 
-"div0#B<A>#(_ZN1BI1AE4div0Ev).95154c4eecaa5aa2388f6884c1f2eb1f_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 16]\n " shape="box"]
+"div0#B<int>#(_ZN1BIiE4div0Ev).7928d23b80a07771917a21f2f65199b6_3" [label="3:  Return Stmt \n   *&return:int=(1 / 0) [line 16]\n " shape="box"]
 	
 
-	 "div0#B<A>#(_ZN1BI1AE4div0Ev).95154c4eecaa5aa2388f6884c1f2eb1f_3" -> "div0#B<A>#(_ZN1BI1AE4div0Ev).95154c4eecaa5aa2388f6884c1f2eb1f_2" ;
-"B#B<A>#{_ZN1BI1AEC1Ev|constexpr}.37a0dc804dbb70abe9c0cba5d0d4b75d_1" [label="1: Start B<A>_B\nFormals:  this:B<A>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
+	 "div0#B<int>#(_ZN1BIiE4div0Ev).7928d23b80a07771917a21f2f65199b6_3" -> "div0#B<int>#(_ZN1BIiE4div0Ev).7928d23b80a07771917a21f2f65199b6_2" ;
+"B#B<int>#{_ZN1BIiEC1Ev|constexpr}.0a6e40da0e7d400cfcd0dfa1df7ad995_1" [label="1: Start B<int>_B\nFormals:  this:B<int>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
-	 "B#B<A>#{_ZN1BI1AEC1Ev|constexpr}.37a0dc804dbb70abe9c0cba5d0d4b75d_1" -> "B#B<A>#{_ZN1BI1AEC1Ev|constexpr}.37a0dc804dbb70abe9c0cba5d0d4b75d_2" ;
-"B#B<A>#{_ZN1BI1AEC1Ev|constexpr}.37a0dc804dbb70abe9c0cba5d0d4b75d_2" [label="2: Exit B<A>_B \n  " color=yellow style=filled]
+	 "B#B<int>#{_ZN1BIiEC1Ev|constexpr}.0a6e40da0e7d400cfcd0dfa1df7ad995_1" -> "B#B<int>#{_ZN1BIiEC1Ev|constexpr}.0a6e40da0e7d400cfcd0dfa1df7ad995_2" ;
+"B#B<int>#{_ZN1BIiEC1Ev|constexpr}.0a6e40da0e7d400cfcd0dfa1df7ad995_2" [label="2: Exit B<int>_B \n  " color=yellow style=filled]
 	
 
 }

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

@@ -13,7 +13,7 @@ codetoanalyze/cpp/quandary/arrays.cpp, arrays::memcpy_bad, 2, QUANDARY_TAINT_ERR
 codetoanalyze/cpp/quandary/arrays.cpp, arrays::memmove_bad, 2, QUANDARY_TAINT_ERROR, [Return from __infer_taint_source,Call to memmove]
 codetoanalyze/cpp/quandary/arrays.cpp, arrays::memset_bad, 2, QUANDARY_TAINT_ERROR, [Return from __infer_taint_source,Call to memset]
 codetoanalyze/cpp/quandary/arrays.cpp, arrays::stack_smash_bad, 2, QUANDARY_TAINT_ERROR, [Return from __infer_taint_source,Call to __set_array_length]
-codetoanalyze/cpp/quandary/arrays.cpp, arrays::std_array_sink_bad, 2, QUANDARY_TAINT_ERROR, [Return from __infer_taint_source,Call to std::array<int,_>_operator[]]
+codetoanalyze/cpp/quandary/arrays.cpp, arrays::std_array_sink_bad, 2, QUANDARY_TAINT_ERROR, [Return from __infer_taint_source,Call to std::array<int,2>_operator[]]
 codetoanalyze/cpp/quandary/arrays.cpp, arrays::std_string_sink_bad, 2, QUANDARY_TAINT_ERROR, [Return from __infer_taint_source,Call to std::basic_string<char,std::char_traits<char>,std::allocator<char>>_operator[]]
 codetoanalyze/cpp/quandary/arrays.cpp, arrays::strcpy_bad, 2, QUANDARY_TAINT_ERROR, [Return from getenv,Call to strcpy]
 codetoanalyze/cpp/quandary/arrays.cpp, arrays::strncpy_bad, 2, QUANDARY_TAINT_ERROR, [Return from __infer_taint_source,Call to strncpy]

infer/tests/codetoanalyze/cpp/shared/templates/class_specialization.cpp.dot

@@ -38,13 +38,6 @@ digraph iCFG {
 	
 
 	 "foo_int#class_specialization#_ZN20class_specialization7foo_intEv.6f63111c0806782f53c8007624316a0c_5" -> "foo_int#class_specialization#_ZN20class_specialization7foo_intEv.6f63111c0806782f53c8007624316a0c_4" ;
-"Base#Base<int>#class_specialization#{_ZN20class_specialization4BaseIiEC1Ev}.9f658966397464c569b5cdf0a55d2da4_1" [label="1: Start class_specialization::Base<int>_Base\nFormals:  this:class_specialization::Base<int>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
-	
-
-	 "Base#Base<int>#class_specialization#{_ZN20class_specialization4BaseIiEC1Ev}.9f658966397464c569b5cdf0a55d2da4_1" -> "Base#Base<int>#class_specialization#{_ZN20class_specialization4BaseIiEC1Ev}.9f658966397464c569b5cdf0a55d2da4_2" ;
-"Base#Base<int>#class_specialization#{_ZN20class_specialization4BaseIiEC1Ev}.9f658966397464c569b5cdf0a55d2da4_2" [label="2: Exit class_specialization::Base<int>_Base \n  " color=yellow style=filled]
-	
-
 "Base#Base<int*>#class_specialization#{_ZN20class_specialization4BaseIPiEC1Ev}.dea792851a5bef48197214d7ac20d162_1" [label="1: Start class_specialization::Base<int*>_Base\nFormals:  this:class_specialization::Base<int*>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
@@ -52,28 +45,13 @@ digraph iCFG {
 "Base#Base<int*>#class_specialization#{_ZN20class_specialization4BaseIPiEC1Ev}.dea792851a5bef48197214d7ac20d162_2" [label="2: Exit class_specialization::Base<int*>_Base \n  " color=yellow style=filled]
 	
 
-"Derived#Derived<int>#class_specialization#{_ZN20class_specialization7DerivedIiEC1Ev}.e116e1143fd21e664658f83e6ae62af4_1" [label="1: Start class_specialization::Derived<int>_Derived\nFormals:  this:class_specialization::Derived<int>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
-	
-
-	 "Derived#Derived<int>#class_specialization#{_ZN20class_specialization7DerivedIiEC1Ev}.e116e1143fd21e664658f83e6ae62af4_1" -> "Derived#Derived<int>#class_specialization#{_ZN20class_specialization7DerivedIiEC1Ev}.e116e1143fd21e664658f83e6ae62af4_3" ;
-"Derived#Derived<int>#class_specialization#{_ZN20class_specialization7DerivedIiEC1Ev}.e116e1143fd21e664658f83e6ae62af4_2" [label="2: Exit class_specialization::Derived<int>_Derived \n  " color=yellow style=filled]
-	
-
-"Derived#Derived<int>#class_specialization#{_ZN20class_specialization7DerivedIiEC1Ev}.e116e1143fd21e664658f83e6ae62af4_3" [label="3:  Constructor Init \n   n$0=*&this:class_specialization::Derived<int>* [line 17]\n  _fun_class_specialization::Base<int>_Base(n$0:class_specialization::Derived<int>*) [line 17]\n " shape="box"]
-	
-
-	 "Derived#Derived<int>#class_specialization#{_ZN20class_specialization7DerivedIiEC1Ev}.e116e1143fd21e664658f83e6ae62af4_3" -> "Derived#Derived<int>#class_specialization#{_ZN20class_specialization7DerivedIiEC1Ev}.e116e1143fd21e664658f83e6ae62af4_2" ;
-"foo#Derived<int>#class_specialization#(_ZN20class_specialization7DerivedIiE3fooEi).0c794b38a798abffd37d8daf11cfbbef_1" [label="1: Start class_specialization::Derived<int>_foo\nFormals:  this:class_specialization::Derived<int>* t:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
-	
-
-	 "foo#Derived<int>#class_specialization#(_ZN20class_specialization7DerivedIiE3fooEi).0c794b38a798abffd37d8daf11cfbbef_1" -> "foo#Derived<int>#class_specialization#(_ZN20class_specialization7DerivedIiE3fooEi).0c794b38a798abffd37d8daf11cfbbef_3" ;
-"foo#Derived<int>#class_specialization#(_ZN20class_specialization7DerivedIiE3fooEi).0c794b38a798abffd37d8daf11cfbbef_2" [label="2: Exit class_specialization::Derived<int>_foo \n  " color=yellow style=filled]
+"Base#Base<int>#class_specialization#{_ZN20class_specialization4BaseIiEC1Ev}.9f658966397464c569b5cdf0a55d2da4_1" [label="1: Start class_specialization::Base<int>_Base\nFormals:  this:class_specialization::Base<int>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
-"foo#Derived<int>#class_specialization#(_ZN20class_specialization7DerivedIiE3fooEi).0c794b38a798abffd37d8daf11cfbbef_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class_specialization::Derived<int>* [line 18]\n  n$1=*&t:int [line 18]\n  *n$0.x:int=n$1 [line 18]\n " shape="box"]
+	 "Base#Base<int>#class_specialization#{_ZN20class_specialization4BaseIiEC1Ev}.9f658966397464c569b5cdf0a55d2da4_1" -> "Base#Base<int>#class_specialization#{_ZN20class_specialization4BaseIiEC1Ev}.9f658966397464c569b5cdf0a55d2da4_2" ;
+"Base#Base<int>#class_specialization#{_ZN20class_specialization4BaseIiEC1Ev}.9f658966397464c569b5cdf0a55d2da4_2" [label="2: Exit class_specialization::Base<int>_Base \n  " color=yellow style=filled]
 	
 
-	 "foo#Derived<int>#class_specialization#(_ZN20class_specialization7DerivedIiE3fooEi).0c794b38a798abffd37d8daf11cfbbef_3" -> "foo#Derived<int>#class_specialization#(_ZN20class_specialization7DerivedIiE3fooEi).0c794b38a798abffd37d8daf11cfbbef_2" ;
 "Derived#Derived<int*>#class_specialization#{_ZN20class_specialization7DerivedIPiEC1Ev}.1a3cc564bd2adc598344fe93c409db80_1" [label="1: Start class_specialization::Derived<int*>_Derived\nFormals:  this:class_specialization::Derived<int*>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 22]\n " color=yellow style=filled]
 	
 
@@ -96,4 +74,26 @@ digraph iCFG {
 	
 
 	 "foo2#Derived<int*>#class_specialization#(_ZN20class_specialization7DerivedIPiE4foo2ES1_).ad7ae4c6761ba05b845d0f55f64e64f6_3" -> "foo2#Derived<int*>#class_specialization#(_ZN20class_specialization7DerivedIPiE4foo2ES1_).ad7ae4c6761ba05b845d0f55f64e64f6_2" ;
+"Derived#Derived<int>#class_specialization#{_ZN20class_specialization7DerivedIiEC1Ev}.e116e1143fd21e664658f83e6ae62af4_1" [label="1: Start class_specialization::Derived<int>_Derived\nFormals:  this:class_specialization::Derived<int>*\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
+	
+
+	 "Derived#Derived<int>#class_specialization#{_ZN20class_specialization7DerivedIiEC1Ev}.e116e1143fd21e664658f83e6ae62af4_1" -> "Derived#Derived<int>#class_specialization#{_ZN20class_specialization7DerivedIiEC1Ev}.e116e1143fd21e664658f83e6ae62af4_3" ;
+"Derived#Derived<int>#class_specialization#{_ZN20class_specialization7DerivedIiEC1Ev}.e116e1143fd21e664658f83e6ae62af4_2" [label="2: Exit class_specialization::Derived<int>_Derived \n  " color=yellow style=filled]
+	
+
+"Derived#Derived<int>#class_specialization#{_ZN20class_specialization7DerivedIiEC1Ev}.e116e1143fd21e664658f83e6ae62af4_3" [label="3:  Constructor Init \n   n$0=*&this:class_specialization::Derived<int>* [line 17]\n  _fun_class_specialization::Base<int>_Base(n$0:class_specialization::Derived<int>*) [line 17]\n " shape="box"]
+	
+
+	 "Derived#Derived<int>#class_specialization#{_ZN20class_specialization7DerivedIiEC1Ev}.e116e1143fd21e664658f83e6ae62af4_3" -> "Derived#Derived<int>#class_specialization#{_ZN20class_specialization7DerivedIiEC1Ev}.e116e1143fd21e664658f83e6ae62af4_2" ;
+"foo#Derived<int>#class_specialization#(_ZN20class_specialization7DerivedIiE3fooEi).0c794b38a798abffd37d8daf11cfbbef_1" [label="1: Start class_specialization::Derived<int>_foo\nFormals:  this:class_specialization::Derived<int>* t:int\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
+	
+
+	 "foo#Derived<int>#class_specialization#(_ZN20class_specialization7DerivedIiE3fooEi).0c794b38a798abffd37d8daf11cfbbef_1" -> "foo#Derived<int>#class_specialization#(_ZN20class_specialization7DerivedIiE3fooEi).0c794b38a798abffd37d8daf11cfbbef_3" ;
+"foo#Derived<int>#class_specialization#(_ZN20class_specialization7DerivedIiE3fooEi).0c794b38a798abffd37d8daf11cfbbef_2" [label="2: Exit class_specialization::Derived<int>_foo \n  " color=yellow style=filled]
+	
+
+"foo#Derived<int>#class_specialization#(_ZN20class_specialization7DerivedIiE3fooEi).0c794b38a798abffd37d8daf11cfbbef_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class_specialization::Derived<int>* [line 18]\n  n$1=*&t:int [line 18]\n  *n$0.x:int=n$1 [line 18]\n " shape="box"]
+	
+
+	 "foo#Derived<int>#class_specialization#(_ZN20class_specialization7DerivedIiE3fooEi).0c794b38a798abffd37d8daf11cfbbef_3" -> "foo#Derived<int>#class_specialization#(_ZN20class_specialization7DerivedIiE3fooEi).0c794b38a798abffd37d8daf11cfbbef_2" ;
 }